Another of those commits on monster speech, hopefully the last one for

some time, though. I added a new prefix "related" if the player character 
has the same genus as the monster. My new prefix additions (hostile, 
related and religion) can now be skipped in the speech lookup, which fixes
a couple of problems where several monsters were forced silent because of
lookup problems.
Also clean up the lookup process for silence, allow charmed monsters to
sometimes speak (if rarely) and added several debugging statements that
are also mentioned in monster_speech.txt that is now clearer than ever 
before (I hope).

Fixed a couple of bugs in the monster shape calculation where the old
glyphs were still being used. Also, a Draconian character eating any type
of Draconian will now count as cannibalism.

Also:
 FR 1894060:  Level annotations now prompt for confirmation if they contain 
              an exclamation mark (rather than "WARN").
 Fix 1859443: Arriving on a square via staircase now calls request_autopickup
              and will describe items on the square.

Oh, and fix init.txt to really allow reading in macros from external files.


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

1 files changed, 7 insertions, 5 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 4cb63046bc..ad5f84db63 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -650,12 +650,12 @@ void up_stairs(dungeon_feature_type force_stair,
 
     crawl_state.level_annotation_shown = false;
 
-    if (level_annotation_has("WARN", next_level_id)
+    if (level_annotation_has("!", next_level_id)
         && next_level_id != level_id::current()
         && next_level_id.level_type == LEVEL_DUNGEON && !force_stair)
     {
         mpr("Warning: level annotation for next level is:", MSGCH_PROMPT);
-        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PROMPT);
+        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PLAIN, YELLOW);
 
         if (!yesno("Enter next level anyway?", true, 0, true, false))
         {
@@ -711,7 +711,7 @@ void up_stairs(dungeon_feature_type force_stair,
         old_level_info.update();
 
     // Make sure we return to our main dungeon level... labyrinth entrances
-    // in the abyss or pandemonium a bit trouble (well the labyrinth does
+    // in the abyss or pandemonium are a bit trouble (well the labyrinth does
     // provide a way out of those places, its really not that bad I suppose)
     if (level_type_exits_up(you.level_type))
         you.level_type = LEVEL_DUNGEON;
@@ -885,6 +885,7 @@ void up_stairs(dungeon_feature_type force_stair,
             }
         }
     }
+    request_autopickup();
 }                               // end up_stairs()
 
 void down_stairs( int old_level, dungeon_feature_type force_stair,
@@ -1031,12 +1032,12 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
 
     crawl_state.level_annotation_shown = false;
 
-    if (level_annotation_has("WARN", next_level_id)
+    if (level_annotation_has("!", next_level_id)
         && next_level_id != level_id::current()
         && next_level_id.level_type == LEVEL_DUNGEON && !force_stair)
     {
         mpr("Warning: level annotation for next level is:", MSGCH_PROMPT);
-        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PROMPT);
+        mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PLAIN, YELLOW);
 
         if (!yesno("Enter next level anyways?", true, 0, true, false))
         {
@@ -1393,6 +1394,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
             new_level_info.update_stair(you.x_pos, you.y_pos, lp, true);
         }
     }
+    request_autopickup();
 }                               // end down_stairs()
 
 void trackers_init_new_level(bool transit)