Mutations 'green marks' was being miscounted as mutation #64, rather than

the correct #65, leading to there being the wrong number of entries in
the mutation tables.


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

3 files changed, 17 insertions, 14 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index bfbd7300ba..558af36ed9 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2004,12 +2004,12 @@ enum mutation_type
     MUT_SMITE,                         //   57
     MUT_CLAWS,                         //jmf: added
     MUT_HOOVES,                        //jmf: etc.
-    MUT_FANGS,
-    MUT_BREATHE_POISON,                //   60
+    MUT_FANGS,                         // 60
+    MUT_BREATHE_POISON,
     MUT_STINGER,
     MUT_BIG_WINGS,
-    MUT_BLUE_MARKS, //   63 - decorative, as in "mark of the devil"
-    MUT_GREEN_MARKS,                   //   64
+    MUT_BLUE_MARKS, //   64 - decorative, as in "mark of the devil"
+    MUT_GREEN_MARKS,                   //   65
     MUT_RED_SCALES = 70,               //   70
     MUT_NACREOUS_SCALES,
     MUT_GREY2_SCALES,
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 01b3114e83..61068227ad 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -267,6 +267,7 @@ const char *mutation_descrip[][3] = {
      "There are several blue sigils on your hands and arms.",
      "Your hands, arms and shoulders are covered in intricate, arcane blue writing."},
 
+    // 65
     {"There is a green sigil on your chest.",
      "There are several green sigils on your chest and abdomen.",
      "Your chest, abdomen and neck are covered in intricate, arcane green writing."},
@@ -275,7 +276,7 @@ const char *mutation_descrip[][3] = {
     {"", "", ""},
     {"", "", ""},
     {"", "", ""},
-    {"", "", ""},
+
     // 70
 
     {"You are partially covered in red scales (AC + 1).",
@@ -514,6 +515,7 @@ const char *gain_mutation[][3] = {
     {"Your hands itch.", "Your hands and forearms itch.",
      "Your arms, hands and shoulders itch."},
 
+    // 65
     {"Your chest itches.", "Your chest and abdomen itch.",
      "Your chest, abdomen and neck itch."},
 
@@ -521,7 +523,7 @@ const char *gain_mutation[][3] = {
     {"", "", ""},
     {"", "", ""},
     {"", "", ""},
-    {"", "", ""},
+
     // 70
 
     {"Red scales grow over part of your body.",
@@ -730,14 +732,15 @@ const char *lose_mutation[][3] = {
     {"", "", ""},
     {"", "", ""},
     {"", "", ""},
+
+    // 65
     {"", "", ""},
     {"", "", ""},
     {"", "", ""},
     {"", "", ""},
     {"", "", ""},
-    {"", "", ""},
-// 70
 
+    // 70
     {"Your red scales disappear.", "Your red scales recede somewhat.",
      "Your red scales recede somewhat."},
 
@@ -770,8 +773,8 @@ const char *lose_mutation[][3] = {
 
     {"Your purple scales disappear.", "Your purple scales recede somewhat.",
      "Your purple scales recede somewhat."},
-// 80
 
+    // 80
     {"Your speckled scales disappear.",
      "Your speckled scales recede somewhat.",
      "Your speckled scales recede somewhat."},
@@ -876,7 +879,6 @@ const char mutation_rarity[] = {
     0,
     0,
     0,
-    0,
 // 70
     2,                          // red scales
     1,                          // nac scales
@@ -1757,13 +1759,14 @@ int how_mutated(void)
     return (j);
 }                               // end how_mutated()
 
-bool delete_mutation(mutation_type which_mutation)
+bool delete_mutation(mutation_type which_mutation, bool force)
 {
     mutation_type mutat = which_mutation;
     int i;
 
-    if (you.mutation[MUT_MUTATION_RESISTANCE] > 1
-        && (you.mutation[MUT_MUTATION_RESISTANCE] == 3 || coinflip()))
+    if (!force
+        && (you.mutation[MUT_MUTATION_RESISTANCE] > 1
+            && (you.mutation[MUT_MUTATION_RESISTANCE] == 3 || coinflip())))
     {
         mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
         return false;
diff --git a/crawl-ref/source/mutation.h b/crawl-ref/source/mutation.h
index 44e4ba1fde..91d1f37995 100644
--- a/crawl-ref/source/mutation.h
+++ b/crawl-ref/source/mutation.h
@@ -39,7 +39,7 @@ formatted_string describe_mutations();
 /* ***********************************************************************
  * called from: decks - it_use2 - mutation - spells
  * *********************************************************************** */
-bool delete_mutation(mutation_type which_mutation);
+bool delete_mutation(mutation_type which_mutation, bool force = false);
 
 
 // last updated 12may2000 {dlb}