Made Ice Cave and Minitomb portal vaults timed. (Thanks to slinkies.)

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

3 files changed, 62 insertions, 20 deletions

diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt
index 2f5c1d6a1a..6fd71b7fde 100644
--- a/crawl-ref/source/dat/descript/features.txt
+++ b/crawl-ref/source/dat/descript/features.txt
@@ -15,10 +15,6 @@ A deep blue altar of Sif Muna
 %%%%
 A dry fountain
 %%%%
-A dusty staircase
-
-It is said that some minor relatives of the pharao were entombed here.
-%%%%
 A flickering gateway to a bazaar
 
 Aside from the vendors who've set up their stores at various places in the 
@@ -156,6 +152,12 @@ A rock wall
 %%%%
 A roughly hewn altar of Beogh
 %%%%
+A sand-covered staircase
+
+You can make out a staircase leading downwards into a small tomb. Sand
+surrounds the staircase and is continuously pouring onto it.
+They said that some minor relatives of the pharaohs were entombed here.
+%%%%
 A shimmering altar of Xom
 %%%%
 A shining altar of Vehumet
diff --git a/crawl-ref/source/dat/icecave.des b/crawl-ref/source/dat/icecave.des
index 7f3b941bd5..68a0f4be27 100644
--- a/crawl-ref/source/dat/icecave.des
+++ b/crawl-ref/source/dat/icecave.des
@@ -15,13 +15,31 @@
 
 {{
 function ice_cave_portal(e)
-  e.marker([[O = lua:one_way_stair { desc = "A frozen archway",
-                                     dst = "ice_cave",
-                                     dstname = "Ice Cave",
-                                     dstname_abbrev = "IceCv",
-                                     dstorigin = "in an ice cave",
-                                     overmap = "frozen archway",
-                                     floor = "stone_arch" }]])
+  local timeout_turns = crawl.random_range(1200, 1700)
+  
+  local messager = 
+    timed_msg {
+      visible = true,
+      -- $F{xxx} will be substituted with the 'entity' property of the timed
+      -- marker, or with the desc property (if entity is not set).
+      messages = time_messages(timeout_turns,
+                               "$F{The} is slowly melting away.",
+                               "$F{The} is melting away.",
+                               "$F{The} is quickly melting away.",
+                               "$F{The} has just melted away.")
+    }
+
+  e.lua_marker('O',
+      timed_marker {
+        desc = "A frozen archway",
+        entity = 'archway',
+        dst = "ice_cave",
+        dstname_abbrev = "IceCv",
+        dstorigin = "in an ince cave",
+        overmap = "frozen archway",
+        turns = timeout_turns,
+        floor = "stone_arch",
+        msg = messager })
   e.kfeat("O = enter_portal_vault")
   e.colour("O = white")
 end
diff --git a/crawl-ref/source/dat/minitomb.des b/crawl-ref/source/dat/minitomb.des
index 53260330f9..6aa14652b0 100644
--- a/crawl-ref/source/dat/minitomb.des
+++ b/crawl-ref/source/dat/minitomb.des
@@ -13,15 +13,37 @@
 
 {{
 function minitomb_portal(e)
-        e.marker([[O = lua:one_way_stair { desc = "A dusty staircase",
-                                           dst  = "minitomb",
-                                           dstorigin = "in a tomb",
-                                           overmap = "dusty staircase",
-                                           floor = "stone_arch" }]])
-        e.kfeat("O = enter_portal_vault")
-        e.colour("O = yellow")
+ local timeout_turns = crawl.random_range(1500, 2000)
+
+  local messager =
+    timed_msg {
+      visible = true,
+      -- $F{xxx} will be substituted with the 'entity' property of the timed
+      -- marker, or with the desc property (if entity is not set).
+      messages = time_messages(timeout_turns,
+          "Nearby sand pours into $F{the}, lightly covering it.",
+          "Nearby sand pours into $F{the}, greatly covering it.",
+          "Nearby sand pours into $F{the}, almost completely blocking access.",
+          "$F{The} has disappeared completely beneath the sand.")
+    }
+
+  e.lua_marker('O',
+      timed_marker {
+        desc = "A sand-covered staircase",
+        entity = 'staircase',
+        dst = "minitomb",
+        dstorigin = "in a tomb",
+        overmap = "sand-covered staircase",
+        turns = timeout_turns,
+        floor = "stone_arch",
+        msg = messager })
+  e.kfeat("O = enter_portal_vault")
+  e.colour("O = yellow")
 end
 
+-- Use the following line in destination maps after all SUBSTs
+-- : minitomb_setup_features(_G)
+-- Note that the function also defines < to be the exit portal.
 function minitomb_setup_features(e)
         e.kfeat("< = exit_portal_vault")
         e.colour("< = yellow")
@@ -32,9 +54,9 @@ function minitomb_setup_features(e)
 end
 }}
 
-default-depth: D:4-8
 
 #### Portal entry vaults.
+default-depth: D:4-8
 
 NAME:   enter_minitomb_1
 TAGS:   uniq_minitomb no_monster_gen
@@ -94,7 +116,7 @@ MAP
 ENDMAP
 
 
-#### The portal vaults.####################################
+#### The portal vaults ####################################
 
 # Reset default depth to prevent random generation of portal vaults.
 default-depth: