From 3b29f72d670d9e01ce1794679a6f86bc44debc72 Mon Sep 17 00:00:00 2001 From: Neil Moore Date: Mon, 9 Jun 2014 12:25:26 -0400 Subject: Remove vestiges of Simulacrum-chunk interactions. Wieldability, usefulness of butchery and chunks, tile wield tip, and monster food pickup. --- crawl-ref/source/itemname.cc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'crawl-ref/source/itemname.cc') 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; -- cgit v1.2.3-54-g00ecf