Remove paws and sleepiness mutations. Those two just don't cut it.

As long as "shaggy fur" stays in, I'm happy. :)


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

7 files changed, 29 insertions, 80 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index dbe2ced9ad..12ad68cb6e 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2596,11 +2596,6 @@ void handle_time( long time_delta )
     {
         yell(true);
     }
-    else if (you.mutation[MUT_SLEEPINESS]
-             && random2(100) < you.mutation[MUT_SLEEPINESS] * 5)
-    {
-        you.put_to_sleep();
-    }
 
     // Update all of the corpses, food chunks and potions of blood on the floor.
     update_corpses(time_delta);
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index a589e79f45..afba81315c 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2073,20 +2073,18 @@ enum mutation_type
     MUT_SMITE,
     MUT_CLAWS,                         
     MUT_FANGS,      // new in 0.3
-    // hooves, talons, paws can replace feet
+    // hooves and talons can replace feet
     MUT_HOOVES,                        //   60
     MUT_TALONS,     // new in 0.4
-    MUT_PAWS,       // new in 0.4
     MUT_BREATHE_POISON,
     MUT_STINGER,
-    MUT_BIG_WINGS,                     //   65
-    MUT_BLUE_MARKS, // decorative, as in "mark of the devil"
+    MUT_BIG_WINGS,
+    MUT_BLUE_MARKS, // 65, decorative, as in "mark of the devil"
     MUT_GREEN_MARKS,
     MUT_SAPROVOROUS,
     MUT_SHAGGY_FUR, // new in 0.4
-    MUT_HIGH_MAGIC, // new in 0.4      --   70
-    MUT_LOW_MAGIC,  // new in 0.4
-    MUT_SLEEPINESS, // new in 0.4
+    MUT_HIGH_MAGIC, // new in 0.4
+    MUT_LOW_MAGIC,  // new in 0.4      --   70
     
     // several types of scales (affect AC and sometimes more)
     MUT_RED_SCALES = 75,               //   75
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index f4f6881ed1..d843830b9d 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -835,13 +835,6 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary)
            return (false);
         }
 
-        if (you.mutation[MUT_PAWS])
-        {
-            if (verbose)
-                mpr("Boots don't fit your paws!");
-           return (false);
-        }
-
         if (you.species == SP_NAGA)
         {
             if (verbose)
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index ea0bf3c5fb..dac38ae016 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1144,14 +1144,6 @@ bool check_armour_shape( const item_def &item, bool quiet )
                 return (false);
             }
 
