Remove jewelry and armour sources of conservation

The amulet of conservation and cloaks of preservation are no longer
necessary without item destruction. Maxwell's patent armour now has
the resistance ego and grants rF+ and rC+.

26 files changed, 42 insertions, 59 deletions

diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 0314439722..b8f90c30b9 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -414,7 +414,7 @@
 # note_skill_max  = false
 # note_xom_effects = false
 # note_chat_messages = false
-# note_items    += rod of, acquirement, preservation, running, of Zot
+# note_items    += rod of, acquirement, running, of Zot
 # note_monsters += orb of fire, ancient lich, Sigmund
 
 ##### 5-  Miscellaneous #############################################
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc
index cc6c63775a..0f1390da13 100644
--- a/crawl-ref/source/actor.cc
+++ b/crawl-ref/source/actor.cc
@@ -260,18 +260,9 @@ bool actor::gourmand(bool calc_unid, bool items) const
     return items && wearing(EQ_AMULET, AMU_THE_GOURMAND, calc_unid);
 }
 
-bool actor::conservation(bool calc_unid, bool items) const
-{
-    return items && (wearing(EQ_AMULET, AMU_CONSERVATION, calc_unid)
-                     || wearing_ego(EQ_ALL_ARMOUR, SPARM_PRESERVATION,
-                                    calc_unid));
-}
-
 bool actor::res_corr(bool calc_unid, bool items) const
 {
-    return items && (wearing(EQ_AMULET, AMU_RESIST_CORROSION, calc_unid)
-                     || wearing_ego(EQ_ALL_ARMOUR, SPARM_PRESERVATION,
-                                    calc_unid));
+    return items && wearing(EQ_AMULET, AMU_RESIST_CORROSION, calc_unid);
 }
 
 // This is a bit confusing. This is not the function that determines whether or
diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h
index 84acef3ef8..6c63697e28 100644
--- a/crawl-ref/source/actor.h
+++ b/crawl-ref/source/actor.h
@@ -302,7 +302,7 @@ public:
     virtual bool inaccuracy() const;
 
     virtual bool gourmand(bool calc_unid = true, bool items = true) const;
-    virtual bool conservation(bool calc_unid = true, bool items = true) const;
+
     virtual bool res_corr(bool calc_unid = true, bool items = true) const;
     bool has_notele_item(bool calc_unid = true) const;
     virtual bool stasis(bool calc_unid = true, bool items = true) const;
diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 11a97c9275..29268681f9 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -800,7 +800,7 @@ PLUS:    +15
 COLOUR:  LIGHTGREEN
 TILE:    urand_maxwell
 TILE_EQ: maxwell
-BRAND:   SPARM_PRESERVATION
+BRAND:   SPARM_RESISTANCE
 MAGIC:   1
 BOOL:    nospell, notelep, cursed
 
diff --git a/crawl-ref/source/dat/defaults/autopickup_exceptions.txt b/crawl-ref/source/dat/defaults/autopickup_exceptions.txt
index 6f31e788f2..3a651c5cb3 100644
--- a/crawl-ref/source/dat/defaults/autopickup_exceptions.txt
+++ b/crawl-ref/source/dat/defaults/autopickup_exceptions.txt
@@ -29,7 +29,7 @@ ae += [^n]identified.*spellbook
 # subtype that means you already have one of it.) Also for some rings.
 # Some items may already be excluded as bad_item, e.g. inaccuracy.
 ae += amulet of (inaccuracy|the gourmand|warding)
-ae += amulet of (resist .*|clarity|rage|conservation|guardian spirit|faith|stasis)
+ae += amulet of (resist .*|clarity|rage|guardian spirit|faith|stasis)
 # Rings of teleportation are not redundant -- double *Tele is pretty good in
 # the Abyss. Still, they're more in line with lanterns of shadow, so you can
 # pick up the second one by hand.
diff --git a/crawl-ref/source/dat/defaults/misc.txt b/crawl-ref/source/dat/defaults/misc.txt
index 0d75bb6378..f97c53bdeb 100644
--- a/crawl-ref/source/dat/defaults/misc.txt
+++ b/crawl-ref/source/dat/defaults/misc.txt
@@ -11,7 +11,7 @@ trapwalk_safe_hp = dart:20,needle:15,arrow:35,bolt:45,spear:40,blade:95
 
 sort_menus += inv: true : equipped, freshness, charged
 
-note_items    += rod of, acquirement, preservation, running, of Zot
+note_items    += rod of, acquirement, running, of Zot
 note_messages += Your scales start
 note_messages += protects you from harm
 note_messages += You fall through a shaft
