summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-08 03:12:02 +0000
committerdploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-08 03:12:02 +0000
commit43e1106505a838b9b0e816cfdd57360e1d1bb947 (patch)
treec5c9b1eaac90684d629a518b53fb9f2195f87679
parentfd5880c67a1c7c78fbb21e0418f89f2e9e3b619a (diff)
downloadcrawl-ref-43e1106505a838b9b0e816cfdd57360e1d1bb947.tar.gz
crawl-ref-43e1106505a838b9b0e816cfdd57360e1d1bb947.zip
New bazaar map (due).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9919 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/CREDITS22
-rw-r--r--crawl-ref/source/dat/bazaar.des39
2 files changed, 50 insertions, 11 deletions
diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS
index 44cef8a26d..e9c1292139 100644
--- a/crawl-ref/CREDITS
+++ b/crawl-ref/CREDITS
@@ -15,16 +15,17 @@ Enne Walker) would like to thank:
We'd also like to thank members of the Dungeon Crawl community who have
contributed to Dungeon Crawl Stone Soup:
-Warwick Allison Benoit Hudson Stefan O'Rear
-Juha Arpiainen Iainuki Yuuma Oohara
-Roy Axenov Ilyak Erik Piper
-Max Bane Mitsuhiro Itakura Lemuel Pitkin
-Bill Beher Eino Keskitalo Derek Ray
-Alexander Beisig Jarmo Kielosto Remsleep
-Erik Inge Bolsø Kornel Kisielewicz David Rose
-Peter Borgmann Vambola Kotkas Sebastian Salman
-Adam Borowski Vsevolod Kozlov Brett Scarborough
-Terje Bø Ryan Kusnery Darshan Shaligram
+Warwick Allison R. Dan Henry Dylan O'Donnell
+Juha Arpiainen Benoit Hudson Stefan O'Rear
+Roy Axenov Iainuki Yuuma Oohara
+Max Bane Ilyak Erik Piper
+Bill Beher Mitsuhiro Itakura Lemuel Pitkin
+Alexander Beisig Eino Keskitalo Derek Ray
+Erik Inge Bolsø Jarmo Kielosto Remsleep
+Peter Borgmann Kornel Kisielewicz David Rose
+Adam Borowski Vambola Kotkas Sebastian Salman
+Terje Bø Vsevolod Kozlov Brett Scarborough
+Jude (due) Brown Ryan Kusnery Darshan Shaligram
Aaron Curtis Jukka Kuusisto Robert Shimmin
Denzi Maciej Lapinski Sigurd
Rachel Elizabeth Dillon Jordan Lewis Edgar Simo
@@ -38,4 +39,3 @@ GreyKnight Wille Mäntylä Steven Wheeler
Shayne Halvorson Onia Ninara Jeremey Wilson
Ciaran Hamilton Erkki Nurmi Yelve Yakut
Chris Hamons nyra Zooko
-R. Dan Henry Dylan O'Donnell
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 029989cd09..5970dd8ca9 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -1264,3 +1264,42 @@ xxxxxxxxxxx...C...xxxxxxxxxxx
xxxxxxxxxxxx.....xxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
+
+#############################################
+# butterfly bazaar (due)
+# ~3.75 shops
+NAME: bazaar_due_butterfly
+TAGS: bazaar allow_dup no_rotate
+ORIENT: encompass
+SHUFFLE: AEST
+NSUBST: A = 1:A / 1:B / 1:C / 1:D
+SUBST: E=>, S=T, T:TUV, D=ABC.
+KFEAT: A = armour shop / weapon shop / wand shop
+KFEAT: B = general shop / food shop
+KFEAT: C = scroll shop / book shop / distillery shop
+SHUFFLE: '"
+SUBST: '=+, "==
+: bazaar_message(_G)
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xE..xxxxxxx...xx.......xx...xxxxxxx..Ex
+xxx...xxxxx.T.''...A...''.T.xxxxx...xxx
+xxxxx.+...+...xx.......xx...+...+.xxxxx
+xxxxxxx...xxxxxxxxx+xxxxxxxxx...xxxxxxx
+xxxxxxxxx.".xxxxxxx.xxxxxxx.".xxxxxxxxx
+xxxxxxxxxxx....xxxx.xxxxx...xxxxxxxxxxx
+x...xx.S.xxxxx.."xx+xx"...xxx.S.xx...xx
+x...xx...xxxxxxxx.....xxxxxxx...xx...xx
+x...xxx+xxxxxxxxx.....xxxxxxxx+xxx...xx
+x.A.+...........+..<..+..........+.A.xx
+x...xxx+xxxxxxxxx.....xxxxxxxx+xxx...xx
+x...xx...xxxxxxxx.....xxxxxxx...xx...xx
+x...xx.S.xxxx..."xx+xx"...xxx.S.xx...xx
+xxxxxxxxxxx...xxxxx.xxxxx...xxxxxxxxxxx
+xxxxxxxxx...xxxxxxx.xxxxxxx...xxxxxxxxx
+xxxxxxx.".xxxxxxxxx+xxxxxxxxx.".xxxxxxx
+xxxxx...xxx...xx.......xx...xxx...xxxxx
+xxx.+.....+.T.''...A...''.T.+.....+.xxx
+xE..xxxxxxx...xx.......xx...xxxxxxx..Ex
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP