summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/bazaar.des
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-23 12:34:08 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-23 12:34:08 +0000
commit7bb02de9ea841f515a3a037435c07099f5165aea (patch)
treeec617828ce633ce96ce8aac731b6dd6e9d25439f /crawl-ref/source/dat/bazaar.des
parentb51b5a77fc118319d78241686846b3e42b660e6c (diff)
downloadcrawl-ref-7bb02de9ea841f515a3a037435c07099f5165aea.tar.gz
crawl-ref-7bb02de9ea841f515a3a037435c07099f5165aea.zip
Lua functions for FLOORCOL and ROCKCOL are now named floorcol() and rockcol() instead of floor_colour and rock_colour, to match the convention for other .des headers (dpeg).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7547 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/bazaar.des')
-rw-r--r--crawl-ref/source/dat/bazaar.des12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 029062fe7d..e9d22cdc23 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -293,7 +293,7 @@ ITEM: any book / good_item any book, any staff
SUBST: d=.d, e=.e, f=.f
# special cases for blue/red floor
: local colour = random_bazaar_colour()
-: _G.floor_colour(colour)
+: floorcol(colour)
: if colour == "red" then
SUBST: l = w
: else
@@ -328,7 +328,7 @@ ITEM: any wand, ring of levitation
SHUFFLE: leAB/wdBA
# special cases for blue/red floor
: local colour = random_bazaar_colour()
-: _G.floor_colour(colour)
+: floorcol(colour)
: if colour == "red" then
SUBST: l = w
: else
@@ -383,7 +383,7 @@ KFEAT: Z = stone_arch
SHUFFLE: lw
# special cases for blue/red floor
: local colour = random_bazaar_colour()
-: _G.floor_colour(colour)
+: floorcol(colour)
: if colour == "red" then
SUBST: l = w
: else
@@ -425,7 +425,7 @@ SUBST: a=T, z=V
SHUFFLE: lw
# special cases for blue/red floor
: local colour = random_bazaar_colour()
-: _G.floor_colour(colour)
+: floorcol(colour)
: if colour == "red" then
SUBST: l = w
: else
@@ -746,7 +746,7 @@ KFEAT: F = scroll shop / distillery shop
: bazaar_message(_G)
# special cases for blue floor
: local colour = random_bazaar_colour()
-: _G.floor_colour(colour)
+: floorcol(colour)
: if colour == "blue" then
SUBST: w = W
: end
@@ -868,7 +868,7 @@ SUBST: z = ., Z = w
SHUFFLE: wl, ABCD
# special cases for blue/red floor
: local colour = random_bazaar_colour()
-: _G.floor_colour(colour)
+: floorcol(colour)
: if colour == "red" then
SUBST: l = w
: else