From 9c1370e65f10a606a136bfaa69bad3c916565d12 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Tue, 12 Jan 2010 12:12:34 +0100
Subject: Mark holy weapons as useless more faithfully to their actual
 uselessness.

---
 crawl-ref/source/itemname.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 3b8fdd45d2..f4e01a5fe2 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2609,11 +2609,16 @@ bool is_useless_item(const item_def &item, bool temp)
         if (!item_type_known(item))
             return (false);
 
-        switch (get_weapon_brand(item))
+        if (you.undead_or_demonic() && is_holy_item(item))
         {
-        case SPWPN_HOLY_WRATH:
-            return (you.is_undead);
+            if (!temp && you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH
+                && you.species != SP_DEMONSPAWN)
+            {
+                return (false);
+            }
+            return (true);
         }
+
         return (false);
 
     case OBJ_MISSILES:
-- 
cgit v1.2.3-54-g00ecf