Further tweaks.

1 files changed, 3 insertions, 185 deletions

diff --git a/crawl-ref/source/dat/wizlab.des b/crawl-ref/source/dat/wizlab.des
index 2a7c217a5c..65274964b5 100644
--- a/crawl-ref/source/dat/wizlab.des
+++ b/crawl-ref/source/dat/wizlab.des
@@ -1593,190 +1593,6 @@ cccccccccccccccccccccccccccccccccccccccccccccc
 ENDMAP
 
 ###############################################################################
-# Random wizard (Death theme) (by Mu.)
-#
-NAME:       wizlab_random2
-ORIENT:     encompass
-TAGS:       wizlab no_item_gen no_monster_gen no_rotate allow_dup
-LFLOORCOL:  darkgrey
-COLOUR:     =c = white
-COLOUR:     " = red
-KFEAT:      _ = altar_kikubaaqudgha
-KMONS:      s = slave
-NSUBST:     ' = 1:= / *:c
-NSUBST:     ; = 1:= / *:c
-KMONS:      V = vampire / vampire knight / vampire mage
-KMONS:      a = patrolling vampire
-KMONS:      z = skeletal warrior
-KMONS:      p = shadow
-### statue needs a description still
-### This statue really needs vampiric draining as a monster spell!
-KMONS:      8 = ice statue col:darkgrey spells:pain;bolt_of_draining;pain;\
-                pain;pain;major_healing name:black_statue \
-                name_replace name_descriptor hd:15 hp:150
-KMONS:      L = patrolling lich / w:5 patrolling ancient lich
-KMONS:      u = patrolling mummy / w:2 patrolling guardian mummy
-KMONS:      M = patrolling mummy priest / w:2 patrolling greater mummy
-MARKER:     u = lua:fog_machine { \
-                 pow_max = 10, delay_min = 10, delay_max = 40, \
-                 size = 1, size_buildup_amnt = 5, \
-                 size_buildup_time = 25, cloud_type = "foul pestilence" \
-             }
-MARKER:     M = lua:fog_machine { \
-                 pow_max = 10, delay_min = 10, delay_max = 40, \
-                 size = 1, size_buildup_amnt = 5, \
-                 size_buildup_time = 25, cloud_type = "foul pestilence" \
-             }
-MARKER:     ! = lua:fog_machine { \
-                 pow_max = 10, delay_min = 10, delay_max = 40, \
-                 size = 1, size_buildup_amnt = 5, \
-                 size_buildup_time = 25, cloud_type = "foul pestilence" \
-             }
-KFEAT:      ! = granite_statue
-KITEM:      * = book of unlife
-KITEM:      % = dagger unrand:morg / demon blade unrand:leech / dagger unrand:vampires_tooth
-KITEM:      $ = potion of healing / potion of heal wounds / potion of decay / \
-            scroll of torment / potion of blood / w:20 gold
-KITEM:      ^ = potion of healing / potion of heal wounds / potion of decay / \
-            scroll of torment / potion of blood / w:20 gold
-KFEAT:      ^ = alarm trap
-KITEM:      | = ring of life protection / amulet of warding / \
-            wand of draining / wand of healing / any book / acquire book / \
-            staff of death / potion of healing / potion of heal wounds / \
-            potion of decay / potion of blood
-SUBST:      B = $$|..
-:           wizlab_setup(_G, "Random")
-MAP
-cccccccccccccccccccccccccccccccccccccccccccccc
-cccccccccccccccccccccc|*|ccccccccccccccccccccc
-ccccccccccccccccccccc|...|cccccccccccccccccccc
-cccccccccccccccccccc.......ccccccccccccccccccc
-cccccccc$$$c...c...c..._...c...c...c$$$ccccccc
-cccccccc$$$+.L.+.!.+.......+.!.+.L.+$$$ccccccc
-cccccccc$$$c...c...c.......c...c...c$$$ccccccc
-cccccccccccccccccccc.......ccccccccccccccccccc
-ccccccccccccccccccccccc+cccccccccccccccccccccc
-cccccccccccccccccccccc...ccccccccccccccccccccc
-cccccccccccccccccccc.......ccccccccccccccccccc
-cccccccccccccccccc.....c.....ccccccccccccccccc
-ccccccccccccccccc......c......cccccccccccccccc
-cccccccccccccccc.......c.......ccccccccccccccc
-cccccccccccccccc.......c.......cccccccc..ccccc
-cccccccccccccccc.......c.......ccccccc....cccc
-cccccccccccccccc.szs...cnnn....cccccc..cc..ccc
-cccccccccccccccc.sss.G.cnsn....ccccc..cccc..cc
-cc............cc.......cnnn....cccc..ccccc..cc
-cc............cc.......c.".....ccc..ccccc..ccc
-cc.ccccccccc..cc.......c.".....cc..ccccc..cccc
-cc.cG$....|c..cc.......c.".....c..ccccc..ccccc
-cc.c$L.....c..cc.......c.".....c..ccc...cccccc
-cc.c.......c..cc.....G.c.Y.V.V.+.ccn...ccccccc
-cc.c.......c..cc.......c.".....cccsn....cccccc
-cc.c.......c..cc.......c.".....ccs.n...ccccccc
-cc.c.......+..cc.......c.".....ccc.n....cccccc
-cc.c%......+..cc.......c.".....ccccn.....ncccc
-cc.ccccccccccccc.......cnnn....cccsn..p..nsccc
-cc.............+.....G.cnsn....cc..n.ppp.n.scc
-cccccccccccccccc.......cnnn....cccsn.p8p.n..cc
-cccccccccccccccc.......c.......cccccpppppncccc
-cccccccccccccccc.......c.......ccccccccccccccc
-cccBBBBBBBBBBccc.......c.......ccccacacacacccc
-cccBBBBBBBBBBccc.......cnnn....cccc+c+c+c+cccc
-cccBBBc''cBBBccc.....G.cnsn....ccc.........ccc
-ccc'c'cM.c'ccccc.......cnnn....ccc.........+ac
-cccucuc..cuccccc.......c.".....ccc.........ccc
-ccc.c.c..c.ccccc.......c.".....cc..........+ac
-ccc+c+c++c+ccccc.......c.".....cc..........ccc
-cc.............c.......c.".....c.....^^^...+ac
-cc.T...........+.....G.c.Y.....+.....^Y^...ccc
-cc.............c.......c.".....c.....^^^...+ac
-ccc+c+c+c++ccccc.......c.".....cc..........ccc
-ccc.c.c.c..ccccc.......c.".....cc..........+ac
-cccucucuc..ccccc.......c.".....ccc.........ccc
-ccc;c;c;c.Mccccc.szs...cnnn....ccc.........+ac
-cccBBBBBc;;ccccc.sss.G.cnsnV.V.ccc.........ccc
-cccBBBBBBBBBcccc.......cnnn....cccc+c+c+c+cccc
-cccBBBBBBBBBcccc.......c.......ccccacacacacccc
-cccccccccccccccc.......c.......ccccccccccccccc
-cccccccccccccccc.......c.......ccccccccccccccc
-cccccccccccccccc.......c.......ccccccccccccccc
-cccccccccccccccc.....ccccc.....ccccccccccccccc
-cccccccccccccccc...ccc...ccc...ccccccccccccccc
-ccccccccccccccccc+cc.......cc+cccccccccccccccc
-cccccccccccccccc...............ccccccccccccccc
-cccccccccccccccc.....<.A.<.....ccccccccccccccc
-cccccccccccccccc...............ccccccccccccccc
-cccccccccccccccccccccccccccccccccccccccccccccc
-ENDMAP
-
-NAME:       wizlab_random3
-ORIENT:     encompass
-TAGS:       wizlab no_item_gen no_monster_gen no_rotate allow_dup
-MAP
-cccccccccccccccccccccccccccccccvvvvvvvvvvvvvvv
-ccccccccccccccclllllll.........+.v.!.v......%v
-ccccccccccccclllllllllll.......+.v.v.v.v...8%v
-ccccccccccclllllllllllllll.....v.!.v.!.v....%v
-cccccccccclllllllllllllllll....vvvvvvvvv.8.1%v
-ccccccccclllllllllllllllllll...vcccccccc%%%%%v
-ccccccccclllllll....llllllll...vcccccccccccccv
-cccccccclllllll......llllllll..vvvvvvvvvvvvvvv
-cccccccclllllll..18..........................c
-cccccccllllllll..22..........................c
-cccccccllllllll......lllllllllvv+vvvvvvvvvvvvv
-ccccccclllllllll....llllllllllv.......+......v
-cccccccllllllllll..lllllllllllv.......v.....2v
-cccccccllllllllll..lllllllllllv.......v.....2v
-cccccccllllllllll..lllllllllllv|||||||v.....2v
-cccccccllllllllll..lllllllllllvvvvvvvvv.....2v
-cccccccclllllllll..llllllllllllcccccccv......v
-cccccccclllllllll..lllllllllllccccccccv......v
-cccccccccllllllll..lllllllllllllccccccv......v
-cccccccccllllllll..llllllllllllllccccvv+vvv+vv
-cccccccccccclllll..llllllllllllllccccv%%%v%%%v
-cccccvvvvvvvvvvll..lllllllllllllcllccv%%%v%%%v
-cccccvll......v.....llllllllllllllcccv%%%v%%%v
-cccccvl1......v......llllllllllllllllvvAvvvBvv
-cccccvcc......+.......vlllllllllllllllvavcv.vc
-cccccvll......v.......vclclllllllllllcvavcvbvc
-cccccvl1......v.......vvvvlllllllllcccvavcvbvc
-cccccvcl......v...........llllllllllllvavcvbvc
-cccccvlllll.lllll.lllllllllllllllllllcvavcvbvc
-cccccvcl......v.......vvvvvvlllllllllcvavcvbvc
-cccccvll......v.......vccclllllllllllcvavcvbvc
-cccccvl1......vvvvvv+vvcccllllllllllccvavvvbvc
-cccccvcc......v.......vccccllllllllllcvaa.bbvc
-cccccvll......v8..2..8vcccclllllllllccvvv+vvvc
-cccccvl1......v.......vccccclllllllllllcv.vccc
-cccccvvvvvvvvvv.......vccccllllllllllllcv.vccc
-ccccccccccccccv.......vcccllllllllllllccv.vccc
-cvvvvvvvccccccvvvv++vvvc....lllllllcllccv.vccc
-cv.....vccccc....o..o........lllllllllccv.vccc
-cv.<A<.vcccc................llllllllllccv.vccc
-cv.....vc..c.................lllllllllccv.vccc
-cv.....v.....................llllllllcccv.vccc
-cv.o.o.v..8................8...llllllcccv.vccc
-cvvv=vvv.....................llllllllllcv.vccc
-ccc..ccccccc..................clllllllccv.vccc
-ccc...ccccc..................ccclllllllcv.vccc
-cc...cc...c.............c....cclllllllccv.vccc
-cc......................cc..cccclllllllcv.vccc
-c.........c.............cc.ccccccclllllcv.vccc
-c......ccccc............ccccccccllllllllv.vccc
-ccc.cccccccc.............cccccccllllllccv.vccc
-cccccccccc..........cccccccccccccllllllcv.vccc
-ccccccccc..........cccccccccccccclllllccv.vccc
-cccccccc...............cccccccccclllllccv.vccc
-ccccccc..........c.....ccccccccccclllcvvv.vvvv
-cccccc....8....ccc..cc.ccccccccccllllcv......v
-ccccc.........cccc....8.ccccccccclllllv......v
-cccccc.....ccccccccc....ccccccccclllllv......v
-cccccccc..ccccccccccccc.cccccccccclllcv.....$v
-ccccccccc.ccccccccccccccccccccccccccccv....$*v
-ccccccccccccccccccccccccccccccccccccccvvvvvvvv
-ENDMAP
-
-###############################################################################
 # Halls of the Hellbinder (by Mu.)
 #
 NAME:       wizlab_demon
@@ -1806,10 +1622,12 @@ KMONS:      1 = col:fire patrolling wizard name:Hellbinder name_replace \
 KITEM:      $ = gold / w:1 scroll of torment / w:1 scroll of summoning
 KITEM:      | = rod of demonology / ring of fire / ring of protection from fire /\
             amulet of conservation / scroll of torment / scroll of summoning /\
-            demon blade / demon whip / demon trident / gold / wand of fire /\
+            demon blade w:2 / demon whip w:2 / demon trident w:3 / gold / wand of fire /\
             wand of draining / staff of summoning / any book / any good_item
 KITEM:      B = randbook disc:summoning
 NSUBST:     | = 1:B / *:|
+:           set_random_mon_list([[imp / shadow imp / lemure / manes / quasit / white imp / ]]
+:                        .. [[ufetubus / midge / red devil / rotting devil / hairy devil / ]])
 MAP
 cccccccccccccccccccccccccccccccccccccccccccccc
 ccccccc.cccccc...................cccccc.cccccc