0008277: Remove damage/random traps from vaults - Dungeon Crawl Stone Soup Tracker

From db3cff7a717bc5e0241dcb0c147b68980e8fb38d Mon Sep 17 00:00:00 2001 From: Andrew Minton <a@cowmuffins.net> Date: Sat, 15 Mar 2014 00:39:35 -0600 Subject: [PATCH] Remove damage traps, ~, ^ from vaults (except Zot:5). --- crawl-ref/source/dat/des/branches/crypt.des | 96 +++++++------- .../source/dat/des/branches/depths_encompass.des | 6 +- crawl-ref/source/dat/des/branches/lair.des | 20 +-- crawl-ref/source/dat/des/branches/snake.des | 1 + crawl-ref/source/dat/des/branches/tomb.des | 106 ++++++++-------- crawl-ref/source/dat/des/branches/vaults.des | 13 +- crawl-ref/source/dat/des/branches/zot.des | 27 ++-- crawl-ref/source/dat/des/portals/ossuary.des | 138 ++++++++++----------- crawl-ref/source/dat/des/variable/float.des | 4 +- .../source/dat/des/variable/large_abstract.des | 79 ++++++------ crawl-ref/source/dat/des/variable/large_themed.des | 25 ++-- .../source/dat/des/variable/mini_monsters.des | 11 +- 12 files changed, 250 insertions(+), 276 deletions(-) diff --git a/crawl-ref/source/dat/des/branches/crypt.des b/crawl-ref/source/dat/des/branches/crypt.des index 2c037e4..70f328e 100644 --- a/crawl-ref/source/dat/des/branches/crypt.des +++ b/crawl-ref/source/dat/des/branches/crypt.des @@ -574,7 +574,7 @@ KFEAT: Z = w:5 alarm trap / w:8 zot trap / w:50 floor KMONS: Y = Boris / ancient lich, ancient lich MONS: w:3 zombie / lich / w:3 skeleton / w:3 bone dragon MONS: skeleton / zombie -KFEAT: v = w:5 ~ / . +KFEAT: v = w:5 . / . KITEM: v = $ / % SUBST: $ = $.*| MAP @@ -1110,7 +1110,6 @@ MONS: guardian mummy MONS: flying skull MONS: mummy / guardian mummy / w:5 nothing : end -SUBST: ; = .:7 ~:2 ^:1 NSUBST: / = 1:| / 2:* / *:% NSUBST: . = 5:0 / *:. NSUBST: %*| = 1:d / 1:h @@ -1123,9 +1122,9 @@ MAP xxv...WWb$$|*|$$bWW...vxx xxxxxxxxv...WW.$/|1|/$.WW...vxxxxxxxx xxccccccv...WWb$$|*|$$bWW...vccccccxx - xxc/;cccv...WWWb.b.b.bWWW...vccc;/cxx - xxc;;;ccvv..WWWWWWWWWWWWW..vvcc;;;cxx -xxxxxxxc;;;/ccvv..WWWWWWWWWWW..vvcc/;;;cxxxxxxx + xxc/.cccv...WWWb.b.b.bWWW...vccc./cxx + xxc...ccvv..WWWWWWWWWWWWW..vvcc...cxx +xxxxxxxc.../ccvv..WWWWWWWWWWW..vvcc/...cxxxxxxx xxccccccc+cccccv...............vccccc+cccccccxx xxcU......cxxxxvv....2...2....vvxxxxc......Ucxx xxc..3....cxxxxxvv.....6.....vvxxxxxc....3..cxx @@ -1133,14 +1132,14 @@ xxc.......cxxxxxvvv.6.....6.vvvxxxxxc.......cxx xxc.......cxxxxxvvvvv.....vvvvvxxxxxc.......cxx xxc...5.5.cxxxxxvvvvvvv+vvvvvvvxxxxxc.5.5...cxx xxccccc+cccxxxxxvcccccU.Ucccccvxxxxxccc+cccccxx -xxxxxxc;cxxxxxxxvc.U.cc+cc.U.cvxxxxxxxc;cxxxxxx - xxc.cxxxxxccccG..F;^;F..Gccccxxxxxc.cxx - xxc;cccccccG....45...54....Gccccccc;cxx - xxc.;;;;;;+.................+;;;;;;.cxx - xxc;cccccccG.......C.......Gccccccc;cxx - xxc.c;;;+;ccc56.........65cccxxxxcc.cxx - xxxxc;c/;;c;ccc5...........5cccxxxxcc;cxxxx -xxxxccc+ccc/c;+7+.............+7ccccccc+cccxxxx +xxxxxxc.cxxxxxxxvc.U.cc+cc.U.cvxxxxxxxc.cxxxxxx + xxc.cxxxxxccccG..F...F..Gccccxxxxxc.cxx + xxc.cccccccG....45...54....Gccccccc.cxx + xxc.......+.................+.......cxx + xxc.cccccccG.......C.......Gccccccc.cxx + xxc.c...+.ccc56.........65cccxxxxcc.cxx + xxxxc.c/..c.ccc5...........5cccxxxxcc.cxxxx +xxxxccc+ccc/c.+7+.............+7ccccccc+cccxxxx xxccc.5.5.ccccccc..c.......c..ccccccc.5.5.cccxx xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx xxccc.....ccccccc..c.......c..ccccccc.....cccxx @@ -1150,17 +1149,17 @@ xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx xxccc.....ccccccc..c6.6.6.6c..ccccccc.....cccxx xxc7+.....+7ccc7+.............+7ccc7+.....+7cxx xxccc.5.5.ccccccc..c.......c..ccccccc.5.5.cccxx -xxxxccc+cccxxxc7+.............+7+;;cccc+cccxxxx - xxc...cxxxxccc..c.......c..ccc;/ccc...cxx +xxxxccc+cccxxxc7+.............+7+..cccc+cccxxxx + xxc...cxxxxccc..c.......c..ccc./ccc...cxx xxc.4.cxxxxc7+.............+7cccccc.4.cxx xxc./.cxxxxccc..c.......c..cccxxxxc./.cxx xxcccccxxxxc7+.............+7cxxxxcccccxx xxxxxxxxxxxccc....c...c....cccxxxxxxxxxxx xxxxc5.Vcc...ccV.5cxxxx xxcccccc...ccccccxx - xxc..;;;...;;;..cxx - xxc;;vcccccccv;;cxx - c..;;;...;;;..c + xxc.............cxx + xxc..vcccccccv..cxx + c.............c cccccc@c@cccccc ENDMAP @@ -1620,7 +1619,6 @@ KFEAT: YD = closed_door KFEAT: ER = alarm trap KFEAT: CSd = floor COLOUR: YsDdE = darkgrey -SUBST: - = ^....... NSUBST: . = 5:0 / *:. KMONS: 0 = lost soul / nothing : local brnd = crawl.random2(15) @@ -1668,43 +1666,43 @@ MAP cc$3$c|*....2....%|c..G.3.G..cc cc...c|%|.......|%|c.........cc ccc+cccccc.....ccccccc+cccBBBcc - cc...c---ccc+ccc---c-----c$$$cc - cc.4.c-G-4-RRR-4-G-+--G--c$$$cc -cccccccccccccccccc...c-------------c-----c%%*cc + cc...c...ccc+ccc...c.....c$$$cc + cc.4.c.G.4.RRR.4.G.+..G..c$$$cc +cccccccccccccccccc...c.............c.....c%%*cc ccccccccccccccccccc+ccccccc+++ccccccc+ccccccccc -c$$A...c|...*c%.*cc...ccc-------ccc...cc%*|%*cc -c$$A.3.c..3..c.3.c..G..---G---G---..G..c..3..cc +c$$A...c|...*c%.*cc...ccc.......ccc...cc%*|%*cc +c$$A.3.c..3..c.3.c..G.....G...G.....G..c..3..cc c$$A...c.....c...c..1...............1..c.....cc c$$Ac+cccc+cccc+cc..G..G..G...G..G..G..cc+++ccc -ccccc-----------cc..1...............1..c-----cc ----cc--G4---4G--cc..G..G..G...G..G..G..c-4-4-cc ----ccc---------ccc..1...............1..c-----cc -@--cccccc+++cccccc..G..G..G...G..G..G..c-----cc ----ccc.........cccc...................ccc---ccc ----cc..G1...1G..ccc+c+c+c+c...c+c+c+c+ccc+++cccc +ccccc...........cc..1...............1..c.....cc +...cc..G4...4G..cc..G..G..G...G..G..G..c.4.4.cc +...ccc.........ccc..1...............1..c.....cc +@..cccccc+++cccccc..G..G..G...G..G..G..c.....cc +...ccc.........cccc...................ccc...ccc +...cc..G1...1G..ccc+c+c+c+c...c+c+c+c+ccc+++cccc c..cc...........ccc5c5c5c5c+++c5c5c5c5ccc...c+Cc -c..ccccc.....cccccc+ccccccc---cccccccccc.....ccc -c..c...c.....c...cc.c.....-----.....ccC+.....+Cc -c--c.............cc.c....1-----1....cccc.....ccc -c---...G.....G...cc.cc....-----....+ccC+.....+Cc -c---....1...1....cc.cccccc-----ccccc.ccc.....ccc -c---...G.....G...cc+cc....-----....cc+C+.....+Cc -c---....1...1....+..+....1-----1....cccc.....ccc -c---...G.....G...cccc.....-----.....ccC+.....+Cc +c..ccccc.....cccccc+ccccccc...cccccccccc.....ccc +c..c...c.....c...cc.c...............ccC+.....+Cc +c..c.............cc.c....1.....1....cccc.....ccc +c......G.....G...cc.cc.............+ccC+.....+Cc +c.......1...1....cc.cccccc.....ccccc.ccc.....ccc +c......G.....G...cc+cc.............cc+C+.....+Cc +c.......1...1....+..+....1.....1....cccc.....ccc +c......G.....G...cccc...............ccC+.....+Cc c..c.............cccccccccc+++cccccccccc.....ccc -c..c...c-----c...c.......--------............+Cc -cccccccc-----ccccc...........................ccc +c..c...c.....c...c...........................+Cc +cccccccc.....ccccc...........................ccc cc.............c...........................+Cc cc.G.G.....G.G.c.cccccc.......ccccccc......ccc - cc..1.......1..cc+$$$$cc-----cc%....+c.....+Cc - cc.G.........G.cc$$$$$cc-----cc%1...cccccccccc - cc..1.......1..cc$$$$1cc-----cc*%%%%cc...----. - cc.G.........G.cccccccc.......ccccccc....----. - cc..1.......1..c.........................----@ - cc.G.........G.c.........................----. - @-.......................................----. - cccccc-----ccccccccccccccccccccccccccccccccccc - cccccc-----ccccc + cc..1.......1..cc+$$$$cc.....cc%....+c.....+Cc + cc.G.........G.cc$$$$$cc.....cc%1...cccccccccc + cc..1.......1..cc$$$$1cc.....cc*%%%%cc........ + cc.G.........G.cccccccc.......ccccccc......... + cc..1.......1..c.............................@ + cc.G.........G.c.............................. + @............................................. + cccccc.....ccccccccccccccccccccccccccccccccccc + cccccc.....ccccc cc.............c .............c ........@....... diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des index 2613e04..6e339ee 100644 --- a/crawl-ref/source/dat/des/branches/depths_encompass.des +++ b/crawl-ref/source/dat/des/branches/depths_encompass.des @@ -76,8 +76,8 @@ NSUBST: e = 1:e / 1:* / *:%, f = 1:e / *:%, g = 1:e / *:% SUBST: | = |* SHUFFLE: 0A SUBST: A = xw, 1 = 11. -# (previously) 762 ;, 372 ., SUBST: . = .:100 ^:1 5:4, ; = .:200 ^:1 1:3 -NSUBST: . = 12:5 / 2:^ / 4 = 5. / *:., ; = 9:3 / 2:^ / 4 = 3. / *:. +# (previously) 762 ;, 372 ., SUBST: . = .:101 5:4, ; = .:201 1:3 +NSUBST: . = 12:5 / 2:. / 4 = 5. / *:., ; = 9:3 / 2:. / 4 = 3. / *:. NSUBST: . = 13:C / 4 = C. / *:., w = 8:W / 4 = W. / *:w MARKER: O = lua:props_marker { portal=1 } MAP @@ -256,7 +256,7 @@ NSUBST: C = 1:+ / *:b NSUBST: D = 1:+ / *:b NSUBST: E = 1:+ / *:x NSUBST: N = 1:= / *:n -KFEAT: ^ = teleport trap / Zot trap +KFEAT: ^ = known teleport trap / known Zot trap SUBST: ':''l. , '=l. SUBST: ":""W. , "=Ww.. ITEM: ring of teleportation diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des index f1e2b52..79d4e27 100644 --- a/crawl-ref/source/dat/des/branches/lair.des +++ b/crawl-ref/source/dat/des/branches/lair.des @@ -1215,7 +1215,7 @@ ENDMAP NAME: wad_woods_03 DEPTH: Lair, Forest : wad_woods_setup(_G, "rock", 3, false, 0, 0, 0) -FTILE: '%~0+14 = floor_dirt +FTILE: '%0+14 = floor_dirt MAP .t t.tt'xx .''t...tt'''''t.1x @@ -1478,14 +1478,14 @@ DEPTH: Lair, Forest KMONS: * = 9 KITEM: * = * : wad_woods_setup(_G, "small", 2, false, 0, 0, 0) -FTILE: @'~*+T = floor_dirt +FTILE: @'*+T = floor_dirt MAP .ttttt1.@.tt .1ttttt..'t1tt .tt..1t.''tttttt tt1tttt.'.t.tW1tt ttt.tt....'.t1t1WWtt -tt.t.tt..~..tttttWWW +tt.t.tt..'..tttttWWW tttt...'..t1tttxtWw t.1t.''tt1t1ttxxxtW ttt.'.t1tttt1x+*xxt @@ -1496,7 +1496,7 @@ ENDMAP NAME: wad_woods_road_06 DEPTH: Lair, Forest : wad_woods_setup(_G, "decor", 1, false, 0, 0, 0) -FTILE: @'~*+T = floor_dirt +FTILE: @'*+T = floor_dirt MAP tt.'@@..tt1ttttt..@@@..ttt tttt.'..ttttt1t11..'...1t11t @@ -1531,9 +1531,9 @@ ttt.t11.1t...MWW.1t.t1..tt...ttt tttt.1..aaaaaaa1Wt.t...t..tt1ttt t.t1.t1aa..a.6aaWWt1.1t.ttttttt tt.ttaaa.aba.aaaWW.t..ttttt1ttt - tt.aa.6a7a~a.6aaWtt1t...tt.tt + tt.aa.6a7a.a.6aaWtt1t...tt.tt t.aaaaaab|baaaaaa.t.......ttt - t1.1aa66a~a.a..aa.t...t.t.ttttt + t1.1aa66a.a.a..aa.t...t.t.ttttt tt.1..aaa.aba6aaa.11.t..tttt%ttt t.t.1..aa..a6.aaWW.t.tt.tt11t tt.t.1.1aaaaaaaWWwW1.t..t.tt @@ -1549,13 +1549,13 @@ DEPTH: D:10-, Lair, Forest ORIENT: float : wad_woods_setup(_G, "other", 5, false, 0, 0, 0) FTILE: "2T = floor_grass -FTILE: @'~0+ = floor_dirt +FTILE: @'0+ = floor_dirt MAP ttxcxxxxxxxxxxxxxxxxxxxxxxxcxxxxxct - ttttxc''''+''0'xxxxxx'''+~'0'cx0'0'ctt - t.ttxc''0'xxxx~x''00x'''x''''cx''~'ctt + ttttxc''''+''0'xxxxxx'''+''0'cx0'0'ctt + t.ttxc''0'xxxx'x''00x'''x''''cx''''ctt tt.txc'0''x''x'x''''x''0x''''cx''''ct1 -tt.t.xc'~''x''+'+'''0x'''x'''~cc+cc+ct1tt +tt.t.xc''''x''+'+'''0x'''x''''cc+cc+ct1tt t.t.txccc++ccccccxcxcxcxcc++cccx'x2'2tt1tt tttt.t.tt''tttttttcttttttt''ttx''x"'"ttt1t ttt..tt''''''tttcttt''''''ttxxxx2'2tt1tt diff --git a/crawl-ref/source/dat/des/branches/snake.des b/crawl-ref/source/dat/des/branches/snake.des index 91509a1..704cdbc 100644 --- a/crawl-ref/source/dat/des/branches/snake.des +++ b/crawl-ref/source/dat/des/branches/snake.des @@ -532,6 +532,7 @@ TAGS: transparent MONS: plant SUBST: . = . W:1 1:1, - = . W:3 0:1 ~:1 %:1 SHUFFLE: 0~ +SUBST: ~ = . MAP @.WWWWWWWW.@ .WWW.....WW. diff --git a/crawl-ref/source/dat/des/branches/tomb.des b/crawl-ref/source/dat/des/branches/tomb.des index e038b40..0f3722f 100644 --- a/crawl-ref/source/dat/des/branches/tomb.des +++ b/crawl-ref/source/dat/des/branches/tomb.des @@ -36,7 +36,6 @@ TAGS: tomb_entry no_monster_gen MONS: sphinx MONS: w:1 mummy / w:9 guardian mummy MONS: mummy priest -SUBST: ' = ~ .:50 KFEAT: O = enter_tomb MAP ........................ @@ -45,13 +44,13 @@ MAP ..cccccccccccccccccccc.. ..cc....2...........cc.. ..cc..............2.cc.. -..cc....cccccccccc''cc.. -..cc....c''''''''c''cc.. -..cc....c''ccccc'c''cc.. -..cc....c''cO'3''c''cc.. -..cc....c''ccccccc''cc.. -..cc.2..c''2''''''''cc.. -..cc....c'''''''''''cc.. +..cc....cccccccccc..cc.. +..cc....c........c..cc.. +..cc....c..ccccc.c..cc.. +..cc....c..cO.3..c..cc.. +..cc....c..ccccccc..cc.. +..cc.2..c..2........cc.. +..cc....c...........cc.. ..cc....cccccccccccccc.. ..cc................cc.. ..cc....2......2....cc.. @@ -307,10 +306,7 @@ TILE: FIJKL = dngn_sarcophagus_pedestal_left TILE: MNOPQ = dngn_sarcophagus_pedestal_right COLOUR: FIJKLMNOPQ = yellow SUBST: FIJKLMNOPQ = G -SUBST: - = T -SUBST: _ = F 6 ~:30 .:30 -SUBST: T = ~ . -SUBST: t = ~ .:50 +SUBST: _ = F 6 .:60 SUBST: ' = 5 .:100 SUBST: 2 = 2 1:2 . SUBST: 1 = 1 2:3 . @@ -338,10 +334,10 @@ xxxxxxxxx..........ccccccccccccccccccccccccccccccccccccccccccc.........xxxxxxxxx xxxxxxxxx..........cc'''''''''''''''''''''''''''''''''''''''cc.........xxxxxxxxx xxxxxxxxx..........cc'''''''''''''''''''''''''''''''''''''''cc.........xxxxxxxxx xxxxxxxxx..........cc''ccccccccccccccccccccccccccccccccccc''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..ttttttttttc................ctt)c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..ccccccccctc..3..........2..ct-tc''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..cA22c111ctc....3..........5c_ttc''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..c2c222ctttc......2.........+cccc''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c............c................c..)c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..ccccccccc.c..3..........2..c...c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..cA22c111c.c....3..........5c_..c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..c2c222c...c......2.........+cccc''cc.........xxxxxxxxx xxxxxxxxx..........cc''c..ccccccccccc.5........3...3..5..c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c.................................c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c............3.............3....2.c''cc.........xxxxxxxxx @@ -349,15 +345,15 @@ xxxxxxxxx..........cc''cccccccccccccc.......2...2........c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c............c....................c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c............c.................3..c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c..cccccccc..c..........2..2......c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..ctttc1Bc..c....................c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..ctctc11c..c...3.......3........c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..ctct11cc..c..............2.....c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..ctcccccc..c.......2............c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''c..cttttttt..c.3...............2..c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..c...c1Bc..c....................c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..c.c.c11c..c...3.......3........c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..c.c.11cc..c..............2.....c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..c.cccccc..c.......2............c''cc.........xxxxxxxxx +xxxxxxxxx..........cc''c..c.........c.3...............2..c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c..ccccccccccc....2.....3.........c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c.......5.........................c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c.................................c''cc.........xxxxxxxxx -xxxxxxxxx..........cc''ccccccccccccccTTTTTTTcccccccccccccc''cc.........xxxxxxxxx +xxxxxxxxx..........cc''cccccccccccccc.......cccccccccccccc''cc.........xxxxxxxxx xxxxxxxxx..........cc''c'''''''''''ccc+++++ccc'''''''''''c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c'''''''''''cc.2...2.cc'''''''''''c''cc.........xxxxxxxxx xxxxxxxxx..........cc''c''ccccccc''cc.L...Q.cc''ccccccc''c''cc.........xxxxxxxxx @@ -411,10 +407,9 @@ SUBST: Q=', q=c, R=T, r=+, S=T, s=+ SHUFFLE: ])}def SUBST: d=", e=", f=" # -SUBST: T = ~ . -SUBST: ' = ~ ':100 +SUBST: ' = . ':100 SUBST: ' = 1:5 2:5 3:1 .:89 -SUBST: " = ~ ":50 +SUBST: " = . ":50 SUBST: " = 2:3 3:1 .:96 # # Number of ' symbols is 211+3=214, hence statistically in the lower @@ -444,26 +439,26 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXcccccccccccccccccccccccccccccccccccccccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcccccccccccccccccccccccccccccccccccccccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""""c""""""c"""""{""""c""""""""c"""""""ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc""""c"""""TcT""""""""TcT""""""TcT""""""ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc""""c"""2"T+T""""""""T+T""2"""T+T""""""ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc"""TcT""""TcT""""""""TcT""""""TcT""""""ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc""TT+T"""""c""""""""""c""""""""c"""""""ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc""""c""""""c""""""""""c""""""""c"""""""ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc""""c"""2""+""""""""""+"""2""""+"""""""ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc""""c""""""c""""""""""c""""""""c"""""""ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc""""+""""""c""""""""""c""""""""c"""""""ccXXXXXXXXXXXXX XXXXXXXXXXXXXXccccc+ccccccccccccccccccccccccccccccc""""ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc""TTc.............................c"3""ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc""""c.............................c"3""ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""""c.............................c""""ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""3"c..xxx4.................4xxx..c"""fccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""""c..xxx...................xxx..c""""ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""""c..xxx.........1.........xxx..c)""}ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""""c..xxx.....2.......2.....xxx..cccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc""""c.............................c''''ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcce"""c.............................cT'''ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc""""c........X...........X........+T'''ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc]""dc.............................cT'''ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcce"""c.............................c''''ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc""""c........X...........X........+''''ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc]""dc.............................c''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXccccccc.....3........(........3.....c''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc''''c.............................c'QQQccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc'''Tc........X...........X........cccqcccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc'''T+.............................c'QQQccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc'''Tc.............................c''''ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc''''c........X...........X........cccqcccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc''''+.............................c'QQQccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc''''c.............................c''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc'ZZZc..xxx.....2.......2.....xxx..c''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcccczcc..xxx.........1.........xxx..c''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc'ZZZc..xxx...................xxx..c''''ccXXXXXXXXXXXXX @@ -472,7 +467,7 @@ XXXXXXXXXXXXXXcc'YYYc.............................c''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXccccycc.............................cRRRAccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc'YYYc.............................ccrccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc''''ccccc+ccccccccccccccc+cccccccccRRR'ccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcc''''''c'TTTc''''''''''''cTT''''''c'''''ccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcc''''''c''''c''''''''''''c''''''''c'''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc'''''WcW''UcU''''''''''VcV''''''ScS''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc'''''WwW''UuU''''''''''VvV''''''SsS''''ccXXXXXXXXXXXXX XXXXXXXXXXXXXXcc'''''WcW''UcU''''''''''VcV''''''ScS''''ccXXXXXXXXXXXXX @@ -510,9 +505,8 @@ PLACE: Tomb:3 ORIENT: encompass TAGS: no_rotate no_dump # -SUBST: ' : " $ ':80 -SUBST: ' = " $ -SUBST: " = ~:1 . +SUBST: ' : . $ ':80 +SUBST: ' = . $ SUBST: $ = *:2 |:1 $:17 # MONS: mummy, guardian mummy, mummy priest, greater mummy @@ -555,22 +549,22 @@ XXXXXXXXXXXXXXcccc....2..........................2...ccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcccccc....2......................2....cccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcccccccc............................cccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXccccccccc+ccc..................ccc+ccccccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccccccc""""cc................cc""""cccccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccccc"""""""cc22222222222222cc"""""'$cccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccc""""""""""cc............cc"""""""'$ccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccc'""""""""""cc..........cc""""""""'$ccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccc$''""""""""""cc........cc"""""""""'$$cccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccc$$$'""""""""""cc222222cc""""""""''$$$cccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccc|$$$''"""""""""c......c"""""""''$$$$$cccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccc||$$$$'""""""""c......c""""""'$$$$$$$cccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccc|||||$$'"""""""c......c"""""'$$$$$$$$cccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccc|||||$'"""""""c......c""""'$$$$$$$$ccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccccc||||$$'""""""c......c""""'$$$$$$$cccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccccc||||$'""""""c......c""""'$$$$$$ccccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccccccc|||$$'"""""c......c"""'$$$$$$cccccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccccccc|||$'""""cc..{...cc""'$$$$$ccccccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXccccccccc||$'""""cc...(..cc"'$$$$$cccccccccXXXXXXXXXXXXX -XXXXXXXXXXXXXXcccccccccc|$'""cccc..[...cccc$$$$ccccccccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccccccc....cc................cc....cccccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccccc.......cc22222222222222cc.....'$cccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccc..........cc............cc.......'$ccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccc'..........cc..........cc........'$ccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccc$''..........cc........cc.........'$$cccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccc$$$'..........cc222222cc........''$$$cccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccc|$$$''.........c......c.......''$$$$$cccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccc||$$$$'........c......c......'$$$$$$$cccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccc|||||$$'.......c......c.....'$$$$$$$$cccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccc|||||$'.......c......c....'$$$$$$$$ccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccccc||||$$'......c......c....'$$$$$$$cccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccccc||||$'......c......c....'$$$$$$ccccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccccccc|||$$'.....c......c...'$$$$$$cccccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccccccc|||$'....cc..{...cc..'$$$$$ccccccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXccccccccc||$'....cc...(..cc.'$$$$$cccccccccXXXXXXXXXXXXX +XXXXXXXXXXXXXXcccccccccc|$'..cccc..[...cccc$$$$ccccccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcccccccccccccccccccccccccccccccccccccccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXcccccccccccccccccccccccccccccccccccccccccccXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX diff --git a/crawl-ref/source/dat/des/branches/vaults.des b/crawl-ref/source/dat/des/branches/vaults.des index 2c73b5b..4b71e0d 100644 --- a/crawl-ref/source/dat/des/branches/vaults.des +++ b/crawl-ref/source/dat/des/branches/vaults.des @@ -8,7 +8,7 @@ {{ -- Vaults:$ common loot substitutions function vaults_end_loot(e) - e.subst("? = | * .:40 ^:3") + e.subst("? = | * .:43") e.subst("| = | *:2") e.subst("* = * |:2") end @@ -2759,15 +2759,14 @@ ENDMAP # Potentially contains the rune. NAME: vaults_end_room_rune TAGS: vaults_end_room_rune -SUBST: ^ = ^. : vaults_end_loot(_G) : vaults_end_rune(_G) MAP ...... -.^^^^. -.^||^. -.^O|^. -.^||^. -.^^^^. +...... +..||.. +..O|.. +..||.. +...... ...... ENDMAP diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des index 087736b..a17e428 100644 --- a/crawl-ref/source/dat/des/branches/zot.des +++ b/crawl-ref/source/dat/des/branches/zot.des @@ -124,7 +124,6 @@ SUBST: = = nnn+ SUBST: c: c:70 v:20 b:10 SUBST: v: vcxlmb, n: nnnnvbcx FTILE: })]O-4G: floor_marble -SUBST: - = ^ .:90 KFEAT: O = enter_zot SUBST: 4 = 122223 MONS: patrolling nonbase draconian @@ -137,17 +136,17 @@ xxxcccccc..3..ccccccxx xxcc......vvv......ccx xxc.v......3......v.cx xxc.2v...nn=nn...v..cx -xxc...nnnn---nnnn...cx -xxc...n----G----n..3cx -xcc...n-G--4--G-n...cc -xc.1.nn----v----nn...c -xc.v.n----v-v----n.v.+ -xc.v.+-G-v-O-v-G-=.v.+ -xc.v.n----v-v----n.v.+ -xc.1.nn----v----nn...c -xcc...n-G--4--G-n...cc -xxc...n----G----n..3cx -xxc...nnnn---nnnn...cx +xxc...nnnn...nnnn...cx +xxc...n....G....n..3cx +xcc...n.G..4..G.n...cc +xc.1.nn....v....nn...c +xc.v.n....v.v....n.v.+ +xc.v.+.G.v.O.v.G.=.v.+ +xc.v.n....v.v....n.v.+ +xc.1.nn....v....nn...c +xcc...n.G..4..G.n...cc +xxc...n....G....n..3cx +xxc...nnnn...nnnn...cx xxc.2v...nn=nn...v..cx xxc.v.....3.......v.cx xxcc......vvv......ccx @@ -693,7 +692,7 @@ TAGS: allow_dup extra luniq DEPTH: Zot:1-4 ORIENT: float SUBST: . = .^ -KFEAT: ^ = Zot trap +KFEAT: ^ = known Zot trap SUBST: > = }]) MAP xxxxxxx @@ -706,7 +705,7 @@ TAGS: allow_dup extra luniq DEPTH: Zot:2- ORIENT: float SUBST: . = .^ -KFEAT: ^ = zot trap +KFEAT: ^ = known zot trap SUBST: < = ([{ MAP xxxxxxx diff --git a/crawl-ref/source/dat/des/portals/ossuary.des b/crawl-ref/source/dat/des/portals/ossuary.des index 9c0dbba..b062079 100644 --- a/crawl-ref/source/dat/des/portals/ossuary.des +++ b/crawl-ref/source/dat/des/portals/ossuary.des @@ -140,7 +140,6 @@ ENDMAP NAME: gup_ossuary_entry_pyramid TAGS: mini_float KMONS: O = mummy -NSUBST: ' = 3:~ / *:' : ossuary_portal(_G) MAP ... @@ -334,8 +333,7 @@ NAME: ossuary_tomb_2 WEIGHT: 40 ORIENT: encompass TAGS: no_item_gen no_monster_gen no_rotate -KFEAT: ~ = dart trap w:1 / arrow trap w:1 / needle trap -KFEAT: ^ = dart trap / arrow trap +KFEAT: ~ = floor # Number of 1's is 53, number of ~'s is 57. : if crawl.one_chance_in(10) then SUBST: ~ = 1 @@ -378,10 +376,10 @@ c111c c111c c111c c111c c111c c111c cKKKc cBBBc -c~~~c c^^^c -c~~~cccccccccccccc^^^c -c~~~c...cddddc...c.z^c -c~~~+3<3=d**dn.A.+.^^c +c~~~c c...c +c~~~cccccccccccccc...c +c~~~c...cddddc...c.z.c +c~~~+3<3=d**dn.A.+...c c~~~c...cddddc...c.z<c cccccccccccccccccccccc ENDMAP @@ -537,35 +535,34 @@ MONS: gnoll zombie / hobgoblin zombie / orc zombie / \ human zombie / kobold zombie / goblin zombie / \ big kobold zombie / centaur zombie / scorpion zombie w:20 ITEM: any scroll / any potion / any jewellery w:1 / nothing -KFEAT: ~ = needle trap / arrow trap / spear trap w:5 / dart trap w:2 / floor w:50 SUBST: 1 = 1. SUBST: 3 = 3. : ossuary_setup_features(_G) MAP ccccccccccccccccccccccccc -c...c..3c..1c~~~ndddc131c -c.A.c...G...+~~~nd2d+313c -c...c3......c~~~ndddc131c +c...c..3c..1c...ndddc131c +c.A.c...G...+...nd2d+313c +c...c3......c...ndddc131c cc+cccG...Gccc+ccccccc+cc -c...c......3c...c3.1c~~~c -c.<.+...G...c...G...c~~~c -c...c...c3..c......3c~~~c -ccccccccccccccG...Gcc~~~c -c1.1cdddn~~~c3.....3c~~~c -c.3.+d2dn~~~+...G...c~~~c -c3.3cdddn~~~c..3c3.1c~~~c +c...c......3c...c3.1c...c +c.<.+...G...c...G...c...c +c...c...c3..c......3c...c +ccccccccccccccG...Gcc...c +c1.1cdddn...c3.....3c...c +c.3.+d2dn...+...G...c...c +c3.3cdddn...c..3c3.1c...c cc+ccccccc+ccccccccccc+cc -c1...3c.....c~~~c...c3.1c -c.....c.....c~~~+...G...c -c.....G.....c~~~c......3c +c1...3c.....c...c...c3.1c +c.....c.....c...+...G...c +c.....G.....c...c......3c c...........cc+cccG...Gcc c3..........c3.3c3.....3c cccG..3..Gccc...c...G...c c3.........3c3.3c1.3c3.1c c...........cc+ccccccc+cc -c.....G.....c~~~ndddc3.3c -c.....c.....+~~~nd2d+.3.c -c3...3c3...1c~~~ndddc1.1c +c.....G.....c...ndddc3.3c +c.....c.....+...nd2d+.3.c +c3...3c3...1c...ndddc1.1c ccccccccccccccccccccccccc ENDMAP @@ -584,16 +581,14 @@ NSUBST: B = 1:+ / *:n NSUBST: C = 1:+ / *:n NSUBST: D = 1:+ / *:n NSUBST: E = 1:+ / *:n -KFEAT: ~ = needle trap / arrow trap / spear trap -SUBST: ~ = ~. NSUBST: X = 1:< / *:. : ossuary_setup_features(_G) MAP ccccccccccccccccccccccccccccccc -c$$B~..........<..........~Cddc -c$$B~.....................~Cddc -cBBB~........ccccc........~CCCc -c~~~~.....................~~~~c +c$$B...........<...........Cddc +c$$B.......................Cddc +cBBB.........ccccc.........CCCc +c.............................c c....2.........1.........2....c c.....cc....1.....1....cc.....c c.....cc...............cc.....c @@ -608,10 +603,10 @@ c.............................c c.....cc....1.....1....cc.....c c.....cc.......1.......cc.....c c....2...................2....c -c~~~~.....................~~~~c -cEEE~........ccccc........~DDDc -c**E~.....................~Deec -c**E~..........<..........~Deec +c.............................c +cEEE.........ccccc.........DDDc +c**E.......................Deec +c**E...........<...........Deec ccccccccccccccccccccccccccccccc ENDMAP @@ -771,22 +766,21 @@ MONS: mummy MONS: generate_awake centaur zombie / generate_awake hobgoblin zombie / \ generate_awake big kobold zombie / nothing w:20 MONS: centaur zombie / hobgoblin zombie / big kobold zombie / nothing w:20 -KFEAT: ~ = dart trap w:20 / net trap / needle trap / alarm trap / floor w:40 +KFEAT: ~ = net trap / alarm trap / floor w:70 KFEAT: T = alarm trap w:20 / net trap / floor w:70 -KFEAT: ^ = net trap w:15 / needle trap w:4 / spear trap w:1 / floor w:20 +KFEAT: ^ = net trap w:15 / floor w:25 COLOUR: ^ = red -KFEAT: W = dart trap / floor w:20 : ossuary_setup_features(_G) MAP cccccccccccccccccccc ccccccccc3c3c3c3c3c3c3cddddccc - ccc.....WWc+c+c+c+c+c+c+c^.....c -cc1.....WW~~~~~~~~~~~~~~~~^.....cc -c......WWW~~~~~~~~~~~~~~~~^.....Mcc -c1....AW<W~~~~~~~~~~~~~~~~^.....M<c -c......WWW~~~~~~~~~~~~~~~~^.....Mcc -cc1.....WW~~~~~~~~~~~~~~~~^.....cc - ccc.....WWc+c+c+c+c+c+c+c^.....c + ccc.......c+c+c+c+c+c+c+c^.....c +cc1.......~~~~~~~~~~~~~~~~^.....cc +c.........~~~~~~~~~~~~~~~~^.....Mcc +c1....A.<.~~~~~~~~~~~~~~~~^.....M<c +c.........~~~~~~~~~~~~~~~~^.....Mcc +cc1.......~~~~~~~~~~~~~~~~^.....cc + ccc.......c+c+c+c+c+c+c+c^.....c ccccccccc3c3c3c3c3c3c3cddddccc cccccccccccccccccccc ENDMAP @@ -869,31 +863,29 @@ SUBST: X = x2 # 50/50 chance of loot for each of the eleven rats in the rat room. KITEM: x = any scroll / any potion KMONS: x = mummy -NSUBST: ' = 10:^ / *:. -KFEAT: ^ = dart trap / arrow trap KITEM: y = any scroll w:5 / any potion w:5 / nothing w:10 KMONS: y = rat skeleton : ossuary_setup_features(_G) MAP ccc cccxccccc - ccc''''+''c cccccc - cc'''ccccc'c cc'+.1cc - cc1'ccc cc+cc cc''cc''cc - cc..cc cc...ccccc''cccc''ccc -ccc cc+cc c+.x.+.1'''cc cc'''cc -cAccc'''cc ccb...cccxccc cecc'cc -c..+..1'+c cBcc+cc ccc cceEec+cc -c<ccc'''cc ccb''cc cccccxccc...ccc -ccc cc+cc cc''+cccccc''+''''+.x.+Xc - c.cc cc1'cc'cdDd.1ccccccc...ccc - c1cc cc..cccc'cdd.cc cc+cc - c''cccc+cc cc'cc+cc cXc - cc''cc...cccccc+yyyccccc ccc - cc'+..x..+'''+yyyyy+.1cc - cccc...cccxcccyyyccc''cc - cc+cc ccc cc+cc cc''ccccc - cxc ccc cc'''+Xc + ccc....+..c cccccc + cc...ccccc.c cc.+.1cc + cc1.ccc cc+cc cc..cc..cc + cc..cc cc...ccccc..cccc..ccc +ccc cc+cc c+.x.+.1...cc cc...cc +cAccc...cc ccb...cccxccc cecc.cc +c..+..1.+c cBcc+cc ccc cceEec+cc +c<ccc...cc ccb..cc cccccxccc...ccc +ccc cc+cc cc..+cccccc..+....+.x.+Xc + c.cc cc1.cc.cdDd.1ccccccc...ccc + c1cc cc..cccc.cdd.cc cc+cc + c..cccc+cc cc.cc+cc cXc + cc..cc...cccccc+yyyccccc ccc + cc.+..x..+...+yyyyy+.1cc + cccc...cccxcccyyyccc..cc + cc+cc ccc cc+cc cc..ccccc + cxc ccc cc...+Xc ccc ccccccc ENDMAP @@ -910,8 +902,7 @@ MONS: mummy KMONS: 4 = Menkaure, mummy # Loot: 1-16 items ITEM: any scroll / any potion / w:5 nothing -KFEAT: ^ = arrow trap / dart trap / alarm trap -KFEAT: m = spear trap +KFEAT: ^ = alarm trap / floor w:20 KFEAT: ~ = alarm trap NSUBST: ' = 2:m / 25:1 / 25:2 / 30:^ / . # 1KB: what's the point of these shortcuts? Removed for now... @@ -974,8 +965,8 @@ KMONS: S = spectral rat / spectral goblin / spectral kobold /\ ITEM: any potion / any scroll / nothing w:1 # # There are not always traps in corridors but they are guaranteed near the loot: -KFEAT: ' = arrow trap w:3 / dart trap w:5 / alarm trap w:7 / floor w:85 -KFEAT: " = spear trap w:1 / net trap w:3 / arrow trap w:5 / dart trap w:10 +KFEAT: ' = alarm trap w:7 / floor w:93 +KFEAT: " = net trap w:3 / floor w:16 # : ossuary_setup_features(_G) MAP @@ -1133,14 +1124,13 @@ MONS: rat zombie / quokka zombie / adder zombie /\ big kobold zombie w:1 / human zombie w:1 / elf zombie w:1 / orc zombie w:1 MONS: generate_awake mummy ITEM: any scroll / any potion / gold w:4 -KFEAT: ~ = arrow trap / needle trap / floor w:40 : ossuary_setup_features(_G) MAP ccccc ccc ccc ccc cdddccccccc1ccc1ccc1ccccccc -cddd~~~~c.............c~~~c -cd<d~~<~+.............+~<~c -cddd~~~~c.............c~~~c +cddd....c.............c...c +cd<d..<.+.............+.<.c +cddd....c.............c...c cdddccccccc1ccc1ccc1cccc+cc ccccc ccc ccc ccc c...c cc...cc @@ -1156,9 +1146,9 @@ ccccc ccc ccc ccc c...c cc...cc cccc ccc ccc ccc c...c c2.cccccccc1ccc1ccc1cccc+cc -cc......c.............c~~~c -c2..A.<.+.............+~<~c -cc......c.............c~~~c +cc......c.............c...c +c2..A.<.+.............+.<.c +cc......c.............c...c c2.cccccccc1ccc1ccc1ccccccc cccc ccc ccc ccc ENDMAP diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des index 6c4257e..29dffa2 100644 --- a/crawl-ref/source/dat/des/variable/float.des +++ b/crawl-ref/source/dat/des/variable/float.des @@ -1471,7 +1471,7 @@ SHUFFLE: WX/ZY , 12/12/67 SUBST: W:ww. , X:. , Z:x , Y:+. SHUFFLE: *5/WW SUBST: *=. , W=wW , !:$. -SUBST: 5 = 5 6 + ^:5 I:5 F:5 +SUBST: 5 = 5 6 + .:5 I:5 F:5 KFEAT: A = > KITEM: A = $ MAP @@ -5727,7 +5727,7 @@ KMONS: P = plant col:magenta name:demonic name_adjective \ tile:mons_demonic_plant KMONS: p = plant NSUBST: p = 3=xcbtvmnw.' / 5:P -NSUBST: . = 30=Pxcbtvmnw / 5:^ / 50:' +NSUBST: . = 30=Pxcbtvmnw / 5:. / 50:' NSUBST: x = 15=Pxcbtvmnw NSUBST: ` = 3:' MARKER: C = lua:fog_machine { \ diff --git a/crawl-ref/source/dat/des/variable/large_abstract.des b/crawl-ref/source/dat/des/variable/large_abstract.des index f900395..1d9d5d2 100644 --- a/crawl-ref/source/dat/des/variable/large_abstract.des +++ b/crawl-ref/source/dat/des/variable/large_abstract.des @@ -149,32 +149,32 @@ KFEAT: 0 = 0 MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xcccccccccccccccccccccccccccccccc -xccw......~......w......~......wc +xccw.............w.............wc xcc.ccccccccccccc.ccccccccccccc.c xcc.c....c.c....c.c....c.c....c.c xcc.c.8..+.c....c.c....+.c..9.c.c xcc.c....c.+..9.c.c.9..c.+....c.c xcc.c....c.c....c.c....c.c....c.c xcc.cccccc.cccccc.cccccc.cccccc.c -xcc~c....c.c....c.c....c.c....c.c +xcc.c....c.c....c.c....c.c....c.c xcc.c....c.c....c.c....+.c....c.c xcc.c8...+.+..8.c.c.8..c.+....c.c xcc.c....c.c....c.c....c.c....c.c xcc.cccccc.cccccc.cccccc.cccccc.c xcc.c....c.c....c.c....c.c....c.c xcc.c....+.c....c.c.0..c.c....c.c -xcc.c..9.c.+.8..c~c....+.+.0..c.c +xcc.c..9.c.+.8..c.c....+.+.0..c.c xcc.c....c.c....c.c....c.c....c.c xcc.cccccc.cccccc.cccccc.cccccc.c xcc.c....c.c....c.c....c.c....c.c xcc.c.0..+.+.0..c.c....+.+....c.c xcc.c....c.c....c.c.0..c.c.8..c.c xcc.cccccc.c....c.c....c.cccccc.c -xcc.c....c.cccccc.cccccc.c....c~c +xcc.c....c.cccccc.cccccc.c....c.c xcc.c....c.c....c.c..9.+.+....c.c xcc.c.0..+.+....c.c9...c.c.0..c.c xcc.c....c.c.8..c.c....c.c....c.c -xcc.cccccc~cccccc.cccccc~cccccc.c +xcc.cccccc.cccccc.cccccc.cccccc.c xccw.......Twwwwc.cwwwwT.......wc xcccccccccccccccc.ccccccccccccccc xxxxxxxxxxxxxxxxc@cxxxxxxxxxxxxxx @@ -224,12 +224,11 @@ NAME: thingy_vault DEPTH: D:12-, !D:$, Depths, !Depths:$ ORIENT: southwest TAGS: no_rotate -NSUBST: ^ = 3:^ / *:. MAP xxxxxxxxxxxxx@xxxxxx -xxxxxxxxxxxxx^xxxxxx -xxxxxxxxxxxx^^^xxxxx -xxxxxxxxxxx^^^^^xxxx +xxxxxxxxxxxxx.xxxxxx +xxxxxxxxxxxx...xxxxx +xxxxxxxxxxx.....xxxx xxxxxxxxxxxx...xxxxx xxxxxxxxxxxx...xxxxx xxxxxxxxxxx.....xxxxxxxxxxxx @@ -298,7 +297,6 @@ ENDMAP NAME: Angbandy_vault ORIENT: northeast DEPTH: Depths, !Depths:$ -SUBST: ^ = ^. SUBST: "=.", '=.', '=$, "=*, *=* |:1 MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -310,19 +308,19 @@ c****cc9.cc..cc8.cc"c.c.c'c"c0ccx c***cc..cc..cc..cc.c.c"c.c.c.c'cx c**cc..cc8.cc..cc.c"c.c.c.c"c.ccx c+cc9.cc..cc..cc"c.c.c.c"c.c.c.cx -c^c..cc..cc..cc.c'c.c.c.c.c"c"ccx -c^^.cc..cc..cc.c.c.c9c'c"c.c.c9cx +c.c..cc..cc..cc.c'c.c.c.c.c"c"ccx +c...cc..cc..cc.c.c.c9c'c"c.c.c9cx c..cc..cc..cc'c.c.c"c.c.c.c9c9ccx c.cc..cc..cc.c.c"c.c.c.c.c'c"c9cx ccc..cc..cc.c.c.c.c.c"c.c.c.cc+cx cc..cc..cc'c"c'c.c.c.c.c'c.cc..cx c0.cc..cc.c.c.c.c8c.c"c.c.cc0.ccx -c^cc..cc"c.c.c'c.c'c.c.c.cc..cccx -c^c..cc.c.c9c.c.c.c'c.c.cc..cc.cx +c.cc..cc"c.c.c'c.c'c.c.c.cc..cccx +c.c..cc.c.c9c.c.c.c'c.c.cc..cc.cx c0..cc'c.c.c"c0c.c.c.c.cc..cc.0cx c..cc.c.c9c'c.c.c'c'c.cc.9cc...cx -c.cc9c.c.c"c.c.c.c.c.cc..cc..c^cx -ccc.c'c'c.c.c.c'c.c'cc..cc..cc^cx +c.cc9c.c.c"c.c.c.c.c.cc..cc..c.cx +ccc.c'c'c.c.c.c'c.c'cc..cc..cc.cx cc'c.c.c.c'c'c.c0c.cc..cc..cc..cx c.c.c"c.c.c.c.c'c.cc9.cc..cc..ccx cc.c8c.c.c'c.c'c.cc..cc..cc0.cccx @@ -330,7 +328,7 @@ c.c'c.c'c0c.c.c"cc..cc..cc..cc$cx cc.c.c.c.c.c"c.cc..cc..cc..cc$$cx c"c.c.c.c'c.c.cc..cc0.cc..cc$$$cx cc.c.c.c.c"c'cc..cc..cc..cc$$$$cx -c'c.c.c'c.c.cc.8.^^.cc...^+$$$$cx +c'c.c.c'c.c.cc.8....cc....+$$$$cx cccc@cccccccccccccccccccccccccccx ENDMAP @@ -342,7 +340,7 @@ DEPTH: D:12-, !D:$, Depths, !Depths:$ ORIENT: northwest MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxx.........^..^.........xxxxx +xxxxxx......................xxxxx xxxxx...xxxxxxxx..xxxxxxxx...xxxx xxxx...xxxxxxxxx..xxxxxxxxx...xxx xxx...xx$*....xx..xx....$$xx...xx @@ -351,14 +349,14 @@ xx..xx*$*$....xx..xx....*$$$xx..x xx..xx$$$.00..xx..xx..00.*$*xx..x xx..xx....09..xx..xx..90....xx..x xx..xx......+xx....xx+......xx..x -xx..xx......x^......^x......xx..x +xx..xx......x........x......xx..x xx..xxxxxxxxx........xxxxxxxxx..x xx..xxxxxxxx..........xxxxxxxx..x xx..............TT..............x xx..............TT..............x xx..xxxxxxxx..........xxxxxxxx..x xx..xxxxxxxxx........xxxxxxxxx..x -xx..xx......x^......^x......xx..x +xx..xx......x........x......xx..x xx..xx......+xx....xx+......xx..x xx..xx....09..xx..xx..90....xx..x xx..xx$$*.00..xx..xx..00.*$$xx..x @@ -367,8 +365,8 @@ xx...xx*$*....xx..xx....$$$xx...x xxx...xx*$....xx..xx....*$xx...xx xxxx...xxxxxxxxx..xxxxxxxxx...xxx xxxxx...xxxxxxxx..xxxxxxxx...xxxx -xxxxxx..^................^..xxxxx -xxxxxxxxxxxxxxxx~~xxxxxxxxxxxxxxx +xxxxxx......................xxxxx +xxxxxxxxxxxxxxxx..xxxxxxxxxxxxxxx xxxxxxxxxxxxxxxx++xxxxxxxxxxxxxxx xxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx ENDMAP @@ -379,15 +377,14 @@ ENDMAP NAME: cross_vault DEPTH: D:12-, !D:$, Depths, !Depths:$ ORIENT: northwest -SUBST: ~=.~, ^=^. MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx............xxxxxxxxxx xxxxxxxx..................xxxxxxx xxxxxx......................xxxxx -xxxxx..........w^^w..........xxxx +xxxxx..........w..w..........xxxx xxxx........wwww++wwww........xxx -xxxx......wwwvvv^^vvvwww......xxx +xxxx......wwwvvv..vvvwww......xxx xxx......wwwwv.9..9.vwwww......xx xxx.....wwwwwv......vwwwww.....xx xxx....wwwwwvv......vvwwwww....xx @@ -396,7 +393,7 @@ xx....wwvvvv....vv....vvvvww....x xx...wwwv......vvvv......vwww...x xx...wwwv....vv8vv8vv....vwww...x xx..wwwwv...vvvv||vvvv...vwwww..x -xx~~wwwwv...vvvv||vvvv...vwwww~~x +xx..wwwwv...vvvv||vvvv...vwwww..x xx..wwwwv....vv8vv8vv....vwwww..x xx...wwwv......vvvv......vwww...x xx...wwwvvvv....vv....vvvvwww...x @@ -407,8 +404,8 @@ xxx.....wwwwwv......vwwwww.....xx xxxx.....wwwwvvvvvvvvwwww.....xxx xxxx.......wwwwwwwwwwww.......xxx xxxxx.........wwwwww.........xxxx -xxxxxx........^~~~~^........xxxxx -xxxxxxxx......^x++x^......xxxxxxx +xxxxxx......................xxxxx +xxxxxxxx.......x++x.......xxxxxxx xxxxxxxxxxx...xx..xx...xxxxxxxxxx xxxxxxxxxxxxxxx..@.xxxxxxxxxxxxxx ENDMAP @@ -423,7 +420,7 @@ KFEAT: ' = alarm trap / floor w:190 MONS: orange crystal statue MAP xxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxx^xxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx xxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx xx.....''''''''.''''''''.....xxx x..bb..xxxxxxxxxxxxxxxxx..bb..xx @@ -464,20 +461,20 @@ MAP ...............................x ...............................x .....cccccccccccccccc..........x -.....c[^...........9cc.........x -.....c^xxxxx+xxxxxx..cc........x -.....c.x9..^^^...9xx..cc.......x +.....c[............9cc.........x +.....c.xxxxx+xxxxxx..cc........x +.....c.x9........9xx..cc.......x .....c.x.xxx=xxxx..xx..cc......x -.....c.x^x$$$$$$xx..xx.9c......x -.....c.+^=$*|||*$xx..xx.c......x -.....c.x^xx$*|||*$xx.9x.c......x -.....c.x9.xx$*|||*$xx^x.c......x -.....c.xx..xx$*|||*$=^+.c......x -.....c9.xx..xx$$$$$$x^x.c......x +.....c.x.x$$$$$$xx..xx.9c......x +.....c.+.=$*|||*$xx..xx.c......x +.....c.x.xx$*|||*$xx.9x.c......x +.....c.x9.xx$*|||*$xx.x.c......x +.....c.xx..xx$*|||*$=.+.c......x +.....c9.xx..xx$$$$$$x.x.c......x .....cc..xx..xxxx=xxx.x.c......x -......cc..xx9...^^^..9x.c......x -.......cc..xxxxxx+xxxxx^c......x -........cc9...........^]c......x +......cc..xx9........9x.c......x +.......cc..xxxxxx+xxxxx.c......x +........cc9............]c......x .........cccccccccccccccc......x ...............................x .........................x diff --git a/crawl-ref/source/dat/des/variable/large_themed.des b/crawl-ref/source/dat/des/variable/large_themed.des index b2a9b42..5e2a981 100644 --- a/crawl-ref/source/dat/des/variable/large_themed.des +++ b/crawl-ref/source/dat/des/variable/large_themed.des @@ -181,13 +181,12 @@ SHUFFLE: w2/l3 SUBST: C = ?5 SUBST: a:. , e:. , b:x. , g:x. , d:x. , B:x. , G:x. , D:x. , ? = x. SUBST: 0 = 4 7 8:20 .:20 -SUBST: T = .:50 ~ SUBST: | : |:30 Z SUBST: ! = +x KFEAT: Z = floor KMONS: Z = hill giant zombie / stone giant zombie / cyclops zombie /\ titan zombie -KFEAT: ( = . w:25 / ~ +KFEAT: ( = . w:25 / . KITEM: ( = any weapon good_item KMONS: 8 = plant KFEAT: 8 = floor @@ -195,11 +194,11 @@ MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxccccccccccxxccccccccccccx xxxx???xxxxxx?***??xxxxxxxxxxxxx.........7...c...444..cccc..........cx -xx$$$$$$?xxxx?.6..?xxxxxxxxxeeee..7..........+........+TT+.........5cx +xx$$$$$$?xxxx?.6..?xxxxxxxxxeeee..7..........+........+..+.........5cx x?$$$$$$.?xx?.666.xxxxxxee0eexxx7....7.......c........cccc.........1cx x.$$$$$$..?x...6..eeeeeeexxxxxxx............7ccccc+ccccccc.........5cx -x....<.....+?....xxxxxxxxx$$$TTcccc+ccccccccccccccTc(((((+..........cx -x?........?xxxx.xxxxxxxx<+$$$TT+.......+TTTTTTTTTTTc(((((c.......***cx +x....<.....+?....xxxxxxxxx$$$..cccc+cccccccccccccc.c(((((+..........cx +x?........?xxxx.xxxxxxxx<+$$$..+.......+...........c(((((c.......***cx xx........?xx...xxxxxxxxxxx!xxxc..4.4..ccccccccccccccccccc444....***cx xxxx?...?xxxx.xxxxxxxxxxxxxCxxxc...4...cxxxCxxxxxxxxxxxxxxxxxxxxx+xxxx xxxxxx!xxxxxx.xxxxxxxbbb;''''''c..4.4..c'''''';ddddddddddxxxxxxxx||xxx @@ -885,8 +884,6 @@ NAME: evilmike_wizard_prison TAGS: no_monster_gen DEPTH: Depths, !Depths:$, Crypt:1-4 ORIENT: southeast -SUBST: ~ = ~:2 .:3 -SUBST: . = ~:1 .:9 NSUBST: 3 = 3:. / *:3 SUBST: ^ : ^mmm KFEAT: ^ = teleport trap @@ -895,7 +892,7 @@ KFEAT: y = rock_wall KMASK: y = no_wall_fixup KPROP: -d|*$14567^ = no_rtele_into FTILE: -mcyd|*$14567^! = FLOOR_PEBBLE_DARKGRAY -FTILE: .@~+23 = FLOOR_HALL +FTILE: .@+23 = FLOOR_HALL TILE: c = DNGN_STONE_WALL_DARKGRAY # This is to mark the wall clearly diggable. TILE: y = WALL_NORMAL @@ -915,12 +912,12 @@ ITEM: acquire any SUBST: - = . MAP xxxxxxxxxxxc.@.cxxxxxxxxxxxx -xxxxxxxxxxxc~~~cxxxxxxxxxxxx -xxxxxxxxxxxc~c.cxxxxxxxxxxxx -xxxxxxxxxxxc~~~cxxxxxxxxxxxx -xxxxcccccccc.c~ccccccccxxxxx -xxxxc-4cc--c~~~c4-cc--cxxxxx -xxxxc--cc4-c3~3c--cc-4cxxxxx +xxxxxxxxxxxc...cxxxxxxxxxxxx +xxxxxxxxxxxc.c.cxxxxxxxxxxxx +xxxxxxxxxxxc...cxxxxxxxxxxxx +xxxxcccccccc.c.ccccccccxxxxx +xxxxc-4cc--c...c4-cc--cxxxxx +xxxxc--cc4-c3.3c--cc-4cxxxxx xxxccmmccmmcc+ccmmccmmccxxxx xxxc3..................cxxxx xxxc3................3.cxxxx diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des index 74172ba..22fe238 100644 --- a/crawl-ref/source/dat/des/variable/mini_monsters.des +++ b/crawl-ref/source/dat/des/variable/mini_monsters.des @@ -2970,7 +2970,7 @@ ENDMAP NAME: onia_ninara_cookie SHUFFLE: ABCDEF -SUBST: A : x, B : x, C : x, D : x, E : x, F : +, G : ~ l:50 w:50 I +SUBST: A : x, B : x, C : x, D : x, E : x, F : +, G : l:50 w:50 I SUBST: x : xvcb SUBST: H = 0 ., J = 1 0:100 $:20 ITEM: any jewellery @@ -3717,7 +3717,7 @@ MAP .""".vvvvv1.... .."..vvvvv.."0. .....vvvvv.""". -.~G..vvvvv..... +..G..vvvvv..... vvvvv.....vvvvv vvvvv."...xx*xv vvvvv."".G.x%8v @@ -6171,21 +6171,20 @@ NAME: minivault_13 TAGS: ruin_abyss DEPTH: D:9-, Elf, Abyss SHUFFLE: AB, CD, EH/FG -KFEAT: ACEH = any trap KITEM: ABCD = gold / nothing SUBST: F = G:99 F:1 KMONS: F = orange crystal statue / silver statue / ice statue MAP ............ .xxxxxxxxxx. -.+.Ac.Cc.9x. +.+..c..c.9x. .x.B+.D+..x. .xcccccc=cx. .x.8+|0c8.x. .x8$c.|c..x. .xc+cccc+cx. -.x.9+EF+..x. -.x..cGHc9.x. +.x.9+.F+..x. +.x..cG.c9.x. .xxxxxxxxxx. ............ ENDMAP -- 1.8.3.2

Issue History
Date Modified	Username	Field	Change
2014-03-15 07:40	minmay	New Issue
2014-03-15 07:40	minmay	File Added: 0001-Remove-damage-traps-from-vaults-except-Zot-5.patch
2014-03-15 17:25	Kate	Issue Monitored: Kate
2014-03-16 03:17	wheals	Issue Monitored: wheals
2014-03-16 03:41	wheals	Note Added: 0025626
2014-03-25 09:14	wheals	Note Added: 0025694
2014-03-25 09:14	wheals	Status	new => resolved
2014-03-25 09:14	wheals	Fixed in Branch	=> 0.14 development branch
2014-03-25 09:14	wheals	Resolution	open => done
2014-03-25 09:14	wheals	Assigned To	=> wheals
2014-04-06 09:07	minmay	Status	resolved => closed
2014-05-15 07:46	Kate	Issue End Monitor: Kate

Notes
(0025626) wheals (administrator) 2014-03-16 03:41	I would be fine with keeping them in Ossuary/Tomb (probably preidentified) but otherwise I totally agree with the idea.

(0025694) wheals (administrator) 2014-03-25 09:14	OK, pushed it with some fixups and the branches I mentioned not changed.

Relationships