Remove mapping abilities from the game

Mapping still exists on cards, scrolls, Xom, and as the passive mutation.
The ball of seeing exists, but will have to be dealt with.

9 files changed, 12 insertions, 87 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 11aee639d3..ca692e1202 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -165,7 +165,6 @@ static const ability_def Ability_List[] =
     { ABIL_NON_ABILITY, "No ability", 0, 0, 0, 0, ABFLAG_NONE },
     { ABIL_SPIT_POISON, "Spit Poison", 0, 0, 40, 0, ABFLAG_BREATH },
 
-    { ABIL_MAPPING, "Sense Surroundings", 0, 0, 30, 0, ABFLAG_NONE },
     { ABIL_TELEPORTATION, "Teleportation", 3, 0, 200, 0, ABFLAG_NONE },
     { ABIL_BLINK, "Blink", 1, 0, 50, 0, ABFLAG_NONE },
 
@@ -210,8 +209,6 @@ static const ability_def Ability_List[] =
     // you used a wand, potion, or miscast effect).  I didn't see
     // any reason to label them as "Evoke" in the text, they don't
     // use or train Evocations (the others do).  -- bwr
-    { ABIL_EVOKE_MAPPING, "Evoke Sense Surroundings",
-      0, 0, 30, 0, ABFLAG_NONE },
     { ABIL_EVOKE_TELEPORTATION, "Evoke Teleportation",
       3, 0, 200, 0, ABFLAG_NONE },
     { ABIL_EVOKE_BLINK, "Evoke Blink", 1, 0, 50, 0, ABFLAG_NONE },
@@ -546,15 +543,6 @@ static talent _get_talent(ability_type ability, bool check_confused)
                         - you.experience_level;
         break;
 
-    case ABIL_EVOKE_MAPPING:
-        failure = 30 - you.skills[SK_EVOCATIONS];
-        break;
-
-    case ABIL_MAPPING:
-        failure = 40 - 10 * player_mutation_level(MUT_MAPPING)
-                  - you.experience_level;
-        break;
-
     case ABIL_BREATHE_FIRE:
         failure = ((you.species == SP_RED_DRACONIAN) ? 30 : 50)
                         - 10 * player_mutation_level(MUT_BREATHE_FLAMES)
@@ -1118,16 +1106,6 @@ static bool _check_ability_possible(const ability_def& abil,
         }
         return (you.can_go_berserk(true) && berserk_check_wielded_weapon());
 
-    case ABIL_MAPPING:
-        if (player_mutation_level(MUT_MAPPING) < 3
-            && (you.level_type == LEVEL_PANDEMONIUM
-                || !player_in_mappable_area()))
-        {
-            mpr("You feel momentarily disoriented.");
-            return (false);
-        }
-        return (true);
-
     case ABIL_FLY_II:
         if (you.duration[DUR_EXHAUSTED])
         {
@@ -1349,25 +1327,6 @@ static bool _do_ability(const ability_def& abil)
         }
         break;
     }
-    case ABIL_EVOKE_MAPPING:    // Randarts
-    case ABIL_MAPPING:          // Sense surroundings mutation
-        power = (abil.ability == ABIL_EVOKE_MAPPING) ?
-            you.skills[SK_EVOCATIONS] : you.experience_level;
-
-        if (magic_mapping(3 + roll_dice(2,
-                          (abil.ability == ABIL_EVOKE_MAPPING) ? power :
-                          power + player_mutation_level(MUT_MAPPING) * 10),
-                          40 + roll_dice( 2, power), true))
-        {
-            mpr("You sense your surroundings.");
-        }
-        else
-            mpr("You feel momentarily disoriented.");
-
-        if (abil.ability == ABIL_EVOKE_MAPPING)
-            exercise(SK_EVOCATIONS, 1);
-        break;
-
     case ABIL_EVOKE_TELEPORTATION:    // ring of teleportation
     case ABIL_TELEPORTATION:          // teleport mut
         if (player_mutation_level(MUT_TELEPORT_AT_WILL) == 3)
@@ -2360,9 +2319,6 @@ std::vector<talent> your_talents(bool check_confused)
     }
 
     // Mutations.
-    if (player_mutation_level(MUT_MAPPING))
-        _add_talent(talents, ABIL_MAPPING, check_confused);
-
     if (player_mutation_level(MUT_SUMMON_MINOR_DEMONS))
         _add_talent(talents, ABIL_SUMMON_MINOR_DEMON, check_confused);
 