diff --git a/crawl-ref/source/dat/des/portals/wizlab.des b/crawl-ref/source/dat/des/portals/wizlab.des
index ea9b90b251..f4a266a299 100644
--- a/crawl-ref/source/dat/des/portals/wizlab.des
+++ b/crawl-ref/source/dat/des/portals/wizlab.des
@@ -1942,8 +1942,8 @@ kmons     ("1 = patrolling Hellbinder dbname:Hellbinder name:" .. string.gsub(wi
 }}
 KITEM:      $ = gold / w:1 scroll of torment / w:1 scroll of summoning
 KITEM:      i = rod of shadows / ring of fire / ring of protection from fire /\
-            amulet of conservation / scroll of torment / scroll of summoning /\
-            demon blade w:1 / demon whip w:1 / demon trident w:1 / gold / wand of fire /\
+            scroll of torment / scroll of summoning / demon blade w:1 /\
+            demon whip w:1 / demon trident w:1 / gold / wand of fire /\
             wand of draining / staff of summoning / any book w:30 / any good_item w:15
 KITEM:      B = randbook disc:summoning
 NSUBST:     i = 2:B / *:i
diff --git a/crawl-ref/source/dat/des/sprint/linesprint.des b/crawl-ref/source/dat/des/sprint/linesprint.des
index 606eeab839..eb6dcdd801 100644
--- a/crawl-ref/source/dat/des/sprint/linesprint.des
+++ b/crawl-ref/source/dat/des/sprint/linesprint.des
@@ -781,8 +781,7 @@ ENDMAP
 NAME:     items_6
 TAGS:     items_6
 ORIENT:   encompass
-KITEM:    a = amulet of conservation randart not_cursed ident:all /\
-    amulet of faith randart not_cursed ident:all /\
+KITEM:    a = amulet of faith randart not_cursed ident:all /\
     amulet of guardian spirit randart not_cursed ident:all /\
     amulet of resist corrosion randart not_cursed ident:all /\
     amulet of resist mutation randart not_cursed ident:all /\
diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
index 9f964bfce3..1cce94d4d5 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -514,8 +514,7 @@ function coven_setup(e)
   e.tile("v = wall_emerald")
   e.subst("0 = 0:20 9:1")
   e.kitem("a = any book good_item ident:all")
