diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 22:16:37 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-19 22:16:37 -0600 |
| commit | cbf5fe7b39f4ae734ba7b596b8a1c17264f797ea (patch) | |
| tree | 17c93ff67a01bcd68821b71cec081e3a2ced1d37 /crawl-ref/source/itemprop.cc | |
| parent | 8e6f0b9972661f6e73e809b55274c0cd4e40528b (diff) | |
| download | crawl-ref-cbf5fe7b39f4ae734ba7b596b8a1c17264f797ea.tar.gz crawl-ref-cbf5fe7b39f4ae734ba7b596b8a1c17264f797ea.zip | |
Properly mark blessed whips as TSO gifts (Scourges instead of Blades).
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 7 |
1 files changed, 4 insertions, 3 deletions
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); |