Make permanent bazaars more rare. The bazaar timer now depends on

depth (and is more generous at shallow depths).


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

2 files changed, 13 insertions, 11 deletions

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 38e6470433..f81df67cce 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -2,14 +2,6 @@
 # bazaar.des - Bazaar entry vaults and bazaar layouts.
 ###############################################################################
 
-# To do:
-# 1) Ideally, the portal duration should depend on absolute depth (the deeper,
-#    the less time the player gets). I suggest a duration of
-#    100 + 10*(30-abs.depth) + rn(100*(30-abs.depth))
-# 2) I think there should be more bazaars: each shop should have a chance of
-#    (abs.depth-10)/30 of becoming a portal (with negative chance==0), and at
-#    most one bazaar per level
-# 3) The above would (and should) include bazaars outside of the dungeon.
 
 ###############################################################################
 # Bazaar entries
@@ -20,10 +12,12 @@ lua {{
 
 function bazaar_portal()
   local messager = bell_clock_msg { initmsg="You hear coins being counted." }
-  if not crawl.one_chance_in(3) then
+  local blow = 200 + 30*(40 - you.absdepth()) + crawl.random2(200)
+  local bhigh = blow + crawl.random2(blow) + 100
+  if not crawl.one_chance_in(6) then
     local pdesc = 'flickering gateway to a bazaar'
     return timed_marker {
-                  low=1000, high=1500, msg=messager,
+                  low=blow, high=bhigh, msg=messager,
                   disappear='The gate to the bazaar disappears!',
                   desc = pdesc, dst = 'bazaar',
                   floor = 'stone_arch'
@@ -401,7 +395,7 @@ xxx.....xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
 xx..www..xxxxxx.a.xxxxxxxxx.c.xxxxxxxxx.e.xxxxxx..lll..xx
 x<.wwwww..+...........+...........+...........+..lllll.>x
 xx..www..xxxxxx.b.xxxxxxxxx.d.xxxxxxxxx.f.xxxxxx..lll..xx
-xx......xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
+xxx.....xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx
 xxxxxxxxxxxxxxxxBxxxxxxxxxxxDxxxxxxxxxxxFxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
diff --git a/crawl-ref/source/dat/icecave.des b/crawl-ref/source/dat/icecave.des
index 33c5df18c5..c414ccb64e 100644
--- a/crawl-ref/source/dat/icecave.des
+++ b/crawl-ref/source/dat/icecave.des
@@ -49,6 +49,14 @@ function ice_cave_colours(e)
 end
 }}
 
+# Using this function will turn any ^ glyph on the map into a fog generator
+# of the following kind:
+#{{
+#function place_vapours()
+#subst("^ = lua:fog_machine{ pow_max = 20, delay_min = 50, delay_max = 300, size = 12, #start_clouds = 1, cloud_type = "freezing vapour"} ")
+#end
+#}}
+
 
 # Entries ##########################################