Backport a number of small fixes and improvements, among others:

* display for silenced grids
* mummy monsters drinking potions
* stationary monsters floundering in shallow water
* replacing post-explosion more() with delay(150)
* fixing debug armour acquirement statistics
* DS Troggies don't get Channeling anymore


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10522 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 2 deletions

diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 4f0d65189a..27f8c4bf7a 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -3301,11 +3301,12 @@ static void _debug_acquirement_stats(FILE *ostat)
 
         if (is_artefact(item))
             num_arts++;
+        else if (type == OBJ_ARMOUR) // Exclude artefacts when counting egos.
+            ego_quants[get_armour_ego_type(item)]++;
 
+        // Include artefacts for weapon brands.
         if (type == OBJ_WEAPONS)
             ego_quants[get_weapon_brand(item)]++;
-        else if (type == OBJ_ARMOUR)
-            ego_quants[get_armour_ego_type(item)]++;
 
         destroy_item(item_index, true);
 
@@ -3445,6 +3446,8 @@ static void _debug_acquirement_stats(FILE *ostat)
                 (float) subtype_quants[i] * 100.0 / (float) total_quant);
     }
     fprintf(ostat, "----------------------\n");
+
+    mpr("Results written into 'items.stat'.");
 }
 
 static void _debug_rap_stats(FILE *ostat)
@@ -3666,6 +3669,7 @@ static void _debug_rap_stats(FILE *ostat)
     }
 
     fprintf(ostat, "\n-----------------------------------------\n\n");
+    mpr("Results written into 'items.stat'.");
 }
 
 void debug_item_statistics( void )