Mixed commit of small additions/changes.

FR 1870139: output "Tele" among enchantment abbrevs
            when "about to teleport"
FR 1834016: print item slots along with rotting message
            (I added an option for this as I personally don't need this.)

Gods:
* Add ^ line for Zin's mutation protection.
* Modify protection from harm adjectives in ^ screen to make difference
  between Ely and Zin/TSO more obvious.

Tiles:
Bug 1870238: Show mimics to be "autopickuable" (green frame).
* Smarter handling of L-click actions in inventory.
* code clean-up


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

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index a696d632af..a0a94ce98b 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -517,6 +517,12 @@ void print_stats(void)
             cprintf( "Holy " );
         }
 
+        if (you.duration[DUR_TELEPORT])
+        {
+            textcolor( LIGHTBLUE );
+            cprintf( "Tele " );
+        }
+
         if (you.duration[DUR_DEFLECT_MISSILES])
         {
 
@@ -1195,7 +1201,7 @@ void print_overview_screen()
     const int relec = player_res_electricity(calc_unid);
     const int rsust = player_sust_abil(calc_unid);
     const int rmuta = wearing_amulet(AMU_RESIST_MUTATION, calc_unid)
-                      || you.religion == GOD_ZIN && you.piety >= 180
+                      || you.religion == GOD_ZIN && you.piety >= 150
                       || you.mutation[MUT_MUTATION_RESISTANCE] == 3;
 
     const int rslow = wearing_amulet(AMU_RESIST_SLOW, calc_unid);