diff options
| -rw-r--r-- | crawl-ref/docs/crawl_manual.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/docs/options_guide.txt | 7 | ||||
| -rw-r--r-- | crawl-ref/settings/init.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 16 |
5 files changed, 26 insertions, 7 deletions
diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt index 6ffdb9f0d0..6bde851f9d 100644 --- a/crawl-ref/docs/crawl_manual.txt +++ b/crawl-ref/docs/crawl_manual.txt @@ -258,8 +258,10 @@ can be subtle, and a full list with explanations is given in Appendix 5. Monsters within your field of vision are listed on a special panel, the monster list. Single monsters also get indicators of their health status in the form of a coloured box, and also on effects they enjoy or suffer -from. Within target mode you can directly target single monsters by use -of the monster list. Use Ctrl-L to toggle this on or off. +from; additionally, for those who worship The Shining One, monsters +whom it would be unchivalric to attack have their name and effect status +coloured magenta. Within target mode you can directly target single +monsters by use of the monster list. Use Ctrl-L to toggle this on or off. Sometimes characters will be able to use special abilities, e.g. the Naga's ability to spit poison, or the magical power to turn invisible diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index 383a61b8ff..3d86d393c8 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -667,10 +667,11 @@ trap_item_brand = none use this brand, the items on the square are hidden by the trap symbol (^) and the trap symbol is branded. -verbose_monster_pane = false - If set to true when using the console version of Crawl (rather than +verbose_monster_pane = true + If set to true false using the console version of Crawl (rather than the tiles version), the pane listing the monsters in sight will give - more detailed information than just "distracted" or "resting". + the older, less detailed information like "distracted" or "resting" + rather than "fleeing", "sleeping", "unaware", etc. 4-e Level Map Functions. ---------------------------- diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index 310eb7dfd2..e44e912575 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -155,7 +155,7 @@ trap_item_brand = reverse # scroll_margin_y = 2 # scroll_margin = 2 # -# verbose_monster_pane = true +# verbose_monster_pane = false ##### 4-g Travel and Exploration ################# # diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 0d63416dbe..e689f6c8df 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -638,7 +638,7 @@ void game_options::reset_options() scroll_margin_x = 2; scroll_margin_y = 2; - verbose_monster_pane = false; + verbose_monster_pane = true; autopickup_on = true; default_friendly_pickup = FRIENDLY_PICKUP_FRIEND; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 3e5426e48e..88732c6bd6 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1391,6 +1391,22 @@ void monster_pane_info::to_string( int count, std::string& desc, break; } + // Evilness of attacking + switch (m_attitude) + { + case ATT_NEUTRAL: + case ATT_HOSTILE: + if (count == 1 && you.religion == GOD_SHINING_ONE + && !tso_unchivalric_attack_safe_monster(m_mon) + && is_unchivalric_attack(&you, m_mon)) + { + desc_color = MAGENTA; + } + break; + default: + break; + } + desc = out.str(); } |