[crawl-ref-commits] master branch updated: 0.11-a0-85-g11ee62d

[<gi...@cr...>]

       via  11ee62d43b012d4f09015d07dcc18fd47abbd412 (commit)
      from  31fb67cd0770a06c49ace4cf97d2849e40ca4aef (commit)

-----------------------------------------------------------------------
commit 11ee62d43b012d4f09015d07dcc18fd47abbd412
Author: Adam Borowski <kil...@an...>
Date:   Tue Jan 31 15:00:13 2012 +0100

    Fix vamp weapons being unwieldable in ZotDef.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/acquire.cc  |    3 ++-
 crawl-ref/source/invent.cc   |    2 +-
 crawl-ref/source/item_use.cc |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 44038f0..04cd7f1 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -1363,7 +1363,8 @@ int acquirement_create_item(object_class_type class_wanted,
             && doodad.base_type == OBJ_WEAPONS
             && !is_unrandom_artefact(doodad)
             && (get_weapon_brand(doodad) == SPWPN_DISTORTION
-               || get_weapon_brand(doodad) == SPWPN_VAMPIRICISM)
+               || get_weapon_brand(doodad) == SPWPN_VAMPIRICISM
+                  && !crawl_state.game_is_zotdef())
             && !can_cut_meat(doodad)
             // being gloved or transformed is ok here
             && !you.has_claws(false)
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index f10e115..4c3ff0a 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -1628,7 +1628,7 @@ bool needs_handle_warning(const item_def &item, operation_types oper)
         }
 
         if (get_weapon_brand(item) == SPWPN_VAMPIRICISM
-            && !you.is_undead)
+            && !you.is_undead && !crawl_state.game_is_zotdef())
         {
             return (true);
         }
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 8e4b856..a4ffa3e 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -208,6 +208,7 @@ bool can_wield(item_def *weapon, bool say_reason,
     if (!ignore_temporary_disability
         && you.hunger_state < HS_FULL
         && get_weapon_brand(*weapon) == SPWPN_VAMPIRICISM
+        && !crawl_state.game_is_zotdef()
         && !you.is_undead)
     {
         if (say_reason)


-- 
Dungeon Crawl Stone Soup