diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-18 18:58:52 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-18 18:58:52 +0000 |
commit | 6d7627cb65e54dae22237da82ea076bf17b1f9b7 (patch) | |
tree | 43eda0c3c953b041e1419650cc78a6ae9c381374 /crawl-ref/source/output.cc | |
parent | 66c0054398335a6929dd22d3690775027b9906b6 (diff) | |
download | crawl-ref-6d7627cb65e54dae22237da82ea076bf17b1f9b7.tar.gz crawl-ref-6d7627cb65e54dae22237da82ea076bf17b1f9b7.zip |
Add the Slime god as per n78291's (Shayne?) patch. Thanks! :D
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10271 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
-rw-r--r-- | crawl-ref/source/output.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 81cc4a51ac..d2d5eb7cd4 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1029,7 +1029,12 @@ void redraw_skill(const std::string &your_name, const std::string &class_name) nowrap_eol_cprintf("Level %d %s", you.experience_level, species_name(you.species,you.experience_level).c_str()); if (you.religion != GOD_NO_GOD) - nowrap_eol_cprintf(" of %s", god_name(you.religion).c_str()); + { + nowrap_eol_cprintf(" of %s", + you.religion == GOD_JIYVA ? god_name_jiyva(true).c_str() + : god_name(you.religion).c_str()); + } + clear_to_end_of_line(); textcolor( LIGHTGREY ); @@ -1319,8 +1324,12 @@ static std::string _verbose_info(const monsters* m) else return(" (sleeping)"); } - if (mons_is_wandering(m) && !mons_is_batty(m)) + if (mons_is_wandering(m) && !mons_is_batty(m) + && !(m->attitude == ATT_STRICT_NEUTRAL)) + { + // Labeling strictly neutral monsters as fellow slimes is more important. return(" (wandering)"); + } if (m->foe == MHITNOT && !mons_is_batty(m) && !mons_neutral(m) && !mons_friendly(m)) { @@ -1409,6 +1418,10 @@ void monster_pane_info::to_string( int count, std::string& desc, //out << " (neutral)"; desc_color = BROWN; break; + case ATT_STRICT_NEUTRAL: + out << " (fellow slime)"; + desc_color = BROWN; + break; case ATT_HOSTILE: // out << " (hostile)"; desc_color = LIGHTGREY; |