Remove vestiges of Simulacrum-chunk interactions.

Wieldability, usefulness of butchery and chunks, tile wield tip, and
monster food pickup.

8 files changed, 14 insertions, 57 deletions

diff --git a/crawl-ref/source/dat/clua/wield.lua b/crawl-ref/source/dat/clua/wield.lua
index 9934ec4deb..d78d125751 100644
--- a/crawl-ref/source/dat/clua/wield.lua
+++ b/crawl-ref/source/dat/clua/wield.lua
@@ -17,7 +17,6 @@ function ch_item_wieldable(it)
     local spells = make_hash(you.spells())
 
     if spells["Sublimation of Blood"] and food.ischunk(it)
-            or spells["Simulacrum"] and food.ismeaty(it)
     then
         return true
     end
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 45093ac114..ee2f83f61a 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -249,8 +249,7 @@ static bool _should_butcher(int corpse_id, bool bottle_blood = false)
     else if (!bottle_blood && you.species == SP_VAMPIRE
              && (can_bottle_blood_from_corpse(corpse.mon_type)
                  || mons_has_blood(corpse.mon_type) && !is_bad_food(corpse))
-             && !you.has_spell(SPELL_SUBLIMATION_OF_BLOOD)
-             && !you.has_spell(SPELL_SIMULACRUM))
+             && !you.has_spell(SPELL_SUBLIMATION_OF_BLOOD))
     {
         bool can_bottle = can_bottle_blood_from_corpse(corpse.mon_type);
         const string msg = make_stringf("You could drain this corpse's blood with <w>%s</w> instead%s. Continue anyway?",
@@ -414,8 +413,7 @@ bool butchery(int which_corpse, bool bottle_blood)
         return false;
     }
 
-    bool wants_any = you.has_spell(SPELL_SIMULACRUM)
-                  || you.has_spell(SPELL_SUBLIMATION_OF_BLOOD);
+    bool wants_any = you.has_spell(SPELL_SUBLIMATION_OF_BLOOD);
 
     // First determine how many things there are to butcher.
     int num_corpses = 0;
@@ -2431,8 +2429,7 @@ bool drop_spoiled_chunks()
     if (Options.auto_drop_chunks == ADC_NEVER)
         return false;
 
-    bool wants_any = you.has_spell(SPELL_SIMULACRUM)
-                  || you.has_spell(SPELL_SUBLIMATION_OF_BLOOD);
+    bool wants_any = you.has_spell(SPELL_SUBLIMATION_OF_BLOOD);
     int nchunks = 0;
     vector<pair<int, int> > chunk_slots;
     for (int slot = 0; slot < ENDOFPACK; slot++)
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 33ccb37e1f..4284170f09 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -254,20 +254,12 @@ static bool _valid_weapon_swap(const item_def &item)
     if (item_is_snakable(item) && you.has_spell(SPELL_STICKS_TO_SNAKES))
         return true;
 
-    // What follows pertains only to Sublimation of Blood and/or Simulacrum.
-    if (!you.has_spell(SPELL_SUBLIMATION_OF_BLOOD)
-        && !you.has_spell(SPELL_SIMULACRUM))
+    if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD))
     {
-        return false;
-    }
-
-    if (item.base_type == OBJ_FOOD && food_is_meaty(item))
-        return item.sub_type == FOOD_CHUNK || you.has_spell(SPELL_SIMULACRUM);
-
-    if (item.base_type == OBJ_POTIONS && item_type_known(item)
-        && you.has_spell(SPELL_SUBLIMATION_OF_BLOOD))
-    {
-        return is_blood_potion(item);
+        if (item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK)
+            return true;
+        if (is_blood_potion(item))
+            return true;
     }
 
     return false;
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 43a7d28f22..65645ad48d 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -3308,12 +3308,8 @@ bool is_useless_item(const item_def &item, bool temp)
     case OBJ_POTIONS:
     {
         // Not useless, even if you can't quaff it.
-        if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD)
-            && (item.sub_type == POT_BLOOD
-                || item.sub_type == POT_BLOOD_COAGULATED))
-        {
+        if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD) && is_blood_potion(item))
             return false;
-        }
 
         // Mummies can't use potions.
         if (you.species == SP_MUMMY)
@@ -3485,9 +3481,6 @@ bool is_useless_item(const item_def &item, bool temp)
             return false;
         }
 
