Level and database text update (David).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1786 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 439 insertions, 122 deletions

diff --git a/crawl-ref/source/dat/descript.txt b/crawl-ref/source/dat/descript.txt
index 5650aceff2..fbe3ee1f12 100644
--- a/crawl-ref/source/dat/descript.txt
+++ b/crawl-ref/source/dat/descript.txt
@@ -305,7 +305,10 @@ beast
 A weird and hideous cross between beast and human.
 %%%%
 iron devil
-A hideous humanoid figure with metal skin.
+
+A hideous humanoid figure with metal skin. While it lacks magical
+attacks and is slow of foot, it makes up for these failings with brute
+strength.
 %%%%
 glowing shapeshifter
 A shapeshifter which has lost control over its transformations, and is constantly changing form.
@@ -338,7 +341,9 @@ large skeleton
 A skeleton compelled to unlife by the exercise of necromancy.
 %%%%
 hell knight
-A heavily armoured warrior, in league with the powers of Hell.
+
+A heavily armoured warrior, in league with the powers of Hell, usually
+accompanied by other unsavoury beings of his ilk.
 %%%%
 necromancer
 A wizard specializing in the practice of death magic.
@@ -350,7 +355,7 @@ orc priest
 A servant of the ancient and cruel gods of the orcs, dressed in a long robe. It continually mumbles strange prayers. You should hope that they remain unheard.
 %%%%
 orc high priest
-An exalted servant of the orc god.
+An exalted servant of the orc god Beogh, mumbling fearsome prayers.
 %%%%
 human
 A remarkably nondescript person.  How odd!
@@ -596,7 +601,8 @@ midge
 A small flying demon.
 %%%%
 neqoxec
-A weirdly shaped demon.
+A weirdly shaped demon, pulsing and shifting with mutagenic energies,
+its belly distended with the devoured brains of its victims.
 %%%%
 orange demon
 A bright orange demon with a venomous stinger.
@@ -1225,19 +1231,30 @@ A large lizard with brightly coloured stripes and splotches.
 %%%%
 komodo dragon
 
-An enormous monitor lizard.  It's more than capable of preying on large animals.  Bits of fetid and rotting flesh from its last few meals are stuck in its teeth.
+An enormous monitor lizard. It's more than capable of preying on large
+animals. Bits of fetid and rotting flesh from its last few meals are
+stuck in its teeth.
 %%%%
 orange crystal statue
 
-An intricately carved statue of glittering orange crystal. Its eyes fix on yours with a piercing gaze.
+An intricately carved statue of glittering orange crystal. Its eyes
+fix on yours with a piercing gaze.
+
+It looks brittle.
 %%%%
 silver statue
 
-A beautiful statue of silver. Its eyes glow with an otherworldly radiance.
+A beautiful statue of silvery hue. Its eyes glow with an otherworldly
+radiance.
+
+It looks brittle.
 %%%%
 ice statue
 
-An imposing statue carved in glistening ice. Freezing vapours swirl about it.
+An imposing statue carved in glistening crystalline ice. Freezing
+vapours swirl about it.
+
+It looks brittle.
 %%%%
 Murray
 
@@ -1678,7 +1695,7 @@ This spell covers the caster with chunky scales of stone, the durability of whic
 %%%%
 Shock
 
-This spell throws a bolt of electricity. 
+This spell throws a bouncing bolt of electricity.
 %%%%
 Swiftness
 
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index a7b6c57a94..4db95b6916 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -3946,8 +3946,9 @@ ENDMAP
 
 ##############################################################
 # Mini maze
-NAME:    onia_ninara_004_mini_maze
+NAME:    onia_ninara_004_a_mini_maze
 TAGS:    entry
