Vault review, mostly for new monster / revisions

 * Abominations earlier than post-Lair have been tweaked down slightly, due
   to large abominations being capable of rolling demonic crawler levels of
   regeneration and small abominations being harder to escape from.
   Aside from a few vaults, this noticeably reduces the highest rolls of
   small abominations in gauntlets and slightly lowers large abominations
   in Gauntlets overall, while reducing their count a bit in the Abyssal
   Lair end. A few other uses of abominations are mildly tweaked otherwise.

 * Undying armouries get another few uses in extended. One or two now place
   in most of Cerebov's vaults, finally emphasizing the steel part of their
   Fire and Steel title beyond iron shots and red devil tridents by using
   the armoury weapon granting gimmick on balrugs. (Since Cerebov's already
   plenty scary, these sparing placements are decently far away from
   Cerebov themself when possible.) They also get a use in earth zigs
   (which helps them further differentiate from Dis floors by arming
   gargoyles and giants), plus a grated ziggurat pillar.

 * Spider rune vaults at the outliers of kill rates have been slightly
   tweaked up or down accordingly, and the _arachne_lair vault previously
   at an acceptable middle-of-the-pack position has been nudged upwards
   in jorogumo count to the moving out Arachne from Spider.

 * Ossuary killrate top and bottom ends have been also nudged correspondingly
   towards the center, and two of the current weakest ones (silent_tomb
   and city_of_the_dead) both get the fresh new marrowcuda option.

crawl-ref/source/dat/des/branches/dis.des

@@ -486,8 +486,8 @@ D..vvv.......vv.
 ENDMAP
 
 NAME:   kennysheep_iron_temple
-ORIENT: centre
 TAGS:   transparent no_rotate no_vmirror no_monster_gen
