In the ASCII version, colour silenced grids CYAN and grids both silenced

and within TSO's halo LIGHTCYAN. Also display a line "This square is
shrouded in silence" wherever applicable.
We might also need to display silence with tiles.


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

3 files changed, 18 insertions, 6 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index a640200b54..242befcd6e 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3434,7 +3434,12 @@ static void _describe_cell(const coord_def& where, bool in_range)
 #endif
 
     if (is_sanctuary(where))
-        mpr("This square lies inside a sanctuary.");
+    {
+        mprf("This square lies inside a sanctuary%s.",
+             silenced(where) ? ", and is shrouded in silence" : "");
+    }
+    else if (silenced(where))
+        mpr("This square is shrouded in silence.");
 
     if (env.cgrid(where) != EMPTY_CLOUD)
     {
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 0751b3899e..b1e768b99c 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3106,11 +3106,10 @@ void level_change(bool skip_attribute_increase)
                     new_exp);
             }
 
-            if (!skip_more)
-                more();
-
             if (!(new_exp % 3) && !skip_attribute_increase)
                 _attribute_increase();
+            else if (!skip_more)
+                more();
 
             // No more prompts for this XL past this point.
 
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index b3acdbd642..ef6466d071 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -521,11 +521,19 @@ static void _get_symbol( const coord_def& where,
                 }
             }
 
-            if (object < NUM_REAL_FEATURES && inside_halo(where)
+            if (object < NUM_REAL_FEATURES
                 && (object >= DNGN_FLOOR_MIN && object <= DNGN_FLOOR_MAX
                     || object == DNGN_UNDISCOVERED_TRAP))
             {
-                *colour = YELLOW | colmask;
+                if (inside_halo(where))
+                {
+                    if (silenced(where))
+                        *colour = LIGHTCYAN | colmask;
+                    else
+                        *colour = YELLOW | colmask;
+                }
+                else if (silenced(where))
+                    *colour = CYAN | colmask;
             }
         }