+CHANCE:  5
 ORIENT:  float
 ITEM:    apple / sausage / nothing / stone / potion of water
 SHUFFLE: ({[, Aa, Bb, Cc, Ee, Ff
@@ -3970,6 +3971,30 @@ x.....[x(x{.....x
 xxxxxxxxxxxxxxxxx
 ENDMAP
 
+NAME:    onia_ninara_004_b_mini_maze
+TAGS:    entry
+CHANCE:  5
+ORIENT:  float
+ITEM:    apple / sausage / nothing / stone / potion of water / w:30 nothing
+SHUFFLE: ({[ , AB
+SUBST:   A : x , B = = +:20 .:30, X = x=
+MONS:    w:30 nothing / w:10 plant / w:3 fungus / w:1 worm 
+MAP
+xxxxxxxxx@xxxxxxx
+x.......A.B.....x
+x.xxxxxBxxxAxxx.x
+x.xd1.......=dx.x
+x.xxxxxxxxxxx1x.x
+x.x...B.......x.x
+x.x.x.x.xxxxxAx.x
+x...x.x...1dx...x
+xxxxx.xxxxxxxx.xx
+x...............x
+x.xxxxxX.Xxxxxx.x
+x.....[x(x{.....x
+xxxxxxxxxxxxxxxxx
+ENDMAP
+
 ##############################################################
 # The zoo
 NAME:    onia_ninara_005_the_zoo
@@ -4020,6 +4045,190 @@ xxxx?x?x?x?x?x?x?xxxx
 xxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+#############################
+# Handbag
+#
+NAME: onia_ninara_010_handbag
+TAGS: entry
+ORIENT: float
+MONS: w:30 rat / goblin / kobold 
+MONS: w:50 giant bat / w:30 small snake / snake / jackal / w:20 giant cockroach
+SUBST: ! = $ %:30
+SUBST: ? = .:20 ~
+SHUFFLE: ({[<
+MAP
+................
+.xx..xx1x{x..xx.
+.....xxxxxx.....
+.xx1xx2?2?xx1xx.
+.(xx=2?!!2?=xx<.
+.xx1xx2?2?xx1xx.
+.....xxxxxx.....
+.xx..x[x1xx..xx.
+.......@........
+ENDMAP
+
+
+##############################################################################
+# Eino's entry vaults
+##############################################################################
+
+##############################################################
+# It's all downhill from here
+# A few cavern-like entry vaults, nothing fancy..
+#
+NAME:     entry_eino_001_a
+TAGS:     entry no_monster_gen
+ORIENT:   northwest
+FLAGS:    no_rotate
+SUBST:    V = V T:2
+SUBST:    ' : x.
+CHANCE:   5
+MAP
+xxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxx{xxxxxxxxxxx
+xxxxxxxxxx..xxxxxxxxxx
+xxxxxxxxxx(.[xxxxxxxxx
+xxxxxxxxx....'''xxxxxx
+xxxxxxxxx.....'''xxxxx
+xxxxxxxx......''''xxxx
+xxxxxxxx......'''xxxxx
+xxxxxxxx.......'xxxxxx
+xxxxxxx........xxxxxxx
+xxxxxxx.........xxxxx.
+xxxxxxx..............@
+xxxxxxx.........xxxxxx
+xxxxxxx.......V..xxxxx
+xxxxxx...........xxxxx
+xxxxxx.......V.V..xxxx
+xxxxxx.............xxx
+xxxxxxx.....V.V.V...xx
+xxxxxxx..............x
+xxxxxxxx@.@xxxxxxx@.xx
+ENDMAP
+
+NAME:     entry_eino_001_b
+TAGS:     entry no_monster_gen
+ORIENT:   northwest
+FLAGS:    no_rotate
+CHANCE:   5
+MAP
+xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxx{xxxxxxxx
+xxxxxxxxxxxx..xxxxxxx
+xxxxxxxxxxxx...xxxwxx
+xxxxxxxxxxx....xwwwxx
+xxxxxxxxxxx..wwwwwwxx
+xxxxxxxwwwwwwWwwwxxxx
+xxxxxxwwwwwwww..xxxxx
+xxxxxxwwxx.......xxxx
+xxxxxxxxx........xxxx
+xxxxxxxxx.........xxx
+xxxxxxxxx..........xx
+xxxxxxxxx..........xx
+xxxxxxxxx...........@
+xxxxxxxxxxx.......xxx
+xxxxxxxxxxxxx.@.xxxxx
+ENDMAP
+
+##############################################################
+# It just gets worse - caverns 2
+#
+NAME:     entry_eino_002_a
+TAGS:     entry no_monster_gen
+ORIENT:   northwest
+FLAGS:    no_rotate
+SHUFFLE:  ABC
+SUBST:    A==, B=x, C=x
+SUBST:    % = % .:5
+CHANCE:   2
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxx{.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxx...xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxx.....xxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxx........xxxxxxx.%.%.%.%.%.xxxxx
+xxxxxxxxxxx..........(..xAxxxxBxxxx.xxxxx
+xxxxxxxxxxxxx.................xxxxxBxxxxx
+xxxxxxxxxxxxxxxx......................xxb
+xxxxxxxxxxxxxxxxxxx.............[.......@
+xxxxxxxxxxxxxxxxxxxxxxx.............xxxxb
+xxxxxxxxxxxxxxxxxxxxxxxxxb.@.bxxxxxxxxxxx
+ENDMAP
+
+NAME:     entry_eino_002_b
+TAGS:     entry
+ORIENT:   northeast
+FLAGS:    no_rotate
+SHUFFLE:  bvc
+SUBST:    ' : x.
+CHANCE:   4
+MAP
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxx
+xxxxxxxxx{xxxxxxxxx
+xxxxxxxx...xxxxxxxx
+xxxxxx.....xxxxxxxx
+xxxxx.....''xxxxxxx
+xxx.......''xxxxxxx
+xx.........'xxxxxxx
+.......(I...'xxxxxx
+@.....vbc..''xxxxxx
+x....cbv...''xxxxxx
+x....I[....''xxxxxx
+...........'xxxxxxx
+@.........''xxxxxxx
+x........''xxxxxxxx
+xx.....xxxxxxxxxxxx
+xxx.@.xxxxxxxxxxxxx
+ENDMAP
+
+NAME:     entry_eino_002_c
+TAGS:     entry no_monster_gen
+ORIENT:   northeast
+FLAGS:    no_rotate
+SUBST:    ' : x. , " : x. , ? = x.
+CHANCE:   4
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?{xxxxxxxxx
+xxxxxxxxxx""xxxxxxxxxxxxxxx?...?xxxxxxxxx
+xxxxxxxxx""""xxxxxxxxxxx?.......?xxxxxxxx
+xxxxxxx""""""""xxxx?............?xxxxxxxx
+xxxxxx""""""....??.............'xxxxxxxxx
+xxxxx""".....................''xxxxxxxxxx
+xF.(x....................'''''xxxxxxxxxxx
+@.......?..........??.''''''xxxxxxxxxxxxx
+xF.%x..xxx?....[..xxxxx''''xxxxxxxxxxxxxx
+xxxxxxxxxxxxxxF.Fxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
 ##############################################################
 # Miscellaneous entries
 ##############################################################
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 0572783823..16b61cdf48 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -392,7 +392,7 @@ ENDMAP
 
 #############################################################################
 # Oklob shooting range
-
+#
 NAME:    oklob_3
 DEPTH:   21-27
 ORIENT:  float
@@ -419,3 +419,43 @@ xxxx...1...xxxx
 xxxxxxxxxxxxxxx
 ENDMAP
 
+#############################################################################
+# Swampy vault
+#
+NAME: onia_ninara_012_swampy_vault
+TAGS: no_pool_fixup no_monster_gen
+ORIENT: float
+SHUFFLE: AB@
+SUBST: A : x, B : x
+SUBST: D = .:30 W
+KFEAT: E = w:20 . / x / w:50 W / w:30 w / ~
+KFEAT: F = w:150 w / w:70 W / ~ / . / x
+KFEAT: G = x / . / w / W
+KFEAT: H = . / W
+KMONS: D = Plant / w:200 nothing
+KMONS: E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
+KMONS: F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
+KMONS: H = swamp drake / swamp dragon / hydra / w:20 nothing
+KITEM: H = any good_item / any potion / w:20 nothing / gold
+DEPTH: Lair
+MAP
+xxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxx
+xxxxxxGGGxxxxxxGEDEExxxxGGxxxxxxx
+xxxxGHHFFGGGGFFFEEDEEGGFFFxxGGxxx
+xxFFFHHFFFFFGFFFFEEDEEFFFFFFFFGxx
+xGGFFFFDDEEFFFFFEEDEEFFFFFFFFFFGx
+xxGFFFFEEDDEEFFEEDEEFFFEEEFFFFGxx
+xGFFFFFFFEEDEEEDDEEEEEEEDDEEEFFGx
+xGGFFFFFFFEEDEDEEEEEEEDDEEDDDEEDB
+xxGFFFFFFFFEEDEDDEDDDDEEEEEEEDDxx
+xxxGFFFFFFEEDEEEEDEEEEEFFFFFFFFxx
+xxxxFFFFFEEDEEFFFFDDFFFFFFFFFGGGx
+xxxGFFFFEEDEEFFFFFFEDEFFFFFFFxxxx
+xGGFFFFFFDEEFFFFFFFFEDFFFFFFGGxxx
+xGFFFFFFEEDEEFFFFFFFFEDEFFFGxxxxx
+xxGxxxGFEEDEEFFFFGGGFFHHHGxxxxxxx
+xxxxxxxGFEEDEEGGxxxxxGFHGxxxxxxxx
+xxxxxxxxGFDEGGxxxxxxxxxGxxxxxxxxx
+xxxxxxxxxxAxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 592bc47c51..806e462edd 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -215,7 +215,7 @@ ENDMAP
 
 
 ##############################################################################
-# Branch ends: Shoals, Slime Pit, Snake Pit, Swamp
+# Branch ends: Shoal, Slime Pit, Snake Pit, Swamp
 # Note that the Shoals usually have a randomised end map; predrawn maps 
 # (which need not be encompassing) are sometimes used, though.
 ##############################################################################
@@ -223,7 +223,7 @@ ENDMAP
 ##############################################################################
 # Shoals: ranged attackers
 #
-NAME:  Shoals_1
+NAME:  Shoal_1
 PLACE: Shoal:5
 MONS:  cyclops, yaktaur, yaktaur captain
 MAP
@@ -261,7 +261,7 @@ ENDMAP
 ##############################################################################
 # Shoals: fish
 #
-NAME:  Shoals_2
+NAME:  Shoal_2
 PLACE: Shoal:5
 MONS:  cyclops,stone giant
 SUBST: 1 = 1.
@@ -298,7 +298,7 @@ ENDMAP
 ##############################################################################
 # Shoals: statue on rune
 #
-NAME: Shoals_3
+NAME: Shoal_3
 PLACE: Shoal:5
 KMONS: x:ice statue/orange crystal statue/silver statue
 KFEAT: x:O
@@ -311,7 +311,7 @@ ENDMAP
 #
 # You may need controlled flight or apportation to get the liquid rune
 #
-NAME:  Shoals_4
+NAME:  Shoal_4
 PLACE: Shoal:5
 KFEAT: O = w
 ### KITEM: O = liquid rune of Zot
@@ -331,6 +331,40 @@ wwwwwwwww
 ....wwwww....
 ENDMAP
 
+##############################
+# Shoal hut with rune inside
+#
+# Shoal:$ is hand-hacked to force lots of minivaults.
+NAME: shoalhut_rune
+PLACE: Shoal:$
+TAGS: water_ok has_rune
+MONS: cyclops
+CHANCE: 1000
+MAP
+ x+x 
+xx1xx
+=1O1x
+xx1xx
+ xxx 
+ENDMAP
+
+##############################
+# Shoal hut with no rune inside
+#
+# Shoal:$ is hand-hacked to force lots of minivaults.
+NAME: shoalhut_norune
+PLACE: Shoal:$
+TAGS: water_ok allow_dup
+MONS: cyclops
+CHANCE: 1000
+MAP
+ x+x 
+xx.xx
+=.*1x
+xx1xx
+ xxx 
+ENDMAP
+
 ##############################################################################
 # Slime Pit
 #
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index ca5b4fff8e..96672304be 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -129,34 +129,29 @@ ENDMAP
 #
 # Lemuel
 #
-NAME: Giant_Chief
-DEPTH: D:11-22, Orc:2-4
-ORIENT: north
-MONS: stone giant, frost giant, fire giant
-MONS: hill giant, cyclops
-MONS: w:50 ogre/w:5 ogre-mage/two-headed ogre
-MONS: wolf/warg
-SUBST: a : x.
-SUBST: b : x.
-SUBST: g : x.
-SUBST: d : x.
-SUBST: ? = x.
-SUBST: ; = .'
-SUBST: e : x.
-SUBST: f : x.
+NAME:    Giant_Chief
+DEPTH:   D:11-22, Orc:2-4
+ORIENT:  north
+MONS:    stone giant, frost giant, fire giant
+MONS:    hill giant, cyclops
+MONS:    w:50 ogre / w:5 ogre-mage / two-headed ogre
+MONS:    wolf / warg
+SHUFFLE: ae / bB / gG / dD
+SUBST:   ; = .' 
 SHUFFLE: 'F1/ww2
 SHUFFLE: w2/l3
-SUBST: C = ?5
-SUBST: 0 = 4 7 8:20 .:20
-SUBST: T = .:50 ~
-SUBST: | : |:30 Z
-SUBST: ! = =?
-KFEAT: Z = floor
-KMONS: Z = hill giant zombie/stone giant zombie/cyclops zombie/titan zombie
-KFEAT: ( = . w:25/~
-KITEM: ( = any weapon good_item
-KMONS: 8 = plant
-KFEAT: 8 = floor
+SUBST:   C = ?5
+SUBST:   a:. , e:. , b:x. , g:x. , d:x. , B:x. , G:x. , D:x. , ? = x. 
+SUBST:   0 = 4 7 8:20 .:20
+SUBST:   T = .:50 ~
+SUBST:   | : |:30 Z
+SUBST:   ! = =+x
+KFEAT:   Z = floor
+KMONS:   Z = hill giant zombie/stone giant zombie/cyclops zombie/titan zombie
+KFEAT:   ( = . w:25 / ~
+KITEM:   ( = any weapon good_item
+KMONS:   8 = plant
+KFEAT:   8 = floor
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -168,19 +163,19 @@ xxxxxxxxx???xxxxxx?***??xxxxxxxxxxxxx.........7...c...444..cccc..........cxxxxxx
 xxxxxxx$$$$$$?xxxx?.6..?xxxxxxxxxeeee..7..........+........+TT+.........5cxxxxxx
 xxxxxx?$$$$$$.?xx?.666.xxxxxxee0eexxx7....7.......c........cccc.........1cxxxxxx
 xxxxxx.$$$$$$..?x...6..eeeeeeexxxxxxx............7ccccc+ccccccc.........5cxxxxxx
-xxxxxx....<....?!?....xxxxxxxxx$$$TTcccc+ccccccccccccccTc(((((+..........cxxxxxx
-xxxxxx?........?xxxxfxxxxxxxx<=$$$TT+.......+TTTTTTTTTTTc(((((c.......***cxxxxxx
-xxxxxxx........?xxfffxxxxxxxxxxx!xxxc..4.4..ccccccccccccccccccc444....***cxxxxxx
-xxxxxxxxx?...?xxxxfxxxxxxxxxxxxxCxxxc...4...cxxxCxxxxxxxxxxxxxxxxxxxxx=xxxxxxxxx
-xxxxxxxxxxx!xxxxxxfxxxxxxxbbb;''''''c..4.4..c'''''';ddddddddddxxxxxxxx||xxxxxxxx
-xxxxxxxx....xxxxxffxaaaaabbb0;''''''c.......c'''''';0ggggdddddd????xxx||xxxxxxxx
+xxxxxx....<.....=?....xxxxxxxxx$$$TTcccc+ccccccccccccccTc(((((+..........cxxxxxx
+xxxxxx?........?xxxx.xxxxxxxx<=$$$TT+.......+TTTTTTTTTTTc(((((c.......***cxxxxxx
+xxxxxxx........?xx...xxxxxxxxxxx!xxxc..4.4..ccccccccccccccccccc444....***cxxxxxx
+xxxxxxxxx?...?xxxx.xxxxxxxxxxxxxCxxxc...4...cxxxCxxxxxxxxxxxxxxxxxxxxx=xxxxxxxxx
+xxxxxxxxxxx!xxxxxx.xxxxxxxbbb;''''''c..4.4..c'''''';ddddddddddxxxxxxxx||xxxxxxxx
+xxxxxxxx....xxxxx..xaaaaabbb0;''''''c.......c'''''';0ggggdddddd????xxx||xxxxxxxx
 xxxxxx...xxxxx???0?aaaaabbbb..;'''''ccc+++ccc''''';...ggggggdddddd???xxxxxxxxxxx
-xxxxxx.xxxx???......aaaabbbbb...;''F,''''''',F'';........ggggggdddd.???xxxxxxxxx
+xxxxxxx.xxx???......aaaabbbbb...;''F,''''''',F'';........ggggggdddd.???xxxxxxxxx
 xxxxxx?!??.....0...aaaa..bbb........;''''''';.........ggggggg.ddd..0...?xxxxxxxx
-xxxxxxx.[........aaaaa....bbbbb.........4...ggggggggggggggg...dddd......??xxxxxx
+xxxxxxx..........aaaaa....bbbbb.........4...ggggggggggggggg...dddd......??xxxxxx
 xxxxxxx?...aaaaaaaaaa.......bbbbbbbbb..0..ggggggggggggggg...0....dd......?xxxxxx
 xxxxxxxaaaaaaaaaaaa.....0.....bbbbbbbbbggggggggggggggg...........dd......?xxxxxx
-xxxxxxxaaaaaaaa.....@..........bbbbb.....gggggggg........@.......d........xxxxxx
+xxxxxxxaaaaaaaa[....@..........bbbbb..@..gggggggg........@.......d.....@..xxxxxx
 ENDMAP
 
 
@@ -613,7 +608,7 @@ xxxxxxxxxx...xx*$....xx..xx....*$xx...xx
 xxxxxxxxxxx...xxxxxxxxx..xxxxxxxxx...xxx
 xxxxxxxxxxxx...xxxxxxxx..xxxxxxxx...xxxx
 xxxxxxxxxxxxx..^................^..xxxxx
-xxxxxxxxxxxxxxxxxxxxxxx^^xxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx~~xxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxx++xxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxx
 ENDMAP
@@ -645,7 +640,7 @@ xxxxxxxxx....wwvvvv....vv....vvvvww....x
 xxxxxxxxx...wwwv......vvvv......vwww...x
 xxxxxxxxx...wwwv....vv8vv8vv....vwww...x
 xxxxxxxxx..wwwwv...vvvv||vvvv...vwwww..x
-xxxxxxxxx^^wwwwv...vvvv||vvvv...vwwww^^x
+xxxxxxxxx~~wwwwv...vvvv||vvvv...vwwww~~x
 xxxxxxxxx..wwwwv....vv8vv8vv....vwwww..x
 xxxxxxxxx...wwwv......vvvv......vwww...x
 xxxxxxxxx...wwwvvvv....vv....vvvvwww...x
@@ -656,7 +651,7 @@ xxxxxxxxxx.....wwwwwv......vwwwww.....xx
 xxxxxxxxxxx.....wwwwvvvvvvvvwwww.....xxx
 xxxxxxxxxxx.......wwwwwwwwwwww.......xxx
 xxxxxxxxxxxx.........wwwwww.........xxxx
-xxxxxxxxxxxxx.........^..^.........xxxxx
+xxxxxxxxxxxxx.........~..~.........xxxxx
 xxxxxxxxxxxxxxx.......x++x.......xxxxxxx
 xxxxxxxxxxxxxxxxxx...xx..xx...xxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx..@.xxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 7566b4a70f..3b03d95108 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -1106,66 +1106,87 @@ ENDMAP
 # Wet chambers - two mutually exclusive versions (Onia Ninara)
 #
 NAME:    onia_ninara_007_chamber_of_wet_secrets
+DEPTH:   8-13
 TAGS:    no_monster_gen no_pool_fixup
 MONS:    centaur, brown snake, electrical eel
 ITEM:    bread ration/meat ration/royal jelly/potion of porridge, good_item cloak/any book
-SUBST:   ; = .:60 w W ?
-KFEAT:   ? = spear trap / blade trap / w:20 floor
-DEPTH:   8-13
+SHUFFLE: !;
+SUBST:   " = .:80 W:30
+SUBST:   ; = .:80 W:30
+SUBST:   ! = w:20 W ? c
+KFEAT:   3 = deep water
+KFEAT:   2 = shallow water / .
+KFEAT:   1 = shallow water / . w:30
+KFEAT:   d = shallow water / .
+KFEAT:   e = shallow water / .
+KFEAT:   ? = spear trap / blade trap
 MAP
 .........
 .ccccccc.
-.c;;2Wdc.
+.c?;2Wdc.
 .ccWccec.
-.c;w;c3c.
-.c;wWccc.
-.cWw;w;c.
-.c;ww;cc.
-.c;w;Wwc.
-.c1wW;wc.
-.c$w?wTc.
-.ccc=ccc.
+.c.w"c3c.
+.c"w"ccc.
+.c.w!;!c.
+.c"w!!;c.
+.c.w!;!c.
+.c1w?T!c.
+.c$w;!!c.
+.cccc=cc.
 .........
 ENDMAP
 
 NAME:    onia_ninara_008_deeper_chamber_of_wet_secrets
+DEPTH:   20-26
 TAGS:    no_monster_gen no_pool_fixup
-MONS:    yaktaur captain, grey snake/yellow snake, storm dragon
+MONS:    yaktaur captain, grey snake, storm dragon
 ITEM:    potion of cure mutation/potion of gain dexterity/potion of gain strength
-ITEM:    potion of gain intelligence/potion of experience/w:40 potion of heal wounds
-SUBST:   ; = .:60 w W ?
-KFEAT:   ? = Zot trap / floor
-SHUFFLE: de
-DEPTH:   20-26
+ITEM:    potion of gain intelligence/potion of experience/w:40 potion of heal wound
+SHUFFLE: de, !;
+KFEAT:   3 = deep water / .
+KFEAT:   | = shallow water / .
+KFEAT:   d = shallow water / .
+KFEAT:   e = shallow water / .
+KFEAT:   2 = shallow water 
+SUBST:   ; = .:80 W:30
+SUBST:   " = .:80 W:30
+SUBST:   ! = w:20 W ? c
+KFEAT:   ? = zot trap
 MAP
 .........
 .ccccccc.
-.c;;2Wdc.
+.c?.2Wdc.
 .ccWcc|c.
-.c;w;c3c.
-.c;wWccc.
-.cWw?w;c.
-.c;ww;cc.
-.c;w;Wwc.
-.c1wW;wc.
-.c$w?wUc.
-.ccc=ccc.
+.c"w"c3c.
+.c"w"ccc.
+.c"w!;!c.
+.c"w!?;c.
+.c"w!!;c.
+.c1w;U!c.
+.c$w!!;c.
+.cccc=cc.
 .........
 ENDMAP
 
+
+
 ##############################################################################
 # Loot vs monsters (Onia Ninara)
 #
 NAME:    onia_ninara_009_dug_in_and_dangerous
-DEPTH:   8-26
-SHUFFLE: vcb
-SUBST:   ? = %:90 *:30 |
+DEPTH:   8-26, !Swamp
+SHUFFLE: vcb, AB?/CD!
+SUBST:   A=9, B=8, C=1, D=9
+SUBST:   ? = %:10 *:50 |:60
+SUBST:   ! = %:90 *:30 |:10
+ITEM:    wand of digging/wand of disintegration/ring of teleportation/stone of earth elementals
+# if brown stairs work again, d could be replaced by brown <> occasionally
 MAP
 ...........
 .vvGvvvGvv.
-.v9998999v.
+.vAAABAAAv.
 .xxxxxxxxx.
-.v???v???v.
+.v???d???v.
 .vvGvvvGvv.
 .....@.....
 ENDMAP
@@ -1201,6 +1222,30 @@ www!!!?ww.
 ENDMAP
 
 ##############################
+# Cookie
+#
+NAME: onia_ninara_cookie
+SHUFFLE: ABCDEF
+SUBST: A : !, B : !, C : !, D : !, E : !, F : =, G : ~ l:50 w:50 I
+SUBST: ! : xvcba
+SUBST: H = 0 . ~ , J = 1 0:100 $:20
+ITEM: any jewelry
+MONS: giant eyeball
+MAP
+...........
+..!H!H!H!..
+.!!B!A!F!!.
+.HCJJJ!JEH.
+.!!J!G!J!!.
+.HDJ!d!JDH.
+.!!J!J!J!!.
+.HEJ!JJJCH.
+.!!F!A!B!!.
+..!H!H!H!..
+...........
+ENDMAP
+
+##############################
 # Secret library minivault
 #
 NAME: library
@@ -1214,37 +1259,3 @@ MAP
 .xxxx.
 ......
 ENDMAP
-
-##############################
-# Shoal hut with rune inside
-#
-# Shoal:$ is hand-hacked to force lots of minivaults.
-NAME: shoalhut_rune
-PLACE: Shoal:$
-TAGS: water_ok has_rune
-MONS: cyclops
-CHANCE: 1000
-MAP
- x+x 
-xx1xx
-=1O1x
-xx1xx
- xxx 
-ENDMAP
-
-##############################
-# Shoal hut with no rune inside
-#
-# Shoal:$ is hand-hacked to force lots of minivaults.
-NAME: shoalhut_norune
-PLACE: Shoal:$
-TAGS: water_ok allow_dup
-MONS: cyclops
-CHANCE: 1000
-MAP
- x+x 
-xx.xx
-=.*1x
-xx1xx
- xxx 
-ENDMAP
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index 376d5224fc..9b72afdfb8 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -93,7 +93,13 @@ ENDMAP
 NAME: orc_david_3
 TAGS: orc_entry
 ORIENT: float
-MONS: weight:30 orc / orc warrior / weight:1 orc knight
+#
+: if you.absdepth() >= 10 then
+MONS: weight:20 orc / orc warrior / weight:2 orc knight
+: else
+MONS: weight:30 orc / orc warrior
+: end
+#
 KFEAT: X = armour shop / .
 KFEAT: Y = weapon shop / .
 SUBST: ? = 1 $
@@ -147,8 +153,13 @@ SHUFFLE: EFGH
 SUBST:   E=3
 SUBST:   F=1, G=1, H=1
 MONS:    orc priest / nothing
+: if you.absdepth() >= 10 then
 MONS:    orc w:32 / w:7 orc warrior / w:1 orc knight
+: else
+MONS:    orc w:30 / w:10 orc warrior
+: end
 MONS:    orc priest
+MONS:    orc w:32 / w:7 orc warrior / w:1 orc knight
 SUBST:   x : cxv
 SHUFFLE: () / XY
 SUBST:   X=., Y=. 
@@ -158,7 +169,7 @@ x.....)O(.....x
 x......F......x
 x2..T.ECG.T..2x
 x2222..H..2222x
-x22222.I.22222x
+x42222.I.22224x
 xxI+IxxxxxI+Ixx
 ...@.......@...
 ENDMAP