Remove "drifitng" mutation, since consensus seems to be that it wasn't

very good.


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

5 files changed, 11 insertions, 84 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 7297d681b1..5297da5f0d 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1251,7 +1251,6 @@ static bool cmd_is_repeatable(command_type cmd, bool is_again = false)
    of round */
 bool apply_berserk_penalty = false;
 
-static void drift_player(int move_x, int move_y);
 /*
  * This function handles the player's input. It's called from main(),
  * from inside an endless loop.
@@ -1319,13 +1318,6 @@ static void input()
         crawl_state.cancel_cmd_repeat("Cannot move, cancelling command "
                                       "repetition.");
 
-        // may sleep walk
-        if (!you.paralysed() && you.mutation[MUT_DRIFTING]
-            && (random2(100) <= you.mutation[MUT_DRIFTING] * 5) )
-        {
-            drift_player(0, 0);
-        }
-        
         world_reacts();
         return;
     }
@@ -3648,47 +3640,6 @@ static void do_berserk_no_combat_penalty(void)
 }                               // end do_berserk_no_combat_penalty()
 
 
-void drift_player(int move_x, int move_y)
-{
-    int drift_dir = -1;
-    int okay_dirs = 0;
-
-    // don't drift if held in a net
-    if (you.attribute[ATTR_HELD])
-        return;
-
-    for (int i = 0; i < 8; i++)
-    {
-        const coord_def      drift_delta = Compass[i];
-        const coord_def      new_pos     = you.pos() + drift_delta;
-        const unsigned short targ_monst  = mgrd(new_pos);
-
-        if (you.can_pass_through(new_pos)
-            && !is_grid_dangerous(grd(new_pos))
-            && (targ_monst == NON_MONSTER ||
-                mons_is_submerged(&menv[targ_monst])))
-        {
-            if (one_chance_in(++okay_dirs))
-                drift_dir = i;
-        }
-    }
-
-    if (okay_dirs > 0)
-    {
-        const coord_def drift_delta = Compass[drift_dir];
-        const coord_def new_pos     = you.pos() + drift_delta;
-
-        if (drift_delta == coord_def(-move_x, -move_y))
-            mpr("You drift backwards.");
-        else if (drift_delta == coord_def(move_x, move_y))
-            mpr("You drift forwards.");
-        else
-            mpr("You drift.");
-
-        move_player_to_grid(new_pos.x, new_pos.y, true, true, false);
-    }
-}
-
 // Called when the player moves by walking/running. Also calls attack
 // function etc when necessary.
 static void move_player(int move_x, int move_y)
@@ -3804,12 +3755,6 @@ static void move_player(int move_x, int move_y)
         if (!move_player_to_grid(targ_x, targ_y, true, false, swap))
             return;
 
-        if (you.mutation[MUT_DRIFTING]
-            && (random2(100) <= you.mutation[MUT_DRIFTING] * 5) )
-        {
-            drift_player(move_x, move_y);
-        }
-
         move_x = 0;
         move_y = 0;
 
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 9536ecba33..7fd47e72fc 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -2233,13 +2233,14 @@ static const char *mutation_type_names[] = {
     "big wings",
     "blue marks",
     "green marks",
-    "drifting",
     "saprovorous",
     "shaggy fur",
     "high mp",
     "low mp",
     "sleepiness",
     "",
+    "",
+
     // from here on scales
     "red scales",
     "nacreous scales",
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 1d1f912c63..2ea4e787bb 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2013,10 +2013,9 @@ enum mutation_type
     MUT_BIG_WINGS,                     //   65
     MUT_BLUE_MARKS, // decorative, as in "mark of the devil"
     MUT_GREEN_MARKS,
-    MUT_DRIFTING,   // new in 0.4
     MUT_SAPROVOROUS,
-    MUT_SHAGGY_FUR, // new in 0.4      --   70
-    MUT_HIGH_MAGIC, // new in 0.4
+    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
     
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index e4d648636c..6484663384 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -297,18 +297,14 @@ const char *mutation_descrip[][3] = {
      "There are several green sigils on your chest and abdomen.",
      "Your chest, abdomen and neck are covered in intricate, arcane green writing."},
 
-    {"You occasionally drift when moving.",
-     "You sometimes drift when moving.",
-     "You frequently drift when moving."},
-
     {"You can tolerate rotten meat.", "You can eat rotten meat.",
      "You thrive on rotten meat."},    
 
-    // 70
     {"You are covered in fur.",
      "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)."},
@@ -322,6 +318,7 @@ const char *mutation_descrip[][3] = {
      "You frequently fall asleep."},
     
     {"", "", ""},
+    {"", "", ""},
 
     // 75
     {"You are partially covered in red scales (AC + 1).",
@@ -567,18 +564,14 @@ const char *gain_mutation[][3] = {
     {"Your chest itches.", "Your chest and abdomen itch.",
      "Your chest, abdomen and neck itch."},
 
-    {"Your movements feel uncertain.",
-     "Your movements feel even more uncertain.",
-     "Your movements feel even more uncertain."},
-
     // saprovorous: can never be gained or lost, only started with    
     {"", "", ""},
     
-    // 70
     {"Fur sprouts all over your body.",
      "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."},
      
@@ -588,6 +581,7 @@ const char *gain_mutation[][3] = {
     {"You feel a bit tired.", "You feel drowsy.", "You feel really drowsy."},
     
     {"", "", ""},
+    {"", "", ""},
 
     // 75
     {"Red scales grow over part of your body.",
@@ -803,18 +797,14 @@ const char *lose_mutation[][3] = {
     {"", "", ""},
     {"", "", ""},
     
-    {"Your movements feel completely certain again.",
-     "Your movements feel more certain.",
-     "Your movements feel more certain."},
-
     // saprovorous: can never be gained or lost, only started with
     {"", "", ""},
 
-    // 70
     {"You shed all your fur.",
      "Your thick fur recedes somewhat.",
      "Your shaggy fur recedes somewhat."},
 
+    // 70
     {"You feel less energetic.", "You feel less energetic.",
      "You feel less energetic."},
 
@@ -824,6 +814,7 @@ const char *lose_mutation[][3] = {
     {"You feel wide awake.", "You feel more awake.", "You feel more awake."},
     
     {"", "", ""},
+    {"", "", ""},
     
     // 75
     {"Your red scales disappear.", "Your red scales recede somewhat.",
@@ -968,11 +959,10 @@ static mutation_def mutation_defs[] = {
     { MUT_BLUE_MARKS, 0, 3, false },     // used by evil gods to mark followers
     { MUT_GREEN_MARKS, 0, 3, false },
 
-    { MUT_DRIFTING, 2, 3, true },
     { MUT_SAPROVOROUS, 0, 3, false },    // species-dependent innate mutation
 
-// 70
     { MUT_SHAGGY_FUR, 2, 3, false },
+// 70
     { MUT_HIGH_MAGIC, 1, 3, false },
     { MUT_LOW_MAGIC, 9, 3, true },
     { MUT_SLEEPINESS, 3, 3, true },
@@ -1392,7 +1382,6 @@ static int calc_mutation_amusement_value(mutation_type which_mutation)
     case MUT_BIG_WINGS:
     case MUT_BLUE_MARKS:
     case MUT_GREEN_MARKS:
-    case MUT_DRIFTING:
         amusement *= 2; // funny!
         break;
 
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index eb1b0860ef..6f1831319f 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1968,13 +1968,6 @@ std::string status_mut_abilities()
                 text += info;
                 have_any = true;
                 break;
-            case MUT_DRIFTING:
-                if (have_any)
-                    text += ", ";
-                snprintf(info, INFO_SIZE, "drifting %d", level);
-                text += info;
-                have_any = true;
-                break;
             case MUT_SLEEPINESS:
                 if (have_any)
                     text += ", ";