Remove ARTP_METABOLISM

Convert existing ones into a negative level of ARTP_STEALTH, or in the case of
Black Knight's barding, to rPois (mostly for flavor reasons).

10 files changed, 33 insertions, 55 deletions

diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 605ea737da..8ea9cd68e0 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -138,7 +138,6 @@
 # FIRE:     Fire resistance/vulnerability.
 # INT:      Intelligence modifier.
 # MAGIC:    Magic resistance/vulnerability.
-# METAB:    Hunger modifier.
 # MP:       Mana capacity modifier.
 # NAME:     Name of artefact when identified.
 # REGEN:    Provides regeneration (40 = ring of regen, 100 = the spell).
@@ -692,7 +691,6 @@ COLOUR:  ETC_JEWEL
 TILE:    urand_dyrovepreva
 TILE_EQ: dyrovepreva
 INT:     2
-METAB:   1
 BOOL:    elec, seeinv
 
 NAME:     hat of the Bear Spirit
@@ -906,7 +904,6 @@ TILE:    urand_cekugob
 AC:      1
 EV:      1
 BOOL:    elec, poison, life, notelep
-METAB:   2
 
 NAME:    amulet of the Four Winds
 OBJ:     OBJ_JEWELLERY/AMU_CLARITY
@@ -1001,8 +998,7 @@ TILE:     urand_bk_barding
 TILE_EQ:  black_knight
 COLOUR:   ETC_UNHOLY
 BRAND:    SPARM_PONDEROUSNESS
-METAB:    -2
-BOOL:     life, evil
+BOOL:     life, poison, evil
 
 NAME:     ring of Vitality
 OBJ:      OBJ_JEWELLERY/RING_REGENERATION
@@ -1176,7 +1172,6 @@ EV:      3
 FIRE:    3
 INT:     3
 MAGIC:   3
-METAB:   10
 HP:      10
 MP:      10
 STEALTH: 2
@@ -1195,7 +1190,6 @@ DEX:     -3
 EV:      -3
 FIRE:    -3
 INT:     -3
-METAB:   -10
 HP:      -10
 MP:      -10
 STEALTH: -2
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 0d0d318ba1..932c13465b 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -1067,12 +1067,8 @@ static void _get_randart_properties(const item_def &item,
             }
             proprt[ARTP_COLD] = -1;
             break;
-        case 7:                     // speed metabolism
-            if (aclass == OBJ_JEWELLERY && atype == RING_HUNGER)
-                break;              // already is a ring of hunger
-            if (aclass == OBJ_JEWELLERY && atype == RING_SUSTENANCE)
-                break;              // already is a ring of sustenance
-            proprt[ARTP_METABOLISM] = 1 + random2(3);
+        case 7:                     // less stealthy
+            proprt[ARTP_STEALTH] = -1 - random2(2);
             break;
         case 8:
             // emits mutagenic radiation - causes
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index d92dfb583e..3f245bd33d 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -221,7 +221,6 @@ static vector<string> _randart_propnames(const item_def& item,
         { "Contam", ARTP_MUTAGENIC,             2 },
         { "*Rage",  ARTP_ANGRY,                 2 },
         { "*Tele",  ARTP_CAUSE_TELEPORTATION,   2 },
-        { "Hunger", ARTP_METABOLISM,            2 }, // handled specially
         { "Noisy",  ARTP_NOISES,                2 },
 
         // Evokable abilities come second
@@ -341,12 +340,6 @@ static vector<string> _randart_propnames(const item_def& item,
                     continue;
 
                 work << propanns[i].name;
-
-                // these need special handling, so we don't give anything away
-                if (propanns[i].prop == ARTP_METABOLISM && val > 2)
-                    work << "+";
-                else if (propanns[i].prop == ARTP_METABOLISM && val < 0)
-                    work << "-";
                 break;
             }
             propnames.push_back(work.str());
@@ -534,19 +527,6 @@ static string _randart_descrip(const item_def &item)
         }
     }
 
-    // Some special cases which don't fit into the above.
-    if (known_proprt(ARTP_METABOLISM))
-    {
-        if (proprt[ARTP_METABOLISM] >= 3)
-            description += "\nIt greatly speeds your metabolism.";
-        else if (proprt[ARTP_METABOLISM] >= 1)
-            description += "\nIt speeds your metabolism. ";
-        if (proprt[ARTP_METABOLISM] <= -3)
-            description += "\nIt greatly slows your metabolism.";
-        else if (proprt[ARTP_METABOLISM] <= -1)
-            description += "\nIt slows your metabolism. ";
-    }
-
     if (known_proprt(ARTP_STEALTH))
     {
         const int stval = proprt[ARTP_STEALTH];
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index b76498f837..cee1c4950e 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -3532,7 +3532,9 @@ enum artefact_prop_type
     ARTP_CAUSE_TELEPORTATION,
     ARTP_PREVENT_TELEPORTATION,
     ARTP_ANGRY,
+#if TAG_MAJOR_VERSION == 34
     ARTP_METABOLISM,
+#endif
     ARTP_MUTAGENIC,
     ARTP_ACCURACY,
     ARTP_DAMAGE,
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d79c0fdd66..edf4c8cca6 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1464,9 +1464,6 @@ int player_hunger_rate(bool temp)
 
     hunger += 4 * you.wearing(EQ_RINGS, RING_HUNGER);
 
-    // randarts
-    hunger += you.scan_artefacts(ARTP_METABOLISM);
-
     // sustenance affects things at the end, because it is multiplicative
     for (int s = you.wearing(EQ_RINGS, RING_SUSTENANCE); s > 0; s--)
         hunger = hunger * 3 / 5;
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 5e9dc43827..8a987aab11 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -923,10 +923,6 @@ int artefact_value(const item_def &item)
     if (prop[ ARTP_MUTAGENIC ])
         ret -= 8;
 
-    // ranges from 1-3
-    if (prop[ ARTP_METABOLISM ])
-        ret -= (2 * prop[ ARTP_METABOLISM ]);
-
     // extremely good
     if (prop[ ARTP_FOG ])
         ret += 50;
diff --git a/crawl-ref/source/tag-version.h b/crawl-ref/source/tag-version.h
index b7ed8f2e45..e64e26a16a 100644
--- a/crawl-ref/source/tag-version.h
+++ b/crawl-ref/source/tag-version.h
@@ -89,7 +89,7 @@ enum tag_minor_version
     TAG_MINOR_MANGROVES,           // Turn all mangroves into trees.
     TAG_MINOR_FIX_FEAT_SHIFT,      // Fix feature shifts from the last tag.
     TAG_MINOR_FUNGUS_FORM,         // Removed confusing touch duration from fungus form.
-    TAG_MINOR_STEALTH_RESCALE,     // Rescaled Stealth property on items.
+    TAG_MINOR_STEALTH_RESCALE,     // Item properties: rescaled Stealth, removed Hunger.
 #endif
     NUM_TAG_MINORS,
     TAG_MINOR_VERSION = NUM_TAG_MINORS - 1
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 19f89b5126..0cd093b1af 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -3593,19 +3593,27 @@ void unmarshallItem(reader &th, item_def &item)
     }
 
     // Rescale stealth (range 10..79 and -10..-98) to discrete steps (+-50/100)
