Allow the player to train only one level of fighting/unarmed combat by

attacking e.g. plants and fungi.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10728 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index a957d8b794..2d0dc36a12 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1853,10 +1853,10 @@ void melee_attack::player_exercise_combat_skills()
 {
     const bool helpless = defender->cannot_fight();
 
-    if (!helpless || you.skills[ wpn_skill ] < 2)
-        exercise( wpn_skill, 1 );
+    if (!helpless || you.skills[wpn_skill] < 1)
+        exercise(wpn_skill, 1);
 
-    if ((!helpless || you.skills[SK_FIGHTING] < 2)
+    if ((!helpless || you.skills[SK_FIGHTING] < 1)
         && one_chance_in(3))
     {
         exercise(SK_FIGHTING, 1);
@@ -3976,7 +3976,7 @@ int melee_attack::player_calc_base_unarmed_damage()
     if (player_in_bat_form())
     {
         // Bats really don't do a lot of damage.
-        damage += you.skills[SK_UNARMED_COMBAT]/5;
+        damage += you.skills[SK_UNARMED_COMBAT] / 5;
     }
     else
         damage += you.skills[SK_UNARMED_COMBAT];