diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-12 14:25:50 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-12 14:25:50 +0000 |
| commit | 71e8cf1a93945211047ab78c851290e92938f6d1 (patch) | |
| tree | 9231eb554aadafece148fabbcbf6e4d6d696ecda /crawl-ref/source/monspeak.cc | |
| parent | 682e94e3c1534de75cc217733aa669798b9065ab (diff) | |
| download | crawl-ref-71e8cf1a93945211047ab78c851290e92938f6d1.tar.gz crawl-ref-71e8cf1a93945211047ab78c851290e92938f6d1.zip | |
Fix new firing interface to also apply when selecting items via tile inventory.
(This will also change the quiver, so that tile players no longer need to
repeatedly choose the same stack of darts to fire: ff will work nicely.)
Implement first part of FR 1911866: merging W/T, R/P
The existing option "easy_unequip" now also allows direct choice of which
armour to take off from the 'W' menu, and same for jewellery for 'P'. Warning
inscriptions are respected.
Now we only need to add a new sorting option sort_equipped that takes care of
equipped stuff being listed first in the inventory. Last time I tried something
like this (chunk sorting by age) I failed miserably, so I'm making no promises.
Also tweak my recent {tried} modification to only apply to jewellery since for
some reasons all unidentified randart weapons show {tried} where jewellery is
really picky about which randarts have been tried and which haven't. Probably
still needs fixing.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3607 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monspeak.cc')
| -rw-r--r-- | crawl-ref/source/monspeak.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index 8528276860..7d99bb3317 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -255,10 +255,6 @@ bool mons_speaks(const monsters *monster) if (monster->has_ench(ENCH_CONFUSION)) prefixes.push_back("confused"); - // only look at the current player form - if (is_player_same_species(monster->type, true)) - prefixes.push_back("related"); - // Add Beogh to list of prefixes for orcs (hostile and friendly) if you // worship Beogh. (This assumes you being a Hill Orc, so might have odd // results in wizard mode.) Don't count charmed orcs. @@ -267,10 +263,17 @@ bool mons_speaks(const monsters *monster) { prefixes.push_back("beogh"); } - else if (is_good_god(you.religion)) - prefixes.push_back("good god"); - else if (is_evil_god(you.religion)) - prefixes.push_back("evil god"); + else + { + // only look at the current player form + if (is_player_same_species(monster->type, true)) + prefixes.push_back("related"); // overkill for Beogh + + if (is_good_god(you.religion)) + prefixes.push_back("good god"); + else if (is_evil_god(you.religion)) + prefixes.push_back("evil god"); + } #ifdef DEBUG_MONSPEAK { |