-    if (th.getMinorVersion() < TAG_MINOR_STEALTH_RESCALE
-        && is_artefact(item)
-        && artefact_wpn_property(item, ARTP_STEALTH))
-    {
-        int prop_st = artefact_wpn_property(item, ARTP_STEALTH);
-        if (prop_st > 50)
-            artefact_set_property(item, ARTP_STEALTH, 2);
-        else if (prop_st < -50)
-            artefact_set_property(item, ARTP_STEALTH, -2);
-        else if (prop_st < 0)
+    if (th.getMinorVersion() < TAG_MINOR_STEALTH_RESCALE && is_artefact(item))
+    {
+        if (artefact_wpn_property(item, ARTP_STEALTH))
+        {
+            int prop_st = artefact_wpn_property(item, ARTP_STEALTH);
+            if (prop_st > 60)
+                artefact_set_property(item, ARTP_STEALTH, 2);
+            else if (prop_st < -70)
+                artefact_set_property(item, ARTP_STEALTH, -2);
+            else if (prop_st < 0)
+                artefact_set_property(item, ARTP_STEALTH, -1);
+            else
+                artefact_set_property(item, ARTP_STEALTH, 1);
+        }
+
+        // Remove fast metabolism property
+        if (artefact_wpn_property(item, ARTP_METABOLISM))
+        {
+            artefact_set_property(item, ARTP_METABOLISM, 0);
             artefact_set_property(item, ARTP_STEALTH, -1);
-        else
-            artefact_set_property(item, ARTP_STEALTH, 1);
+        }
     }
 #endif
 
diff --git a/crawl-ref/source/util/art-data.pl b/crawl-ref/source/util/art-data.pl
index 933b2a2489..76532aff0f 100755
--- a/crawl-ref/source/util/art-data.pl
+++ b/crawl-ref/source/util/art-data.pl
@@ -45,7 +45,6 @@ my %field_type = (
     FLY      => "bool",
     LIFE     => "bool",
     MAGIC    => "num",
-    METAB    => "num",
     HP       => "num",
     MP       => "num",
     MUTATE   => "bool",
@@ -86,6 +85,8 @@ my %field_type = (
     plus2     => "num",
     base_type => "enum",
     sub_type  => "enum",
+
+    unused    => "unused",
 );
 
 my @field_list = keys(%field_type);
@@ -483,7 +484,7 @@ my @art_order = (
     "{", "BRAND", "AC", "EV", "STR", "INT", "DEX", "\n",
     "FIRE", "COLD", "ELEC", "POISON", "LIFE", "MAGIC", "\n",
     "SEEINV", "INV", "FLY", "BLINK", "BERSERK",  "NOISES", "\n",
-    "NOSPELL", "RND_TELE", "NOTELEP", "ANGRY", "METAB", "\n",
+    "NOSPELL", "RND_TELE", "NOTELEP", "ANGRY", "unused", "\n",
     "MUTATE", "ACC", "DAM", "CURSED", "STEALTH", "MP", "\n",
     "BASE_DELAY", "HP", "CLARITY", "BASE_ACC", "BASE_DAM", "\n",
     "RMSL", "FOG", "REGEN", "NO_UPGRADE", "\n",
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 2603ad63cc..b3af84d3fb 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -1371,7 +1371,9 @@ static void _debug_rap_stats(FILE *ostat)
         -1, //ARTP_CAUSE_TELEPORTATION
         -1, //ARTP_PREVENT_TELEPORTATION
         -1, //ARTP_ANGRY
+#if TAG_MAJOR_VERSION == 34
          0, //ARTP_METABOLISM
+#endif
         -1, //ARTP_MUTAGENIC
          0, //ARTP_ACCURACY
          0, //ARTP_DAMAGE
@@ -1526,7 +1528,9 @@ static void _debug_rap_stats(FILE *ostat)
         "ARTP_CAUSE_TELEPORTATION",
         "ARTP_PREVENT_TELEPORTATION",
         "ARTP_ANGRY",
+#if TAG_MAJOR_VERSION == 34
         "ARTP_METABOLISM",
+#endif
         "ARTP_MUTAGENIC",
         "ARTP_ACCURACY",
         "ARTP_DAMAGE",