-            if (you.mutation[MUT_PAWS])
-            {
-                if (!quiet)
-                    mpr("Boots don't fit your paws!");
-
-                return (false);
-            }
-
             switch (you.species)
             {
             case SP_NAGA:
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 47353ebca3..d90cecc54b 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -273,10 +273,8 @@ const char *mutation_descrip[][3] = {
      "You have razor-sharp teeth."},
 
     // 60 - leave some space for more demonic powers...
-
     {"You have hooves in place of feet.", "", ""},
     {"You have talons in place of feet.", "", ""},
-    {"You have soft paws in place of feet.", "", ""},
 
     {"You can exhale a cloud of poison.", "", ""},
 
@@ -284,12 +282,12 @@ const char *mutation_descrip[][3] = {
      "Your tail ends in a sharp poisonous barb.",
      "Your tail ends in a wicked poisonous barb."}, //jmf: nagas & dracos
 
-    // 65
     {"Your wings are large and strong.", "", ""},       //jmf: dracos only
 
     //jmf: these next two are for evil gods to mark their followers; good gods
     //     will never accept a 'marked' worshipper
 
+    // 65
     {"There is a blue sigil on each of your hands.",
      "There are several blue sigils on your hands and arms.",
      "Your hands, arms and shoulders are covered in intricate, arcane blue writing."},
@@ -305,19 +303,17 @@ const char *mutation_descrip[][3] = {
      "You are covered in thick fur.",
      "Your thick and shaggy fur keeps you warm."},
      
-    // 70
     {"You have an increased reservoir of magic (+10 percent mp).",
      "You have a strongly increased reservoir of magic (+20 percent mp).",
      "You have an extremely increased reservoir of magic (+30 percent mp)."},
 
+    // 70
     {"Your magical capacity is low (-10 percent mp).",
      "Your magical capacity is very low (-20 percent mp).",
      "Your magical capacity is extremely low (-30 percent mp)."},
 
-    {"You occasionally fall asleep.",
-     "You sometimes fall asleep.",
-     "You frequently fall asleep."},
-    
+    {"", "", ""},
+    {"", "", ""},
     {"", "", ""},
     {"", "", ""},
 
@@ -547,7 +543,6 @@ const char *gain_mutation[][3] = {
     // 60
     {"Your feet shrivel into cloven hooves.", "", ""},
     {"Your feet stretch and sharpen into talons.", "", ""},
-    {"Your feet sprout fur and twist into soft paws.", "", ""},
 
     {"You taste something nasty.", "You taste something very nasty.",
      "You taste something extremely nasty."},
@@ -556,9 +551,9 @@ const char *gain_mutation[][3] = {
      "The barb on your tail looks sharper.",
      "The barb on your tail looks very sharp."},
 
-    // 65
     {"Your wings grow larger and stronger.", "", ""},
 
+    // 65
     {"Your hands itch.", "Your hands and forearms itch.",
      "Your arms, hands and shoulders itch."},
 
@@ -572,15 +567,15 @@ const char *gain_mutation[][3] = {
      "Your fur grows into a thick mane.",
      "Your thick fur grows shaggy and warm."},
 
-    // 70
     {"You feel more energetic.", "You feel more energetic.",
      "You feel more energetic."},
      
+    // 70
     {"You feel less energetic.", "You feel less energetic.",
      "You feel less energetic."},
 
-    {"You feel a bit tired.", "You feel drowsy.", "You feel really drowsy."},
-    
+    {"", "", ""},
+    {"", "", ""},
     {"", "", ""},
     {"", "", ""},
 
@@ -788,13 +783,12 @@ const char *lose_mutation[][3] = {
     // 60
     {"Your hooves expand and flesh out into feet!", "", ""},
     {"Your talons dull and shrink into feet.", "", ""},
-    {"Your paws shed and extend into feet.", "", ""},
 
     {"", "", ""},
     {"", "", ""},
-    
-    // 65
     {"", "", ""},
+
+    // 65
     {"", "", ""},
     {"", "", ""},
     
@@ -805,18 +799,18 @@ const char *lose_mutation[][3] = {
      "Your thick fur recedes somewhat.",
      "Your shaggy fur recedes somewhat."},
 
-    // 70
     {"You feel less energetic.", "You feel less energetic.",
      "You feel less energetic."},
 
+    // 70
     {"You feel more energetic.", "You feel more energetic.",
      "You feel more energetic."},
 
-    {"You feel wide awake.", "You feel more awake.", "You feel more awake."},
-    
     {"", "", ""},
     {"", "", ""},
-    
+    {"", "", ""},
+    {"", "", ""},
+
     // 75
     {"Your red scales disappear.", "Your red scales recede somewhat.",
      "Your red scales recede somewhat."},
@@ -951,24 +945,25 @@ static mutation_def mutation_defs[] = {
 // 60
     { MUT_HOOVES, 1, 1, false },
     { MUT_TALONS, 1, 1, false },
-    { MUT_PAWS, 1, 1, false },
 
     { MUT_BREATHE_POISON, 0, 1, false }, // Naga only
     { MUT_STINGER, 0, 3, false },        // Naga and Draconian only
-// 65
     { MUT_BIG_WINGS, 0, 1, false },      // Draconian only
+// 65
     { MUT_BLUE_MARKS, 0, 3, false },     // used by evil gods to mark followers
     { MUT_GREEN_MARKS, 0, 3, false },
 
     { MUT_SAPROVOROUS, 0, 3, false },    // species-dependent innate mutation
 
     { MUT_SHAGGY_FUR, 2, 3, false },
-// 70
+    
     { MUT_HIGH_MAGIC, 1, 3, false },
+// 70
     { MUT_LOW_MAGIC, 9, 3, true },
-    { MUT_SLEEPINESS, 3, 3, true },
     { RANDOM_MUTATION, 0, 3, false },    
     { RANDOM_MUTATION, 0, 3, false },
+    { RANDOM_MUTATION, 0, 3, false },
+    { RANDOM_MUTATION, 0, 3, false },
 
 // 75 -- scales of various colours and effects
     { MUT_RED_SCALES, 2, 3, false },
@@ -1368,7 +1363,6 @@ static int calc_mutation_amusement_value(mutation_type which_mutation)
     case MUT_FANGS:
     case MUT_HOOVES:
     case MUT_TALONS:
-    case MUT_PAWS:
     case MUT_BREATHE_POISON:
     case MUT_STINGER:
     case MUT_BIG_WINGS:
@@ -1634,7 +1628,7 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
     }
 
     // putting boots on after they are forced off. -- bwr
-    if ((mutat == MUT_HOOVES || mutat == MUT_TALONS || mutat == MUT_PAWS)
+    if ((mutat == MUT_HOOVES || mutat == MUT_TALONS)
          && !player_has_feet())
     {
         return false;
@@ -1786,7 +1780,6 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
     //jmf: like horns
     case MUT_HOOVES:
     case MUT_TALONS:
-    case MUT_PAWS:
         mpr(gain_mutation[mutat][you.mutation[mutat]], MSGCH_MUTATION);
         remove_one_equip(EQ_BOOTS);
         break;
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index f9e4e62326..23ddcba5da 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2172,13 +2172,6 @@ std::string status_mut_abilities()
                 text += info;
                 have_any = true;
                 break;
-            case MUT_SLEEPINESS:
-                if (have_any)
-                    text += ", ";
-                snprintf(info, INFO_SIZE, "sleepiness %d", level);
-                text += info;
-                have_any = true;
-                break;
 
             /* demonspawn mutations */
             case MUT_TORMENT_RESISTANCE:
@@ -2299,12 +2292,6 @@ std::string status_mut_abilities()
                 text += "talons";
                 have_any = true;
                 break;
-            case MUT_PAWS:
-                if (have_any)
-                    text += ", ";
-                text += "soft paws";
-                have_any = true;
-                break;
             case MUT_BREATHE_POISON:
                 if (have_any)
                     text += ", ";
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 5b138ebe2f..a1318308c9 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -610,11 +610,8 @@ bool player_has_feet()
    if (you.species == SP_NAGA || player_genus(GENPC_DRACONIAN))
        return false;
        
-   if (you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS]
-       || you.mutation[MUT_PAWS])
-   {
+   if (you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS])
        return false;
-   }
    
    return true;
 }
@@ -629,8 +626,7 @@ bool you_tran_can_wear(int eq, bool check_mutation)
 
        if (eq == EQ_BOOTS
            && (player_is_swimming() && you.species == SP_MERFOLK
-               || you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS]
-               || you.mutation[MUT_PAWS]))
+               || you.mutation[MUT_HOOVES] || you.mutation[MUT_TALONS]))
        {
            return false;
        }
@@ -3518,13 +3514,8 @@ int check_stealth(void)
         else if ( !player_can_swim() )
             stealth /= 2;       // splashy-splashy
     }
-    else
-    {
-        if (you.mutation[MUT_HOOVES])
-            stealth -= 10;  // clippety-clop
-        else if (you.mutation[MUT_PAWS])
-            stealth += 10;
-    }
+    else if (you.mutation[MUT_HOOVES])
+        stealth -= 10;  // clippety-clop
 
     // Radiating silence is the negative complement of shouting all the
     // time... a sudden change from background noise to no noise is going