[crawl-ref-commits] master branch updated: 0.8.0-a0-6045-gdfe96dd

[<gi...@cr...>]

       via  dfe96dd62db23ead752c928b26f4de58fd13838f (commit)
      from  0a530a3b76c53ec2a79773752a2114af9d47f518 (commit)

-----------------------------------------------------------------------
commit dfe96dd62db23ead752c928b26f4de58fd13838f
Author: Adam Borowski <kil...@an...>
Date:   Wed Mar 30 11:30:50 2011 +0200

    Make statue_bzr always place permanent bazaars.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/des/portals/bazaar.des |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/dat/des/portals/bazaar.des b/crawl-ref/source/dat/des/portals/bazaar.des
index 1dab83d..234e901 100644
--- a/crawl-ref/source/dat/des/portals/bazaar.des
+++ b/crawl-ref/source/dat/des/portals/bazaar.des
@@ -15,12 +15,16 @@
 
 lua {{
 
-function place_bazaar_portal(e)
+function place_bazaar_portal(e, perm)
   e.kfeat("O = enter_portal_vault")
-  e.lua_marker('O', bazaar_portal())
+  if perm then
+     e.lua_marker('O', bazaar_portal(false))
+  else
+     e.lua_marker('O', bazaar_portal(not crawl.one_chance_in(6)))
+  end
 end
 
-function bazaar_portal()
+function bazaar_portal(timed)
   local desc_long =
 "Aside from the vendors who've set up their stores at various places in the " ..
 "dungeon, there are others trying to make a living by traveling from place " ..
@@ -45,7 +49,7 @@ function bazaar_portal()
     }
   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
+  if timed then
     local pdesc = 'flickering gateway to a bazaar'
     return timed_marker {
                   low=blow, high=bhigh, msg=messager, single_timed=true,
@@ -240,7 +244,7 @@ NAME:   statue_bzr
 TAGS:   bzr_entry
 SUBST:  G = G111
 MONS:   orange crystal statue / silver statue / ice statue
-: place_bazaar_portal(_G)
+: place_bazaar_portal(_G, true)
 MAP
  @
 cGc


-- 
Dungeon Crawl Stone Soup