-        if (food_is_meaty(item) && you.has_spell(SPELL_SIMULACRUM))
-            return false;
-
         if (is_fruit(item) && you_worship(GOD_FEDHAS))
             return false;
 
@@ -3499,17 +3492,15 @@ bool is_useless_item(const item_def &item, bool temp)
 
         if (you.has_spell(SPELL_ANIMATE_DEAD)
             || you.has_spell(SPELL_ANIMATE_SKELETON)
+            || you.has_spell(SPELL_SIMULACRUM)
             || you_worship(GOD_YREDELEMNUL) && !you.penance[GOD_YREDELEMNUL]
                && you.piety >= piety_breakpoint(0))
         {
             return false;
         }
 
-        if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD)
-            || you.has_spell(SPELL_SIMULACRUM))
-        {
+        if (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD))
             return false;
-        }
 
         return true;
 
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 7cb14b0a77..8cb613253b 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -189,8 +189,7 @@ void turn_corpse_into_chunks(item_def &item, bool bloodspatter,
     item.quantity  = 1 + random2(max_chunks);
     item.quantity  = stepdown_value(item.quantity, 4, 4, 12, 12);
 
-    bool wants_for_spells = you.has_spell(SPELL_SIMULACRUM)
-                            || you.has_spell(SPELL_SUBLIMATION_OF_BLOOD);
+    bool wants_for_spells = you.has_spell(SPELL_SUBLIMATION_OF_BLOOD);
     // Don't mark it as dropped if we are forcing autopickup of chunks.
     if (you.force_autopickup[OBJ_FOOD][FOOD_CHUNK] <= 0
         && is_bad_food(item) && !wants_for_spells)
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index e206f70f7b..0b3267fcc2 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -2202,22 +2202,6 @@ bool monster::pickup_gold(item_def &item, int near)
     return pickup(item, MSLOT_GOLD, near);
 }
 
-bool monster::pickup_food(item_def &item, int near)
-{
-    // Chunks are used only for Simulacrum.
-    if (item.base_type == OBJ_FOOD
-        && item.sub_type == FOOD_CHUNK
-        && has_spell(SPELL_SIMULACRUM)
-        && mons_class_can_be_zombified(item.mon_type))
-    {
-        // If a Beoghite monster ever gets Simulacrum, please
-        // add monster type restrictions here.
-        return pickup(item, MSLOT_MISCELLANY, near);
-    }
-
-    return false;
-}
-
 bool monster::pickup_misc(item_def &item, int near)
 {
     // Never pick up the horn of Geryon or runes, except for mimics.
@@ -2323,8 +2307,6 @@ bool monster::pickup_item(item_def &item, int near, bool force)
         return pickup_armour(item, near, force);
     case OBJ_MISCELLANY:
         return pickup_misc(item, near);
-    case OBJ_FOOD:
-        return pickup_food(item, near);
     case OBJ_GOLD:
         return pickup_gold(item, near);
     case OBJ_JEWELLERY:
diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h
index 554cd5bc58..4baed8b10f 100644
--- a/crawl-ref/source/monster.h
+++ b/crawl-ref/source/monster.h
@@ -270,7 +270,6 @@ public:
     bool      pickup_armour(item_def &item, int near, bool force);
     bool      pickup_jewellery(item_def &item, int near, bool force);
     bool      pickup_misc(item_def &item, int near);
-    bool      pickup_food(item_def &item, int near);
     bool      pickup_missile(item_def &item, int near, bool force);
     bool      drop_item(int eslot, int near);
     void      equip(item_def &item, int slot, int near = -1);
diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc
index c64bd052a1..52db4e0801 100644
--- a/crawl-ref/source/tilereg-inv.cc
+++ b/crawl-ref/source/tilereg-inv.cc
@@ -543,10 +543,8 @@ bool InventoryRegion::update_tip_text(string& tip)
                 // For Sublimation of Blood.
                 if (wielded)
                     _handle_wield_tip(tmp, cmd, "\n[Ctrl + L-Click] ", true);
-                else if (food_is_meaty(item)
-                             && you.has_spell(SPELL_SIMULACRUM)
-                         || item.sub_type == FOOD_CHUNK
-                             && you.has_spell(SPELL_SUBLIMATION_OF_BLOOD))
+                else if (item.sub_type == FOOD_CHUNK
+                         && you.has_spell(SPELL_SUBLIMATION_OF_BLOOD))
                 {
                     _handle_wield_tip(tmp, cmd, "\n[Ctrl + L-Click] ");
                 }