-  e.kitem("b = amulet of conservation randart not_cursed ident:all /\
-          amulet of faith randart not_cursed ident:all /\
+  e.kitem("b = amulet of faith randart not_cursed ident:all /\
           amulet of guardian spirit randart not_cursed ident:all /\
           amulet of resist corrosion randart not_cursed ident:all /\
           amulet of resist mutation randart not_cursed ident:all /\
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index dc9ff7c26b..bb5c036b7e 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -1360,7 +1360,7 @@ KITEM: 1 = icy rune of zot
 KITEM: 2 = superb_item, star_item
 KMONS: ! = patrolling ice fiend
 KITEM: ! = potion of resistance ident:all q:3, potion of agility ident:all q:3, \
-  cloak ego:preservation ident:type, wand of hasting ident:type
+           wand of hasting ident:type
 COLOUR: #c = lightcyan
 KFEAT: # = closed_door
 MARKER: # = lua:props_marker({ \
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 3f8ca57d63..a918e7ee1e 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -4,11 +4,6 @@ amulet of clarity
 This amulet protects its wearer from some forms of mental confusion, including
 being berserked against one's will.
 %%%%
-amulet of conservation
-
-This amulet protects some of the possessions of its wearer from outright
-destruction, but not infallibly so.
-%%%%
 amulet of faith
 
 This is a talisman crafted to call the attention of the gods to its wearer.
diff --git a/crawl-ref/source/dat/descript/quotes.txt b/crawl-ref/source/dat/descript/quotes.txt
index dc8c5f56c9..0a4e94ecbf 100644
--- a/crawl-ref/source/dat/descript/quotes.txt
+++ b/crawl-ref/source/dat/descript/quotes.txt
@@ -645,10 +645,6 @@ amulet of clarity
 
 <amulet>
 %%%%
-amulet of conservation
-
-<amulet>
-%%%%
 amulet of faith
 
 <amulet>
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index bb558bed36..02044059e2 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -180,8 +180,8 @@ static const char* _jewellery_base_ability_string(int subtype)
     case AMU_WARDING:            return "Ward";
     case AMU_RESIST_CORROSION:   return "rCorr";
     case AMU_THE_GOURMAND:       return "Gourm";
-    case AMU_CONSERVATION:       return "Cons";
 #if TAG_MAJOR_VERSION == 34
+    case AMU_CONSERVATION:       return "Cons";
     case AMU_CONTROLLED_FLIGHT:  return "cFly";
 #endif
     case AMU_RESIST_MUTATION:    return "rMut";
@@ -402,8 +402,10 @@ static const char* _jewellery_base_ability_description(int subtype)
         return "It protects you from acid and corrosion.";
     case AMU_THE_GOURMAND:
         return "It allows you to eat raw meat even when not hungry.";
+#if TAG_MAJOR_VERSION == 34
     case AMU_CONSERVATION:
         return "It protects your inventory from destruction.";
+#endif
     case AMU_RESIST_MUTATION:
         return "It protects you from mutation.";
     case AMU_GUARDIAN_SPIRIT:
@@ -1276,12 +1278,12 @@ static string _describe_armour(const item_def &item, bool verbose)
             description += "It increases the power of its wearer's "
                 "magical spells.";
             break;
-
+#if TAG_MAJOR_VERSION == 34
         case SPARM_PRESERVATION:
             description += "It protects its wearer's possessions "
                 "from corrosion and destruction.";
             break;
-
+#endif
         case SPARM_REFLECTION:
             description += "It reflects blocked things back in the "
                 "direction they came from.";
@@ -1612,7 +1614,7 @@ bool is_dumpable_artefact(const item_def &item, bool verbose)
     else if (item.base_type == OBJ_ARMOUR)
     {
         const int spec_ench = get_armour_ego_type(item);
-        return spec_ench >= SPARM_RUNNING && spec_ench <= SPARM_PRESERVATION;
+        return spec_ench >= SPARM_RUNNING && spec_ench <= SPARM_ARCHMAGI;
     }
     else if (item.base_type == OBJ_JEWELLERY)
         return true;
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 0ab9470e79..86d9af61ab 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -534,7 +534,9 @@ const char* armour_ego_name(const item_def& item, bool terse)
         case SPARM_RESISTANCE:        return "resistance";
         case SPARM_POSITIVE_ENERGY:   return "positive energy";
         case SPARM_ARCHMAGI:          return "the Archmagi";
+#if TAG_MAJOR_VERSION == 34
         case SPARM_PRESERVATION:      return "preservation";
+#endif
         case SPARM_REFLECTION:        return "reflection";
         case SPARM_SPIRIT_SHIELD:     return "spirit shield";
         case SPARM_ARCHERY:           return "archery";
@@ -564,7 +566,9 @@ const char* armour_ego_name(const item_def& item, bool terse)
         case SPARM_RESISTANCE:        return "rC+ rF+";
         case SPARM_POSITIVE_ENERGY:   return "rN+";
         case SPARM_ARCHMAGI:          return "Archmagi";
+#if TAG_MAJOR_VERSION == 34
         case SPARM_PRESERVATION:      return "rCorr, Cons";
+#endif
         case SPARM_REFLECTION:        return "reflect";
         case SPARM_SPIRIT_SHIELD:     return "Spirit";
         case SPARM_ARCHERY:           return "archery";
@@ -752,8 +756,8 @@ static const char* jewellery_type_name(int jeweltype)
     case AMU_WARDING:           return "amulet of warding";
     case AMU_RESIST_CORROSION:  return "amulet of resist corrosion";
     case AMU_THE_GOURMAND:      return "amulet of the gourmand";
-    case AMU_CONSERVATION:      return "amulet of conservation";
 #if TAG_MAJOR_VERSION == 34
+    case AMU_CONSERVATION:      return "amulet of conservation";
     case AMU_CONTROLLED_FLIGHT: return "amulet of controlled flight";
 #endif
     case AMU_INACCURACY:        return "amulet of inaccuracy";
@@ -2329,8 +2333,11 @@ void check_item_knowledge(bool unknown_items)
                 continue;
             }
 
-            if (i == OBJ_JEWELLERY && j == AMU_CONTROLLED_FLIGHT)
+            if (i == OBJ_JEWELLERY
+                && (j == AMU_CONTROLLED_FLIGHT || j == AMU_CONSERVATION))
+            {
                 continue;
+            }
 
             if (i == OBJ_STAVES && j == STAFF_ENCHANTMENT)
                 continue;
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 5b0d1ba40c..c9f3a96f3c 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -191,8 +191,8 @@ enum jewellery_type
     AMU_WARDING,
     AMU_RESIST_CORROSION,
     AMU_THE_GOURMAND,
-    AMU_CONSERVATION,
 #if TAG_MAJOR_VERSION == 34