@@ -2476,9 +2432,6 @@ std::vector<talent> your_talents(bool check_confused)
     if (wearing_amulet(AMU_RAGE) || scan_artefacts(ARTP_BERSERK))
         _add_talent(talents, ABIL_EVOKE_BERSERK, check_confused);
 
-    if (scan_artefacts( ARTP_MAPPING ))
-        _add_talent(talents, ABIL_EVOKE_MAPPING, check_confused);
-
     if (player_equip( EQ_RINGS, RING_INVISIBILITY )
         || player_equip_ego_type( EQ_ALL_ARMOUR, SPARM_DARKNESS )
         || scan_artefacts( ARTP_INVISIBLE ))
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 4f0a9100e2..2ce6e13e99 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -1078,13 +1078,6 @@ void static _get_randart_properties(const item_def &item,
         power_level++;
     }
 
-    // sense surroundings
-    if (!done_powers && one_chance_in(10))
-    {
-        proprt[ARTP_MAPPING] = 1;
-        power_level++;
-    }
-
     if (!done_powers && one_chance_in(10) && aclass == OBJ_ARMOUR
         && (atype == ARM_CAP || atype == ARM_SHIELD))
     {
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index b597b65367..7d11a7da1e 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -1730,7 +1730,7 @@ char _prop_type[ARTP_NUM_PROPERTIES] = {
     ARTP_VAL_BOOL, //BLINK
     ARTP_VAL_BOOL, //CAN_TELEPORT
     ARTP_VAL_BOOL, //BERSERK
-    ARTP_VAL_BOOL, //MAPPING
+    ARTP_VAL_BOOL, //UNUSED_1
     ARTP_VAL_POS,  //NOISES
     ARTP_VAL_BOOL, //PREVENT_SPELLCASTING
     ARTP_VAL_BOOL, //CAUSE_TELEPORTATION
@@ -3513,7 +3513,7 @@ static void _debug_rap_stats(FILE *ostat)
          1, //ARTP_BLINK
          1, //ARTP_CAN_TELEPORT
          1, //ARTP_BERSERK
-         1, //ARTP_MAPPING
+         1, //ARTP_UNUSED_1
         -1, //ARTP_NOISES
         -1, //ARTP_PREVENT_SPELLCASTING
         -1, //ARTP_CAUSE_TELEPORTATION
@@ -3656,7 +3656,7 @@ static void _debug_rap_stats(FILE *ostat)
         "ARTP_BLINK",
         "ARTP_CAN_TELEPORT",
         "ARTP_BERSERK",
-        "ARTP_MAPPING",
+        "ARTP_UNUSED_1",
         "ARTP_NOISES",
         "ARTP_PREVENT_SPELLCASTING",
         "ARTP_CAUSE_TELEPORTATION",
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 2fed72f52f..88a58f38cf 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -196,7 +196,6 @@ static std::vector<std::string> _randart_propnames( const item_def& item )
         { "+Rage",  ARTP_BERSERK,               2 },
         { "+Inv",   ARTP_INVISIBLE,             2 },
         { "+Lev",   ARTP_LEVITATE,              2 },
-        { "+Map",   ARTP_MAPPING,               2 },
 
         // Resists, also really important
         { "rElec",  ARTP_ELECTRICITY,           2 },
@@ -398,7 +397,6 @@ static std::string _randart_descrip( const item_def &item )
         { ARTP_BLINK, "It lets you blink.", false},
         { ARTP_CAN_TELEPORT, "It lets you teleport.", false},
         { ARTP_BERSERK, "It lets you go berserk.", false},
-        { ARTP_MAPPING, "It lets you sense your surroundings.", false},
         { ARTP_SPIRIT_SHIELD, "It shields you from harm at the cost of magical power.", false},
         { ARTP_NOISES, "It makes noises.", false},
         { ARTP_PREVENT_SPELLCASTING, "It prevents spellcasting.", false},
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 0b9eb03319..f1de0ac8b7 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -12,8 +12,8 @@ enum ability_type
 {
     ABIL_NON_ABILITY = -1,
     ABIL_SPIT_POISON = 1,              //    1
-    ABIL_MAPPING,
-    ABIL_TELEPORTATION,
+    // was Mapping
+    ABIL_TELEPORTATION = 3,
     ABIL_BREATHE_FIRE,
     ABIL_BLINK,                        //    5
     ABIL_BREATHE_FROST,
@@ -38,8 +38,8 @@ enum ability_type
     ABIL_FLY_II,                       //   25
     ABIL_DELAYED_FIREBALL,
     ABIL_MUMMY_RESTORATION,
-    ABIL_EVOKE_MAPPING,
-    ABIL_EVOKE_TELEPORTATION,
+    // Was evoke mapping
+    ABIL_EVOKE_TELEPORTATION = 29,
     ABIL_EVOKE_BLINK,                  //   30
     ABIL_RECHARGING,                   //   31
     // 32 - 50 unused
@@ -2354,7 +2354,7 @@ enum mutation_type
     MUT_DEFORMED,
     MUT_TELEPORT_AT_WILL,
     MUT_SPIT_POISON,
-    MUT_MAPPING,
+    MUT_UNUSED_1,
     MUT_BREATHE_FLAMES,
     MUT_BLINK,
     MUT_HORNS,
@@ -2552,7 +2552,7 @@ enum artefact_prop_type
     ARTP_BLINK,                         //   15
     ARTP_CAN_TELEPORT,
     ARTP_BERSERK,
-    ARTP_MAPPING,
+    ARTP_UNUSED_1,
     ARTP_NOISES,
     ARTP_PREVENT_SPELLCASTING,          //   20
     ARTP_CAUSE_TELEPORTATION,
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 23c2861b13..a407337fc5 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -2520,7 +2520,7 @@ bool gives_ability(const item_def &item)
         return (false);
 
     // Check for evokable randart properties.
-    for (int rap = ARTP_INVISIBLE; rap <= ARTP_MAPPING; rap++)
+    for (int rap = ARTP_INVISIBLE; rap <= ARTP_BERSERK; rap++)
         if (artefact_wpn_property( item, static_cast<artefact_prop_type>(rap) ))
             return (true);
 
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 959dcddf53..d7da7b3073 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -473,21 +473,6 @@ mutation_def mutation_defs[] = {
 
       "spit poison"
     },
-    { MUT_MAPPING,                    3,  3, false, false,
-      {"You can sense your immediate surroundings.",
-       "You can sense your surroundings.",
-       "You can sense a large area of your surroundings."},
-
-      {"You feel aware of your surroundings.",
-       "You feel more aware of your surroundings.",
-       "You feel even more aware of your surroundings."},
-
-      {"You feel slightly disoriented.",
-       "You feel slightly disoriented.",
-       "You feel slightly disoriented."},
-
-      "mapping"
-    },
     { MUT_BREATHE_FLAMES,             4,  3, false, false,
       {"You can breathe flames.",
        "You can breathe fire.",
@@ -1735,7 +1720,6 @@ static int _calc_mutation_amusement_value(mutation_type which_mutation)
     case MUT_TELEPORT_CONTROL:
     case MUT_MAGIC_RESISTANCE:
     case MUT_TELEPORT_AT_WILL:
-    case MUT_MAPPING:
     case MUT_CLARITY:
     case MUT_MUTATION_RESISTANCE:
     case MUT_ROBUST:
@@ -2734,7 +2718,7 @@ void roll_demonspawn_mutations()
     // "Awesome" mutations are character defining; they have a major
     // effect on strategy in at least one branch.
     static const mutation_type awesome_muts[] = {
-        MUT_HEAT_RESISTANCE, MUT_FAST, MUT_TELEPORT_AT_WILL, MUT_MAPPING,
+        MUT_HEAT_RESISTANCE, MUT_FAST, MUT_TELEPORT_AT_WILL,
         MUT_ROBUST, MUT_NEGATIVE_ENERGY_RESISTANCE, MUT_BLACK_SCALES,
         MUT_METALLIC_SCALES, MUT_RED2_SCALES, MUT_STOCHASTIC_TORMENT_RESISTANCE
     };
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 03a4eb2fac..179abf506c 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2592,7 +2592,7 @@ std::string _status_mut_abilities()
                 snprintf(info, INFO_SIZE, "spit poison %d", level);
                 current = info;
                 break;
-            case MUT_MAPPING:
+            case MUT_PASSIVE_MAPPING:
                 snprintf(info, INFO_SIZE, "sense surroundings %d", level);
                 current = info;
                 break;
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index f8fc73de53..fe79eef620 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -821,9 +821,6 @@ int artefact_value( const item_def &item )
     if (prop[ ARTP_BERSERK ])
         ret += 5;
 
-    if (prop[ ARTP_MAPPING ])
-        ret += 15;
-
     if (prop[ ARTP_INVISIBLE ])
         ret += 20;