From cbf5fe7b39f4ae734ba7b596b8a1c17264f797ea Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 19 Nov 2009 22:16:37 -0600 Subject: Properly mark blessed whips as TSO gifts (Scourges instead of Blades). --- crawl-ref/source/itemprop.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/itemprop.cc') diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 272b0df66f..d700b753d8 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -1500,7 +1500,7 @@ bool is_demonic(const item_def &item) return (false); } -bool is_blessed_blade(const item_def &item) +bool is_blessed(const item_def &item) { if (item.base_type == OBJ_WEAPONS) { @@ -1525,11 +1525,12 @@ bool is_blessed_blade(const item_def &item) return (false); } -bool is_blessed_blade_convertible(const item_def &item) +bool is_blessed_convertible(const item_def &item) { return (!is_artefact(item) && (item.base_type == OBJ_WEAPONS && (is_demonic(item) + || item.sub_type == WPN_HOLY_SCOURGE || weapon_skill(item) == SK_LONG_BLADES))); } @@ -1604,7 +1605,7 @@ bool convert2good(item_def &item, bool allow_blessed) break; } - if (is_blessed_blade(item)) + if (is_blessed(item)) item.flags &= ~ISFLAG_RACIAL_MASK; return (true); -- cgit v1.2.3-54-g00ecf