+ORIENT: centre
 MONS:   hell sentinel, iron golem
 MARKER: F = lua:fog_machine { cloud_type = "flame", pow_min = 100, \
                               pow_max = 100, delay = 10, size = 1, \

crawl-ref/source/dat/des/branches/lair.des

@@ -3666,10 +3666,12 @@ ENDMAP
 NAME:    hellmonk_lair_end_abyssal_woods
 PLACE:   Lair:$
 ORIENT:  northwest
-MONS:    blink frog / basilisk w:3, small abomination
+MONS:    blink frog / basilisk w:3, small abomination / brain worm w:2
 MONS:    shapeshifter / chaos spawn / smoke demon / ynoxinul
-MONS:    raiju, ugly thing / large abomination, thrashing horror
+MONS:    raiju, ugly thing, thrashing horror / large abomination w:5
 KMONS:   7 = spriggan ; rapier ego:distortion
+KITEM:   O = spriggan skeleton / wolf skeleton w:3 /\
+             polar bear skeleton w:2 / black bear skeleton w:2
 KITEM:   R = earthy gem, %
 KFEAT:   u = demonic_tree
 KFEAT:   N = enter_abyss
@@ -3678,18 +3680,32 @@ SUBST:   " = '.
 COLOUR:  '%M = magenta
 FTILE:   '%MN_u = floor_nerves_magenta
 NSUBST:  %d = 1:R / 2:| / 3:* / *:%
-NSUBST:  1 = 5=1 / 1.., 2 = 4=2 / 2..
-NSUBST:  4 = 4 / 3, ' = 2:6 / 2 = 56 / 3:O / 5 = 5543O. / .
+NSUBST:  1 = 5:1 / 1.., 2 = 3:2 / 2:. / * = 2..
+NSUBST:  4 = 4 / *:3, ' = 2:6 / 2 = 56 / 3:O / 5 = 5543O. / *:.
 SUBST:   7M = 7O
-# 33% chance for an additional opening at the south.
+# 33% chance each for additional openings at the south or north east.
 SHUFFLE: yzD / JKL / JKL
 SUBST:   y = @, zD= ., JK = t, L = p
-# 33% chance for an additional opening at the north east.
 SHUFFLE: EFH / JKL / JKL
 SUBST:   E = @, FH= ., JK = t, L = p
 SUBST:   a = tt..., q = pp..., p = tttu, s = rr..., r = tu
-KITEM:   O = spriggan skeleton / wolf skeleton w:3 /\
-             polar bear skeleton w:2 / black bear skeleton w:2
+{{
+  local cols = {"dngn_demonic_tree_1 / dngn_demonic_tree_16",
+                "dngn_demonic_tree_2 / dngn_demonic_tree_3",
+                "dngn_demonic_tree_4 / dngn_demonic_tree_5",
+                "dngn_demonic_tree_6 / dngn_demonic_tree_7",
+                "dngn_demonic_tree_8 / dngn_demonic_tree_9",
+                "dngn_demonic_tree_10 / dngn_demonic_tree_11",
+                "dngn_demonic_tree_12 / dngn_demonic_tree_13",
+                "dngn_demonic_tree_14 / dngn_demonic_tree_15",}
+  local col1 = util.random_from(cols)
+  local col2 = col1
+  while col2 == col1 do
+    col2 = util.random_from(cols)
+  end
+
+  tile("u = " .. col1 .. " / " .. col2)
+}}
 MAP
 ttttttttttttttttttttttttttttttttttttttttttttttttttt
 tttttttttttttttttttttttttttttttpppppppppppttpppptt

crawl-ref/source/dat/des/branches/pan.des

@@ -60,7 +60,8 @@ function pan_lord_setup(_G, name)
                  "deep elf annihilator / titan w:5 / lich w:5 / " ..
                  "demonspawn blood saint",
         Cerebov = "sun moth / efreet / sun demon / ynoxinul / balrug / " ..
-                  "brimstone fiend w:1 / demonspawn warmonger w:1",
+                  "undying armoury w:1 / brimstone fiend w:1 / " ..
+                  "demonspawn warmonger w:1",
         ['Gloorx Vloq'] = "juggernaut skeleton w:100 / " ..
                  "caustic shrike skeleton w:100 / " ..
                  "hellephant skeleton w:100 / soul eater w:200 / " ..
@@ -1185,7 +1186,7 @@ NAME:      cerebov_st
 TAGS:      cerebov patrolling uniq_cerebov
 ORIENT:    north
 MONS:      patrolling Cerebov, balrug, brimstone fiend
-MONS:      red devil, sun demon, sun moth
+MONS:      red devil, sun demon, sun moth, undying armoury
 : pan_lord_setup(_G, 'Cerebov')
 epilogue{{
   pan_lord_epilogue('Cerebov')
@@ -1209,10 +1210,10 @@ xx....vv.vv||v.......v$$vv+v.................v.+.........3v.$||v.vv....xx
 xx.....v.vv||v.v.1.v.v$$v4.v.v...2.....2...v.v.v..v..v..v.v.$$$v.v.....xx
 xx....vv.vv||v.v...v.v$$vO3v.................v.v.....5..5.+.$$$v.vv....xx
 xx....vv.vv+vv.......vv+vvvv.v.....&.&.....v.v.vvvvvvvvvvvvvvvvv.vv....xx
-xx.....v.vv..2.......2..v..+.................+.............+...v.v.....xx
+xx.....v.vv..2.......2..v..+........7........+.............+...v.v.....xx
 xx....vv.vv..2.......2..v..v.v.....&.&.....v.vvvvvvvvvvvvvvv...v.vv....xx
 xx....vv.vv.............v..v.................v...v..4..v$|$v.6.v.vv....xx
-xx.....v.vv....v...v....v..v.v...2.....2...v.v...+..2..+|$|v.2.v.v.....xx
+xx.....v.vv....v...v....v..v.v...2.....2...v.v...+..2.7+|$|v.2.v.v.....xx
 xx....vv.vv...vv+++vv...v..v.................v.4.v..4..v$|$v...v.vv....xx
 xx....vv.vvvvvv.....vvvvv..v.v.v.v.....v.v.v.v.4.vvvvvvvvvvv...v.vv....xx
 xx.....v.vvv...............v.......v.v.......v...vvvvvvvvvvv+vvv.v.....xx
@@ -1232,7 +1233,8 @@ ENDMAP
 NAME:     evilmike_cerebov_lava
 TAGS:     cerebov patrolling uniq_cerebov
 ORIENT:   northwest
-MONS:     Cerebov, balrug, brimstone fiend, sun demon, sun moth
+MONS:     Cerebov, balrug, brimstone fiend, sun demon
+MONS:     sun moth, undying armoury
 SUBST:    X : v, Y : .v, L : lll.
 SUBST:    U : W., W : V., V : v.
 SHUFFLE:  XY
@@ -1263,7 +1265,7 @@ xx.....vv.v...LLLL...llll...v2vvvvvvvvvvvv..
 xx..vvvvv.U..LLLL.....llll.....&....vllvvv..
 xx..v%%%v...LLvvv......llll...vWvWv.v4...vv.
 xx..v|||v..LLvv.v.Y....llll...&.....+.......
-xx..v|Q|+..LLvOX3.Y...1lllll.4......+.5.2..@
+xx..v|Q|+.6LLvOX3.Y..1.lllll...6....+.5.2..@
 xx..v|||v..LLvv.v.Y....llll...&.....+.......
 xx..v%%%v...LLvvv......llll...vWvWv.v4...vv.
 xx..vvvvv.U..LLLL.....llll.....&....vllvvv..
@@ -1288,7 +1290,7 @@ NAME:     cerebov_grunt
 TAGS:     cerebov uniq_cerebov
 ORIENT:   northwest
 MONS:     patrolling Cerebov, balrug, brimstone fiend
-MONS:     sun demon, red devil, sun moth
+MONS:     sun demon, red devil, sun moth, undying armoury
 NSUBST:   5 = 2:6 / * = 44455
 : pan_lord_setup(_G, 'Cerebov')
 epilogue{{
@@ -1304,13 +1306,13 @@ xxxx............v|||v............
 xxxx..........vvv|||vvv..........
 xxxx.........vvvvv+vvvvv.........
 xxxx........vvv...4...vvv........
-xxxx.......vvv.........vvv.......
+xxxx.......vvv....7....vvv.......
 xxxx......vvv2...vvv...2vvv......
 xxxx.vvvvvv.....vvOvv.....vvvvvv.
 xxxx.v|$$v.....vv$3$vv.....v$||v.
 xxxx.v||$+4..vvv$vvv$vvv..4+$$|v.
 xxxx.v|$$v...vll.$1$.llv...v$||v.
-xxxx.vvvvv...vll$.2.$llv...vvvvv.
+xxxx.vvvvv...vll$...$llv...vvvvv.
 xxxx....vv...vvl.2.2.lvv...vv....
 xxxx....vv....vl.vvv.lv....vv....
 xxxx....vvv...v.lllll.v...vvv....
@@ -1333,7 +1335,8 @@ ENDMAP
 NAME:     cerebov_grunt_fire_and_steel
 TAGS:     cerebov uniq_cerebov
 ORIENT:   north
-MONS:     patrolling Cerebov, balrug, brimstone fiend, sun demon, sun moth
+MONS:     patrolling Cerebov, balrug, brimstone fiend, sun demon
+MONS:     sun moth, undying armoury
 NSUBST:   O = 1:O / *:|, 4 = 3:5 / *:4
 : pan_lord_setup(_G, 'Cerebov')
 epilogue{{
@@ -1352,7 +1355,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 .lvv..4.....2..vvvvvl.lvvvvvvvl.lvvvvvvl...lvvvllll.
 .llv...vvvvv...vlllll4lllllllll4lllllvll...llvvvvvl.
 ...+.4.v|$|v...+.........&.&.........+..4.2..v$|$vl.
-...+...v$|$+.2.+...2.........2.......+...1.3.+|O$vl.
+...+...v$|$+2.6+...2.........2.......+...1.3.+|O$vl.
 ...+.4.v|$|v...+.........&.&.........+..4.2..v$|$vl.
 .llv...vvvvv...vlllll4lllllllll4lllllvll...llvvvvvl.
 .lvv..4.....2..vvvvvl.lvvvvvvvl.lvvvvvvl...lvvvllll.
@@ -1365,7 +1368,6 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ....@..........................................@....
 ENDMAP
 
-
 ##############################################################################
 # Gloorx Vloq
 #

crawl-ref/source/dat/des/branches/spider.des

@@ -2286,13 +2286,13 @@ TAGS:   no_pool_fixup
 WEIGHT: 20
 PLACE:  Spider:$
 ORIENT: float
-MONS:   ghost moth, moth of wrath / ghost moth, emperor scorpion
+MONS:   ghost moth, moth of wrath, emperor scorpion
 MONS:   wolf spider / redback / tarantella / jumping spider / culicivora
-MONS:   orb spider / steelbarb worm, redback
+MONS:   orb spider / steelbarb worm w:7, redback
 KITEM:  R = milky-white gem
 KITEM:  O = gossamer rune of Zot
-NSUBST: 4 = 3:3 / * = 44.
-NSUBST: 7 = 3 = 111.. / 1:2
+NSUBST: 4 = 3:3 / * = 44444..
+NSUBST: 7 = 3 = 111.. / 2 = 12
 NSUBST: d = 1:R / 3:d / 3:e / *:f
 SUBST:  5 = 5., 6 = 66...
 SUBST:  W = W..
@@ -2311,7 +2311,7 @@ wW.xcccW666....W5.W....WWWWW..cccxx
   xxcW-4.wccdd575dwww4d--ccc.-..cccxx
   WxcW-..5cd4wwwww3Oww474-3c..W5cccxxx
   xxccW.4.c-74.wwwwwww4ddccc6-.Wcccxx
-   xxccW4Wcccc...4.dd4---6-6-6ccccxx
+   xxccW4Wcccc..74.dd4---6-6-6ccccxx
     xxcW45..-cccc-3cc-66-6-ccccxxxx
      xcccW-...44cccc6-6-6-ccxxxxxx
      xxxcccccc4.....-6-ccccxx  xx
@@ -2480,7 +2480,8 @@ xxcc-.h.....""...g...."".......-"c
 ENDMAP
 
 ##########################################
-# Arachne Lair Rune Vault
+# Made pre-exile, but still named in her honour,
+# and also still named for easier statistics assessment.
 NAME:   johnstein_spider_rune_arachne_lair
 TAGS:   no_monster_gen
 ORIENT: float
@@ -2523,7 +2524,7 @@ KFEAT:   Y = web / floor w:40
 SHUFFLE: Gg / Hh / Ii / Jj / Kk / Ll
 SUBST:   G = O, g = o, HhIiJKL = %, jkl = .
 # thin out monsters and set up loot
-SUBST:   1 = 1..
+SUBST:   1 = 111.....
 NSUBST:  % = 2:d / 2:e / 2:f / * = def...
 NSUBST:  2 = 6 = 5. / 2:4 / 6 = 2. / *:1
 NSUBST:  3 = 4:3 / 1:6 / * = 2.
@@ -2533,9 +2534,9 @@ MAP
    ..cccccc5...5cccccc..
    .cc.Gcccc+++ccccH.cc.
    ccg4.c..2.2.2..c.4hcc
-  cc..3cc.2.2Z2.2.cc3..cc
+  cc..3cc.2.2.2.2.cc3..cc
  xc...cc.2'''''''2.cc...cx
- xc.2cc..1c''!''c1..cc2.cx
+ xc.2cc.Z1c''!''c1Z.cc2.cx
  xc..c.'1ccc!!!ccc1'.c..cx
 xxc.1.'''1c--!--c1'''.1.cxx
 xcc.1''''_"?????"_''''1.ccx
@@ -2553,7 +2554,7 @@ xcc.1''''_""???""_''''1.ccx
  xcc.1.'1ccc'!'ccc1'.1.ccx
  xcc..c..1c'''''c1..c..ccx
  xcc..cc.2'''''''2.cc..ccx
- xc2.ccc...2.Z.2...ccc.2cx
+ xc2.ccc..Z2...2Z..ccc.2cx
  xc..cccc1..222..1cccc..cx
  xc..cccc.1..2..1.cccc..cx
  xc2.ccc...........ccc.2cx
@@ -2589,7 +2590,7 @@ KITEM:  R = milky-white gem
 KITEM:  O = potion of ambrosia ident:type, gossamer rune of Zot
 KFEAT:  M = stone_wall
 KFEAT:  P = granite_statue
-NSUBST: S = 4:1 / 6 = 1. /*:., H = 2:5 / 1:6 / 1:7 / K
+NSUBST: S = 4:1 / 6 = 1. / *:., H = 4:5 / 1:6 / 1:7 / *:K
 SUBST:  K = 2 5:4 6:2 7:2 E:20, E = 3 4:30 .:20
 SUBST:  Q = W .:15
 NSUBST: d = 2:d / 2:e / 3:f / *=gggge
@@ -2650,7 +2651,7 @@ MONS:   broodmother
 KITEM:  P = milky-white gem
 KITEM:  O = potion of ambrosia ident:type, gossamer rune of Zot
 KFEAT:  ^ = web
-NSUBST: . = 96 = 1... / *:., 2 = 2:2 / *=2...
+NSUBST: . = 80 = 1... / *:., 2 = 2:2 / *=2...
 NSUBST: 6 = 4:6 / 4 = 456. / *= 4..
 NSUBST: d = 1:O / 1:P / 3:d / 3:e / 3:f
 SUBST:  3 = 3....
@@ -2715,7 +2716,7 @@ MONS:   emperor scorpion
 MONS:   radroach / spark wasp
 KITEM:  R = milky-white gem
 KITEM:  O = potion of ambrosia ident:type, gossamer rune of Zot
-NSUBST: 7 = 4:7 / * = 7..
+NSUBST: 7 = 4:7 / 1:. / * = 7..
 # bias the big monsters, randomly
 : if crawl.one_chance_in(3) then
     SUBST:  7 = 44456
@@ -2724,8 +2725,8 @@ NSUBST: 7 = 4:7 / * = 7..
 : else
     SUBST:  7 = 45666
 : end
-NSUBST: . = 16 = 3... / 16 = 2... / 16 = 1... / *:.
-NSUBST: ' = 12 = 1... / 16 = 2... / 1:3 / 1:3. / *:.
+NSUBST: . = 12 = 3... / 16 = 2... / 16 = 1... / *:.
+NSUBST: ' = 10 = 1... / 16 = 2... / 1:3 / 1:3. / *:.
 # bias the ruination level of the terrain
 : if crawl.one_chance_in(3) then
     SUBST:  A = cc.

crawl-ref/source/dat/des/branches/swamp.des

@@ -2196,7 +2196,7 @@ DEPTH:   Swamp, !Swamp:$
 KMONS:   o = oklob plant
 KFEAT:   ^ = permanent teleport trap
 SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff/Gg/Hh/Ii, %*$
-NSUBST:  ' = ^ / o / '
+NSUBST:  ' = 1:^ / 3:o / *:'
 SUBST:   abcde = w, fghi = t, ABCDE = .wW, FGHI = .t, ' = ':100 $$$%%
 SUBST:   _ = .._, . = ......W
 CLEAR:   _
@@ -3404,7 +3404,8 @@ NAME:    swamp_vile
 TAGS:    no_pool_fixup no_monster_gen
 PLACE:   Swamp:$
 ORIENT:  southeast
-MONS:    bog body / ugly thing, shadow / orange demon / small abomination w:2
+MONS:    bog body / ugly thing / small abomination w:2
+MONS:    shadow / orange demon w:2
 MONS:    large abomination / very ugly thing / thrashing horror w:6
 MONS:    green death, sin beast, great orb of eyes, titanic slime creature
 KMONS:   8 = hydra / swamp dragon