From f041f603574aa87804c80067da8dce67d9927b9f Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 28 Oct 2007 14:31:57 +0000 Subject: Changed vaults (dploog). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2639 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/dat/bazaar.des | 141 ++++++----- crawl-ref/source/dat/crypt.des | 107 --------- crawl-ref/source/dat/elf.des | 518 ---------------------------------------- crawl-ref/source/dat/entry.des | 40 ++-- crawl-ref/source/dat/float.des | 8 +- crawl-ref/source/dat/hells.des | 22 +- crawl-ref/source/dat/lab.des | 103 +++----- crawl-ref/source/dat/lair.des | 20 +- crawl-ref/source/dat/large.des | 5 +- crawl-ref/source/dat/mini.des | 161 +++++++------ crawl-ref/source/dat/orc.des | 4 +- crawl-ref/source/dat/vaults.des | 1 - crawl-ref/source/dat/zot.des | 64 +---- 13 files changed, 237 insertions(+), 957 deletions(-) (limited to 'crawl-ref/source/dat') diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des index 7fdc5a86f1..deb057bff8 100644 --- a/crawl-ref/source/dat/bazaar.des +++ b/crawl-ref/source/dat/bazaar.des @@ -5,6 +5,11 @@ ############################################################################### # Bazaar entries +# What is still missing: +# The timer should be more generous for lower levels. +# Bazaars would also make sense outside of the dungeon (at least in the Vaults, +# Orc, and Elf). + # Utility functions lua {{ @@ -28,32 +33,6 @@ function bazaar_message(e) e.welcome("You enter an inter-dimensional bazaar!") end -function random_bazaar_colour() - local colours = {"blue", "red", "lightblue", "magenta", "green"} - - crawl.mpr("#colours = " .. #colours) - - local ret = colours[crawl.random2(#colours) + 1] - - crawl.mpr("ret = " .. ret) - - return ret -end - -function fixup_bazaar() - dgn.fixup_stairs("stone_arch", "exit_portal_vault") - dgn.floor_halo("enter_shop", "yellow") - - if (dgn.get_floor_colour() == "black") then - dgn.change_floor_colour(random_bazaar_colour()) - end - - if (dgn.get_rock_colour() == "black") then - dgn.change_rock_colour("yellow") - end -end - -dgn.set_lt_callback("bazaar", "fixup_bazaar") }} default-depth: D:10-27 @@ -135,7 +114,7 @@ ENDMAP NAME: bzr_entry_005 TAGS: bzr_entry allow_dup ORIENT: float -SHUFFLE: wlW +SHUFFLE: wwlW MARKER: O = lua:bazaar_portal() MAP wwwww @@ -195,10 +174,7 @@ ENDMAP # upstair, which will be converted into a stone arch (and on which the player # will be placed when entering the bazaar). If there's no upstair, the player # will arrive on a random square. -# -# You can force a particular colour for the rock walls or floor using -# ROCKCOL and FLOORCOL directives. -# + NAME: bazaar_general_marketplace TAGS: bazaar allow_dup FLAGS: no_rotate @@ -277,12 +253,10 @@ ITEM: any jewellery / good_item any jewellery 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) -: if colour == "red" then +: if you.bazaar_floor() == "red" then SUBST: l = w : else -: if colour == "blue" then +: if you.bazaar_floor() == "blue" then SUBST: w = l : end : end @@ -310,12 +284,10 @@ KFEAT: B = distillery shop ITEM: any wand, ring of levitation SHUFFLE: leAB/wdBA # special cases for blue/red floor -: local colour = random_bazaar_colour() -: _G.floor_colour(colour) -: if colour == "red" then +: if you.bazaar_floor() == "red" then SUBST: l = w : else -: if colour == "blue" then +: if you.bazaar_floor() == "blue" then SUBST: w = l : end : end @@ -345,33 +317,32 @@ x...x....................x...x xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP +######################################## +# bazaars in a row +# NAME: bazaar_row TAGS: bazaar allow_dup FLAGS: no_rotate ORIENT: encompass SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss +# two guaranteed shops, expected four shops KFEAT: A = any shop / antique weapon shop KFEAT: B = any shop / antique armour shop KFEAT: C = any shop / wand shop KFEAT: D = any shop / jewellery shop KFEAT: E = any shop / weapon shop / armour shop KFEAT: F = any shop / book shop / scroll shop -SUBST: a=T, b=T, c=T, d=T, e=T, f=T -SUBST: z=V, y=V, r=V, s=V +SUBST: b=a, c=a, d=a, e=a, f=a, a=T +SUBST: y=z, r=z, s=z, z=V, Y=Z, R=Z, S=Z KFEAT: Z = stone_arch -KFEAT: Y = stone_arch -KFEAT: R = stone_arch -KFEAT: S = stone_arch SHUFFLE: lw # special cases for blue/red floor -: local colour = random_bazaar_colour() -: _G.floor_colour(colour) -: if colour == "red" then -SUBST: l = w +: if you.bazaar_floor() == "red" then +SUBST: l : wWx : else -: if colour == "blue" then -SUBST: w = l +: if you.bazaar_floor() == "blue" then +SUBST: w : Wx : end : end # @@ -389,6 +360,51 @@ xxxxxxxxxxxxxxxxBxxxxxxxxxxxDxxxxxxxxxxxFxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP +######################################## +# bazaars in a row v2 +# +NAME: bazaar_row_2 +TAGS: bazaar allow_dup +FLAGS: no_rotate +ORIENT: encompass +SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff/Gg/Hh +SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss, Ee/Jj, Ff/Kk, Gg/Mm +# one guaranteed shop, expected 4.5 shops +SUBST: B=A, C=A, D=A, E=A, F=A, G=A, H=A +SUBST: b=a, c=a, d=a, e=a, f=a, g=a, h=a +SUBST: Y=Z, R=Z, S=Z, J=Z, K=Z, M=Z +SUBST: y=z, r=z, s=z, j=z, k=z, m=z +KFEAT: A = any shop +KFEAT: Z = stone_arch +SUBST: a=T, z=V +SHUFFLE: lw +# special cases for blue/red floor +: if you.bazaar_floor() == "red" then +SUBST: l : wWx +: else +: if you.bazaar_floor() == "blue" then +SUBST: w : Wx +: end +: end +# +SUBST: w:wWx, l:lx +: bazaar_message(_G) +MAP +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxAxxxxxxxxxxxCxxxxxxxxxxxExxxxxxxxxxxGxxxxxxxxxxxxxxxx +xxx.....xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx +xx..www..xxxxxx.a.xxxxxxxxx.c.xxxxxxxxx.e.xxxxxxxxx.g.xxxxxx..lll..xx +x<.wwwww..+...........+...........+...........+...........+..lllll.>x +xx..www..xxxxxx.b.xxxxxxxxx.d.xxxxxxxxx.f.xxxxxxxxx.h.xxxxxx..lll..xx +xx......xxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxxxx...xxxxxxx.....xxx +xxxxxxxxxxxxxxxxBxxxxxxxxxxxDxxxxxxxxxxxFxxxxxxxxxxxHxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +ENDMAP + +####################################### +# circle bazaar +# + NAME: bazaar_circle_1 CHANCE: 2 TAGS: bazaar allow_dup @@ -592,7 +608,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP NAME: bazaar_circle_6 -CHANCE: 3 +CHANCE: 1 TAGS: bazaar allow_dup FLAGS: no_rotate ORIENT: encompass @@ -689,10 +705,8 @@ KFEAT: D = antique weapon shop KFEAT: E = antique armour shop KFEAT: F = scroll shop / distillery shop : bazaar_message(_G) -# special cases for blue floor -: local colour = random_bazaar_colour() -: _G.floor_colour(colour) -: if colour == "blue" then +# special case for floor +: if you.bazaar_floor() == "blue" then SUBST: w = W : end # @@ -815,12 +829,10 @@ SHUFFLE: zZ SUBST: z = ., Z = w SHUFFLE: wl, ABCD # special cases for blue/red floor -: local colour = random_bazaar_colour() -: _G.floor_colour(colour) -: if colour == "red" then +: if you.bazaar_floor() == "red" then SUBST: l = w : else -: if colour == "blue" then +: if you.bazaar_floor() == "blue" then SUBST: w = l : end : end @@ -952,7 +964,7 @@ xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx -xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxx=xxxxx +xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx x.........xxxxxxxxx.........xxxxxxxxx.........x x....A....z.......z....A....z.......z....A....x @@ -964,7 +976,7 @@ xxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxxxxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx -x....B....z.......=....A....z.......z....A....x +x....B....z.......z....A....z.......z....A....x x.........xxxxxxxxx.........xxxxxxxxx.........x xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -991,13 +1003,13 @@ xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx -xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxx=xxxxx +xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx x.........xxxxxxxxx.........xxxxxxxxx.........x x....A....z.......z....A....z.......z....A....x x.........xxxxxxxxx.........xxxxxxxxx.........x xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx -xxxxx=xxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx +xxxxxzxxxxxxxxxxxxxxxxxzxxxxxxxxxxxxxxxxxzxxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx xxxxx.xxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx.xxxxx @@ -1053,6 +1065,7 @@ ENDMAP NAME: bazaar_triangles TAGS: bazaar allow_dup ORIENT: encompass +CHANCE: 1 FLAGS: no_rotate SHUFFLE: ACD SUBST: A = < @@ -1075,6 +1088,7 @@ ENDMAP NAME: bazaar_hexagon TAGS: bazaar allow_dup ORIENT: encompass +CHANCE: 4 FLAGS: no_rotate SHUFFLE: AC, BD KFEAT: A = armour shop / weapon shop / wand shop @@ -1106,6 +1120,7 @@ NAME: bazaar_triangle_bulge TAGS: bazaar allow_dup ORIENT: encompass FLAGS: no_rotate +CHANCE: 5 SHUFFLE: ABC SUBST: A = <, B = > KFEAT: C = any shop diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des index 2bfe8c14a8..04336e7f93 100644 --- a/crawl-ref/source/dat/crypt.des +++ b/crawl-ref/source/dat/crypt.des @@ -343,108 +343,6 @@ vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ENDMAP -############################################################################## -# big garden full of undead - monster colour enabled for this -NAME: garden_of_evil_bobbens -ORIENT: encompass -TAGS: no_monster_gen no_item_gen no_pool_fixup -FLAGS: no_rotate -PLACE: Crypt:5 -KFEAT: z = . -KMONS: z = skeletal warrior -KFEAT: I = . -KMONS: I = iron golem -KFEAT: C = . -KMONS: C = crystal golem -KFEAT: N = . -KMONS: N = necromancer -KFEAT: M = . -KMONS: M = large zombie/small zombie/large skeleton/small skeleton/ghoul/necrophage -KFEAT: H = . -KMONS: H = hell knight -KFEAT: D = . -KMONS: D = skeletal dragon -KFEAT: s = . -KMONS: s = flying skull -KFEAT: S = . -KMONS: S = sun demon -KFEAT: J = . -KMONS: J = death ooze -KFEAT: B = . -KMONS: B = ancient lich -KFEAT: A = . -KMONS: A = large abomination/w:5 small abomination -KFEAT: X = . -KMONS: X = dancing weapon -KFEAT: E = . -KMONS: E = vampire knight -# death plants -KFEAT: F = . -KMONS: F = w:20 col:darkgrey plant/col:lightgrey plant -SUBST: p = .F -# red walls -COLOUR: r = red -SUBST: r = v -# traps -SUBST: ; = .:6 ~:2 ^:1 -# gateway to pan -KFEAT: / = enter_pandemonium -# water may be lava -SUBST: w : wl -MAP -xxxxxxxxxxxxvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -xxxxxxxxxxxxv...v.zz.......zz..........v*$$$$$$$v........v -xxxxxxxxxxxxv...vc..c..c..c..c..c..c...v|*$$$$$$=..H.....v -xxxxxxxxxxxxv...........s............z.vvvvvvvvvv.A...E..v -xxxxxxxxxxxxv..................s.....zNv........v...U....v -xxxxxxxxxxxxv...........s..............+........+........v -xxxxxxxxxxxxv...vc..c..c..c..c..c..c...v........v........v -xxxxxxxxxxxxv...v.zz.......zz..........v........v........v -xxxxxxxxxxxxvvv+vvvvvvvvvvvvvvvvvvvvvvvv........vvvvvvvvvv -xxxxxxxxxxxxvc;;;ccccFFJpFFJ.FppFp.....v........vFFFFpp..v -xxxxxxxxxxxxvcc+cc..cFF.ppFp.p..p.....pv........vFFFpp...v -xxxxxxxxxxxxccc...H.c$FpJ.p...p.......pvvvz..zvvvpppp....v -xxxxxxxxxxccc.....H.ccccpp.JpFFp.......pFvv++vvppp.......v -xxxxxxxxccc....cccccc..ccccvvvvvvvvvv..pppp.pFFp.........v -xxxxxxxcc....ccc....c.I...ccc.D.+...v...p....pp..........v -xxxxxccc....cc......cz.z....ccc.vvv.+.....p......vvvvvvv.v -xxxxcc....ccc..z.N..c...c.....cccM+.vp..........pvMvMvMv.v -xxxcc.....c.....z...c...cccc....ccv+vpp...HHH..pFv+v+v+v.v -xxcc................c...c|$ccc...ccMvFp.p.......pv..s..v.v -xxc...............ccc+c.c*$..c+...ccvFp....N.....+...NUv.v -xcccccccccccc+ccccc.z.ccc.E...cc...ccFpp....V....v..s..v.v -cc....;;;;;;;..cc.......cc.X...ccMz.ccFpp.....p..v+v+v+v.v -cI....;;;;;;;.cc....(....cc.....ccN..cFFpp.......vMvMvMv.v -ccccc+cccccccccz...{.....zccccccccc+cccccp..p....vvvvvvv.v -v|pc..........cc....[....cc.............c...........pFp..v -vFFcc....D....ccc.......cc..ccc........cc.p.......p..p...v -vpppcc.....cccc.ccc.z.ccc...cAc.c+c...cc......p..........v -vJ.ppcc...cc......ccccc.N...c+c.cAc...c..p..........p...pv -v.p.ppcc............c...........ccc..cc.....p..........ppv -vpp.Jppcc.......c...c.ccc..H.......Ncc.......pp..ppppppppv -v.Jpp.p.ccc.....c...c.cAc..c+c.....cc...p...pvvv+vvvFpFFFv -vp.p.p.pppccc...c..;c.c+c..cAc...cccp.....pppv.....vFFFFFv -v.pp......p.ccc.c..;+......ccc..ccp.....pppFFv.....vFFFFFv -v.J...p.p.....cccc.;c.........cccp...p.vvvvvvv.....vvvvvvv -v..p......p...p..cccc...N...ccc.p......v...;;;.D.D.;;;...v -v..p..p...........pFc.....ccc.....p..p.vz..;vvvvvvvvv;..zv -v..........p.......pc..cccc...pp......pv...;;;;...;;;;...v -vp.....p............ccccFp...pFFp....ppvvvvvvvv.v.vvvvvvvv -v........rrrrrrrr......ppp...pFTFp...pFvwwwwwww.w.wwwwwwwv -v...rrrrrr$|r...r............pFFpJ...pFvwwwwww..w..wwwwwwv -v..rr....r+rr...r..G..p.....ppppppp..ppvwwwwwv.....vwwwwwv -v..r...S........rrrC......vvvv+vvvpp..pvwwwwvvv...vvvwwwwv -v..r../.........+;+....p..v$$$$$*vp....vwwwvvU.....Uvvwwwv -v..r...S........rrrC......v$**$$|vp...pvwwwv...GBG...vwwwv -v..rr....r+rr...rFpG......v|||*||v...p.vwwwvv$$vvv$$vvwwwv -v...rrrrrr$|r...rp...p....vvvvvvvv..J..vwwwwvv$*|*$vvwwwwv -v.....ppFrrrrrrrrp..................p..vwwwwwvv|||vvwwwwwv -vp.....ppp........ppppp...p.......p....vwwwwwwvvvvvwwwwwwv -vpp..............ppFFFppp.....ppp......vwwwwwwwwvwwwwwwwwv -vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvwwwwwwwwwWwwwwwwwv -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxvvvvvvvvvvvvvvvvvvv -ENDMAP - ############################################################################## # The three Tomb levels: these should generally be of a confusing layout. ############################################################################## @@ -455,8 +353,6 @@ ENDMAP NAME: tomb_1 PLACE: Tomb:1 ORIENT: encompass -# The whole branch starts off with teleport control prevention. -BFLAGS: no_tele_control # SHUFFLE: ([{, AB), ]}, FIJKL/fijkl, _- SUBST: A=|*, B=|* @@ -673,9 +569,6 @@ SUBST: $ = *:2 |:1 $:17 # MONS: mummy, guardian mummy, mummy priest, greater mummy # -MARKER: O = lua:item_pickup_change_flags { \ - branch_flags="!no_tele_control", item="golden rune" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des index 5bd1eb2824..986ed7381d 100644 --- a/crawl-ref/source/dat/elf.des +++ b/crawl-ref/source/dat/elf.des @@ -97,7 +97,6 @@ NAME: elf_hall PLACE: Elf:7 ORIENT: northwest FLAGS: no_rotate -LFLAGS: no_tele_control MONS: deep elf high priest, deep elf demonologist, deep elf annihilator MONS: deep elf sorcerer, deep elf death mage MONS: deep elf blademaster, deep elf master archer @@ -111,10 +110,6 @@ SUBST: v : xvb SUBST: | = | *:2 SUBST: $ = $:20 *:4 |:1 SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -162,7 +157,6 @@ NAME: elf_hall_gauntlet_wide PLACE: Elf:7 TAGS: no_pool_fixup FLAGS: no_rotate -LFLAGS: no_tele_control ORIENT: float CHANCE: 5 MONS: deep elf high priest, deep elf demonologist @@ -179,10 +173,6 @@ KMONS: A = deep elf master archer KFEAT: A = | KMONS: B = deep elf blademaster KFEAT: B = | -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } MAP cccccccccccccccccccccccccc c2ccccccc........ccccccccc @@ -214,7 +204,6 @@ ENDMAP NAME: elf_hall_gauntlet_narrow PLACE: Elf:7 FLAGS: no_rotate -LFLAGS: no_tele_control TAGS: no_pool_fixup ORIENT: float CHANCE: 5 @@ -237,10 +226,6 @@ SUBST: | = | *:2 SUBST: * = * |:3 KITEM: 6 = | KITEM: 7 = | -#MARKER: U = lua:feat_change_change_flags { \ -# level_flags="!no_tele_control", final_feat="dry_fountain", \ -# group="fountain" \ -# } MAP ccccccccccccccccccccccccc c2ccccccc.......ccccccccc @@ -268,509 +253,6 @@ Yyyyyyyyyy.ccc.zzzzzzzzzZ xxxxxxxxxxUucuUxxxxxxxxxx ENDMAP -############################################################################## -# Elf vault, rogue theme (David) - -NAME: elf_hall_rogue_1 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ~ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$ce**|||**eccccccce%*%%%*%ec$$ccccxc -cxc..c$$=....7....ccccccc....7....c$$c..cxc -cx.d%c$ccccc...ccccccccc=ccc...ccccc$c*e.xc -cx.d%cc=.c.cc.cc.|.ccccc.|.cc.cc.c.c==|e.xc -cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc -cxccccc$$|*|*c...c...U...c...c***|$$cccccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcccc$$$c*|*c...|...c...|...c***c$$$ccccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccccccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...ccc...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc*|*=c4.+.........ccccxc -cxcccc.4..|....c.6cce|ecc6.c....|..4.ccccxc -cxcccc=..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..=cccc+cccccc...ccc...cccccc+ccccc..cxc -cx.e|ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc -cx.e*cc.......ccccccccccccccc.......cc%d.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_2 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$ce%*%%%%%ecccccc=e**|||**ec$$ccccxc -cxc..c$$c....7....ccccc=c....7....c$$=..cxc -cx.e*c$ccccc...=cccccc=ccccc...ccccc$c*e.xc -cx.e%cc=.c.cc.cc...ccc=c...cc.cc.c.c=c|e.xc -cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc -cxccc=c$$|*|*c...c...U...c...c***|$$cccccxc -cxcccc$$$c|**...4c.4.!.4.c4..3*||c$$$ccccxc -cxcccc$$$c*|*c.......c.......c***c$$$ccccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccccccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...c=c...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc*|*cc4.+.........ccccxc -cxcccc.4..|....c.6cce|ecc6.c....|..4.ccccxc -cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.e|ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc -cx.e*c=.......ccccccccccccccc.......cc%d.xc -cxc..=c...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_3 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$ce%%%%%*%eccccccce**|||**ec$$=cccxc -cxc..c$$c....7....ccccccc....7....=$$c..cxc -cx.e|c$ccccc...ccc=ccccccccc...ccccc$c*e.xc -cx.e*=c=.c.cc.cc...ccccc...cc.cc.c.c=c%e.xc -cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc -cxccccc$$|*|*c...c...U...c...c***|$$cc=ccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$c=ccxc -cxcccc$$$c*|*c.......c.......c***c$$$c=ccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$c=ccxc -cxccccccc...cccccc...?...cccccc...cccc=ccxc -cxccccc.....?.ccc...ccc...ccc.?.....cc=ccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cc=ccxc -cxcccc.........+.4cc*|*cc4.+.........c=ccxc -cxcccc.4..|....c.6cce|ecc6.c....|..4.c=ccxc -cxccccc..c~c..cc...=c|cc...cc..c~c..cc=ccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc|e.xc -cx.d%cc.......ccccccccccccccc.......cc*e.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_4 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$ce%*%%%%%eccccccce**|||**ec$$ccccxc -cxc..=$$c....7....ccccccc....7....c$$c..cxc -cx.e%c$ccccc...ccccccccccccc...ccccc$c*e.xc -cx.e*cc=.c.cc.cc...ccccc...cc.cc.c.c=c|e.xc -cxc..cc$.c**c=c..c..ccc..c..c=c|*c.$cc..cxc -cxccccc$$|*|*c...c...U...c...c***|$$c=cccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcccc$$$c*|*c.......c.......c***c$$$ccccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccccccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...=cc...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc*|*cc4.+.........ccccxc -cxcccc.4..|....c.6cce|ecc6.c....|..4.ccccxc -cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc*e.xc -cx.d%cc.......ccccccccccccccc.......cc|e.xc -cxc..cc...!...cccc.......cccc...!...c=..cxc -cxccccc.......ccc~6cc?cc6~ccc.......=ccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_5 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$cd%%%%%%%dc==c===e%%%%%%%ec$$ccccxc -cxc..c$$c....7....ccc=ccc....7....c$$c..cxc -cx.e|=$ccccc...cccccc=cccccc...ccccc$c*e.xc -cx.e*ccc.c.cc.cc...cc=cc...cc.cc.c.c=c|e.xc -cxc..cc$.c**ccc..c..c=c..c..ccc|*c.$c=..cxc -cxccccc$$|*|*c...c...U...c...c***|$$cccccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcccc$$$c*|*c.......c.......c***c$$$ccccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccccccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...ccc...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.c=|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc|||cc4.+.........ccccxc -cxcccc.4..|....c.6cce|ecc6.c....|..4.=cccxc -cxccccc..c~c..cc...cc|cc...cc..c~c..cc=ccxc -cxc..c=ccc+cccccc...ccc...cccccc+ccccc..cxc -cx.e|=cc.~~~.ccccc.......ccccc.~~~.ccc|e.xc -cx.e|cc.......ccccccccccccccc.......cc|e.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_6 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$ce%%%%%%%eccccccce**|||**ec$$ccccxc -cxc..c$$c....7....cccccc=....7....c$$c..cxc -cx.e|c$cccc=...cccccccc=cccc...ccccc$c*e.xc -cx.e*cc=.c.cc.cc...ccccc...cc.cc.c.c=c|e.xc -cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc -cxcc=cc$$|*|*c...c...U...c...c***|$$c=cccxc -cxcc=c$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcc=c$$$c*|*c.......c.......c***c$$$ccccxc -cxcc=c$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccc=ccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...ccc...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc*|*cc4.+.........ccccxc -cxcccc.4..|....c.6ccd|dcc6.c....|..4.ccccxc -cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.e*ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc -cx.e|cc.......ccccccccccccccc.......cc%d.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccc=c.......ccc~6cc?cc6~ccc.......cccccxc -cxcc=ccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccc===c...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_7 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$cd|*|||**dcccccccd*||*|**dc$$ccccxc -cxc..c$$c....7....ccccccc....7....c$$c..cxc -cx.e|c$ccccc...ccccccccccccc...ccccc$c%e.xc -cx.e|c=c.c.cc.cc...ccccc...cc.cc.c.c=c%e.xc -cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$c=..cxc -cxcc=cc$$|*|*c...c...U...c...c***|$$cccccxc -cxcc=c$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcc=c$$$c*|*c.......c.......c***c$$$ccccxc -cxcc=c$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxcc=cccc...cccccc...?...cccccc...cccccccxc -cxcc=cc.....?.ccc...ccc...ccc.?.....cccccxc -cxccc=c.2.!.?.cc.6.cc%cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc*|%cc4.+.........ccccxc -cxcccc.4..|....c.6cce%ecc6.c....|..4.ccccxc -cxccc=c..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...c=c...cccccc+ccccc..cxc -cx.e|ccc.~~~.ccccc.......ccccc.~~~.ccc*e.xc -cx.e|cc.......ccccccccccccccc.......cc*e.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_8 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$ce*|||||*ec==ccc=e*|||||*ec$$ccccxc -cxc..=$$c....7....=cc=c=c....7....=$$c..cxc -cx.e%c$ccccc...ccccc=c=ccccc...ccccc$c|e.xc -cx.e%cc=.c.cc.cc...ccccc...cc.cc.c.cc=|e.xc -cxc..cc$.c**ccc..c..ccc..c..ccc|*c.$cc..cxc -cxccccc$$|*|*c...c...U...c...c***|$$cc=ccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$c=ccxc -cxcccc$$$c*|*c.......c.......c***c$$$c=ccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$c=ccxc -cxccccccc...cccccc...?...cccccc...cccc=ccxc -cxccccc.....?.ccc...ccc...ccc.?.....==cccxc -cxccccc.2.!.?.cc.6.cc%cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc*%*cc4.+.........ccccxc -cxcccc.4..|....c.6cce|e=c6.c....|..4.ccccxc -cxccc=c..c~c..cc...cc*cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.e%ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc -cx.e%cc.......ccccccccccccccc.......cc%d.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......=ccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_9 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxcccc$$=e**|||**eccccccce%%|%|%%e=$$ccccxc -cxc..c$$c....7....==ccccc....7....c$$c..cxc -cx.d|c$ccccc...cccc=cc=ccccc...ccccc$c%d.xc -cx.d|ccc.c.cc.cc...cc=cc...cc.c=.c.ccc%d.xc -cxc..cc$.c|*ccc..c..=cc..c..ccc|*c.$cc..cxc -cxccccc$$|*|*c...c...U...c...c***|$$cccccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcccc$$$c*||c.......c.......c***c$$$ccccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccccccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...ccc...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc||*cc4.+.........ccccxc -cxcccc.4..|....c.6c=e|ecc6.c....|..4.ccccxc -cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc -cx.d%cc.......ccccccccccccccc.......cc%d.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - -####################################### - -NAME: elf_hall_rogue_10 -PLACE: Elf:7 -CHANCE: 1 -ORIENT: float -FLAGS: no_rotate -LFLAGS: no_tele_control -ITEM: scroll of teleportation, any scroll -MONS: deep elf high priest, deep elf demonologist -MONS: deep elf annihilator, deep elf sorcerer -MONS: deep elf death mage -MONS: deep elf conjurer / deep elf fighter / deep elf summoner / deep elf knight / nothing -MONS: curse skull / curse toe -SUBST: ~ = ^ .:30 -SUBST: !=15, ?=.?, ?:23, 4=4. -SUBST: % = % *:1 -SUBST: | = | *:2 -SUBST: * = * |:3 -MARKER: U = lua:feat_change_change_flags { \ - level_flags="!no_tele_control", final_feat="dry_fountain", \ - group="fountain" \ - } -MAP -ccccccccccccccccccccccccccccccccccccccccccc -cxccc====ccccc=======cccc====ccccccccccccxc -cxcc=cccc=ccc=ccccccc=c==cccc=cccccccccccxc -cxcc=c$$ce**|||**eccc=ccce|*|*|*|ec$$ccccxc -cxc..c$$=....7....ccccccc....7....c$$c..cxc -cx.e%c$ccccc...=cccccccccccc...ccccc$c%d.xc -cx.e%ccc.c.cc.cc...ccccc...cc.cc.c.ccc%d.xc -cxc..cc$.c|*ccc..c..ccc..c..ccc|*c.$cc..cxc -cxccccc$$|*|*c...c...U...c...c***|$$cccccxc -cxcccc$$$c|**...4c.4.!.4.c4...*||c$$$ccccxc -cxcccc$$$c*||c.......c.......c***c$$$ccccxc -cxcccc$ccccccc..ccc+ccc+ccc..ccccccc$ccccxc -cxccccccc...cccccc...?...cccccc...cccccccxc -cxccccc.....?.ccc...ccc...ccc.?.....cccccxc -cxccccc.2.!.?.cc.6.cc|cc.6.cc.?.!.3.cccccxc -cxcccc.........+.4cc||*cc4.+.........ccccxc -cxcccc.4..|....c.6ccd|dcc6.c....|..4.ccccxc -cxccccc..c~c..cc...cc|cc...cc..c~c..cccccxc -cxc..ccccc+cccccc...ccc...cccccc+ccccc..cxc -cx.d%ccc.~~~.ccccc.......ccccc.~~~.ccc%d.xc -cx.d%cc.......ccccccccccccccc.......cc%d.xc -cxc..cc...!...cccc.......cccc...!...cc..cxc -cxccccc.......ccc~6cc?cc6~ccc.......cccccxc -cxcccccc.3..6..|~~ccc.ccc~~|..6..2.ccccccxc -cxccccccc...ccccccccc.ccccccccc...cccccccxc -ccccccccccccccccccccc@ccccccccccccccccccccc -ENDMAP - ############################################################################ # (Mini)vaults specific to the Elven Halls diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des index 6cdf40b8ec..d14768abc0 100644 --- a/crawl-ref/source/dat/entry.des +++ b/crawl-ref/source/dat/entry.des @@ -170,7 +170,7 @@ xxxxx.........xxxxx xxxxx....@....xxxxx ENDMAP -NAME: lemuel_oo5_c +NAME: lemuel_005_c TAGS: entry no_monster_gen ORIENT: float SHUFFLE: {[(, ABC @@ -3106,6 +3106,10 @@ TAGS: entry MONS: w:30 nothing / worm MONS: w:30 nothing / ooze / weight:2 jelly MONS: w:30 nothing / jackal / rat + +# There is a very slight chance that a jelly or an intelligent monster +# (hobgoblin) might spawn inside the cage. This is okay; added an exit. + FLAGS: no_rotate ORIENT: float SUBST: ?=Gx, ===++ @@ -3120,7 +3124,7 @@ MAP .x.............x. .=T....xxx....T=. .x.....({[.....x. -.x..T.......T..x. +.x..T...]...T..x. .xxx=xxxxxxx=xxx. ................. ENDMAP @@ -3368,25 +3372,25 @@ TAGS: entry ORIENT: float SHUFFLE: cxxx MAP -.............................. -............c..c.............. -...........c.................. -...........c...c.............. -...cc......cccc............... -..cccc........................ -.cc.cc........................ + ...... + ..c..c. + .c..... + .... ..c...c. +...cc......cccc.. +..cccc........... +.cc.cc........... ..cc.....cc.ccc............... ........c..[..cc.....c....ccc. .......cc.{.....c....c....c.c. ........c..(..cc.....c....ccc. ..cc.....cc.ccc............... -.cc.cc........................ -..cccc........................ -...cc......cccc............... -...........c...c.............. -...........c.................. -............c..c.............. -.............................. +.cc.cc........... +..cccc........... +...cc......cccc.. +...........c...c. + .c..... + ..c..c. + ...... ENDMAP @@ -3880,8 +3884,8 @@ xxxxxxxxxx+xxxxx+xxxxxxxxxx ......xxxx.......xxxx...... ........xx..[.{..xx........ ........xxx.....xxx........ -........xxxxx.xxxxx........ -.......xxxxxx+xxxxxx....... +........xxxxx+xxxxx........ +.......xxxxxx.xxxxxx....... .......xxxxx...xxxxx....... ......xxxx.......xxxx...... ......xx...........xx...... diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des index 032546e274..e1b174818d 100644 --- a/crawl-ref/source/dat/float.des +++ b/crawl-ref/source/dat/float.des @@ -218,7 +218,7 @@ ENDMAP # possibility to script the trolls guard the bridge would be great here -evk # NAME: troll_bridge -DEPTH: D:7-15 +DEPTH: D:9-18 ORIENT: float TAGS: no_pool_fixup MONS: troll w:50 / rock troll / iron troll w:5 @@ -342,8 +342,12 @@ ENDMAP ############################################################################# # Oklob shooting range # +# Disallowing this vault on branch starts, as brown stairs can't help there. +# Chance for a plant to turn oklob based on dungeon level. +# NAME: oklob_3 -DEPTH: D:21-27, Lair, Elf +DEPTH: D:21-27, Lair:2-10, Elf:2-7 +CHANCE: 1 ORIENT: float SHUFFLE: ab" / AB' SUBST: a=[, b=(, A=., B=., "=., ':>', '=>. diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des index 3a00aadf68..8f09b7547b 100644 --- a/crawl-ref/source/dat/hells.des +++ b/crawl-ref/source/dat/hells.des @@ -203,10 +203,6 @@ NAME: castle_dis PLACE: Dis:7 TAGS: dis ORIENT: north -LFLAGS: no_tele_control -MARKER: O = lua:item_pickup_change_flags { \ - level_flags="!no_tele_control", item="iron rune" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -257,10 +253,6 @@ MONS: random, random NAME: asmodeus PLACE: Geh:7 ORIENT: encompass -LFLAGS: no_tele_control -MARKER: O = lua:item_pickup_change_flags { \ - level_flags="!no_tele_control", item="obsidian rune" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -341,20 +333,18 @@ MONS: Serpent of Hell, random, random ############################################################################ # Antaeus; bottom of Cocytus. David's Improved Demon Lairs, episode I. # +# To do: this level has much shorter distances to travel, hence should +# come up with harder resistance. NAME: antaeus_david_1 PLACE: Coc:7 ORIENT: encompass -LFLAGS: no_tele_control MONS: Antaeus, Ice Fiend, ice dragon / nothing ITEM: any, any misc, any misc, any misc SHUFFLE: O1d / e0% / f9* / g8| KMONS: d = ice devil w:5 / Ice Fiend / nothing w:5 KITEM: d = any SUBST: ' = w . -MARKER: O = lua:item_pickup_change_flags { \ - level_flags="!no_tele_control", item="icy rune" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -435,13 +425,9 @@ ENDMAP NAME: antaeus_in_days_of_yore PLACE: Coc:7 ORIENT: encompass -LFLAGS: no_tele_control SHUFFLE: $|, 2X SUBST: X=., 3=3. MONS: Antaeus, Ice Fiend, ice dragon, Ice Fiend -MARKER: O = lua:item_pickup_change_flags { \ - level_flags="!no_tele_control", item="icy rune" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -524,12 +510,8 @@ ENDMAP NAME: ereshkigal PLACE: Tar:7 ORIENT: encompass -LFLAGS: no_tele_control MONS: Ereshkigal, necrophage, wraith, shadow, small zombie MONS: small skeleton, Shadow Fiend -MARKER: O = lua:item_pickup_change_flags { \ - level_flags="!no_tele_control", item="bone rune" \ - } MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des index 860a3c91fd..314866b554 100644 --- a/crawl-ref/source/dat/lab.des +++ b/crawl-ref/source/dat/lab.des @@ -25,7 +25,7 @@ ENDMAP # Labyrinth exit minivaults ############################################################################# # These are generated by the TAG: minotaur. -# You *must* place the minotaur(s) yourself! +# You *must* place the minotaur yourself! Only one minotaur per map, please. # There must be an exit (<), leading back to the dungeon. # # You can use the "generate_loot" tag to indicate that you're not explicitly @@ -53,7 +53,7 @@ NAME: labyrinth_watery TAGS: minotaur generate_loot no_pool_fixup allow_dup MONS: minotaur SHUFFLE: def -SUBST: d=~, e=~, f=. +SUBST: d=~, e=~, f=., c:vvc MAP ......... .ccccccc. @@ -104,19 +104,16 @@ ENDMAP NAME: labyrinth_hidden_loot TAGS: minotaur generate_loot allow_dup MONS: minotaur -SHUFFLE: def -SUBST: d = 1, e = 1 -KFEAT: f = blade trap / needle trap / axe trap / floor w:70 -KMONS: f = minotaur -KITEM: f = any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item / nothing, any good_item / nothing -MAP +NSUBST: d = 1 / % +SUBST: c : cvv +MAi ............ .cccccccccc. .cxxxxdxxxc. .cxxxx=xxxc. .cxx..U.xxc. -.ce=U.1.xxc. -.cxx...U=fc. +.cd=U...xxc. +.cxx...U=dc. .cxx.<..xxc. .cxxxx+xxxc. .cxxxx.xxxc. @@ -128,12 +125,12 @@ ENDMAP # Mini labyrinth exit NAME: labyrinth_mini_lab TAGS: minotaur generate_loot allow_dup -MONS: minotaur SHUFFLE: def, gh, ij, klm SUBST: d = c, e = ., f = c. SUBST: g = c, h = . SUBST: k = <, l = ., m = ., i = ., j = . KMONS: < = minotaur +SUBST: c : vvc validate {{ return has_exit_from_glyph('<') }} @@ -155,61 +152,36 @@ MAP ............... ENDMAP -############################################################################# -# Three rows exit -NAME: labyrinth_rows -TAGS: minotaur -SHUFFLE: def -MONS: minotaur -KFEAT: d = floor -KITEM: d = any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item, any good_item -KFEAT: e = floor -KFEAT: f = < -MAP -.................. -.cccccccccccccccc. -.+1............dc. -.cccccccccccccccc. -.+1............ec. -.cccccccccccccccc. -.+1............fc. -.cccccccccccccccc. -.................. -ENDMAP - ############################################################################# # Trapped exits - this is evil! -NAME: labyrinth_trapped -TAGS: minotaur generate_loot allow_dup -SHUFFLE: dD/eE/fF, ghi -MONS: minotaur -SUBST: g = c, h = c, i = . -KFEAT: d = axe trap / dart trap / needle trap / blade trap -KFEAT: e = axe trap / dart trap / needle trap / blade trap -KFEAT: f = axe trap / dart trap / needle trap / blade trap -KFEAT: D = teleport trap -KFEAT: E = teleport trap -KFEAT: F = floor +NAME: labyrinth_trapped +TAGS: minotaur generate_loot allow_dup +SHUFFLE: dD/eE/fF +MONS: minotaur +NSUBST: g = . / c +NSUBST: D = . / D +KFEAT: d = axe trap / dart trap / needle trap / blade trap +KFEAT: D = teleport trap +SUBST: c : vvc CHANCE: 1 MAP -............ -.ccccccccccc. -.g..ddD+.ccc. -.c.ccccc.ccc. -.h..eeE+.1w!;!c. +#.c"w!!;c. +#.c.w!;!c. +#.c1w?T!c. +#.c$w;!!c. +#.cccc=cc. +#......... +#ENDMAP # -NAME: onia_ninara_007_chamber_of_wet_secrets -DEPTH: D:8-13 -TAGS: no_monster_gen no_pool_fixup -KMONS: 1 = centaur -KMONS: 2 = brown snake -KMONS: 3 = electrical eel -ITEM: bread ration/meat ration/royal jelly/potion of porridge, good_item cloak/any book -SHUFFLE: !; -SUBST: " = .:80 W:30 -SUBST: ; = .:80 W:30 -SUBST: ! = w:20 W ? c -KFEAT: 3 = w -KFEAT: 2 = W / . -KFEAT: 1 = W / . w:30 -KFEAT: d = W / . -KFEAT: e = W / . -KFEAT: ? = spear trap / blade trap -MAP -......... -.ccccccc. -.c?;2Wdc. -.ccWccec. -.c.w"c3c. -.c"w"ccc. -.c>w!;!c. -.c"w!!;c. -.c.w!;!c. -.c1w?T!c. -.c$w;!!c. -.cccc=cc. -......... -ENDMAP - -NAME: onia_ninara_008_deeper_chamber_of_wet_secrets -DEPTH: D:20-26 -TAGS: no_monster_gen no_pool_fixup -KMONS: 1 = yaktaur captain -KMONS: 2 = grey snake -KMONS: 3 = storm dragon -ITEM: potion of cure mutation/potion of gain dexterity/potion of gain strength -ITEM: potion of gain intelligence/potion of experience/w:40 potion of heal wounds -SHUFFLE: de, !; -KFEAT: 3 = w / . -KFEAT: | = W / . -KFEAT: d = W / . -KFEAT: e = W / . -KFEAT: 2 = W -SUBST: ; = .:80 W:30 -SUBST: " = .:80 W:30 -SUBST: ! = w:20 W ? c -KFEAT: ? = zot trap -MAP -......... -.ccccccc. -.c?.2Wdc. -.ccWcc|c. -.c"w"c3c. -.c"w"ccc. -.c"w!;!c. -.c"w!?;c. -.c"w!!;c. -.c1w;U!c. -.c$w!!;c. -.cccc=cc. -......... -ENDMAP - +#NAME: onia_ninara_008_deeper_chamber_of_wet_secrets +#DEPTH: D:20-26 +#TAGS: no_monster_gen no_pool_fixup +#KMONS: 1 = yaktaur captain +#KMONS: 2 = grey snake +#KMONS: 3 = storm dragon +#ITEM: potion of cure mutation/potion of gain dexterity/potion of gain strength +#ITEM: potion of gain intelligence/potion of experience/w:40 potion of heal wounds +#SHUFFLE: de, !; +#KFEAT: 3 = w / . +#KFEAT: | = W / . +#KFEAT: d = W / . +#KFEAT: e = W / . +#KFEAT: 2 = W +#SUBST: ; = .:80 W:30 +#SUBST: " = .:80 W:30 +#SUBST: ! = w:20 W ? c +#KFEAT: ? = zot trap +#MAP +#......... +#.ccccccc. +#.c?.2Wdc. +#.ccWcc|c. +#.c"w"c3c. +#.c"w"ccc. +#.c"w!;!c. +#.c"w!?;c. +#.c"w!!;c. +#.c1w;U!c. +#.c$w!!;c. +#.cccc=cc. +#......... +#ENDMAP ############################################################################## diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des index fa098b1e23..a6326054a8 100644 --- a/crawl-ref/source/dat/orc.des +++ b/crawl-ref/source/dat/orc.des @@ -148,7 +148,7 @@ ENDMAP NAME: david_orc_5 TAGS: orc_entry ORIENT: float -KFEAT: C = altar_beogh w:70 / altar_yredelemnul / altar_makhleb / altar_trog +KFEAT: C = altar_beogh SHUFFLE: EFGH SUBST: E=3 SUBST: F=1, G=1, H=1 @@ -167,8 +167,6 @@ MONS: orc w:32 / w:7 orc warrior / w:1 orc knight MONS: orc w:32 / w:7 orc warrior : end SUBST: x : cxv -SHUFFLE: () / XY -SUBST: X=., Y=. MAP xxxxxxxxxxxxxxx x......O......x diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des index 6c4ba200c8..5290c3e117 100644 --- a/crawl-ref/source/dat/vaults.des +++ b/crawl-ref/source/dat/vaults.des @@ -188,7 +188,6 @@ ORIENT: encompass # # the rune's spot, occassionally put nasty on the rune KMONS: O = 8 / 9 / w:80 nothing -KFEAT: O = O NSUBST: O = O / o KITEM: o = any good_item KFEAT: o = w:120 . / any shop diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des index 0f060a726a..d832d224a2 100644 --- a/crawl-ref/source/dat/zot.des +++ b/crawl-ref/source/dat/zot.des @@ -6,13 +6,9 @@ ############################################################################## # hall_of_Zot -NAME: hall_of_Zot_5 +NAME: hall_of_Zot PLACE: Zot:5 ORIENT: north -LFLAGS: no_tele_control - -FLOORCOL: magenta -ROCKCOL: lightmagenta #traps SUBST: C = c:1000 = @@ -39,10 +35,6 @@ SUBST: K = 4:30 5 8 9 SUBST: L = 4 5:30 8 9 SUBST: M = 4 5 8:30 9 -MARKER: Z = lua:item_pickup_change_flags { \ - level_flags="!no_tele_control", item="Orb of Zot" \ - } - MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -82,60 +74,6 @@ xxxxxxxxxxxcc..............ccxxxc...............cxxxcc..............ccxxxxxxxxxx xxxxxxxxxxxxccccccccccccccccxxxxcccccccc@ccccccccxxxxccccccccccccccccxxxxxxxxxxx ENDMAP -################################################################ - -# For colouring the walls and floors of the first four levels - -NAME: hall_of_Zot_1 -PLACE: Zot:1 -TAGS: transparent -ORIENT: float - -FLOORCOL: lightgrey -ROCKCOL: lightgrey - -MAP -. -ENDMAP - -### -NAME: hall_of_Zot_2 -PLACE: Zot:2 -TAGS: transparent -ORIENT: float -FLOORCOL: lightgrey -ROCKCOL: blue - -MAP -. -ENDMAP -### - -NAME: hall_of_Zot_3 -PLACE: Zot:3 -TAGS: transparent -ORIENT: float - -FLOORCOL: blue -ROCKCOL: lightblue - -MAP -. -ENDMAP - -### - -NAME: hall_of_Zot_4 -PLACE: Zot:4 -TAGS: transparent -ORIENT: float - -FLOORCOL: lightblue -ROCKCOL: magenta - -MAP -. -ENDMAP -- cgit v1.2.3-54-g00ecf