Make verbose_monster_pane default to true, and for TSO-ites colour monster pane

entries magenta if attacking that monster would be unchivalric.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8458 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 17 insertions, 1 deletions

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();
 }