diff options
| -rw-r--r-- | crawl-ref/source/dat/altar.des | 12 | ||||
| -rw-r--r-- | crawl-ref/source/dat/float.des | 10 | ||||
| -rw-r--r-- | crawl-ref/source/dat/large.des | 18 | ||||
| -rw-r--r-- | crawl-ref/source/dat/mini.des | 90 |
4 files changed, 69 insertions, 61 deletions
diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des index 1735f5d7f3..1cdc9ebdcf 100644 --- a/crawl-ref/source/dat/altar.des +++ b/crawl-ref/source/dat/altar.des @@ -116,10 +116,10 @@ DEPTH: D:2-18, Swamp, Shoal CHANCE: 9 : local brnd = crawl.random2(13) : if brnd > 10 then -TAGS: no_monster_gen no_rotate +TAGS: no_monster_gen no_rotate # this case almost always has altar access : else -TAGS: no_monster_gen no_pool_fixup no_rotate +TAGS: no_monster_gen no_pool_fixup no_rotate : end MAP ......... @@ -273,9 +273,9 @@ ENDMAP NAME: lemuel_angel_altar DEPTH: D:3-18, Vault : if you.absdepth() > 12 then -MONS: Daeva / Angel +MONS: patrolling Daeva / patrolling Angel : else -MONS: Angel +MONS: patrolling Angel : end KFEAT: C = altar_elyvilon / altar_zin / altar_shining_one MAP @@ -321,7 +321,7 @@ ENDMAP NAME: david_defended_altar_orc DEPTH: D:7-20, Orc -MONS: orc priest +MONS: patrolling orc priest TAGS: uniq_defended_altar KFEAT: D = altar_beogh / w:1 altar_okawaru / w:1 altar_makhleb / w:1 altar_trog MAP @@ -334,7 +334,7 @@ ENDMAP NAME: david_defended_altar_elf DEPTH: D:7-20, Elf -MONS: deep elf priest / w:30 nothing +MONS: patrolling deep elf priest / w:30 nothing TAGS: uniq_defended_altar MAP ccccc... diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des index 5609eae76e..0d9cd202e3 100644 --- a/crawl-ref/source/dat/float.des +++ b/crawl-ref/source/dat/float.des @@ -151,7 +151,8 @@ ENDMAP NAME: MiniTomb ORIENT: float DEPTH: D:15-26, Crypt -MONS: large zombie/nothing, mummy, guardian mummy, greater mummy, large zombie +MONS: large zombie/nothing, mummy, patrolling guardian mummy +MONS: patrolling greater mummy, large zombie MONS: mummy / nothing SHUFFLE: 2F, cbv MAP @@ -241,8 +242,11 @@ ENDMAP NAME: troll_bridge DEPTH: D:9-18 ORIENT: float -TAGS: no_pool_fixup -MONS: patrolling troll w:50 / patrolling rock troll / patrolling iron troll w:5 +TAGS: no_pool_fixup +SUBST: 1 = 1:50 2 3:5 +MONS: patrolling troll +MONS: patrolling rock troll +MONS: patrolling iron troll MAP xxxxx...........................xxxxxx xwwwx...........................xxxxxx diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des index 840d0f4eaf..747a98c11f 100644 --- a/crawl-ref/source/dat/large.des +++ b/crawl-ref/source/dat/large.des @@ -57,7 +57,7 @@ ENDMAP NAME: statuecave_lemuel ORIENT: northeast DEPTH: D:7-27, Lair, Crypt -MONS: ice statue/orange crystal statue +MONS: ice statue / orange crystal statue SHUFFLE: 1|/!* SUBST: *:*$, ?:x., !:., '=w. ITEM: ring of teleportation / ring of levitation @@ -92,7 +92,7 @@ ENDMAP NAME: dragon1_lemuel ORIENT: northeast DEPTH: D:9-20, Lair -MONS: dragon, ice dragon +MONS: patrolling dragon, patrolling ice dragon ITEM: potion of levitation / scroll of teleportation SUBST: ! : ?x SHUFFLE: 1?/2W @@ -166,7 +166,7 @@ ENDMAP NAME: Giant_Chief_Lemuel DEPTH: D:11-22, Orc:3-4 ORIENT: north -MONS: stone giant, frost giant, fire giant +MONS: patrolling stone giant, patrolling frost giant, patrolling fire giant MONS: hill giant, cyclops MONS: w:50 ogre / w:5 ogre-mage / two-headed ogre MONS: wolf / warg @@ -924,8 +924,8 @@ NAME: orc_temple ORIENT: southwest TAGS: no_rotate DEPTH: D:14-26, Orc:2-4 -MONS: orc warlord, orc priest, orc high priest, orc warrior, orc wizard -MONS: orc knight, orc sorcerer +MONS: orc warlord, patrolling orc priest, patrolling orc high priest +MONS: orc warrior, orc wizard, orc knight, orc sorcerer KFEAT: C = altar_beogh MAP xxxxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx @@ -1177,8 +1177,8 @@ DEPTH: D:10-16 ORIENT: south TAGS: no_pool_fixup no_rotate uniq_rubicon CHANCE: 6 -ITEM: ring of levitation / potion of levitation / nothing, potion of levitation -ITEM: nothing, nothing, nothing +ITEM: ring of levitation / potion of levitation / nothing +ITEM: potion of levitation / nothing, nothing, nothing, nothing SHUFFLE: {[(, )gh SUBST: ?:?.w, ?=w., w:lw, ':'.c, '=cx. MAP @@ -1212,8 +1212,8 @@ DEPTH: D:10-16 ORIENT: south TAGS: no_rotate uniq_rubicon CHANCE: 4 -ITEM: ring of levitation / potion of levitation / nothing, potion of levitation -ITEM: nothing, nothing, nothing, nothing +ITEM: ring of levitation / potion of levitation / nothing +ITEM: potion of levitation, nothing, nothing, nothing, nothing SHUFFLE: {[(, fgW, )hi SUBST: ?:?.wW, ?=wW., ':'.c, '=c. MAP diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des index 89329cbc76..e5bdcefa95 100644 --- a/crawl-ref/source/dat/mini.des +++ b/crawl-ref/source/dat/mini.des @@ -101,10 +101,11 @@ ENDMAP ####################################################################### # An item encased in glass. If the player wants it, it can be dug out. -NAME: item_on_display_a -DEPTH: D, Elf, Crypt, Vault +NAME: item_on_display_a +DEPTH: D, Elf, Crypt, Vault CHANCE: 9 -TAGS: no_monster_gen no_item_gen +SUBST: % = %%%* +TAGS: no_monster_gen no_item_gen MAP ..... .mmm. @@ -115,10 +116,11 @@ ENDMAP ##################################################################### # A good item encased in transparent stone. -NAME: item_on_display_b -DEPTH: D, Elf, Crypt, Vault +NAME: item_on_display_b +DEPTH: D, Elf, Crypt, Vault CHANCE: 1 -TAGS: no_monster_gen no_item_gen +SUBST: * = ***| +TAGS: no_monster_gen no_item_gen MAP ..... .nnn. @@ -381,10 +383,10 @@ ENDMAP # Should work without explicit floor margin (dp) NAME: hive_lemuel DEPTH: D:9-27,Hive:* -MONS: killer bee, yellow wasp, red wasp, spiny worm, killer bee zombie +MONS: killer bee, yellow wasp, red wasp, spiny worm SUBST: ? : .w SUBST: 1 = 1 a:2 -SUBST: 1 : 1:15 2 3:2 4:1 5:2 +SUBST: 1 : 1:15 2 3:2 4:1 SUBST: * : * R:3 MAP ???????? @@ -452,7 +454,7 @@ ENDMAP # NAME: water_maze_lemuel TAGS: no_pool_fixup uniq_water_maze_lemuel -ITEM: ring of teleportation +ITEM: ring of teleportation / scroll of teleportation q:3 DEPTH: D:5-27 MAP wwwwwwwww @@ -472,11 +474,11 @@ wwccwwcwcwwccww wwwwwwwww ENDMAP -NAME: water_boxes_lemuel -TAGS: no_pool_fixup uniq_water_maze_lemuel -DEPTH: D:5-27, Swamp -KMONS: * = fungus -KFEAT: * = * +NAME: water_boxes_lemuel +TAGS: no_pool_fixup uniq_water_maze_lemuel +DEPTH: D:5-27, Swamp +KMONS: * = fungus +KFEAT: * = * NSUBST: a = 1:= / *:x NSUBST: b = 1:= / *:x NSUBST: c = 1:= / *:x @@ -533,11 +535,11 @@ ENDMAP ############################################################################## # Greed's colour -NAME: david_greed -CHANCE: 4 -DEPTH: D:10-26, Vault, Elf -ITEM: nothing / any good_item -MONS: silver statue / orange crystal statue / ice statue +NAME: david_greed +CHANCE: 4 +DEPTH: D:10-26, Vault, Elf +ITEM: nothing / any good_item +MONS: silver statue / orange crystal statue / ice statue SHUFFLE: d| MAP xxxxxxxxx @@ -634,7 +636,7 @@ ENDMAP # NAME: minivault_7 TAGS: allow_dup -MONS: queen bee, killer bee, killer bee larva +MONS: patrolling queen bee, patrolling killer bee, killer bee larva MAP ............ ....aaaa.... @@ -655,7 +657,7 @@ ENDMAP # NAME: minivault_8 TAGS: allow_dup -MONS: molten gargoyle +MONS: patrolling molten gargoyle MAP x.x.x.x.x.x. .c.c.c.c.c.x @@ -801,8 +803,8 @@ ENDMAP ################################### # Lava pond # -NAME: minivault_15 -MONS: silver statue / ice statue +NAME: minivault_15 +MONS: silver statue / ice statue KFEAT: 1 = < MAP ......... @@ -818,12 +820,12 @@ ENDMAP ################################### -NAME: minivault_16 -TAGS: allow_dup -CHANCE: 40 +NAME: minivault_16 +TAGS: allow_dup +CHANCE: 40 # as this replaces the former statue only minivaults SHUFFLE: G111 -MONS: orange crystal statue / silver statue / ice statue +MONS: orange crystal statue / silver statue / ice statue MAP ........... ........... @@ -1056,7 +1058,8 @@ ENDMAP # NAME: minivault_29 TAGS: allow_dup -MONS: queen ant, soldier ant, giant ant, ant larva +MONS: patrolling queen ant, patrolling soldier ant +MONS: patrolling giant ant, ant larva MAP .3......3... ...x.xx.x.2. @@ -1101,9 +1104,9 @@ ENDMAP ################################### # Solitary fountain # -NAME: solitary_fountain +NAME: solitary_fountain DEPTH: D, Elf, Vault -TAGS: allow_dup +TAGS: allow_dup SUBST: ?=TUV MAP ..... @@ -1116,8 +1119,8 @@ ENDMAP ################################### # Fountainhead # -NAME: fountainhead -TAGS: allow_dup +NAME: fountainhead +TAGS: allow_dup SUBST: ?=TUV MAP .............. @@ -1139,12 +1142,12 @@ ENDMAP ################################### # Billiards (David Ploog) # -NAME: billiards -MONS: orc wizard, deep elf conjurer +NAME: billiards +MONS: orc wizard, deep elf conjurer SHUFFLE: 1*/2d -SUBST: * = * |:1 %:4 -SUBST: d = * | -NSUBST: X = + / x +SUBST: * = * |:1 %:4 +SUBST: d = * | +NSUBST: X = + / x MAP ............. .xxxxxxxxxxx. @@ -1325,11 +1328,12 @@ ENDMAP NAME: onia_ninara_009_dug_in_and_dangerous TAGS: allow_dup DEPTH: D:8-26, Vault -SHUFFLE: vcb, AB?/CD!, d<> +SHUFFLE: vcb, AB?/CD!, d<>, de SUBST: A=9, B=8, C=1, D=9 SUBST: ? = %:10 *:50 |:60 SUBST: ! = %:90 *:30 |:10 -ITEM: wand of digging/wand of disintegration/ring of teleportation/stone of earth elementals +ITEM: wand of digging / wand of disintegration +ITEM: ring of teleportation / stone of earth elementals MAP ........... .vvnvvvnvv. @@ -1355,7 +1359,7 @@ SUBST: 3 = 3. SUBST: . = . 1:1 KFEAT: ? = * KMONS: ? = plant -TAGS: no_monster_gen +TAGS: no_monster_gen MAP ..wwwww... .wwwwwwww2 @@ -1397,10 +1401,10 @@ ENDMAP ############################## # Secret library minivault # -NAME: library +NAME: library DEPTH: 1-27 -TAGS: mini_float allow_dup -ITEM: any book w:20/any scroll/nothing +TAGS: mini_float allow_dup +ITEM: any book w:20 / any scroll / nothing MAP x=xx xddx |