Cleanup of manual (patches 1798238, 1798239) and of claw

mutation as well as the breathe poison one (patches
1795977, 1797293). All patches by dolorous.


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

2 files changed, 46 insertions, 22 deletions

diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index fa34e0386e..6ebd6cb595 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -1336,11 +1336,12 @@ at using armour and shields. They are poor at missile combat, the single
 exception being crossbows, those being rather mechanical weapons. Since
 pole-arms usually are too big for them to wield comfortably, they make
 quite bad weapons for Dwarves.
+
 In general, they are rather resistant to magic than capable of dealing
 with it. However, they are very proficient at earth and fire magics. 
 Thus, many a Mountain Dwarf started career as an elementalist in one of 
-those schools.
-They advance in levels at a similar rate to Grey and Deep elves.
+those schools. They advance in levels at a similar rate to Grey and Deep
+elves.
 
 Halflings:
 ----------
@@ -1377,14 +1378,14 @@ Hill orcs are orcs from the upper world who, jealous of the riches which
 their cousins the cave orcs possess below the ground, descend in search 
 of plunder and adventure.
 
-Hill orcs are as robust as the hill dwarves, but have very low reserves 
-of magical energy. Their forte is brute-force fighting, and they are 
-skilled at using most hand weapons (with the exception of short blades, 
-at which they are only fair), although they are not particularly good at
-using missile weapons. They prefer to use their own weapons. Orcs are 
-poor at using most types of magic with the exception of conjurations, 
-necromancy, and earth and fire elemental magic. They advance as quickly
-as humans.
+Hill orcs are as robust as the mountain dwarves, but have very low 
+reserves of magical energy. Their forte is brute-force fighting, and 
+they are skilled at using most hand weapons (with the exception of short 
+blades, at which they are only fair), although they are not particularly 
+good at using missile weapons. They prefer to use their own weapons. 
+Orcs are poor at using most types of magic with the exception of 
+conjurations, necromancy, and earth and fire elemental magic. They 
+advance as quickly as humans.
 
 Kobolds:
 --------
@@ -1456,7 +1457,8 @@ Genealogists would call these species Common Ogres and Sapient Ogres rather,
 yet the folklore labels stuck somehow. These two are genuinely different 
 races stemming from a mythological progenitor, the Primordial Ogre. 
 While crossbreeding is possible, it is generally frowned upon in Ogre 
-societies: the resulting offspring is often ill-fated, and in very rare cases, even two-headed ogres result.
+societies: the resulting offspring is often ill-fated, and in very rare
+cases, even two-headed ogres result.
 
 Ogres are huge, chunky creatures who usually live to do nothing more than 
 smash, smash, smash, and destroy. They have great physical strength, but 
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index b09cf787dd..fe617537f4 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -51,24 +51,30 @@
 int how_mutated(void);
 char body_covered(void);
 
-const char* troll_claw_messages[3] = {
+const char *troll_claw_descrip[4] = {
+    "You have claws for hands.",
+    "You have sharp claws for hands.",
+    "You have very sharp claws for hands.",
+    "You have claws sharper than steel for hands."
+};
+
+const char *troll_claw_gain[3] = {
     "Your claws sharpen.",
     "Your claws sharpen.",
     "Your claws steel!"
 };
 
-const char* naga_speed_descrip[4] = {
+const char *troll_claw_lose[3] = {
+    "Your claws look duller.",
+    "Your claws look duller.",
+    "Your claws feel softer."
+};
+
+const char *naga_speed_descrip[4] = {
     "You cover the ground very slowly.",    // 10*14/10 = 14
     "You cover the ground rather slowly.",  //  8*14/10 = 11
     "You cover the ground rather quickly.", //  7*14/10 = 9
-    "You cover the ground quickly.",        //  6*14/10 = 8
-};
-
-const char* troll_claw_descrip[4] = {
-    "You have claws for hands.",
-    "You have sharp claws for hands.",
-    "You have very sharp claws for hands.",
-    "You have claws sharper than steel for hands."
+    "You cover the ground quickly."         //  6*14/10 = 8
 };
 
 const char *mutation_descrip[][3] = {
@@ -1187,6 +1193,13 @@ formatted_string describe_mutations()
     {
         if (you.mutation[i] != 0 && !you.demon_pow[i])
         {
+            // this is already handled above:
+            if (you.species == SP_NAGA &&
+                (i == MUT_BREATHE_POISON || i == MUT_FAST))
+                continue;
+            if (you.species == SP_TROLL && i == MUT_CLAWS)
+                continue;
+                
             have_any = true;
 
             result += mutation_name(static_cast<mutation_type>(i));
@@ -1460,6 +1473,9 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
         return false;
     }
 
+    if (mutat == MUT_BREATHE_POISON && you.species != SP_NAGA)
+        return false;
+
     if (mutat == MUT_BIG_WINGS && !player_genus(GENPC_DRACONIAN))
         return false;
 
@@ -1612,7 +1628,7 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
          break;
          
     case MUT_CLAWS:
-        mpr((you.species == SP_TROLL ? troll_claw_messages
+        mpr((you.species == SP_TROLL ? troll_claw_gain
              : gain_mutation[mutat])[you.mutation[mutat]],
              MSGCH_MUTATION);
 
@@ -1875,6 +1891,12 @@ bool delete_mutation(mutation_type which_mutation, bool force)
     case MUT_BONEY_PLATES:
         modify_stat(STAT_DEXTERITY, 1, true);
 
+    case MUT_CLAWS:
+        mpr((you.species == SP_TROLL ? troll_claw_lose
+             : lose_mutation[mutat])[you.mutation[mutat] - 1],
+             MSGCH_MUTATION);
+        break;
+
     default:
         mpr(lose_mutation[mutat][you.mutation[mutat] - 1], MSGCH_MUTATION);
         break;