+    AMU_CONSERVATION,
     AMU_CONTROLLED_FLIGHT,
 #endif
     AMU_INACCURACY,
@@ -356,7 +356,9 @@ enum special_armour_type
     SPARM_RESISTANCE,
     SPARM_POSITIVE_ENERGY,
     SPARM_ARCHMAGI,
+#if TAG_MAJOR_VERSION == 34
     SPARM_PRESERVATION,
+#endif
     SPARM_REFLECTION,
     SPARM_SPIRIT_SHIELD,
     SPARM_ARCHERY,
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc
index 27c2697d2e..9e512bc513 100644
--- a/crawl-ref/source/l_item.cc
+++ b/crawl-ref/source/l_item.cc
@@ -298,9 +298,9 @@ static const char *ring_types[] =
 static const char *amulet_types[] =
 {
     "rage", "clarity", "warding", "resist corrosion",
-    "gourmand", "conservation",
+    "gourmand",
 #if TAG_MAJOR_VERSION == 34
-    "controlled flight",
+    "conservation", "controlled flight",
 #endif
     "inaccuracy",
     "resist mutation", "guardian spirit", "faith", "stasis",
diff --git a/crawl-ref/source/l_you.cc b/crawl-ref/source/l_you.cc
index 1634ab1063..c188baa741 100644
--- a/crawl-ref/source/l_you.cc
+++ b/crawl-ref/source/l_you.cc
@@ -121,7 +121,6 @@ LUARET1(you_see_invisible, boolean, you.can_see_invisible(false))
 // Returning a number so as not to break existing scripts.
 LUARET1(you_spirit_shield, number, you.spirit_shield(false) ? 1 : 0)
 LUARET1(you_gourmand, boolean, you.gourmand(false))
-LUARET1(you_conservation, boolean, you.conservation(false))
 LUARET1(you_res_corr, boolean, you.res_corr(false))
 LUARET1(you_like_chunks, number, player_likes_chunks(true))
 LUARET1(you_saprovorous, number, player_mutation_level(MUT_SAPROVOROUS))
@@ -466,7 +465,6 @@ static const struct luaL_reg you_clib[] =
     { "saprovorous",  you_saprovorous },
     { "like_chunks",  you_like_chunks },
     { "gourmand",     you_gourmand },
-    { "conservation", you_conservation },
     { "res_corr",     you_res_corr },
     { "flying",       you_flying },
     { "transform",    you_transform },
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 84277457c7..8723bf4f08 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -658,6 +658,7 @@ static void _set_removed_types_as_identified()
 {
 #if TAG_MAJOR_VERSION == 34
     you.type_ids[OBJ_JEWELLERY][AMU_CONTROLLED_FLIGHT] = ID_KNOWN_TYPE;
+    you.type_ids[OBJ_JEWELLERY][AMU_CONSERVATION] = ID_KNOWN_TYPE;
     you.type_ids[OBJ_STAVES][STAFF_ENCHANTMENT] = ID_KNOWN_TYPE;
     you.type_ids[OBJ_STAVES][STAFF_CHANNELING] = ID_KNOWN_TYPE;
     you.type_ids[OBJ_POTIONS][POT_GAIN_STRENGTH] = ID_KNOWN_TYPE;
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 2fd3f179de..ceaf499d8a 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1829,7 +1829,6 @@ static special_armour_type _determine_armour_ego(const item_def& item,
         rc = random_choose(SPARM_POISON_RESISTANCE,
                            SPARM_DARKNESS,
                            SPARM_MAGIC_RESISTANCE,
-                           SPARM_PRESERVATION,
                            -1);
         break;
 
@@ -1941,11 +1940,12 @@ bool is_armour_brand_ok(int type, int brand, bool strict)
 
     case SPARM_PONDEROUSNESS:
         return true;
-
+#if TAG_MAJOR_VERSION == 34
     case SPARM_PRESERVATION:
         if (type == ARM_PLATE_ARMOUR && !strict)
             return true;
         // deliberate fall-through
+#endif
     case SPARM_DARKNESS:
         return slot == EQ_CLOAK;
 
@@ -3075,8 +3075,8 @@ jewellery_type get_random_amulet_type()
     int res;
     do
         res = (AMU_FIRST_AMULET + random2(NUM_JEWELLERY - AMU_FIRST_AMULET));
-    // Do not generate cFly
-    while (res == AMU_CONTROLLED_FLIGHT);
+    // Do not generate cFly or Cons
+    while (res == AMU_CONTROLLED_FLIGHT || res == AMU_CONSERVATION);
 
     return jewellery_type(res);
 #else
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 2cbc913d5d..7fc0e4c054 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -4757,7 +4757,9 @@ static int _str_to_ego(item_spec &spec, string ego_str)
         "resistance",
         "positive_energy",
         "archmagi",
+#if TAG_MAJOR_VERSION == 34
         "preservation",
+#endif
         "reflection",
         "spirit_shield",
         "archery",
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index c0469cf1c8..909052dcc4 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -1807,13 +1807,6 @@ static int _get_monster_armour_value(const monster *mon,
     if (!mons_class_flag(mon->type, M_SEE_INVIS))
         value += get_armour_see_invisible(item, true);
 
-    // Likewise rCorr
-    if (get_armour_ego_type(item) == SPARM_PRESERVATION
-        && !mon->res_corr(false, false))
-    {
-        value++;
-    }
-
     // Give a sizable bonus for shields of reflection.
     if (get_armour_ego_type(item) == SPARM_REFLECTION)
         value += 3;
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 8acf63b3be..07ea054a63 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -2298,8 +2298,6 @@ static vector<formatted_string> _get_overview_resistances(
     out += show_angry ? _resist_composer("Rnd*Rage", cwidth, 1, 1, false) + "\n"
                       : _resist_composer("Clarity", cwidth, rclar) + "\n";
 
-    const int rcons = you.conservation(calc_unid);
-    out += _resist_composer("Conserve", cwidth, rcons) + "\n";
     const int rcorr = you.res_corr(calc_unid);
     out += _resist_composer("rCorr", cwidth, rcorr) + "\n";
     const int rrott = you.res_rotting();
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index c95524c76f..8db871820b 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1298,7 +1298,6 @@ unsigned int item_value(item_def item, bool ident)
             {
             case SPARM_RUNNING:
             case SPARM_ARCHMAGI:
-            case SPARM_PRESERVATION:
             case SPARM_RESISTANCE:
                 valued += 250;
                 break;
@@ -1640,7 +1639,6 @@ unsigned int item_value(item_def item, bool ident)
                 case RING_REGENERATION:
                 case RING_WIZARDRY:
                 case AMU_GUARDIAN_SPIRIT:
-                case AMU_CONSERVATION:
                 case AMU_THE_GOURMAND:
                     valued += 300;
                     break;
diff --git a/crawl-ref/source/test/stress/abyss.rc b/crawl-ref/source/test/stress/abyss.rc
index 918c95383f..ef47947562 100644
--- a/crawl-ref/source/test/stress/abyss.rc
+++ b/crawl-ref/source/test/stress/abyss.rc
@@ -42,7 +42,7 @@ function ready()
     crawl.sendkeys("g&o[large shield" .. eol .. "reflection" .. eol)
     crawl.sendkeys("g&o[helmet" .. eol .. "see invis" .. eol)
     crawl.sendkeys("g&o[gloves" .. eol .. "strength" .. eol)
-    crawl.sendkeys("g&o[cloak" .. eol .. "preservation" .. eol)
+    crawl.sendkeys("g&o[cloak" .. eol .. "" .. eol)
     crawl.sendkeys("g&o=sustain" .. eol)
     --# somehow ga doesn't work... why?
     crawl.sendkeys("gwcWdWeWfWgWhWiPj")
diff --git a/crawl-ref/source/test/stress/abyss_short_run.rc b/crawl-ref/source/test/stress/abyss_short_run.rc
index 75c8bda800..d6ec8911d7 100644
--- a/crawl-ref/source/test/stress/abyss_short_run.rc
+++ b/crawl-ref/source/test/stress/abyss_short_run.rc
@@ -40,7 +40,7 @@ function ready()
     crawl.sendkeys("g&o[large shield" .. eol .. "reflection" .. eol)
     crawl.sendkeys("g&o[helmet" .. eol .. "see invis" .. eol)
     crawl.sendkeys("g&o[gloves" .. eol .. "strength" .. eol)
-    crawl.sendkeys("g&o[cloak" .. eol .. "preservation" .. eol)
+    crawl.sendkeys("g&o[cloak" .. eol .. "" .. eol)
     --# somehow ga doesn't work... why?
     crawl.sendkeys("gwcWdWeWfWgWhWi")
     crawl.sendkeys("&tca9" .. eol .. "b9" .. eol .. esc)
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 6dd45a7ca1..eda98fc76f 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -1198,7 +1198,9 @@ static void _debug_acquirement_stats(FILE *ostat)
             "resistance",
             "positive energy",
             "archmagi",
+#if TAG_MAJOR_VERSION == 34
             "preservation",
+#endif
             "reflection",
             "spirit shield",
             "archery",