diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-15 14:37:29 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-15 14:55:40 -0600 |
| commit | ca0822add27cfd9c9871abebb43b43a4f3bc93d7 (patch) | |
| tree | a9591eddd99a0c052e3b9692352ad31952844f4c | |
| parent | 41433f0fcd2501fbaf8c75c8e69c1ad75aa36d8d (diff) | |
| download | crawl-ref-ca0822add27cfd9c9871abebb43b43a4f3bc93d7.tar.gz crawl-ref-ca0822add27cfd9c9871abebb43b43a4f3bc93d7.zip | |
Make mini_float the default; add a no_exits tag instead.
There have been so many problems with minivaults not having exits that
this is an easier solution than the alternative.
You're still allowed to explicitly place exits, of course, in which case
floating exits go away.
There are a couple of other small tweaks to the level documentation here
as well.
35 files changed, 306 insertions, 373 deletions
diff --git a/crawl-ref/docs/develop/levels/introduction.txt b/crawl-ref/docs/develop/levels/introduction.txt index c75a9e5862..a8553406e3 100644 --- a/crawl-ref/docs/develop/levels/introduction.txt +++ b/crawl-ref/docs/develop/levels/introduction.txt @@ -170,11 +170,6 @@ If you do use them, > is almost always better than <. Entry points ------------ -Minivaults can use explicit @ exits, or be completely surrounded by -one space of floor for accessibility. Alternatively, you can request -that the dungeon builder pick appropriate exits as it does for -floating vaults by using the "mini_float" tag. - The entry point '@' must be present for all vaults (except for full-screen vaults where it must not, and for floating vaults and minivaults where it is optional). All @ will be connected to floor @@ -191,10 +186,11 @@ The level-builder will also implicitly treat doors and runed doors on the edge of a map as explicit exits (the same as using @) and connect them to the rest of the level. -Not using @ and allowing the level-builder to pick exits is -acceptable in floating vaults, but when you use no @'s with this -feature in mind, please add comments stating this - else somebody -may just add @'s later on. :) +Not using @ will cause the level builder to pick exits randomly from +non-solid squaress on the edge of your vault. You should always either +have explicit exits or accessible squares; if the vault is completely +inaccessible (by exits, non-solid squares that can act as exits, or by +stair), it will fail to load - so don't do that. Minivaults vs. random vaults ---------------------------- diff --git a/crawl-ref/docs/develop/levels/syntax.txt b/crawl-ref/docs/develop/levels/syntax.txt index 9704765719..e70fc48499 100644 --- a/crawl-ref/docs/develop/levels/syntax.txt +++ b/crawl-ref/docs/develop/levels/syntax.txt @@ -44,9 +44,10 @@ Features -------- @ - Entry point - must be on outside edge. This point will be connected to the rest of the level with a corridor for both normal vaults and minivaults. - If a normal vault, or a minivault tagged 'mini_float', has no entry points - defined, random traversable squares on its edge will be chosen and - connected, as if they had the @ glyph. + If a vault has no entry points defined, random traversable squares on + its edge will be chosen and connected, as if they had the @ glyph. (In + the rare event where you don't want this - usually completely enclosed + vaults accessible through some other means - use the "no_exits" tag.) The + and = glyphs, when placed on the edge of the map, are also considered entry points. @@ -377,11 +378,10 @@ TAGS: Tags go on a TAGS: line and are space-separated. You can have several the area. * "no_item_gen": Prevents random item generation in the vault. Items explicitly placed by the vault are not affected. - * "mini_float": applicable only to minivaults, requests that - the dungeon builder pick random exits from the minivault and - connect it to the rest of the level, similar to the exit behaviour - for floating vaults. Has no effect if the minivault has explicitly - defined exits (the @ glyph). + * "no_exits": In the absence of explicit exits, requests that the + dungeon builder does not try to pick its own exits from the + (mini)vault. Usually only used when the vault is completely + enclosed and accessible through other means. * "no_monster_gen": Prevents random monster generation at the time of the vault's creation. Highly advised for arrival vaults with a player-hostile geography, MUST-HAVE for those with water/lava. @@ -442,16 +442,13 @@ TAGS: Tags go on a TAGS: line and are space-separated. You can have several removing walls near the edges, making it look like a ruin. You can request that a vault be ruined only in a particular branch using "ruin_<branch>". For instance: "ruin_lair". - * "trowel_portal": This vault can be created by the Trowel card. - This tag should be used exclusively for the generic (one tile) - entries to portal vaults, like bazaars and labyrinths. Other - portal vaults may be eligible for Trowel, too. * "no_dump": Don't dump out this vault's name in the list of vaults generated during the game. Use this if the vault is predictable (like the Vaults:5 and Slime:6 vaults) or are for weird internal uses (like the shoalhut vaults). * "unrand": Don't pick this vault randomly by DEPTH. Can still be - picked by tag or PLACE. + picked by tag or PLACE. Almost exclusively used by layouts and + subvaults. * "transparent": Marks the vault as potentially passable for the purposes of level connectivity. By default, vaults are considered non-passable regardless of their contents. With this tag, the diff --git a/crawl-ref/source/dat/des/altar/altar.des b/crawl-ref/source/dat/des/altar/altar.des index 0d355970e6..e5c8954e81 100644 --- a/crawl-ref/source/dat/des/altar/altar.des +++ b/crawl-ref/source/dat/des/altar/altar.des @@ -86,7 +86,7 @@ ENDMAP ############################################################################## NAME: basic_altar -TAGS: allow_dup extra no_monster_gen transparent mini_float decor +TAGS: allow_dup extra no_monster_gen transparent decor DEPTH: 5- CHANCE: 20% (Orc) CHANCE: 10% (Snake, Forest) @@ -153,7 +153,7 @@ MAP ENDMAP NAME: lemuel_tele_altar -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2-, Vaults SUBST: Y = X x KFEAT: X = known teleport trap @@ -277,7 +277,7 @@ ENDMAP # NAME: lemuel_hellish_altar DEPTH: D:8-, Crypt, Geh -TAGS: no_monster_gen mini_float +TAGS: no_monster_gen MONS: iron devil/orange demon MONS: hell beast/red devil MONS: iron imp diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des index 283229376d..c8cdcc0726 100644 --- a/crawl-ref/source/dat/des/altar/overflow.des +++ b/crawl-ref/source/dat/des/altar/overflow.des @@ -87,7 +87,7 @@ ENDMAP # A ruined temple NAME: evilmike_ruin_ashenzari TAGS: uniq_altar_ashenzari temple_overflow_1 temple_overflow_ashenzari -TAGS: transparent mini_float decor +TAGS: transparent decor SUBST: x = xxxxx-, - = ----. TILE: x = WALL_BRICK_VINES FTILE: -V_ = FLOOR_SANDSTONE @@ -117,7 +117,7 @@ MAP ENDMAP NAME: ashenzari_conservatory_becter -TAGS: temple_overflow_1 temple_overflow_ashenzari transparent mini_float +TAGS: temple_overflow_1 temple_overflow_ashenzari transparent DEPTH: D:2-9 KFEAT: _ = altar_ashenzari MAP @@ -133,7 +133,7 @@ ENDMAP NAME: cheibrodos_ashenzari_chains TAGS: temple_overflow_1 -TAGS: temple_overflow_ashenzari uniq_altar_ashenzari transparent mini_float +TAGS: temple_overflow_ashenzari uniq_altar_ashenzari transparent DEPTH: D:3-9 KFEAT: _ = altar_ashenzari KFEAT: m = iron_grate @@ -149,7 +149,7 @@ ENDMAP NAME: cheibriados_altar_1 TAGS: uniq_altar_cheibriados temple_overflow_1 temple_overflow_cheibriados -TAGS: transparent mini_float decor +TAGS: transparent decor KFEAT: _ = altar_cheibriados : interest_check(_G) MAP @@ -160,7 +160,7 @@ ENDMAP NAME: cheibriados_altar_2 TAGS: uniq_altar_cheibriados temple_overflow_1 temple_overflow_cheibriados -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2- WEIGHT: 1 KPROP: 1 = no_rtele_into @@ -248,7 +248,7 @@ ccc+ccc ENDMAP NAME: chei_snail_safe_becter -TAGS: overflow_altar_cheibriados transparent mini_float no_monster_gen +TAGS: overflow_altar_cheibriados transparent no_monster_gen TAGS: transparent DEPTH: D:4-9 WEIGHT: 5 @@ -295,7 +295,7 @@ ENDMAP NAME: grunt_dithmenos_smoke TAGS: uniq_altar_dithmenos temple_overflow_1 temple_overflow_dithmenos -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2- KFEAT: C = altar_dithmenos MARKER: C = lua:fog_machine { cloud_type = "black smoke", \ @@ -475,7 +475,7 @@ ENDMAP NAME: fedhas_altar_1 TAGS: uniq_altar_fedhas temple_overflow_1 temple_overflow_fedhas -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2- KFEAT: C = altar_fedhas MONS: plant @@ -490,7 +490,7 @@ ENDMAP NAME: fedhas_altar_2 TAGS: uniq_altar_fedhas temple_overflow_1 temple_overflow_fedhas -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2- KFEAT: C = altar_fedhas NSUBST: w = 2:W / *:w @@ -522,7 +522,7 @@ MAP ENDMAP NAME: fedhas_altar_4 -TAGS: uniq_altar_fedhas temple_overflow_1 temple_overflow_fedhas mini_float +TAGS: uniq_altar_fedhas temple_overflow_1 temple_overflow_fedhas TAGS: decor DEPTH: D:2- KFEAT: C = altar_fedhas @@ -595,7 +595,7 @@ ENDMAP NAME: fedhas_ov_isle_minmay TAGS: temple_overflow_1 temple_overflow_fedhas uniq_altar_fedhas no_monster_gen -TAGS: transparent mini_float +TAGS: transparent DEPTH: D:2-9 MONS: plant / bush w:5 KPROP: 1_ = no_rtele_into @@ -620,7 +620,7 @@ MAP ENDMAP NAME: fedhas_altar_fruit_tree -TAGS: uniq_altar_fedhas temple_overflow_1 temple_overflow_fedhas mini_float +TAGS: uniq_altar_fedhas temple_overflow_1 temple_overflow_fedhas TAGS: no_item_gen no_rotate no_vmirror decor DEPTH: D:2- NSUBST: g = 4:f/*:. @@ -652,7 +652,7 @@ ENDMAP NAME: fedhas_bush_and_centaur_altar TAGS: temple_overflow_1 temple_overflow_fedhas uniq_altar_fedhas -TAGS: transparent mini_float +TAGS: transparent DEPTH: D:3-15 KFEAT: _ = altar_fedhas MONS: centaur, bush @@ -867,7 +867,7 @@ ccccccccccccccc ENDMAP NAME: kiku_gazebo_garden_becter -TAGS: temple_overflow_1 temple_overflow_kikubaaqudgha transparent mini_float +TAGS: temple_overflow_1 temple_overflow_kikubaaqudgha transparent DEPTH: D:2-9 KMONS: f = w:2 col:darkgrey plant name:withered name_adjective \ tile:mons_withered_plant / w:1 col:lightgrey plant name:withered \ @@ -894,7 +894,7 @@ MAP ENDMAP NAME: kiku_gazebo_pond_becter -TAGS: temple_overflow_1 temple_overflow_kikubaaqudgha transparent mini_float +TAGS: temple_overflow_1 temple_overflow_kikubaaqudgha transparent DEPTH: D:2-9 KFEAT: _ = altar_kikubaaqudgha KMASK: Ww = no_monster_gen @@ -951,7 +951,7 @@ ENDMAP NAME: demons_altar DEPTH: D:3-11, Orc:1-3 TAGS: no_monster_gen patrolling temple_overflow_1 temple_overflow_makhleb -TAGS: layout_rooms layout_city layout_open layout_cross mini_float +TAGS: layout_rooms layout_city layout_open layout_cross KFEAT: _ = altar_makhleb # Either one slow type 3 or 4 demon (iron devil or smoke demon) or # three slow type 5 demons (iron imp). @@ -981,7 +981,7 @@ ENDMAP NAME: bloody_makhleb TAGS: uniq_altar_makhleb temple_overflow_1 temple_overflow_makhleb -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2-12, Orc, Vaults KPROP: . = bloody / nothing KFEAT: _ = altar_makhleb @@ -1011,7 +1011,7 @@ ccc.ccc ENDMAP NAME: makhleb_blood_cavern_becter -TAGS: uniq_altar_makhleb temple_overflow_1 temple_overflow_makhleb mini_float +TAGS: uniq_altar_makhleb temple_overflow_1 temple_overflow_makhleb DEPTH: 2-9 : if you.absdepth() < 6 then : dgn.delayed_decay(_G, '1', 'human corpse') @@ -1042,7 +1042,7 @@ ENDMAP NAME: makhleb_heckhound_becter TAGS: uniq_altar_makhleb temple_overflow_1 temple_overflow_makhleb -TAGS: no_monster_gen mini_float +TAGS: no_monster_gen DEPTH: D:2-9 KFEAT: _ = altar_makhleb KMONS: _ = hound perm_ench:bleeding @@ -1060,7 +1060,7 @@ xy...yx ENDMAP NAME: makhleb_grotto_becter -TAGS: no_monster_gen temple_overflow_1 temple_overflow_makhleb mini_float +TAGS: no_monster_gen temple_overflow_1 temple_overflow_makhleb DEPTH: D:2-9 MONS: iron imp w:1 / shadow imp w:1 / crimson imp KFEAT: _ = altar_makhleb @@ -1146,7 +1146,7 @@ CCCCCCCC+++CCCCCCCC ENDMAP NAME: nemelex_dance_club_becter -TAGS: overflow_altar_nemelex_xobeh transparent mini_float +TAGS: overflow_altar_nemelex_xobeh transparent TAGS: no_rotate no_vmirror no_monster_gen no_item_gen DEPTH: D:2-9 : if you.depth() <= 4 then @@ -1175,7 +1175,7 @@ MAP ENDMAP NAME: nemelex_diamond_rough_becter -TAGS: overflow_altar_nemelex_xobeh transparent mini_float +TAGS: overflow_altar_nemelex_xobeh transparent KFEAT: _ = altar_nemelex_xobeh COLOUR: x = lightred COLOUR: 'b = silver @@ -1198,7 +1198,7 @@ MAP ENDMAP NAME: nemelex_lonely_heart_becter -TAGS: overflow_altar_nemelex_xobeh transparent mini_float +TAGS: overflow_altar_nemelex_xobeh transparent TAGS: no_rotate no_vmirror no_monster_gen no_item_gen DEPTH: D:2-9 MONS: nothing w:4 / jessica w:1 @@ -1219,7 +1219,7 @@ MAP ENDMAP NAME: nemelex_spade_bored_becter -TAGS: overflow_altar_nemelex_xobeh transparent mini_float +TAGS: overflow_altar_nemelex_xobeh transparent TAGS: no_rotate no_vmirror no_monster_gen no_item_gen DEPTH: D:2-9 KFEAT: _ = altar_nemelex_xobeh @@ -1356,7 +1356,7 @@ ENDMAP NAME: okawaru_gym_becter TAGS: uniq_altar_okawaru temple_overflow_1 temple_overflow_okawaru -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2-9 KFEAT: _ = altar_okawaru MAP @@ -1518,7 +1518,7 @@ ENDMAP # general_overflow_altar cannot contain the power of Qazlal NAME: nicolae_qazlal_general_emergency TAGS: temple_overflow_qazlal temple_overflow_1 uniq_altar_qazlal -TAGS: no_monster_gen no_pool_fixup mini_float +TAGS: no_monster_gen no_pool_fixup DEPTH: D:2- SHUFFLE: xXY / xXY / xXY / abc SHUFFLE: XY @@ -1642,7 +1642,7 @@ ENDMAP NAME: bloody_trog TAGS: uniq_altar_trog temple_overflow_1 temple_overflow_trog -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2-12, Orc, Vaults KPROP: . = bloody / nothing KFEAT: _ = altar_trog @@ -1656,7 +1656,7 @@ ENDMAP NAME: trog_ov_bears_minmay TAGS: temple_overflow_1 temple_overflow_trog uniq_altar_trog -TAGS: transparent mini_float +TAGS: transparent DEPTH: D:6- : if you.absdepth() < 10 then MONS: black bear @@ -1775,7 +1775,7 @@ xx..._"..xx ENDMAP NAME: trog_hazing_becter -TAGS: overflow_altar_trog mini_float no_monster_gen no_item_gen no_pool_fixup +TAGS: overflow_altar_trog no_monster_gen no_item_gen no_pool_fixup DEPTH: D:2-9, Orc:1-3 MONS: goblin ; stone q:5 . animal skin / \ hobgoblin ; stone q:5 . animal skin / \ @@ -1799,7 +1799,7 @@ xxTw.wTxx ENDMAP NAME: trog_three_pillars_becter -TAGS: overflow_altar_trog transparent mini_float decor +TAGS: overflow_altar_trog transparent decor DEPTH: D:2-9 KFEAT: _ = altar_trog SUBST: y = x.. @@ -1827,7 +1827,7 @@ ENDMAP NAME: fiery_altar_vehumet DEPTH: D:2-10, Orc:1-3 WEIGHT: 8 -TAGS: temple_overflow_1 temple_overflow_vehumet mini_float +TAGS: temple_overflow_1 temple_overflow_vehumet MARKER: : = lua:fog_machine { cloud_type = "flame", \ pow_min = 6, pow_max = 8, delay_min = 55, delay_max = 75, \ size = 2, walk_dist = 0, spread_rate= 0 } @@ -1843,7 +1843,7 @@ ENDMAP NAME: vehumet_statue DEPTH: D:4-10 -TAGS: temple_overflow_1 temple_overflow_vehumet transparent mini_float +TAGS: temple_overflow_1 temple_overflow_vehumet transparent SHUFFLE: 12 MONS: statue name:charred name_adjective tile:mons_statue_mage \ hp:12 hd:3 spells:throw_flame @@ -1862,7 +1862,7 @@ ENDMAP NAME: vehumet_crystals DEPTH: D:2-10, Orc:1-3 -TAGS: temple_overflow_1 temple_overflow_vehumet transparent mini_float +TAGS: temple_overflow_1 temple_overflow_vehumet transparent KFEAT: _ = altar_vehumet : interest_check(_G) MAP @@ -1879,7 +1879,7 @@ ENDMAP NAME: vehumet_altar_wand_db TAGS: uniq_altar_vehumet temple_overflow_1 temple_overflow_vehumet -TAGS: transparent mini_float patrolling +TAGS: transparent patrolling DEPTH: D:2-9 KFEAT: _ = altar_vehumet MONS: goblin; wand of flame | wand of frost | wand of magic darts /\ @@ -1928,7 +1928,7 @@ ENDMAP NAME: xom_teletrap_fun TAGS: temple_overflow_1 temple_overflow_xom uniq_altar_xom -TAGS: transparent mini_float +TAGS: transparent KFEAT: _ = altar_xom NSUBST: T = . / T KFEAT: T = known teleport trap @@ -1941,7 +1941,7 @@ MAP ENDMAP NAME: xom_butterflies -TAGS: temple_overflow_1 temple_overflow_xom transparent mini_float +TAGS: temple_overflow_1 temple_overflow_xom transparent KFEAT: _ = altar_xom KITEM: _ = wand of random effects w:40 / any wand COLOUR: . = random @@ -2039,7 +2039,7 @@ ENDMAP NAME: yredelemnul_altar_generic TAGS: uniq_altar_yredelemnul temple_overflow_1 temple_overflow_yredelemnul -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:2- KFEAT: C = altar_yredelemnul KMONS: f = w:2 col:darkgrey plant name:withered name_adjective \ @@ -2099,7 +2099,7 @@ ccccccccccccccc ENDMAP NAME: yredelemnul_forgotten_temple_becter -TAGS: temple_overflow_1 temple_overflow_yredelemnul no_monster_gen no_item_gen mini_float +TAGS: temple_overflow_1 temple_overflow_yredelemnul no_monster_gen no_item_gen DEPTH: D:2-9 KFEAT: _ = altar_yredelemnul KFEAT: . = known web trap / . @@ -2167,7 +2167,7 @@ ENDMAP NAME: zin_purify TAGS: no_item_gen no_monster_gen temple_overflow_1 temple_overflow_zin -TAGS: transparent mini_float +TAGS: transparent DEPTH: D:2-9, Orc:1-3 KFEAT: _ = altar_zin KFEAT: v = general shop name:Zin type:Purification suffix:Station count:1 \ @@ -2218,7 +2218,7 @@ ENDMAP NAME: zin_academy TAGS: no_item_gen no_monster_gen temple_overflow_1 temple_overflow_zin -TAGS: transparent mini_float +TAGS: transparent DEPTH: D:2-9 KFEAT: _ = altar_zin COLOUR: c = white @@ -2239,7 +2239,7 @@ ENDMAP NAME: zin_statuary TAGS: no_item_gen no_monster_gen temple_overflow_1 temple_overflow_zin -TAGS: transparent mini_float +TAGS: transparent DEPTH: D:2-9 KFEAT: _ = altar_zin COLOUR: c = white @@ -2316,7 +2316,7 @@ MAP ENDMAP NAME: tso_oasis_becter -TAGS: temple_overflow_1 temple_overflow_the_shining_one transparent mini_float +TAGS: temple_overflow_1 temple_overflow_the_shining_one transparent TAGS: no_item_gen no_monster_gen KMONS: f = plant SUBST: ` = ff. @@ -2724,7 +2724,7 @@ NAME: general_overflow_altar DEPTH: D:2- WEIGHT: 10 TAGS: no_monster_gen no_pool_fixup temple_overflow_generic_1 -TAGS: transparent mini_float +TAGS: transparent SHUFFLE: xXY / xXY / xXY / abc SHUFFLE: XY SUBST: X=+, Y=x, a=w, b=w, c=w @@ -2745,7 +2745,7 @@ ENDMAP NAME: old_standard_altar DEPTH: D, Depths -TAGS: transparent mini_float allow_dup decor temple_overflow_generic_1 +TAGS: transparent allow_dup decor temple_overflow_generic_1 SHUFFLE: cvxxxx : altar_check(_G) MAP @@ -2791,7 +2791,7 @@ b.b ENDMAP NAME: lemuel_doored_altar -TAGS: transparent mini_float decor temple_overflow_generic_1 +TAGS: transparent decor temple_overflow_generic_1 DEPTH: D:1-, Vaults, Lair, Elf, Crypt SHUFFLE: XY SUBST: X = . diff --git a/crawl-ref/source/dat/des/altar/vehumet_trees.des b/crawl-ref/source/dat/des/altar/vehumet_trees.des index 585098d130..25934cee91 100644 --- a/crawl-ref/source/dat/des/altar/vehumet_trees.des +++ b/crawl-ref/source/dat/des/altar/vehumet_trees.des @@ -31,7 +31,7 @@ end NAME: dk_vehumet_trees DEPTH: 2-10 -TAGS: temple_overflow_vehumet mini_float +TAGS: temple_overflow_vehumet WEIGHT: 0 KFEAT: _ = altar_vehumet SUBST: x : G:1 t:1 x:8 diff --git a/crawl-ref/source/dat/des/altar/yredelemnul_ordeal.des b/crawl-ref/source/dat/des/altar/yredelemnul_ordeal.des index 4fc8f77f5f..b77550e631 100644 --- a/crawl-ref/source/dat/des/altar/yredelemnul_ordeal.des +++ b/crawl-ref/source/dat/des/altar/yredelemnul_ordeal.des @@ -29,7 +29,7 @@ end }} NAME: dk_yredelemnul_ordeal -TAGS: uniq_altar_yredelemnul temple_overflow_yredelemnul mini_float +TAGS: uniq_altar_yredelemnul temple_overflow_yredelemnul DEPTH: D:2-10 MONS: goblin zombie / kobold zombie / human zombie / jackal zombie, \ goblin skeleton / kobold skeleton / human skeleton / jackal skeleton diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des index 030c9bcab3..d3ae8eebf3 100644 --- a/crawl-ref/source/dat/des/branches/abyss.des +++ b/crawl-ref/source/dat/des/branches/abyss.des @@ -94,7 +94,7 @@ xx+xx ENDMAP NAME: abyss_entry_crystal -TAGS: nolayout_encompass mini_float +TAGS: nolayout_encompass : abyss_entry(_G, 'O') SHUFFLE: AB SUBST: A : .:50 G:50 T U V Y t @@ -109,7 +109,7 @@ xb.....bx ENDMAP NAME: abyss_entry_glasseish -TAGS: nolayout_encompass mini_float transparent +TAGS: nolayout_encompass transparent WEIGHT: 5 : abyss_entry(_G, 'O') KPROP: T = no_rtele_into @@ -521,7 +521,7 @@ SUBST: + = M, ' = x:5 c:2 v:1 b:1, " = ., % = %%***| SUBST: AB : wwl, CD : wll NSUBST: M : 1:+ / 2 = mmm+ / * = m:19 +:1 : else -TAGS: extra transparent mini_float +TAGS: extra transparent WEIGHT: 1 SUBST: M = m, 34'" = ., ABCD = W : end @@ -705,7 +705,7 @@ x.xxxd.x+xx.. ENDMAP NAME: hangedman_abyss_or_decor_stabs -TAGS: transparent mini_float no_pool_fixup decor +TAGS: transparent no_pool_fixup decor DEPTH: D, Depths, Abyss : if you.branch() == "Abyss" then SUBST: xc = xxxxcccb, ' = %0, " = wl... @@ -728,7 +728,7 @@ MAP ENDMAP NAME: hangedman_abyss_or_decor_jellyfish_corner -TAGS: transparent mini_float decor +TAGS: transparent decor DEPTH: D:4-, Depths, Abyss WEIGHT: 5 (D), 10 : if you.branch() == "Abyss" then @@ -757,7 +757,7 @@ ccccccccc...J. ENDMAP NAME: hangedman_abyss_or_decor_lesser_grid -TAGS: transparent mini_float no_pool_fixup decor +TAGS: transparent no_pool_fixup decor DEPTH: D, Depths, Abyss : if you.branch() == "Abyss" then SHUFFLE: ABCDEF, "' @@ -785,7 +785,7 @@ MAP ENDMAP NAME: hangedman_abyss_or_decor_clamps -TAGS: transparent mini_float no_pool_fixup decor +TAGS: transparent no_pool_fixup decor DEPTH: D:8-, Depths, Abyss KFEAT: @ = + SHUFFLE: ABCDEFGH, '" @@ -1367,7 +1367,7 @@ cc.4nnn.....nnn4.cc ENDMAP NAME: hangedman_abyss_rune_treasure_dump -TAGS: abyss_rune unrand no_monster_gen no_item_gen mini_float +TAGS: abyss_rune unrand no_monster_gen no_item_gen WEIGHT: 2 KMONS: 12 = great orb of eyes perm_ench:shapeshifter KMONS: 34 = guardian serpent perm_ench:shapeshifter diff --git a/crawl-ref/source/dat/des/branches/coc.des b/crawl-ref/source/dat/des/branches/coc.des index 38fb049c22..c3a7265d25 100644 --- a/crawl-ref/source/dat/des/branches/coc.des +++ b/crawl-ref/source/dat/des/branches/coc.des @@ -47,7 +47,7 @@ end ############################################################################## NAME: grunt_cocytus_stairs_refrigerator -TAGS: transparent mini_float +TAGS: transparent DEPTH: Coc:1-6 COLOUR: c = blue MONS: Ice Fiend, blizzard demon, ice devil, blue devil, white imp @@ -72,7 +72,7 @@ ENDMAP NAME: nicolae_coc_three_mouths DEPTH: Coc, !Coc:$ -TAGS: transparent extra mini_float decor +TAGS: transparent extra decor SUBST: j = >}}, b = >]], c = >)) SHUFFLE: )}] MAP diff --git a/crawl-ref/source/dat/des/branches/dis.des b/crawl-ref/source/dat/des/branches/dis.des index 3d53a3bd43..ebbc25ae0d 100644 --- a/crawl-ref/source/dat/des/branches/dis.des +++ b/crawl-ref/source/dat/des/branches/dis.des @@ -194,7 +194,7 @@ ENDMAP ############################################################################## NAME: hangedman_player_shredder -TAGS: transparent mini_float no_monster_gen no_item_gen no_pool_fixup +TAGS: transparent no_monster_gen no_item_gen no_pool_fixup DEPTH: Dis:1-6, Zot:1-4 : if you.branch() == "Dis" then KMONS: 01 = tormentor diff --git a/crawl-ref/source/dat/des/branches/elf.des b/crawl-ref/source/dat/des/branches/elf.des index 02b62ed079..384391dfc1 100644 --- a/crawl-ref/source/dat/des/branches/elf.des +++ b/crawl-ref/source/dat/des/branches/elf.des @@ -689,7 +689,6 @@ ENDMAP NAME: guppyfry_elf_castle DEPTH: Elf:2- -TAGS: mini_float MONS: deep elf fighter / deep elf mage / deep elf knight MONS: deep elf blademaster / deep elf death mage / deep elf sorcerer MONS: plant @@ -712,7 +711,6 @@ ENDMAP NAME: guppyfry_elf_garden DEPTH: Elf:2- -TAGS: mini_float MONS: deep elf fighter / deep elf mage / deep elf priest MONS: deep elf blademaster / deep elf master archer / deep elf sorcerer MONS: plant @@ -760,7 +758,6 @@ ENDMAP NAME: guppyfry_elf_lava DEPTH: Elf:2- -TAGS: mini_float MONS: deep elf conjurer / deep elf mage / deep elf summoner MONS: deep elf annihilator / deep elf death mage / deep elf demonologist KFEAT: v = general shop type:Elven suffix:Fire count:7 ; \ @@ -846,7 +843,7 @@ ENDMAP NAME: nicolae_elf_stone_circles DEPTH: Elf -TAGS: transparent extra decor allow_dup luniq mini_float +TAGS: transparent extra decor allow_dup luniq SHUFFLE: za, bd SUBST: a = A, b = B, zd = c SHUFFLE: AB, DEFG @@ -1085,7 +1082,7 @@ cG..xJ..E.x.xxDxx ENDMAP NAME: hangedman_elven_pyramids -TAGS: extra transparent mini_float decor +TAGS: extra transparent decor DEPTH: Elf SHUFFLE: ABCD, +-_, yz / yz / zy SUBST: A : ZZ., B : Z., C : Z.., D = . diff --git a/crawl-ref/source/dat/des/branches/geh.des b/crawl-ref/source/dat/des/branches/geh.des index 09422d0f28..1d6ba8860d 100644 --- a/crawl-ref/source/dat/des/branches/geh.des +++ b/crawl-ref/source/dat/des/branches/geh.des @@ -289,7 +289,7 @@ ENDMAP NAME: nicolae_geh_sunburst DEPTH: Geh, !Geh:$ -TAGS: transparent extra mini_float decor +TAGS: transparent extra decor SHUFFLE: abcdefgh/!''''!!!/!!''!!''/!''!!''!/!'!'!'!'/!!!'!!!'/!!!!!!!'/'''''''' SUBST: { = }}}{ SHUFFLE: }]), ([{ @@ -342,7 +342,7 @@ ENDMAP NAME: nicolae_geh_fiery_graves DEPTH: Geh, !Geh:$ -TAGS: transparent extra decor mini_float +TAGS: transparent extra decor SUBVAULT: A : nicolae_fiery_grave SUBVAULT: B : nicolae_fiery_grave SUBVAULT: C : nicolae_fiery_grave diff --git a/crawl-ref/source/dat/des/branches/hell.des b/crawl-ref/source/dat/des/branches/hell.des index 583e9e7b34..21a9519fd2 100644 --- a/crawl-ref/source/dat/des/branches/hell.des +++ b/crawl-ref/source/dat/des/branches/hell.des @@ -264,7 +264,7 @@ ENDMAP ############################################################################## NAME: grunt_hell_horde -TAGS: nolayout_encompass mini_float uniq_hell_entry_high +TAGS: nolayout_encompass uniq_hell_entry_high : hell_entry_feature(_G, 'O') NSUBST: + = 1:+ / 1:+x / *:x MONS: hell hog / hell hound, hell hound / nothing diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des index b9bace7a5b..2c36c4ef73 100644 --- a/crawl-ref/source/dat/des/branches/lair.des +++ b/crawl-ref/source/dat/des/branches/lair.des @@ -694,7 +694,7 @@ ENDMAP # NAME: bobbens_dragon_lair_wall DEPTH: Lair:2- -TAGS: no_monster_gen mini_float +TAGS: no_monster_gen : if you.depth() >= 7 then MONS: fire dragon w:9 / lindwurm w:1 MONS: fire drake / w:2 mottled dragon / w:4 nothing @@ -784,7 +784,7 @@ ENDMAP # NAME: hibernation_bobbens DEPTH: Lair -TAGS: allow_dup no_monster_gen no_item_gen mini_float +TAGS: allow_dup no_monster_gen no_item_gen MONS: ice dragon / fire dragon / swamp dragon / anaconda w:5 MONS: swamp dragon / hydra / catoblepas MONS: swamp drake / w:20 spiny frog / w:20 komodo dragon /\ @@ -998,7 +998,6 @@ ENDMAP # Two stream minivaults NAME: guppyfry_lair_drakes DEPTH: Lair -TAGS: mini_float WEIGHT: 15 : if you.depth() > 3 and crawl.coinflip() then MONS: fire drake / swamp drake / mottled dragon @@ -1027,7 +1026,7 @@ ENDMAP ############################################################################### # A polar bear lost in the jungle, how odd NAME: roderic_lost_polar_bear -TAGS: no_monster_gen mini_float +TAGS: no_monster_gen DEPTH: Lair:3-7 MONS: plant, polar_bear, bush SUBST: ? = 1t @@ -1170,7 +1169,6 @@ t1..t1.t.tt.t111.t...c..4C4..c..1t.1.tt.t. ENDMAP NAME: wad_woods_01 -TAGS: mini_float DEPTH: Lair, Forest : wad_woods_setup(_G, "small", 2, true, 21, 2, 8) MAP @@ -1191,7 +1189,6 @@ ttt.tt4ttt..%.4ttOttt ENDMAP NAME: wad_woods_02 -TAGS: mini_float DEPTH: Lair, Forest : wad_woods_setup(_G, "small", 2, false, 0, 0, 0) MAP @@ -1233,7 +1230,6 @@ MAP ENDMAP NAME: wad_woods_04 -TAGS: mini_float DEPTH: Lair, Forest : wad_woods_setup(_G, "rock", 2, false, 0, 0, 0) FTILE: '+*0 = floor_dirt @@ -1258,7 +1254,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP NAME: wad_woods_06 -TAGS: mini_float extra +TAGS: extra DEPTH: Lair, Forest : wad_woods_setup(_G, "small", 2, false, 0, 0, 0) MAP @@ -1276,7 +1272,7 @@ t1tt1ttt21tt ENDMAP NAME: wad_woods_antlair -TAGS: mini_float uniq_anthill +TAGS: uniq_anthill DEPTH: Lair, Forest : wad_woods_setup(_G, "rock", 5, false, 0, 0, 0) MONS: worker ant, soldier ant @@ -1328,7 +1324,7 @@ ttt5tt.t.tt1t1t.t%1tt.t5tttttt ENDMAP NAME: wad_woods_river_02 -TAGS: mini_float extra +TAGS: extra DEPTH: Lair, Forest : wad_woods_setup(_G, "small", 1, true, 32, 2, 24) MAP @@ -1348,7 +1344,6 @@ ttt1ttt.WWWt.ttt0t1t ENDMAP NAME: wad_woods_river_03 -TAGS: mini_float DEPTH: Lair, Forest : wad_woods_setup(_G, "decor", 1, false, 32, 3, 24) MAP @@ -1366,7 +1361,7 @@ WWWWt.t.t1t ENDMAP NAME: wad_woods_river_04 -TAGS: no_vmirror no_rotate mini_float +TAGS: no_vmirror no_rotate DEPTH: D, Lair, Forest TILE: X = wall_brick_dark_leak TILE: x = wall_brick_dark @@ -1659,7 +1654,6 @@ ENDMAP # contains up to to 4 basilisks, standing around an item NAME: kennysheep_basilisk_garden DEPTH: Lair:3- -TAGS: mini_float MONS: basilisk NSUBST: . = 1:1 / 3 = 111. SUBST: . = .........G @@ -1856,7 +1850,7 @@ ENDMAP NAME: nicolae_lair_firefly_meadow DEPTH: Lair -TAGS: transparent mini_float +TAGS: transparent MONS: giant firefly NSUBST: . = 5:1 MAP @@ -1872,7 +1866,7 @@ MAP ENDMAP NAME: nicolae_lair_grove_arrangements -TAGS: transparent decor extra luniq mini_float +TAGS: transparent decor extra luniq DEPTH: Lair SHUFFLE: abcdefghi/''''T''''/T'''''''T/T'''T'''T/T'T'''T'T/T'T'T'T'T/\ TTT'''TTT/'T'T'T'T'/T'T''''T'/'T'TTT'T'/'T'''''T'/TTTT'TTTT/\ @@ -1935,7 +1929,7 @@ ENDMAP ##### NAME: grunt_forest_stairs_basic -TAGS: transparent extra luniq_staircase mini_float decor +TAGS: transparent extra luniq_staircase decor DEPTH: Lair MONS: plant SUBST: 1 = 1. @@ -1956,7 +1950,6 @@ ENDMAP NAME: grunt_forest_stairs_clearing DEPTH: Lair:2-, !Lair:$ -TAGS: mini_float MONS: plant / bush, wolf, black bear, polar bear, spriggan SUBST: t = t. NSUBST: Q = 3:2 / 1:3 / 1:4 / 1:5 / *:. diff --git a/crawl-ref/source/dat/des/branches/orc.des b/crawl-ref/source/dat/des/branches/orc.des index 861d9d61aa..cbe39fea71 100644 --- a/crawl-ref/source/dat/des/branches/orc.des +++ b/crawl-ref/source/dat/des/branches/orc.des @@ -699,7 +699,6 @@ ENDMAP # A temple (minmay) # NAME: minmay_orc_temple_a -TAGS: mini_float DEPTH: Orc MONS: orc, patrolling orc priest KFEAT: _ = altar_beogh @@ -718,7 +717,6 @@ ENDMAP # Another temple (minmay) # NAME: minmay_orc_temple_b -TAGS: mini_float DEPTH: Orc MONS: orc / nothing w:40, patrolling orc priest / nothing w:5 KFEAT: _ = altar_beogh @@ -752,7 +750,6 @@ ENDMAP # Still another temple (minmay) # NAME: minmay_orc_temple_c -TAGS: mini_float DEPTH: Orc:2- MONS: orc, orc priest, orc high priest SUBST: . = 1 .:200 @@ -789,7 +786,6 @@ ENDMAP ####################### # Yet Another Temple NAME: bh_open_orc_temple -TAGS: mini_float DEPTH: Orc:3- SUBST: " = 1....... MONS: orc w:8 / orc priest w:2 / orc warrior @@ -818,7 +814,6 @@ ENDMAP # Treasure chamber (minmay) # NAME: minmay_orc_treasury -TAGS: mini_float DEPTH: Orc:3- MONS: orc warlord band, orc knight band SUBST: $ = $:100 *| @@ -852,7 +847,7 @@ vv...................vv ENDMAP NAME: guppyfry_orc_lava_fort -TAGS: no_item_gen no_monster_gen mini_float +TAGS: no_item_gen no_monster_gen DEPTH: Orc:3- KMONS: 1 = orc high priest / orc sorcerer KMONS: 2 = orc knight @@ -918,7 +913,7 @@ ENDMAP ################################################## # The orcs piled up some loose rubble. NAME: rock_pile -TAGS: no_item_gen no_monster_gen mini_float +TAGS: no_item_gen no_monster_gen DEPTH: Orc MONS: orc ; sling . stone q:30, boulder beetle KITEM: d = w:3 stone / w:1 large rock q:1 @@ -1189,7 +1184,7 @@ xxxxxxXXXX''''Exxx ENDMAP NAME: nicolae_orc_flooded_monolith -TAGS: extra decor mini_float transparent +TAGS: extra decor transparent DEPTH: Orc SUBST: W = w., c : ccccbv MAP @@ -1275,7 +1270,7 @@ xxxxXXxxxxxX....@ ENDMAP NAME: nicolae_orc_rockfall -TAGS: transparent extra decor mini_float no_item_gen +TAGS: transparent extra decor no_item_gen DEPTH: Orc : dgn.delayed_decay_extra(_G, 'o', 'orc corpse', 'stone q:1 / nothing, large rock q:1') KITEM: r = stone q:1 / nothing w:5 / large rock q:1 w:3 @@ -1291,7 +1286,7 @@ MAP ENDMAP NAME: nicolae_orc_sculptors_studio -TAGS: extra decor mini_float no_item_gen +TAGS: extra decor no_item_gen DEPTH: Orc NSUBST: r = 1:H / 1:C / *:r SUBST: G = GGGI diff --git a/crawl-ref/source/dat/des/branches/pan.des b/crawl-ref/source/dat/des/branches/pan.des index 5df66825c1..506622b1ae 100644 --- a/crawl-ref/source/dat/des/branches/pan.des +++ b/crawl-ref/source/dat/des/branches/pan.des @@ -241,7 +241,7 @@ x@@xxxxxxxx ENDMAP NAME: rand_demon_pan_entry_3 -TAGS: mini_float transparent +TAGS: transparent : pan_entry_feature(_G, 'O') : pan_entry_vault_contents(_G, 'O') MAP @@ -260,7 +260,7 @@ MAP ENDMAP NAME: rand_demon_pan_entry_4 -TAGS: mini_float transparent +TAGS: transparent : pan_entry_feature(_G, 'O') : pan_entry_vault_contents(_G, 'O') MAP @@ -278,7 +278,7 @@ MAP ENDMAP NAME: rand_demon_pan_entry_5 -TAGS: mini_float transparent +TAGS: transparent : pan_entry_feature(_G, 'O') : pan_entry_vault_contents(_G, 'O') MAP @@ -297,7 +297,7 @@ MAP ENDMAP NAME: rand_demon_pan_entry_7 -TAGS: mini_float transparent +TAGS: transparent NSUBST: ? = 1:O / 4:1 / *:. : pan_entry_feature(_G, 'O') : pan_entry_vault_contents(_G, 'O') @@ -317,7 +317,7 @@ MAP ENDMAP NAME: rand_demon_pan_entry_8 -TAGS: mini_float transparent +TAGS: transparent : pan_entry_feature(_G, 'O') : pan_entry_vault_contents(_G, 'O') MAP @@ -336,7 +336,7 @@ MAP ENDMAP NAME: rand_demon_pan_entry_9 -TAGS: mini_float transparent +TAGS: transparent NSUBST: ^ = 4:1 / *:. : pan_entry_feature(_G, 'O') : pan_entry_vault_contents(_G, 'O') @@ -359,7 +359,7 @@ ENDMAP # More entries based on panlord vaults. NAME: grunt_pan_entry_in_and_out -TAGS: mini_float transparent +TAGS: transparent SUBST: d = 112 : pan_entry_feature(_G, 'e') : pan_entry_vault_contents(_G, 'e') @@ -379,7 +379,7 @@ MAP ENDMAP NAME: grunt_pan_entry_spiral -TAGS: mini_float transparent +TAGS: transparent SUBST: d = 112 : pan_entry_feature(_G, 'e') : pan_entry_vault_contents(_G, 'e') @@ -399,7 +399,7 @@ MAP ENDMAP NAME: grunt_pan_entry_zigzag -TAGS: mini_float transparent +TAGS: transparent SUBST: d = 112 : pan_entry_feature(_G, 'e') : pan_entry_vault_contents(_G, 'e') @@ -2461,7 +2461,7 @@ ENDMAP ################################## NAME: reaverb_pan_chaos_star -TAGS: extra decor transparent mini_float +TAGS: extra decor transparent MAP ... .... ..x.. .... @@ -2486,7 +2486,7 @@ ENDMAP ################################### NAME: reaverb_pan_squares -TAGS: extra decor transparent mini_float +TAGS: extra decor transparent MAP ....... .xxxxx. diff --git a/crawl-ref/source/dat/des/branches/shoals.des b/crawl-ref/source/dat/des/branches/shoals.des index f70a1c7437..c4b660a73b 100644 --- a/crawl-ref/source/dat/des/branches/shoals.des +++ b/crawl-ref/source/dat/des/branches/shoals.des @@ -351,7 +351,6 @@ ENDMAP NAME: hangedman_shoal_octodias DEPTH: Shoals -TAGS: mini_float KMONS: 1 = octopode crusher KFEAT: 1 = deep_water MAP @@ -872,7 +871,7 @@ xxr----WWmwW--rx ENDMAP NAME: nicolae_shoals_seven_spires -TAGS: transparent water_ok mini_float extra +TAGS: transparent water_ok extra DEPTH: Shoals MAP ..... @@ -1066,7 +1065,7 @@ WEIGHT: 8 # Shoal huts. NAME: shoalhut_rune -TAGS: shoal_rune_simple water_ok no_dump mini_float transparent +TAGS: shoal_rune_simple water_ok no_dump transparent NSUBST: A = 1:+ / 1 = x:19 +:1 / *:x SUBST: 0 = 0. SUBST: e = e. @@ -1086,7 +1085,7 @@ ENDMAP # Shoal decoy hut NAME: shoalhut -TAGS: shoal_hut_simple water_ok no_dump allow_dup mini_float transparent +TAGS: shoal_hut_simple water_ok no_dump allow_dup transparent NSUBST: A = 1 = x:14 +:1 / *:x NSUBST: 0 = 2:. / 2:0 / * = 0. MAP @@ -1124,7 +1123,7 @@ ENDMAP # HangedMan's alternative Shoals:$ NAME: shoals_rune_alternative -TAGS: shoal_rune_hangedman water_ok allow_dup transparent mini_float no_dump +TAGS: shoal_rune_hangedman water_ok allow_dup transparent no_dump KMONS: 12 = merfolk impaler / merfolk javelineer / merfolk aquamancer KMONS: 3 = kraken / harpy band w:5 KMONS: d = siren / water nymph w:5 @@ -1151,7 +1150,7 @@ xxW...DC.x@ ENDMAP NAME: shoals_rune_alternative_decoy -TAGS: shoal_hut_hangedman water_ok allow_dup transparent mini_float no_dump +TAGS: shoal_hut_hangedman water_ok allow_dup transparent no_dump SHUFFLE: AB / AB / BA, CD / CD / DC NSUBST: 0 = 2:0 / 2:. / * = 00... SUBST: AC = x, B = w, D = . diff --git a/crawl-ref/source/dat/des/branches/slime.des b/crawl-ref/source/dat/des/branches/slime.des index 8e67e6f908..05e6b78d97 100644 --- a/crawl-ref/source/dat/des/branches/slime.des +++ b/crawl-ref/source/dat/des/branches/slime.des @@ -364,7 +364,7 @@ ENDMAP NAME: nicolae_slime_pool DEPTH: Slime -TAGS: transparent mini_float +TAGS: transparent MONS: slime creature ORIENT: float SHUFFLE: abcd diff --git a/crawl-ref/source/dat/des/branches/snake.des b/crawl-ref/source/dat/des/branches/snake.des index ea6861e8e7..0e5f5742c0 100644 --- a/crawl-ref/source/dat/des/branches/snake.des +++ b/crawl-ref/source/dat/des/branches/snake.des @@ -228,7 +228,6 @@ ENDMAP NAME: nicolae_snake_lava_pool DEPTH: Snake -TAGS: mini_float SUBST: L = l1 SUBST: 1 = 1. MONS: adder / ball python / black mamba / anaconda w:5 / \ @@ -255,7 +254,6 @@ ENDMAP NAME: nicolae_snake_springs DEPTH: Snake -TAGS: mini_float SUBST: W = w1 SUBST: 1 = 1. MONS: adder / ball python / black mamba / anaconda w:5 / \ @@ -399,7 +397,7 @@ xx.B...B.xx ENDMAP NAME: nicolae_snake_shapes -TAGS: no_pool_fixup mini_float +TAGS: no_pool_fixup DEPTH: Snake NSUBST: 0 = 2:9 / 1:8 / *:0 SUBST: x : xcvmlwWb diff --git a/crawl-ref/source/dat/des/branches/spider.des b/crawl-ref/source/dat/des/branches/spider.des index c9b48b9c8e..eaa3ae68a5 100644 --- a/crawl-ref/source/dat/des/branches/spider.des +++ b/crawl-ref/source/dat/des/branches/spider.des @@ -347,7 +347,7 @@ xxW.xxxW..xxxxW.xx ENDMAP NAME: spiders_nest_the_unseen -TAGS: no_item_gen no_monster_gen mini_float +TAGS: no_item_gen no_monster_gen DEPTH: Spider:3- MONS: trapdoor spider, patrolling ghost moth SUBST: | = %%d, * = ..%%d @@ -372,7 +372,7 @@ MAP ENDMAP NAME: spiders_nest_ghost_moth_duel -TAGS: no_item_gen no_monster_gen mini_float +TAGS: no_item_gen no_monster_gen DEPTH: Spider:3- MONS: ghost moth, tarantella ITEM: piece of ambrosia @@ -462,7 +462,7 @@ MAP ENDMAP NAME: hangedman_spider_trapstep -TAGS: no_monster_gen no_pool_fixup patrolling mini_float allow_dup +TAGS: no_monster_gen no_pool_fixup patrolling allow_dup DEPTH: Spider:1-3, Zot:1-4 KMONS: 0 = patrolling spider KMONS: 1 = tarantella @@ -564,7 +564,6 @@ ENDMAP # Some wasp vaults. Wasps eat spiders (and players). NAME: spiders_nest_wasp_nest DEPTH: Spider -TAGS: mini_float MONS: red wasp / w:5 yellow wasp SUBST: 1 = %1 SUBST: a = .a @@ -819,7 +818,7 @@ ENDMAP NAME: nicolae_orb_island DEPTH: Spider:2- -TAGS: no_pool_fixup mini_float +TAGS: no_pool_fixup MONS: generate_awake orb spider KPROP: 1'z = no_rtele_into KMASK: w = no_monster_gen @@ -893,7 +892,7 @@ ENDMAP # Demonic crawler nest, maybe with a demonic farmer NAME: nicolae_crawler_farm DEPTH: Spider -TAGS: no_monster_gen patrolling no_trap_gen mini_float +TAGS: no_monster_gen patrolling no_trap_gen MONS: crimson imp w:50 / white imp w:25 / shadow imp w:15 / \ iron imp w:10 / nothing w:50 MONS: demonic crawler @@ -918,7 +917,6 @@ ENDMAP NAME: nicolae_spider_shape DEPTH: Spider -TAGS: mini_float MAP ........... .xxx...xxx. @@ -934,7 +932,7 @@ ENDMAP NAME: nicolae_arachne_temple DEPTH: Spider:2- -TAGS: no_item_gen no_monster_gen no_trap_gen mini_float +TAGS: no_item_gen no_monster_gen no_trap_gen MONS: spider, tarantella, wolf spider, redback, jumping spider FTILE: -2 = FLOOR_SANDSTONE FTILE: 'A435 = FLOOR_LIMESTONE @@ -1080,7 +1078,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP NAME: nicolae_spider_circle_web -TAGS: mini_float transparent extra +TAGS: transparent extra DEPTH: Spider MAP ......x @@ -1107,7 +1105,7 @@ xxx..x...xxx...x..x.. ENDMAP NAME: nicolae_spider_webs_and_nodes -TAGS: mini_float transparent extra +TAGS: transparent extra DEPTH: Spider SUBST: A : .B, B : x .:5, C : .D, D : x .:5 MAP diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des index bb61a51b7d..e7abcf929d 100644 --- a/crawl-ref/source/dat/des/branches/swamp.des +++ b/crawl-ref/source/dat/des/branches/swamp.des @@ -73,7 +73,7 @@ MAP ENDMAP NAME: minmay_swamp_entry_swarm -TAGS: swamp_entry mini_float +TAGS: swamp_entry WEIGHT: 5 SUBST: W = 1WWWWW, t = ttt., T = tttW, W = WWWwww., ' = W NSUBST: 1 = 2:1 / 1WWWWW @@ -196,7 +196,7 @@ default-depth: Swamp ############################################################################### # A series of pools by Jude. NAME: swamp_pool1 -TAGS: no_pool_fixup allow_dup extra luniq_pool mini_float +TAGS: no_pool_fixup allow_dup extra luniq_pool WEIGHT: 1000 {{ smear_map({iterations=5, smear='w', onto='wwt"', boxy=false}) }} SUBST: "=ttw @@ -211,7 +211,7 @@ MAP ENDMAP NAME: swamp_pool2 -TAGS: no_pool_fixup allow_dup extra luniq_pool mini_float +TAGS: no_pool_fixup allow_dup extra luniq_pool WEIGHT: 500 SUBST: "=ttttw MAP @@ -225,7 +225,7 @@ MAP ENDMAP NAME: swamp_pool3 -TAGS: no_pool_fixup allow_dup extra luniq_pool mini_float +TAGS: no_pool_fixup allow_dup extra luniq_pool WEIGHT: 500 SUBST: '=Wt, "=wwt MAP @@ -238,7 +238,7 @@ twwww"t ENDMAP NAME: swamp_pool4 -TAGS: no_pool_fixup allow_dup extra luniq_pool mini_float +TAGS: no_pool_fixup allow_dup extra luniq_pool WEIGHT: 500 SUBST: "=ttttw MAP @@ -252,7 +252,7 @@ MAP ENDMAP NAME: swamp_pool5 -TAGS: no_pool_fixup allow_dup extra luniq_pool mini_float +TAGS: no_pool_fixup allow_dup extra luniq_pool KMONS: 1 = patrolling swamp drake KFEAT: 1 = deep_water WEIGHT: 500 @@ -323,7 +323,7 @@ MAP ENDMAP NAME: nicolae_swamp_treefoil -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor SUBST: T = t. KFEAT: . = . w:30 / W MAP @@ -1321,7 +1321,7 @@ tWTTWWTTWt ENDMAP NAME: nicolae_swamp_snake_nest -TAGS: transparent no_monster_gen mini_float +TAGS: transparent no_monster_gen KMONS: 1 = anaconda KMONS: 2 = adder / ball python / water moccasin / black mamba SUBST: T = ..ttw @@ -1382,7 +1382,7 @@ tttt@@tttt ENDMAP NAME: nicolae_swamp_dragon_and_kin -TAGS: patrolling transparent mini_float +TAGS: patrolling transparent SUBST: T = t., B = tt_ NSUBST: d = D / d KMONS: D = swamp dragon @@ -1407,7 +1407,7 @@ BBttTTTTTTTtttBB ENDMAP NAME: nicolae_swamp_hydra_murder_den -TAGS: no_monster_gen mini_float +TAGS: no_monster_gen : local heads = crawl.roll_dice(2, 3) + 7 KPROP: ' = no_rtele_into SUBST: Z = T_ @@ -1559,7 +1559,7 @@ txx+xxt ENDMAP NAME: cheibrodos_swamp_minitomb -TAGS: no_item_gen no_monster_gen mini_float +TAGS: no_item_gen no_monster_gen DEPTH: Swamp, !Swamp:$ KMONS: - = bog body w:20 / troll zombie / troll skeleton / shadow w:5 KITEM: - = w:5 gold / w:2 any jewellery / w:20 nothing diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des index 0411f7c460..7c08051d92 100644 --- a/crawl-ref/source/dat/des/branches/zot.des +++ b/crawl-ref/source/dat/des/branches/zot.des @@ -1180,7 +1180,7 @@ MAP ENDMAP NAME: bh_zot_levy_curve -TAGS: extra mini_float +TAGS: extra DEPTH: Zot SUBST: W = Ww MAP diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des index 4797305fac..902e2ba092 100644 --- a/crawl-ref/source/dat/des/builder/food.des +++ b/crawl-ref/source/dat/des/builder/food.des @@ -95,7 +95,7 @@ NAME: blue_anna_alchemist DEPTH: D:8-14 : food_weight(_G, 8) WEIGHT: 15 -TAGS: uniq_second_food extra chance_second_food mini_float +TAGS: uniq_second_food extra chance_second_food SUBVAULT: Z : fruiting_plant SUBVAULT: Y : fruiting_plant SUBVAULT: X : fruiting_plant diff --git a/crawl-ref/source/dat/des/builder/shops.des b/crawl-ref/source/dat/des/builder/shops.des index 62b48b2eca..1226f054a2 100644 --- a/crawl-ref/source/dat/des/builder/shops.des +++ b/crawl-ref/source/dat/des/builder/shops.des @@ -357,7 +357,7 @@ ENDMAP NAME: nicolae_offbrand_ammo DEPTH: D:5-, Depths, Orc WEIGHT: 1 -TAGS: no_hmirror no_vmirror mini_float +TAGS: no_hmirror no_vmirror KFEAT: S = general shop type:Off-Brand suffix:Ammunition count:7 ; \ large rock ego:returning q:3 | large rock ego:exploding q:3 | \ large rock ego:chaos q:3 | large rock ego:poisoned q:3 | \ diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des index 07f5a07352..21fd7d3476 100644 --- a/crawl-ref/source/dat/des/portals/sewer.des +++ b/crawl-ref/source/dat/des/portals/sewer.des @@ -60,7 +60,6 @@ end default-depth: D:3-6 NAME: portal_sewer_entry_a -TAGS: mini_float : sewer_portal(_G) SUBST: 1 = 2234.......... MONS: nothing @@ -194,7 +193,7 @@ xx-------xx ENDMAP NAME: gup_sewer_entry_bubbles -TAGS: mini_float patrolling +TAGS: patrolling : sewer_portal(_G) KMONS: 1 = rat / green rat w:5 / adder w:5 / giant cockroach / \ giant mite / giant gecko / worm w:5 / nothing @@ -215,7 +214,6 @@ xx-xxxxxx-xx ENDMAP NAME: gup_sewer_entry_bowl -TAGS: mini_float : sewer_portal(_G) KMONS: 1 = rat / green rat w:5 / \ giant cockroach / giant mite / giant gecko / worm w:3 / nothing @@ -231,7 +229,6 @@ MAP ENDMAP NAME: gup_sewer_entry_glass -TAGS: mini_float : sewer_portal(_G) KMONS: 1 = adder / giant cockroach / nothing MAP @@ -245,7 +242,6 @@ MAP ENDMAP NAME: lightli_sewer_entry_pipes -TAGS: mini_float NSUBST: o = 1:O / *:W SUBST: W = WWWWW1 MONS: green rat / adder / rat / worm diff --git a/crawl-ref/source/dat/des/portals/wizlab.des b/crawl-ref/source/dat/des/portals/wizlab.des index cbe88073fe..71688c362b 100644 --- a/crawl-ref/source/dat/des/portals/wizlab.des +++ b/crawl-ref/source/dat/des/portals/wizlab.des @@ -461,7 +461,6 @@ wwbm..O..mbww ENDMAP NAME: mu_enter_wizlab_2 -TAGS: mini_float SHUFFLE: tU TILE: m = dngn_transparent_wall_green COLOUR: m = lightgreen @@ -561,7 +560,6 @@ bbbb...bbbb ENDMAP NAME: mu_enter_wizlab_6 -TAGS: mini_float SUBST: x = mc. TILE: c = wall_stone_white TILE: m = dngn_transparent_stone_magenta @@ -610,7 +608,6 @@ xxxxxxxxxxxxx ENDMAP NAME: infiniplex_enter_wizlab_glasses -TAGS: mini_float FTILE: GO_ = floor_rough_magenta TILE: m = dngn_transparent_wall_green COLOUR: m = lightgreen @@ -628,7 +625,6 @@ MAP ENDMAP NAME: infiniplex_enter_wizlab_water -TAGS: mini_float FTILE: cnO_ = floor_rough_magenta TILE: n = dngn_transparent_stone_magenta COLOUR: n = lightmagenta @@ -649,7 +645,6 @@ ww......ww ENDMAP NAME: infiniplex_enter_wizlab_spiral -TAGS: mini_float SUBST: G : xG. SUBST: x : xx. MARKER: ! = lua:fog_machine { \ diff --git a/crawl-ref/source/dat/des/serial/aquarium.des b/crawl-ref/source/dat/des/serial/aquarium.des index 9606cd8572..a58e6f82b3 100644 --- a/crawl-ref/source/dat/des/serial/aquarium.des +++ b/crawl-ref/source/dat/des/serial/aquarium.des @@ -1347,7 +1347,7 @@ ENDMAP NAME: aquarium_pool_1 WEIGHT: 10 -TAGS: serial_aquarium_pool mini_float +TAGS: serial_aquarium_pool NSUBST: ! = 1:@ / *:! SUBST: ! = @.... : init_aquarium(_G) @@ -1363,7 +1363,7 @@ ENDMAP NAME: aquarium_pool_2 WEIGHT: 20 -TAGS: serial_aquarium_pool mini_float +TAGS: serial_aquarium_pool NSUBST: ! = 1:@ / *:! SUBST: ! = @.... : init_aquarium(_G) diff --git a/crawl-ref/source/dat/des/serial/column_ruins.des b/crawl-ref/source/dat/des/serial/column_ruins.des index 8c45f0f4ad..9a57dde4e4 100644 --- a/crawl-ref/source/dat/des/serial/column_ruins.des +++ b/crawl-ref/source/dat/des/serial/column_ruins.des @@ -260,7 +260,7 @@ ENDMAP # (4 vaults) NAME: column_ruins_portal_island -TAGS: serial_column_ruins_portal luniq_column_ruins_portal mini_float +TAGS: serial_column_ruins_portal luniq_column_ruins_portal WEIGHT: 1 SHUFFLE: ?! SUBST: ! : - @@ -290,7 +290,7 @@ ENDMAP # Although it is hard to tell from the map, this enterance can # have a moat of lava around it too. NAME: column_ruins_portal_squares -TAGS: serial_column_ruins_portal luniq_column_ruins_portal mini_float +TAGS: serial_column_ruins_portal luniq_column_ruins_portal WEIGHT: 4 : if crawl.one_chance_in(2) then SUBST: JKL : l @@ -353,7 +353,7 @@ MAP ENDMAP NAME: column_ruins_portal_hut -TAGS: serial_column_ruins_portal luniq_column_ruins_portal mini_float +TAGS: serial_column_ruins_portal luniq_column_ruins_portal WEIGHT: 2 : init_column_ruins_hut(_G) : init_column_ruins_portal(_G) @@ -378,7 +378,7 @@ ENDMAP NAME: column_ruins_temple_circle TAGS: serial_column_ruins_fancy luniq_column_ruins_temple -TAGS: mini_float transparent +TAGS: transparent WEIGHT: 5 SHUFFLE: GI SUBST: G = p @@ -417,7 +417,7 @@ ENDMAP NAME: column_ruins_temple_hut TAGS: serial_column_ruins_fancy luniq_column_ruins_temple -TAGS: mini_float transparent +TAGS: transparent WEIGHT: 2 : init_column_ruins_hut(_G) : init_column_ruins(_G) @@ -436,7 +436,7 @@ ENDMAP NAME: column_ruins_square_huge TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 2 SUBST: Z : KKT SUBST: T : TTGG_ @@ -458,7 +458,7 @@ ENDMAP NAME: column_ruins_square_large TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 5 SUBST: Z : LLLT SUBST: T : TG_ @@ -478,7 +478,7 @@ ENDMAP NAME: column_ruins_square_medium TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 8 SUBST: T : TG__ SUBST: T = TTUVVV @@ -495,7 +495,7 @@ ENDMAP NAME: column_ruins_square_small TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 5 SUBST: T : TG____ SUBST: T = TTUVVV @@ -510,7 +510,7 @@ ENDMAP NAME: column_ruins_circle_large TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 2 SUBST: Z : JJT SUBST: T : TG_ @@ -532,7 +532,7 @@ ENDMAP NAME: column_ruins_circle_medium TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 5 SUBST: Z : KKKT SUBST: T : TG__ @@ -552,7 +552,7 @@ ENDMAP NAME: column_ruins_circle_small TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 3 SUBST: T : TG____ SUBST: T = TTUVVV @@ -569,7 +569,7 @@ ENDMAP NAME: column_ruins_courtyard_long TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 5 : init_column_ruins(_G) MAP @@ -582,7 +582,7 @@ ENDMAP NAME: column_ruins_courtyard_long_water TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 1 : if you.branch() == "Depths" then SUBST: w : wl @@ -600,7 +600,7 @@ ENDMAP NAME: column_ruins_hut TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 40 SUBST: 0 = 0:40 9:10 $:15 %:5 *:1 T:9 _:120 SUBST: T = TTUVVV @@ -621,7 +621,7 @@ ENDMAP NAME: column_ruins_hut_ruined TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 15 NSUBST: x = 6:x / 2:_ / *=xx_ : init_column_ruins_hut(_G) @@ -641,7 +641,7 @@ ENDMAP NAME: column_ruins_hut_water TAGS: serial_column_ruins_fancy -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 5 SUBST: z = ww_ SUBST: y = W__ @@ -665,7 +665,7 @@ ENDMAP NAME: column_ruins_hut_pillars TAGS: serial_column_ruins_fancy luniq -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 10 SUBST: 0 = 0:40 9:10 $:15 %:5 *:1 T:9 _:20 SUBST: T = TTUVVV @@ -694,7 +694,7 @@ ENDMAP NAME: column_ruins_open_tiny TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 25 : init_column_ruins(_G) MAP @@ -705,7 +705,7 @@ ENDMAP NAME: column_ruins_open_small TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 20 SUBST: T : TG____ SUBST: T = TTUVVV @@ -720,7 +720,7 @@ ENDMAP NAME: column_ruins_open_medium TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 10 SUBST: T : TG__ SUBST: T = TTUVVV @@ -737,7 +737,7 @@ ENDMAP NAME: column_ruins_open_large TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 5 SUBST: T : TG_ SUBST: T = TTUVVV @@ -756,7 +756,7 @@ ENDMAP NAME: column_ruins_open_tiny_water TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 2 : if you.branch() == "Depths" then SUBST: w : l @@ -773,7 +773,7 @@ ENDMAP NAME: column_ruins_open_small_water TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 3 : if you.branch() == "Depths" then SUBST: w : l @@ -792,7 +792,7 @@ ENDMAP NAME: column_ruins_open_medium_water TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float transparent +TAGS: allow_dup transparent WEIGHT: 1 : if you.branch() == "Depths" then SUBST: w : l @@ -813,7 +813,7 @@ ENDMAP NAME: column_ruins_columns_dead_end TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 5 : init_column_ruins(_G) MAP @@ -824,7 +824,7 @@ ENDMAP NAME: column_ruins_columns_straight TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 20 : init_column_ruins(_G) MAP @@ -835,7 +835,7 @@ ENDMAP NAME: column_ruins_columns_corner TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 10 : init_column_ruins(_G) MAP @@ -851,7 +851,7 @@ ENDMAP NAME: column_ruins_columns_T TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 3 : init_column_ruins(_G) MAP @@ -867,7 +867,7 @@ ENDMAP NAME: column_ruins_columns_plus TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 2 : init_column_ruins(_G) MAP @@ -888,7 +888,7 @@ ENDMAP NAME: column_ruins_columns_water TAGS: serial_column_ruins_simple -TAGS: allow_dup mini_float +TAGS: allow_dup WEIGHT: 2 : if you.branch() == "Depths" then SUBST: w : l @@ -996,7 +996,7 @@ ENDMAP # This one is more common because it might be any single pillar NAME: column_ruins_grid_1 TAGS: serial_column_ruins_simple -TAGS: allow_dup transparent mini_float +TAGS: allow_dup transparent WEIGHT: 25 : init_column_ruins(_G) MAP @@ -1007,7 +1007,7 @@ ENDMAP NAME: column_ruins_grid_2 TAGS: serial_column_ruins_simple -TAGS: allow_dup transparent mini_float +TAGS: allow_dup transparent WEIGHT: 5 : init_column_ruins(_G) MAP @@ -1020,7 +1020,7 @@ ENDMAP NAME: column_ruins_grid_3 TAGS: serial_column_ruins_simple -TAGS: allow_dup transparent mini_float +TAGS: allow_dup transparent WEIGHT: 10 : init_column_ruins(_G) MAP @@ -1035,7 +1035,7 @@ ENDMAP NAME: column_ruins_grid_4 TAGS: serial_column_ruins_simple -TAGS: allow_dup transparent mini_float +TAGS: allow_dup transparent WEIGHT: 5 : init_column_ruins(_G) MAP @@ -1052,7 +1052,7 @@ ENDMAP NAME: column_ruins_grid_5 TAGS: serial_column_ruins_fancy -TAGS: allow_dup transparent mini_float +TAGS: allow_dup transparent WEIGHT: 2 : init_column_ruins(_G) MAP diff --git a/crawl-ref/source/dat/des/serial/forest.des b/crawl-ref/source/dat/des/serial/forest.des index d8672ece53..c2de0a6313 100644 --- a/crawl-ref/source/dat/des/serial/forest.des +++ b/crawl-ref/source/dat/des/serial/forest.des @@ -359,7 +359,7 @@ ENDMAP # 10 vaults NAME: infiniplex_forest_clump_tiny -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 2, 6) MAP """ @@ -368,7 +368,7 @@ MAP ENDMAP NAME: infiniplex_forest_clump_small -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 3, 9) MAP "" @@ -380,7 +380,7 @@ MAP ENDMAP NAME: infiniplex_forest_clump_medium -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 2, 6) MAP """" @@ -394,7 +394,7 @@ DEEtEED" ENDMAP NAME: infiniplex_forest_clump_large -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 1, 3) MAP """" @@ -410,7 +410,7 @@ MAP ENDMAP NAME: infiniplex_forest_clump_long -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 2, 6) MAP """""" @@ -423,7 +423,7 @@ DEEtttttDED" ENDMAP NAME: infiniplex_forest_clump_diagonal -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 2, 6) MAP """" @@ -438,7 +438,7 @@ MAP ENDMAP NAME: infiniplex_forest_clump_curved -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 2, 6) MAP """""" @@ -454,7 +454,7 @@ MAP ENDMAP NAME: infiniplex_forest_clump_C -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 1, 3) MAP """"" @@ -469,7 +469,7 @@ MAP ENDMAP NAME: infiniplex_forest_clump_cross -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 1, 3) MAP """ @@ -486,7 +486,7 @@ DEEttttEtE" ENDMAP NAME: infiniplex_forest_clump_double -TAGS: transparent mini_float +TAGS: transparent : init_forest(_G, 2, 6) MAP "" @@ -570,7 +570,7 @@ t t.t t ENDMAP NAME: infiniplex_forest_lined_room_ -TAGS: transparent mini_float +TAGS: transparent SHUFFLE: JK SUBST: J = t SUBST: K = . @@ -584,7 +584,7 @@ t t t ENDMAP NAME: infiniplex_forest_lined_room_2 -TAGS: transparent mini_float +TAGS: transparent SHUFFLE: JK SUBST: J = t SUBST: K = . @@ -600,7 +600,7 @@ t t t t ENDMAP NAME: infiniplex_forest_lined_room_3 -TAGS: transparent mini_float +TAGS: transparent SHUFFLE: JK SUBST: J = t SUBST: K = . @@ -618,7 +618,7 @@ t t t t t ENDMAP NAME: infiniplex_forest_lined_ring -TAGS: transparent mini_float +TAGS: transparent SHUFFLE: JKLL SUBST: J = t SUBST: K = . diff --git a/crawl-ref/source/dat/des/traps/grate.des b/crawl-ref/source/dat/des/traps/grate.des index 099f1b98b1..97e70667cb 100644 --- a/crawl-ref/source/dat/des/traps/grate.des +++ b/crawl-ref/source/dat/des/traps/grate.des @@ -79,7 +79,7 @@ ENDMAP NAME: stair_cage_open DEPTH: D:9-, Depths:2-, Crypt:2-, Elf:2-, Snake:2-, Zot:2-, Vaults:2- -TAGS: extra luniq_grate_trap no_monster_gen mini_float +TAGS: extra luniq_grate_trap no_monster_gen TAGS: vaults_empty WEIGHT: 2 : place_grate_trap(_G, '^', 'm') diff --git a/crawl-ref/source/dat/des/variable/mini_features.des b/crawl-ref/source/dat/des/variable/mini_features.des index e62289143a..848c2047ab 100644 --- a/crawl-ref/source/dat/des/variable/mini_features.des +++ b/crawl-ref/source/dat/des/variable/mini_features.des @@ -33,7 +33,7 @@ default-depth: D, Depths, Elf, Crypt NAME: glass_columns_a DEPTH: D, Depths, Elf, Crypt -TAGS: serial_glass transparent mini_float extra allow_dup decor +TAGS: serial_glass transparent extra allow_dup decor WEIGHT: 5 MAP ..... @@ -45,7 +45,7 @@ ENDMAP NAME: glass_columns_b DEPTH: D, Depths, Elf, Crypt -TAGS: serial_glass transparent mini_float extra allow_dup decor +TAGS: serial_glass transparent extra allow_dup decor WEIGHT: 3 MAP ....... @@ -59,7 +59,7 @@ ENDMAP NAME: glass_columns_c DEPTH: D, Depths, Elf, Crypt -TAGS: serial_glass transparent mini_float extra allow_dup decor +TAGS: serial_glass transparent extra allow_dup decor WEIGHT: 2 MAP ......... @@ -137,7 +137,7 @@ ENDMAP # Small intersection with statues (Eino) NAME: small_statue_intersection DEPTH: D:2-, Depths:2-, !Depths:$, Elf, Crypt, Lair, Abyss -TAGS: transparent mini_float allow_dup no_hmirror no_vmirror extra +TAGS: transparent allow_dup no_hmirror no_vmirror extra TAGS: ruin_lair ruin_abyss decor MAP xx.xx @@ -172,7 +172,7 @@ ENDMAP # This is an ancient vault. NAME: solitary_fountain DEPTH: D, Depths, Elf -TAGS: transparent mini_float allow_dup extra decor +TAGS: transparent allow_dup extra decor SUBST: ?=TUV KMASK: TU = no_monster_gen MAP @@ -186,7 +186,7 @@ ENDMAP # Another very classical vault. NAME: fountainhead DEPTH: D, Depths, Elf, Crypt -TAGS: transparent mini_float allow_dup extra decor +TAGS: transparent allow_dup extra decor SUBST: ?=TUV MAP .............. @@ -222,7 +222,7 @@ ENDMAP NAME: corexii_leaking_fountain DEPTH: D, Depths, Elf, Crypt -TAGS: transparent mini_float no_monster_gen no_item_gen extra decor +TAGS: transparent no_monster_gen no_item_gen extra decor NSUBST: W = 5:W / *:. MAP ..... @@ -280,7 +280,7 @@ MAP ENDMAP NAME: nrook_mini_vaults -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP ......... @@ -379,7 +379,7 @@ MAP ENDMAP NAME: minmay_door_square -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP ................. @@ -444,7 +444,7 @@ xxx@xxx ENDMAP NAME: minmay_misc_feat_pillars -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf, Crypt SUBST: x : xxxxcvbmG MAP @@ -456,7 +456,7 @@ MAP ENDMAP NAME: minmay_misc_feat_square -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: x = x. KPROP: x = no_rtele_into @@ -471,7 +471,7 @@ MAP ENDMAP NAME: minmay_misc_feat_plants -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor MONS: plant, bush, fungus DEPTH: D, Depths SUBST: x : xxxxcvbmGt123 @@ -491,7 +491,7 @@ MAP ENDMAP NAME: minmay_misc_feat_rows -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf, Crypt MAP ....... @@ -508,7 +508,7 @@ MAP ENDMAP NAME: minmay_misc_feat_diagonals -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf SUBST: x : xmb MAP @@ -522,7 +522,7 @@ MAP ENDMAP NAME: minmay_misc_feat_doors -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP x.x.x.x.x @@ -567,7 +567,7 @@ xxxxxxxxxxxxxxxxxxxx ENDMAP NAME: minmay_misc_feat_five -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf, Crypt SUBST: x : xxxxcvbm MAP @@ -579,7 +579,7 @@ MAP ENDMAP NAME: minmay_misc_feat_chi -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP .......... @@ -618,7 +618,7 @@ xx?xx xx?xx ENDMAP NAME: minmay_misc_feat_enclosed -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: X = xx. KPROP: ' = no_rtele_into @@ -636,7 +636,7 @@ MAP ENDMAP NAME: minmay_misc_feat_room -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: ? = GGGTUV KMASK: TU = no_monster_gen @@ -651,7 +651,7 @@ MAP ENDMAP NAME: minmay_misc_feat_iff -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: X : xcvb. MAP @@ -670,7 +670,7 @@ MAP ENDMAP NAME: minmay_misc_feat_columns -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf, Crypt MAP ... @@ -685,7 +685,7 @@ MAP ENDMAP NAME: minmay_misc_feat_cross -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf, Crypt SUBST: X : x. MAP @@ -751,7 +751,7 @@ xx@xx@xx ENDMAP NAME: minmay_misc_feat_nine_boxes -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths NSUBST: A = 1:. / *:x, B = 1:. / *:x, C = 1:. / *:x NSUBST: D = 1:. / *:x, E = 1:. / *:x, F = 1:. / *:x @@ -773,7 +773,7 @@ MAP ENDMAP NAME: minmay_misc_feat_four_crosses -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: c : ccx SUBST: G : GGGb @@ -792,7 +792,7 @@ MAP ENDMAP NAME: minmay_misc_feat_roman -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP ............. @@ -807,7 +807,7 @@ MAP ENDMAP NAME: minmay_misc_feat_more_columns -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: X : x. MAP @@ -824,7 +824,7 @@ MAP ENDMAP NAME: minmay_misc_feat_x -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP ........ ........ @@ -840,7 +840,7 @@ MAP ENDMAP NAME: minmay_misc_feat_secret_circle -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths SUBST: X : x. SUBST: Y : x. @@ -870,7 +870,7 @@ MAP ENDMAP NAME: minmay_misc_feat_tiny -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP ...... @@ -882,7 +882,7 @@ MAP ENDMAP NAME: minmay_stone_trees_small -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Lair WEIGHT: 6 MAP @@ -896,7 +896,7 @@ MAP ENDMAP NAME: minmay_stone_trees_medium -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Lair WEIGHT: 3 MAP @@ -916,7 +916,7 @@ MAP ENDMAP NAME: minmay_stone_trees_large -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Lair WEIGHT: 1 SUBST: T = t. @@ -954,7 +954,7 @@ wwwwwwwww ENDMAP NAME: minmay_holes -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D:5-, !D:$, Depths, !Depths:$, Lair:1-7 KFEAT: ^ = known shaft trap SUBST: . = . ^:1, ' = . ^:2, " = . ^:4 @@ -977,7 +977,7 @@ MAP ENDMAP NAME: minmay_splitting_lines -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths WEIGHT: 5 MAP @@ -1005,7 +1005,7 @@ MAP ENDMAP NAME: minmay_curled_crystal -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf WEIGHT: 3 MAP @@ -1018,7 +1018,7 @@ MAP ENDMAP NAME: minmay_parallelograms -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths WEIGHT: 2 SHUFFLE: EFGH @@ -1042,7 +1042,7 @@ MAP ENDMAP NAME: minmay_large_rounded_square -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Crypt WEIGHT: 1 SUBST: x : x c:2 v:1 b:1 @@ -1154,7 +1154,7 @@ MAP ENDMAP NAME: roderic_chinese_pattern_swastika -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths WEIGHT: 1 MAP @@ -1303,7 +1303,7 @@ ENDMAP #cross filled (sun sumbol) in ancient Mid East and Greece NAME: roderic_filled_cross -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths WEIGHT: 1 SUBST: ? = x+ @@ -1325,7 +1325,7 @@ ENDMAP #cross of infinity NAME: roderic_cross_of_infinity -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths WEIGHT: 1 MAP @@ -1347,7 +1347,7 @@ ENDMAP #nine men's morris (Roderic) NAME: roderic_nine_men_s_morris -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths, Elf WEIGHT: 1 SHUFFLE: defgh @@ -1395,7 +1395,7 @@ x'...'...'x ENDMAP NAME: roderic_ancient_swastika -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths WEIGHT: 1 SHUFFLE: '" @@ -1419,7 +1419,7 @@ MAP ENDMAP NAME: roderic_lattice_a -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MAP ........................................... @@ -1448,7 +1448,7 @@ ENDMAP # Malta's cross NAME: roderic_malta_cross -TAGS: transparent mini_float allow_dup extra decor +TAGS: transparent allow_dup extra decor WEIGHT: 1 DEPTH: D, Depths MAP @@ -1466,7 +1466,7 @@ MAP ENDMAP NAME: roderic_whirl -TAGS: transparent mini_float allow_dup extra decor +TAGS: transparent allow_dup extra decor DEPTH: D, Depths, Elf WEIGHT: 1 SUBST: ? : ttTTG @@ -1512,7 +1512,7 @@ MAP ENDMAP NAME: hex_tiny -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor MAP ... .x.x. @@ -1524,7 +1524,7 @@ MAP ENDMAP NAME: hex_medium -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor MAP ....... .x.x.x.x. @@ -1544,7 +1544,7 @@ MAP ENDMAP NAME: hex_large -TAGS: transparent mini_float extra +TAGS: transparent extra MAP ........... .x.x.x.x.x.x. @@ -1615,7 +1615,7 @@ ENDMAP NAME: moated_statue DEPTH: D, Depths, Elf, Crypt -TAGS: transparent extra allow_dup mini_float decor +TAGS: transparent extra allow_dup decor MAP xxxxxxx .WWGWW. @@ -1642,7 +1642,7 @@ xx..m..mm.....mm..m..xx ENDMAP NAME: wad_floor_pattern_1 -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor WEIGHT: 2 FTILE: ' = floor_volcanic COLOUR: ' = red @@ -1674,7 +1674,7 @@ MAP ENDMAP NAME: wad_floor_pattern_2 -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor WEIGHT: 2 FTILE: ' = floor_pebble_cyan COLOUR: ' = green @@ -1706,7 +1706,7 @@ MAP ENDMAP NAME: wad_floor_pattern_untrapped -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor WEIGHT: 4 KFEAT: ~ = floor FTILE: GT = floor_pebble_darkgray @@ -2758,7 +2758,7 @@ ENDMAP # Not hard to obtain as is, but requires getting shafted. NAME: minmay_item_behind_shaft -TAGS: extra mini_float +TAGS: extra DEPTH: D:2-, !D:$, Depths, !Depths:$ KFEAT: S = shaft trap MAP @@ -2943,7 +2943,7 @@ xxxx ENDMAP NAME: eino_small_chamber_without_monster -TAGS: mini_float allow_dup extra ruin_lair ruin_abyss +TAGS: allow_dup extra ruin_lair ruin_abyss DEPTH: D:4-, Depths, Lair, Abyss MAP xxxxx @@ -3102,7 +3102,7 @@ NAME: nicolae_benzene_ring DEPTH: D:6-, Depths NSUBST: d = d / . ITEM: any ring -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor MAP xxxxxxxxxx...xxxxxxxxxx xxxxxxxx...x...xxxxxxxx @@ -3332,7 +3332,7 @@ MARKER: * = lua:fog_machine { cloud_type="flame", \ COLOUR: n = red SUBST: * = . : if you.branch() == "Geh" then -TAGS: transparent mini_float extra +TAGS: transparent extra : end MAP ........... @@ -3604,7 +3604,7 @@ cvvv+vvvc ENDMAP NAME: nrook_campfire -TAGS: transparent mini_float extra decor +TAGS: transparent extra decor DEPTH: D, Depths MARKER: P = lua:fog_machine { cloud_type = "flame", \ pow_min = 10, pow_max = 10, delay = 5, \ @@ -3654,7 +3654,7 @@ ENDMAP ####################################################################### NAME: minivault_1 -TAGS: transparent mini_float allow_dup extra ruin_abyss +TAGS: transparent allow_dup extra ruin_abyss DEPTH: D:4-, Depths, Abyss MAP ............ @@ -3672,7 +3672,7 @@ MAP ENDMAP NAME: minivault_4 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Abyss MAP ............ @@ -3711,7 +3711,7 @@ ENDMAP NAME: minivault_10 DEPTH: D:6-, Depths, !Depths:$ SUBST: * = %:30 * |:1 -TAGS: mini_float extra +TAGS: extra MAP xxxx xxxx x**x x**x @@ -3728,7 +3728,7 @@ ENDMAP # Multicoloured onion NAME: minivault_11 DEPTH: D, Depths, Elf, Crypt, Lair, Abyss -TAGS: transparent mini_float extra ruin_abyss ruin_lair decor +TAGS: transparent extra ruin_abyss ruin_lair decor SHUFFLE: bcv MAP ............ @@ -3747,7 +3747,7 @@ ENDMAP # Water cross NAME: minivault_14 -TAGS: transparent mini_float allow_dup extra decor +TAGS: transparent allow_dup extra decor MAP ............ .wwwww.wwww. @@ -3764,7 +3764,7 @@ MAP ENDMAP NAME: minivault_19 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Lair, Abyss MAP ............ @@ -3782,7 +3782,7 @@ MAP ENDMAP NAME: minivault_21 -TAGS: transparent mini_float allow_dup extra +TAGS: transparent allow_dup extra DEPTH: D:8-, !D:$, Depths:2-, !Depths:$ MAP ............ @@ -3800,7 +3800,7 @@ MAP ENDMAP NAME: minivault_22 -TAGS: transparent mini_float allow_dup extra ruin_abyss +TAGS: transparent allow_dup extra ruin_abyss DEPTH: D:6-, Depths, !Depths:$, Abyss SUBST: $ : $ *:5 SUBST: ~ : . +:2 @@ -3820,7 +3820,7 @@ MAP ENDMAP NAME: minivault_23 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Lair, Abyss MAP x.x.x.x.x.x. @@ -3838,7 +3838,7 @@ x.x.x.x.x.x. ENDMAP NAME: minivault_24 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Lair, Abyss MAP ............ @@ -3856,7 +3856,7 @@ MAP ENDMAP NAME: minivault_25 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Lair, Abyss SHUFFLE: XY SUBST: X=x, Y=+ @@ -3876,7 +3876,7 @@ MAP ENDMAP NAME: minivault_26 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Lair, Abyss MAP c..........c @@ -3894,7 +3894,7 @@ c..........c ENDMAP NAME: minivault_27 -TAGS: transparent mini_float allow_dup extra ruin_abyss decor +TAGS: transparent allow_dup extra ruin_abyss decor DEPTH: D, Elf, Crypt, Lair, Abyss MAP ............ diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des index 50cc376d46..cbe018e8eb 100644 --- a/crawl-ref/source/dat/des/variable/mini_monsters.des +++ b/crawl-ref/source/dat/des/variable/mini_monsters.des @@ -346,7 +346,7 @@ MAP ENDMAP NAME: hangedman_stitches_earthworm -TAGS: no_monster_gen no_item_gen transparent no_pool_fixup mini_float +TAGS: no_monster_gen no_item_gen transparent no_pool_fixup DEPTH: Depths, Spider:2-, Abyss KMONS: 0 = 0 KMONS: 1 = giant slug @@ -455,7 +455,6 @@ MAP ENDMAP NAME: rats_and_rats_again -TAGS: mini_float DEPTH: D:8-14 MONS: shadow imp MONS: rat w:40 / green rat w:20 / orange rat w:1 / nothing @@ -809,7 +808,7 @@ ENDMAP # A raven's nest, containing some jewellery. # Could be used as a subvault in some forest vault. NAME: roderic_ravens_nest -TAGS: extra mini_float +TAGS: extra DEPTH: D:8-12, Lair:3-, Swamp KMONS: 1 = raven KITEM: % = any jewellery @@ -1036,7 +1035,7 @@ xxx+xxxx xxx+xxxx xxx+xxxx xxx+xxxx ENDMAP NAME: hangedman_misty_isle -TAGS: transparent mini_float no_monster_gen no_pool_fixup patrolling +TAGS: transparent no_monster_gen no_pool_fixup patrolling DEPTH: D:7-12 KMONS: 123 = sky beast KMONS: 45 = insubstantial wisp @@ -1066,7 +1065,7 @@ MAP ENDMAP NAME: guppyfry_early_lair_pool -TAGS: patrolling no_monster_gen transparent mini_float +TAGS: patrolling no_monster_gen transparent DEPTH: D:2-5 KMONS: 1 = big fish KMONS: 2 = giant slug / adder @@ -1297,7 +1296,7 @@ ENDMAP # Necromancer has a house with a fridge (and a nice garden) (Eino) NAME: eino_house_with_fridge DEPTH: D:9-15, Lair:2- -TAGS: no_monster_gen no_item_gen mini_float +TAGS: no_monster_gen no_item_gen MONS: patrolling necromancer, plant MONS: green rat simulacrum / wolf simulacrum / \ yak simulacrum / polar bear simulacrum @@ -1355,7 +1354,6 @@ ENDMAP NAME: nooodl_orcs_dogs DEPTH: D:10-, Depths:1, Orc -TAGS: mini_float : if you.absdepth() > 18 then MONS: w:5 orc warlord / orc knight / orc warrior / orc sorcerer / w:5 orc wizard : elseif you.absdepth() > 13 then @@ -1830,7 +1828,7 @@ ENDMAP NAME: guppyfry_early_elven_hall DEPTH: D:6-9 -TAGS: patrolling no_monster_gen mini_float transparent +TAGS: patrolling no_monster_gen transparent MONS: deep elf fighter, plant ITEM: any scroll / any food / any book SUBST: - = 2....GTd$% @@ -1854,7 +1852,7 @@ ENDMAP NAME: guppyfry_early_orc_mine DEPTH: D:2-5 -TAGS: patrolling no_monster_gen mini_float transparent +TAGS: patrolling no_monster_gen transparent MONS: orc, goblin, hobgoblin, orc priest, orc wizard, orc warrior ITEM: stone / large rock q:1 w:1 NSUBST: ? = 2:$ / 2:d / *:. @@ -1879,7 +1877,7 @@ MAP ENDMAP NAME: guppyfry_library_mini -TAGS: patrolling mini_float no_monster_gen transparent +TAGS: patrolling no_monster_gen transparent DEPTH: Snake, Elf, Orc, Zot ITEM: gold / any scroll / any book w:4 SUBST: ? = 123d @@ -2253,7 +2251,7 @@ ENDMAP ##### Red devils (4) can use weapons and armour. NAME: einodemon_armed_red_devil_minivault -TAGS: patrolling mini_float +TAGS: patrolling DEPTH: D:12-, Elf, !Elf:$ MONS: red devil ; spear | trident . ring mail | scale mail MONS: red devil ; spear | trident . buckler @@ -2277,7 +2275,7 @@ ENDMAP ##### Demonic crawlers (s) and beetles. NAME: einodemon_crawler_minivault -TAGS: patrolling mini_float +TAGS: patrolling DEPTH: D:13-, Elf, Spider MONS: demonic crawler MONS: goliath beetle / boulder beetle w:8 / demonic crawler w:2 / \ @@ -2319,7 +2317,7 @@ ENDMAP # Carrion pond # Bad water, a lot of carrion and feeders around, yuck! NAME: roderic_carrion_pond -TAGS: no_monster_gen no_trap_gen mini_float +TAGS: no_monster_gen no_trap_gen DEPTH: Lair:2-7, Swamp MONS: necrophage SUBST: ' = 111. @@ -2423,7 +2421,7 @@ ENDMAP NAME: hallowed_hall -TAGS: no_monster_gen no_trap_gen mini_float +TAGS: no_monster_gen no_trap_gen DEPTH: Depths MONS: pearl dragon, apis, ophan, plant ITEM: potion of curing ident:type / potion of heal wounds ident:type @@ -2754,7 +2752,7 @@ ccccccccc@c ENDMAP NAME: disabler_island -TAGS: no_monster_gen no_pool_fixup mini_float +TAGS: no_monster_gen no_pool_fixup DEPTH: D:8-14, Lair SUBST: ? = W.. NSUBST: ' = 3:* / 1:> / 6:1 / *:., 1 : 2:1 / 2 = 1.. / *:w @@ -3331,7 +3329,6 @@ MAP ENDMAP NAME: minmay_three_doors -TAGS: mini_float DEPTH: D:6-, Depths SHUFFLE: 089, ABC SUBST: AB = ., C = * @@ -3383,7 +3380,7 @@ ENDMAP # Small chamber for a nice item (Eino) NAME: small_chamber_with_monster -TAGS: mini_float extra +TAGS: extra DEPTH: D:8-, Depths, Elf, Crypt MAP xxxxxxx @@ -3658,7 +3655,7 @@ ENDMAP NAME: evilmike_bad_box DEPTH: D:13-, Depths -TAGS: mini_float no_wall_fixup +TAGS: no_wall_fixup MONS: boring beetle NSUBST: 9 = 1:1 / 1:19 / *:9 KMONS: 8 = 8 @@ -3710,7 +3707,7 @@ ccccccccccccccccccc ENDMAP NAME: hangedman_feature_mirror -TAGS: transparent mini_float extra allow_dup no_monster_gen +TAGS: transparent extra allow_dup no_monster_gen TAGS: no_item_gen no_trap_gen no_pool_fixup patrolling DEPTH: D, Depths, Orc, Elf, Crypt, Snake, Shoals, Geh, Coc, Dis, Tar, Zot WEIGHT: 10 (D), 1 (Geh, Coc, Dis, Tar, Zot), 4 @@ -3826,7 +3823,7 @@ ENDMAP ################## # Stair vaults. They place a few random monsters but are mainly for variety. NAME: st_stairs_1 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Elf, Crypt NSUBST: ' = 1:> / *:., . = 2 = 0:19 .:1 / 2 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3843,7 +3840,7 @@ MAP ENDMAP NAME: st_stairs_2 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Elf, Crypt NSUBST: . = 1:> / 2 = 0:19 .:1 / 2 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3862,7 +3859,7 @@ MAP ENDMAP NAME: st_stairs_3 -TAGS: extra transparent allow_dup ruin_lair mini_float luniq_st_stairs +TAGS: extra transparent allow_dup ruin_lair luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: ' = 1:> / 2 = 0:19 .:1 / 2 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3879,7 +3876,7 @@ MAP ENDMAP NAME: st_stairs_4 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: ' = 1:> / 2 = 0:19 .:1 / 2 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3896,7 +3893,7 @@ x.x.x.x.x ENDMAP NAME: st_stairs_5 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: ' = 1:> / 2 = 0:19 .:1 / 3 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3914,7 +3911,7 @@ xx..xx..xx ENDMAP NAME: st_stairs_6 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: ' = 1:> / 1 = 0:19 .:1 / 2 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3928,7 +3925,7 @@ xx..xx ENDMAP NAME: st_stairs_7 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: ' = 1:> / 1 = 0:19 .:1 / 2 = 0:1 .:4 / *:. SUBST: > = }]) @@ -3944,7 +3941,7 @@ ENDMAP # I like the way these ones can turn out, # it reminds me of those rooms in Angband NAME: st_stairs_8 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: . = 1:> / 1 = 0:19 .:1 / 2 = 0:1 .:4 / *:. : random_stair(_G, ">") @@ -3959,7 +3956,7 @@ x.x.x.x ENDMAP NAME: st_stairs_9 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: . = 1:> / 2:0 / 2 = .:3 0:1 / *:. : random_stair(_G, ">") @@ -3976,7 +3973,7 @@ x.x.x.x.x ENDMAP NAME: st_stairs_10 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: . = 1:> / 2 = 0:19 .:1 / 4 = 0:1 .:4 / *:. : random_stair(_G, ">") @@ -3995,7 +3992,7 @@ x.x.x.x.x.x ENDMAP NAME: st_stairs_11 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: . = 1:> / 3 = 0:19 .:1 / 5 = 0:1 .:9 / *:. : random_stair(_G, ">") @@ -4014,7 +4011,7 @@ x.x.x.x.x.x.x.x.x ENDMAP NAME: st_stairs_12 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: . = 1:> / 1 : 0:19 .:1 / 2 = 0:1 .:4 / *:. : random_stair(_G, ">") @@ -4029,7 +4026,7 @@ x.x.x.x.x.x.x.x.x ENDMAP NAME: st_stairs_13 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Lair, Elf, Crypt NSUBST: . = 1:> / 1 : 0:19 .:1 / 2 = 0:1 .:4 / *:. : random_stair(_G, ">") @@ -4042,7 +4039,7 @@ x.x.x.x.x.x.x.x.x.x.x ENDMAP NAME: st_stairs_14 -TAGS: extra transparent allow_dup mini_float luniq_st_stairs +TAGS: extra transparent allow_dup luniq_st_stairs DEPTH: D, Depths, Zot, Snake, Elf, Crypt NSUBST: . = 1 : 0:19 .:1 / 2 = 0:1 .:4 / *:. : random_stair(_G, ">") @@ -4120,7 +4117,7 @@ ENDMAP NAME: lightli_fourway_metalbox DEPTH: D:9-, Depths -TAGS: mini_float transparent +TAGS: transparent NSUBST: % = 1:* / *:% NSUBST: 0 = 1:9 / *:0 MAP @@ -4520,7 +4517,7 @@ ENDMAP # Some miniature stair vaults; these all place a couple of monsters, # but they're mainly around for the decor (same principle as st's). NAME: grunt_ministairs_1 -TAGS: extra transparent allow_dup mini_float luniq_grunt_ministairs +TAGS: extra transparent allow_dup luniq_grunt_ministairs DEPTH: D:2-, Depths, Zot, Snake, Elf, Crypt : grunt_ministairs_setup(_G, false) MAP @@ -4534,7 +4531,7 @@ MAP ENDMAP NAME: grunt_ministairs_2 -TAGS: extra transparent allow_dup mini_float luniq_grunt_ministairs +TAGS: extra transparent allow_dup luniq_grunt_ministairs DEPTH: D:2-, Depths, Zot, Snake, Elf, Crypt : grunt_ministairs_setup(_G, false) MAP @@ -5771,7 +5768,7 @@ ENDMAP # If the vault comes up in Orc or Elf, there will be natives around. # NAME: sword_in_stone -TAGS: no_monster_gen mini_float patrolling vaults_hard +TAGS: no_monster_gen patrolling vaults_hard DEPTH: D:5-, Depths, !Depths:$, Vaults, Orc, Elf KMONS: A = Blork the orc / orc warrior ; great sword . chain mail | plate armour, \ orc warrior ; great sword . chain mail | plate armour / nothing diff --git a/crawl-ref/source/dat/vim/syntax/levdes.vim b/crawl-ref/source/dat/vim/syntax/levdes.vim index ceef099c8b..b365b85d11 100644 --- a/crawl-ref/source/dat/vim/syntax/levdes.vim +++ b/crawl-ref/source/dat/vim/syntax/levdes.vim @@ -96,7 +96,7 @@ syn keyword desOrientation lab generate_loot syn keyword desOrientation ziggurat_pillar centered " map building in dungeon.cc (`transparent` is handled later) "Note: `dummy` mis-catches `training dummy` about half as often as actually used as tag -syn keyword desOrientation dummy arrival mini_float extra ruin layout pan decor +syn keyword desOrientation dummy arrival no_exits extra ruin layout pan decor syn keyword desOrientation allow_dup uniq luniq syn keyword desOrientation no_hmirror no_vmirror no_rotate syn keyword desOrientation no_dump diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index acbd893512..f5d0968690 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -4332,7 +4332,7 @@ static const vault_placement *_build_vault_impl(const map_def *vault, _ruin_vault(place); if (place.exits.empty() && placed_vault_orientation != MAP_ENCOMPASS - && (!place.map.is_minivault() || place.map.has_tag("mini_float"))) + && (!place.map.is_minivault() || !place.map.has_tag("no_exits"))) { _pick_float_exits(place, place.exits); } diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 58587537f1..0843a1ec8a 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -2791,7 +2791,7 @@ string map_def::validate_map_placeable() /** * Check to see if the vault can connect normally to the rest of the dungeon. */ -bool map_def::has_exit(bool &floating) const +bool map_def::has_exit() const { map_def dup = *this; for (int y = 0, cheight = map.height(); y < cheight; ++y) @@ -2804,41 +2804,21 @@ bool map_def::has_exit(bool &floating) const map_feature_at(&dup, coord_def(x, y), -1); // If we have a stair, assume the vault can be disconnected. if (feat_is_stair(feat) && !feat_is_escape_hatch(feat)) - { - floating = false; return true; - } const bool non_floating = glyph == '@' || glyph == '=' || glyph == '+'; if (non_floating || !feat_is_solid(feat) || feat_is_closed_door(feat)) { if (x == 0 || x == cwidth - 1 || y == 0 || y == cheight - 1) - { - if (non_floating) - { - floating = false; - return true; - } - floating = true; - continue; - } + return true; for (orth_adjacent_iterator ai(coord_def(x, y)); ai; ++ai) - { if (!map.in_map(*ai)) - { - if (non_floating) - { - floating = false; - return true; - } - floating = true; - } - } + return true; } } - return floating; + return false; } string map_def::validate_map_def(const depth_ranges &default_depths) @@ -2960,22 +2940,14 @@ string map_def::validate_map_def(const depth_ranges &default_depths) // Encompass vaults, pure subvaults, and dummy vaults are exempt from // exit-checking. - if (orient != MAP_ENCOMPASS && !has_tag("unrand") && !has_tag("dummy")) + if (orient != MAP_ENCOMPASS && !has_tag("unrand") && !has_tag("dummy") + && !has_tag("no_exits") && map.width() > 0 && map.height() > 0) { - bool floating = false; - if (!has_exit(floating)) - { - return make_stringf( - "Map '%s' has no (possible) exits", - name.c_str()); - } - // Lab minivaults work differently - they are supposed to guarantee - // connectivity around the edge. - if (floating && is_minivault() && !has_tag("mini_float") - && !depths.is_usable_in(level_id(BRANCH_LABYRINTH))) + if (!has_exit()) { return make_stringf( - "Minivault '%s' has no explicit exits or mini_float", + "Map '%s' has no (possible) exits; use TAGS: no_exits if " + "this is intentional", name.c_str()); } } diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index 4ba7cf1bdd..8108a284c1 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -1300,7 +1300,7 @@ private: string rewrite_chunk_errors(const string &s) const; string apply_subvault(string_spec &); string validate_map_placeable(); - bool has_exit(bool &floating) const; + bool has_exit() const; }; const int CHANCE_ROLL = 10000; |