diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-28 19:08:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-28 19:08:03 +0000 |
| commit | 1e14066ec4bae72628883a11e60460b6794645d0 (patch) | |
| tree | c8cc530cc264af07d8c73510634da75c8f0886d4 /crawl-ref/source/religion.cc | |
| parent | b578218b05ae153f3425278bedbb8efca48e259e (diff) | |
| download | crawl-ref-1e14066ec4bae72628883a11e60460b6794645d0.tar.gz crawl-ref-1e14066ec4bae72628883a11e60460b6794645d0.zip | |
Fix 1951264: Buggy uniques' wielding messages.
Fix named orcs getting no descriptions. The descriptions will have to be
tweaked, probably using lua, to allow for friendly orcs. The
descriptions for orc priests look particularly out of place with Beogh.
Viewing friendlies now also lists their quiver and alternate weapon.
Dualwielders now never will pick up shields, and single wielders will
drop their shield if they wield a two-handed weapon.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4755 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 88b37366ab..3ad061bdfb 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2551,15 +2551,15 @@ bool is_evil_item(const item_def& item) int item_eff = item_special_wield_effect(item); retval = (is_demonic(item) - || item.special == SPWPN_SCEPTRE_OF_ASMODEUS - || item.special == SPWPN_STAFF_OF_DISPATER - || item.special == SPWPN_SWORD_OF_CEREBOV - || item_eff == SPWLD_CURSE - || item_eff == SPWLD_TORMENT - || item_eff == SPWLD_ZONGULDROK - || item_brand == SPWPN_DRAINING - || item_brand == SPWPN_PAIN - || item_brand == SPWPN_VAMPIRICISM); + || item.special == SPWPN_SCEPTRE_OF_ASMODEUS + || item.special == SPWPN_STAFF_OF_DISPATER + || item.special == SPWPN_SWORD_OF_CEREBOV + || item_eff == SPWLD_CURSE + || item_eff == SPWLD_TORMENT + || item_eff == SPWLD_ZONGULDROK + || item_brand == SPWPN_DRAINING + || item_brand == SPWPN_PAIN + || item_brand == SPWPN_VAMPIRICISM); } break; case OBJ_WANDS: @@ -2570,18 +2570,18 @@ bool is_evil_item(const item_def& item) break; case OBJ_POTIONS: retval = (item.sub_type == POT_BLOOD - || item.sub_type == POT_BLOOD_COAGULATED); + || item.sub_type == POT_BLOOD_COAGULATED); break; case OBJ_BOOKS: retval = (item.sub_type == BOOK_NECROMANCY - || item.sub_type == BOOK_DEATH - || item.sub_type == BOOK_UNLIFE - || item.sub_type == BOOK_NECRONOMICON - || item.sub_type == BOOK_DEMONOLOGY); + || item.sub_type == BOOK_DEATH + || item.sub_type == BOOK_UNLIFE + || item.sub_type == BOOK_NECRONOMICON + || item.sub_type == BOOK_DEMONOLOGY); break; case OBJ_STAVES: retval = (item.sub_type == STAFF_DEATH - || item.sub_type == STAFF_DEMONOLOGY); + || item.sub_type == STAFF_DEMONOLOGY); break; case OBJ_MISCELLANY: retval = (item.sub_type == MISC_LANTERN_OF_SHADOWS); |