diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 21:36:32 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 21:36:32 +0000 |
| commit | 2e1a0765e5fbdb41324bca70ece54bfdc63a9204 (patch) | |
| tree | 554f1f103c22520c602e5d1664f527f1ecad8945 /crawl-ref/source/describe.cc | |
| parent | 7267cbb0b90edbd50a914aa3fa5e4790ac360824 (diff) | |
| download | crawl-ref-2e1a0765e5fbdb41324bca70ece54bfdc63a9204.tar.gz crawl-ref-2e1a0765e5fbdb41324bca70ece54bfdc63a9204.zip | |
Mention monsters regenerating (e.g. trolls) or not regenerating (e.g.
zombies) in their descriptions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9643 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 38062331d1..b04ca94afe 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1820,7 +1820,7 @@ std::string get_item_description( const item_def &item, bool verbose, // either the wand "no charges left" or the meat chunk // "unpleasant" description can follow on the same line. // Same for missiles' descriptions. - description.seekp(description.tellp() - (std::streamoff)1); + description.seekp(description.tellp() - (std::streamoff)2); description << " "; } } @@ -1952,7 +1952,8 @@ std::string get_item_description( const item_def &item, bool verbose, break; } - if (is_good_god(you.religion) && is_player_same_species(item.plus) + if (god_hates_cannibalism(you.religion) + && is_player_same_species(item.plus) || you.religion == GOD_ZIN && mons_class_intel(item.plus) >= I_NORMAL) { @@ -2720,6 +2721,12 @@ static std::string _monster_stat_description(const monsters& mon) << (fly == FL_FLY ? "fly" : "levitate") << ".$"; } + // Unusual regeneration rates. + if (!mons_can_regenerate(&mon)) + result << pronoun << " cannot regenerate.$"; + else if (monster_descriptor(mon.type, MDSC_REGENERATES)) + result << pronoun << " regenerates quickly.$"; + return (result.str()); } @@ -2859,8 +2866,8 @@ void get_monster_db_desc(const monsters& mons, describe_info &inf, break; } - // Don't leak or duplicate resistance information for ghosts/demons. - if (mons.type != MONS_PANDEMONIUM_DEMON && mons.type != MONS_PLAYER_GHOST) + // Don't leak or duplicate resistance information for demons. + if (mons.type != MONS_PANDEMONIUM_DEMON) { std::string result = _monster_stat_description(mons); if (!result.empty()) |