diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-06-12 20:16:59 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-06-12 20:16:59 +0100 |
| commit | 3c3d02167e7a198132d664d6c13a29548f42f8f7 (patch) | |
| tree | 5a76119f2e947a781ccaa705aadec95b3552afcc /crawl-ref/source/itemprop.cc | |
| parent | ae6d43520af7837038e1cbbc135fa5e24513cc56 (diff) | |
| download | crawl-ref-3c3d02167e7a198132d664d6c13a29548f42f8f7.tar.gz crawl-ref-3c3d02167e7a198132d664d6c13a29548f42f8f7.zip | |
Allow gods to rebrand blessed weapons again
Diffstat (limited to 'crawl-ref/source/itemprop.cc')
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index bac81dd6a2..1adcd19cd9 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -1513,7 +1513,7 @@ bool convert2bad(item_def &item) return true; } -bool is_brandable_weapon(const item_def &wpn, bool allow_ranged) +bool is_brandable_weapon(const item_def &wpn, bool allow_ranged, bool divine) { if (wpn.base_type != OBJ_WEAPONS) return false; @@ -1527,7 +1527,9 @@ bool is_brandable_weapon(const item_def &wpn, bool allow_ranged) return false; } - if (is_blessed(wpn)) + // Only gods can rebrand blessed weapons, and they revert back to their + // old base type in the process. + if (is_blessed(wpn) && !divine) return false; return true; |