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

2 files changed, 8 insertions, 8 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 0489bb30d7..1f17197005 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -2090,8 +2090,8 @@ matter which weapon your character is wielding (if any). Fighting is
 also the skill that determines the number of hit points your character
 gets as they increase in levels (note that this is calculated so that
 you don't get a long run advantage by starting out with a high Fighting
-skill). The first two levels of Fighting skill can be obtained by
-training melee combat against plants and fungi.
+skill). The first level of Fighting skill can be obtained by training
+melee combat against plants and fungi.
 
 Weapon skills affect your ability to fight with specific melee weapons.
 Weapon skills include:
@@ -2126,8 +2126,8 @@ them anyway). You can practise Unarmed Combat by attacking empty-handed,
 and it is also exercised when you make a secondary attack (a kick,
 punch, etc.). Unarmed combat is particularly difficult to use in
 combination with heavy armour or shields or very big weapons. As with
-Fighting, the first two levels of this skill can be obtained by training
-it against plants and fungi.
+Fighting, the first level of this skill can be obtained by training it
+against plants and fungi.
 
 Ranged combat skills:
 ---------------------
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];