Inform user on why a known shaft trap isn't triggered (fixes bug 2294949).

Be more agressive about making shaft traps on invalid levels disappear in
a puff of logic.

If a wizard command creates a trap shaft on an invalid level, inform the
user.


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

1 files changed, 10 insertions, 2 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 74e8d2e821..c5cbf044fc 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1803,7 +1803,9 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
         if (!is_valid_shaft_level())
         {
             if (known_trap)
-                mpr("Strange, the shaft doesn't seem to lead anywhere.");
+                mpr("The shaft disappears is a puff of logic!");
+
+            find_trap(you.pos())->destroy();
             return;
         }
 
@@ -1811,7 +1813,13 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
         if (shaft_dest == level_id::current())
         {
             if (known_trap)
-                mpr("Strange, the shaft doesn't seem to lead anywhere.");
+            {
+                mpr("Strange, the shaft seems to lead back to this level.");
+                mpr("The strain on the space-time continuum destroys the "
+                    "shaft!");
+            }
+
+            find_trap(you.pos())->destroy();
             return;
         }
         shaft_level = absdungeon_depth(shaft_dest.branch,