Remove Big fish from vaults

Some sharks have also been removed from vaults where convenient, since
sharks are next to be removed.

14 files changed, 63 insertions, 109 deletions

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index cb4d1786f6..566aca6936 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -462,25 +462,6 @@ xxxxx xx.xx xxxxx
       xx@xx
 ENDMAP
 
-NAME:   elyvilon_altar_2
-TAGS:   uniq_altar_elyvilon temple_overflow_1 temple_overflow_elyvilon
-TAGS:   no_pool_fixup no_monster_gen transparent decor
-DEPTH:  D:2-
-KFEAT:  C = altar_elyvilon
-NSUBST: W = 1:Z / *:W
-KMONS:  Z = big fish att:good_neutral
-KFEAT:  Z = W
-: interest_check(_G)
-MAP
-   @
-  wWw
- wwWww
-@WWCWW@
- wwWww
-  wWw
-   @
-ENDMAP
-
 NAME:   elyvilon_altar_3
 TAGS:   uniq_altar_elyvilon temple_overflow_1 temple_overflow_elyvilon
 TAGS:   no_pool_fixup decor
@@ -618,7 +599,6 @@ xxxxxxxtttttttx
 xxxxxxxxxxxxxxx
 ENDMAP
 
-# Threat: two big fish. Loot: some fruits.
 # The oklob plant may be abusable (if so, remove it).
 NAME:    tgw_fedhas
 TAGS:    no_item_gen no_monster_gen
@@ -626,23 +606,22 @@ TAGS:    temple_overflow_1 temple_overflow_fedhas uniq_altar_fedhas
 DEPTH:   Lair, D:2-
 KFEAT:   _ = altar_fedhas
 KPROP:   xzd3P = no_rtele_into
-MONS:    plant, fungus, oklob plant, big fish, bush, toadstool col:random
+MONS:    plant, fungus, oklob plant, bush, toadstool col:random
 KITEM:   d = fruit / nothing
 KFEAT:   d = floor
 SUBST:   x = TTPPPPP.
 # Only make "oklob behind bushes" situation possible a bit deeper.
 : if you.absdepth() > 5 then
 SHUFFLE: PQR
-SUBST:   Q = 115, R = 11125
+SUBST:   Q = 114, R = 11124
 : end
 SUBST:   P = 112
 SUBST:   z = .
 SHUFFLE: ...", TU
 SUBST:   T = xt, U = xx
-SUBST:   " = .....6
+SUBST:   " = .....5
 COLOUR:  . = green / none
 COLOUR:  ' = green
-NSUBST:  w = 2:4 / *:w
 
 MAP
 ccccccccccccccccccccccc
@@ -651,10 +630,10 @@ cxxxxxxxxxxxxxxPxxd3xxc
 cxxxxxxxxxxxxxxPddddxxc
 cxxxxxxxxxxxxxxPPPxzdxc
 cxxxxxxx.......xxPPxxxc
-cxxxxxx..wwdww..xxPPxxc
-cxxxxx..wwwdwww..xxxPxc
-cxxxx..wwwwdwwww..xxxxc
-cxxxx.wwwwwdwwwww.xxxxc
+cxxxxxx..ww.ww..xxPPxxc
+cxxxxx..www.www..xxxPxc
+cxxxx..wwww.wwww..xxxxc
+cxxxx.wwwww.wwwww.xxxxc
 cxxxx.wwww'''wwww.xxxxc
 cxxxx.wwww'_'wwww.xxxxc
 cxxxx.wwww'''wwww.xxxxc
@@ -903,8 +882,6 @@ TAGS:   no_pool_fixup uniq_zombie_altar no_monster_gen temple_overflow_1
 TAGS:   temple_overflow_kikubaaqudgha
 KFEAT:  _ = altar_kikubaaqudgha
 MONS:   rat zombie / bat zombie / nothing w:90
-MONS:   big fish zombie
-NSUBST: w = 1 : 22w / *:w
 : interest_check(_G)
 MAP
 xxxxxxxxxxxxxxxx
@@ -2133,17 +2110,15 @@ DEPTH:  D:2-, Crypt
 TAGS:   no_pool_fixup uniq_zombie_altar no_monster_gen temple_overflow_1
 TAGS:   temple_overflow_yredelemnul
 KFEAT:  _ = altar_yredelemnul
-SUBST:  1 : 1Ww
-SUBST:  1 = WWw
-NSUBST: w = 2:1 / *:w
-KMONS:  1 = big fish zombie
+MONS:   patrolling gnoll zombie
+NSUBST: A = 2:1 / *:.
 MAP
 xxxxxxxxxxxxxxxx
-xxxxwwwwwwwwxxxx
-xxxx11111111xxxx
+xxxxAAAAAAAAxxxx
+xxxx........xxxx
 @............._x
-xxxx11111111xxxx
-xxxxwwwwwwwwxxxx
+xxxx........xxxx
+xxxxAAAAAAAAxxxx
 xxxxxxxxxxxxxxxx
 ENDMAP
 
diff --git a/crawl-ref/source/dat/des/branches/crypt.des b/crawl-ref/source/dat/des/branches/crypt.des
index 83b410b2ad..42686ac96a 100644
--- a/crawl-ref/source/dat/des/branches/crypt.des
+++ b/crawl-ref/source/dat/des/branches/crypt.des
@@ -481,7 +481,7 @@ TAGS: no_pool_fixup extra
 SUBST: . : .W
 SUBST: 1 = w:50 1
 KFEAT: 1 = w
-KMONS: 1 = big fish zombie / shark zombie
+KMONS: 1 = swamp worm zombie
 MAP
 @..wwwww..@
 ..ww111ww..
@@ -962,7 +962,7 @@ TAGS: no_pool_fixup extra
 DEPTH: Crypt
 SUBST: w = Ww, . = ...W
 NSUBST: A = + / c
-KMONS: 1 = big fish zombie / swamp worm zombie
+KMONS: 1 = swamp worm zombie
 KMONS: 2 = bog body
 KFEAT: 1 = w
 KFEAT: 2 = W / . w:20
diff --git a/crawl-ref/source/dat/des/branches/hell.des b/crawl-ref/source/dat/des/branches/hell.des
index 737845dbab..34143c5f88 100644
--- a/crawl-ref/source/dat/des/branches/hell.des
+++ b/crawl-ref/source/dat/des/branches/hell.des
@@ -546,7 +546,7 @@ WEIGHT: 5
 COLOUR: . = magenta
 FTILE:  .O = floor_infernal_blank
 NSUBST: w = 5=F / *:w
-KMONS:  F = spectral shark / spectral big fish
+KMONS:  F = spectral swamp worm
 KFEAT:  EFw = deep_water
 KMASK:  Ww = no_monster_gen
 : hell_entry_feature(_G, 'O')
diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des
index e0e7ba85d7..566cafda34 100644
--- a/crawl-ref/source/dat/des/branches/lair.des
+++ b/crawl-ref/source/dat/des/branches/lair.des
@@ -1729,7 +1729,7 @@ ORIENT: float
 TAGS:   patrolling no_monster_gen
 MONS:   black bear / polar bear
 KFEAT:  " = W
-KMONS:  " = big fish / shark / electric eel
+KMONS:  " = electric eel w:40 / nothing
 KITEM:  % = fruit w:80 / w:1 meat ration
 SUBST:  % = %., * = *:40 |, B = 1., E = tE
 CLEAR:  E
@@ -1758,7 +1758,7 @@ NSUBST: 0 = 2:9 / *:0
 MONS:   plant / bush / toadstool
 KMONS:  2 = plant / toadstool
 KMONS:  3 = w:2 shark / plant / toadstool
-KMONS:  4 = w:5 big fish / shark / electric eel
+KMONS:  4 = electric eel w:40 / nothing
 KFEAT:  23 = W
 KFEAT:  4 = w
 KMONS:  5 =  lindwurm / dire elephant / catoblepas
@@ -1916,8 +1916,6 @@ KMONS: Y = yak
 KMONS: D = death yak
 KMONS: C = catoblepas
 KMONS: P = plant
-KMONS: k = big fish
-KFEAT: k = w
 MAP
         .@@@.
       .........
@@ -1927,8 +1925,8 @@ MAP
  .PPttP..P.P.PP.ftP...
  .P....PPP...PPP.PP..@
 ..PP..PPPwwwC.P..PPP.@
-......Y.wkwwww.Y.ttP.@
-.@.PP..Pwwwwkw...fttt.
+......Y.wwwwww.Y.ttP.@
+.@.PP..Pwwwwww...fttt.
  @..P..PP.wwwPP.ttttt
   @.PP.PPP..PP..PPttt
   ...Ptt.P.PPPPPP....
diff --git a/crawl-ref/source/dat/des/branches/shoals.des b/crawl-ref/source/dat/des/branches/shoals.des
index 8678fed16d..32cc346bab 100644
--- a/crawl-ref/source/dat/des/branches/shoals.des
+++ b/crawl-ref/source/dat/des/branches/shoals.des
@@ -158,7 +158,7 @@ TAGS:   shoals_entry
 KFEAT:  O = enter_shoals
 NSUBST: Z = 4:1 / *:W
 KFEAT:  1 = W
-KMONS:  1 = big fish w:5 / shark w:5 / merfolk w:5 / mermaid w:5
+KMONS:  1 = merfolk / mermaid
 MAP
 ..xxx
 xZ..x
@@ -735,8 +735,8 @@ NAME: nicolae_shoals_siren_and_animal_friends
 DEPTH: Shoals
 TAGS: patrolling no_monster_gen
 SUBST: w = f:4 w W
-KMONS: f = bat w:5 / big fish w:5 / griffon / harpy / hippogriff / \
-       kraken w:1 / raven w:5 / sea snake / shark / sky beast w:1 / \
+KMONS: f = bat w:5 / griffon / harpy / hippogriff / \
+       kraken w:1 / raven w:5 / sea snake / sky beast w:1 / \
        snapping turtle / steam dragon w:1 / alligator w:5 / \
        alligator snapping turtle / anaconda w:1 / \
        water moccasin w:5 / electric eel w:1
@@ -757,7 +757,7 @@ DEPTH: Shoals:2-
 TAGS: no_item_gen no_monster_gen
 KMONS: i = merfolk impaler band / merfolk javelineer band
 SUBST: : = .:3 h:1, W = .W
-: dgn.delayed_decay(_G, 'h', 'big fish corpse / snapping turtle corpse / shark corpse')
+: dgn.delayed_decay(_G, 'h', 'snapping turtle corpse')
 MAP
 WWWWWWW
 WW:::WW
diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des
index e8782b013b..b641036d24 100644
--- a/crawl-ref/source/dat/des/branches/swamp.des
+++ b/crawl-ref/source/dat/des/branches/swamp.des
@@ -173,7 +173,7 @@ MARKER: O = lua:fog_machine { pow_min = 8, pow_max = 12, delay = 25, \
 NSUBST: A = ttttw / w, B = ttttw / w, C = ttttw / w, D = ttttw / w
 NSUBST: E = T / ., F = T / ., G = T / ., H = T / ., I = T / ., J = T / .
 SUBST: T = tt.
-KMONS: 1 = swamp worm / big fish
+KMONS: 1 = swamp worm
 KMONS: 2 = electric eel
 KFEAT: 12 = w
 MAP
@@ -1285,10 +1285,10 @@ NAME: nicolae_swamp_necromancer_hut
 SUBST: q = tW., r = W., W = zWW
 # Necromancer gets the spell set without bolt of fire so he doesn't torch the place.
 MONS: necromancer actual_spells spells:bolt_of_cold;agony;.;animate_dead;simulacrum;.
-KMONS: z = big fish zombie / swamp drake zombie / swamp worm zombie / \
+KMONS: z = crocodile zombie / swamp drake zombie / swamp worm zombie / \
         water moccasin zombie / swamp dragon zombie / \
         komodo dragon zombie / red wasp zombie / alligator zombie / \
-        crocodile zombie / hydra zombie / giant leech zombie / hydra zombie / \
+        hydra zombie / giant leech zombie / hydra zombie / \
         alligator simulacrum w:1 / swamp drake simulacrum w:1 / \
         swamp dragon simulacrum w:1 / hydra simulacrum w:1
 KFEAT: z = shallow_water
diff --git a/crawl-ref/source/dat/des/branches/tar.des b/crawl-ref/source/dat/des/branches/tar.des
index 2b8589685b..5ea3f0c397 100644
--- a/crawl-ref/source/dat/des/branches/tar.des
+++ b/crawl-ref/source/dat/des/branches/tar.des
@@ -872,7 +872,7 @@ NSUBST: ! = 2:. / *:c
 NSUBST: ? = 2:. / *:c
 NSUBST: ^ = 2:. / *:c
 KMONS:  E = spectral kraken
-KMONS:  F = spectral shark / spectral big fish
+KMONS:  F = spectral swamp worm
 KFEAT:  EFw = deep_water
 KMASK:  Ww = no_monster_gen
 : serpent_of_hell_setup(_G)
diff --git a/crawl-ref/source/dat/des/branches/temple.des b/crawl-ref/source/dat/des/branches/temple.des
index 694f4cade9..8a1881594e 100644
--- a/crawl-ref/source/dat/des/branches/temple.des
+++ b/crawl-ref/source/dat/des/branches/temple.des
@@ -764,14 +764,7 @@ NAME:   minmay_temple_entry_water_ring
 TAGS:   temple_entry no_pool_fixup
 ORIENT: float
 WEIGHT: 3
-KMONS:  1 = big fish
-KFEAT:  1 = W
 KMASK:  W = no_monster_gen
-NSUBST: W = 1:1
-: if crawl.one_chance_in(5) then
-SUBST:  W = w
-KPROP:  ' = no_rtele_into
-: end
 SUBST:  ' = .
 SUBST:  x : xxcccvvbt
 KFEAT:  O = enter_temple
@@ -1008,7 +1001,7 @@ SUBST:   W : mvbG
 SUBST:   W = w
 NSUBST:  w = 6:1 / *:w
 KFEAT:   1 = w
-KMONS:   1 = shark / electric eel / big fish
+KMONS:   1 = electric eel
 : else
 SUBST:   W = w
 :end
@@ -1069,7 +1062,7 @@ SUBST:   W : mvbG
 SUBST:   W = w
 NSUBST:  w = 6:1 / *:w
 KFEAT:   1 = w
-KMONS:   1 = shark / electric eel / big fish
+KMONS:   1 = electric eel
 : else
 SUBST:   W = w
 :end
diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des
index 9b150b79ab..8564a0b081 100644
--- a/crawl-ref/source/dat/des/builder/food.des
+++ b/crawl-ref/source/dat/des/builder/food.des
@@ -154,6 +154,7 @@ cccccccccccc
 ENDMAP
 
 # 23.2k/19.9k/13k
+# Not really a fish farm now that fish are gone...
 NAME:   hangedman_fish_farm
 DEPTH:  D:9-14
 : food_weight(_G, 7)
@@ -161,16 +162,14 @@ WEIGHT: 15
 TAGS:   uniq_second_food extra chance_second_food no_monster_gen no_pool_fixup \
         patrolling
 KMONS:  A = merfolk ; spear
-KMONS:  B = big fish / nothing
-KMONS:  C = big fish
-KFEAT:  gBC = shallow_water
+KFEAT:  g = shallow_water
 ITEM:   meat ration q:2 no_mimic, bread ration q:3 no_mimic, throwing net
-:       dgn.delayed_decay(_G, 'g', 'big fish corpse')
+:       dgn.delayed_decay(_G, 'g', 'electric eel corpse')
 MAP
 xxxxxx
 xgxedx
 +..fAx
-xCBBBx
+xWWWWx
 xxxxxx
 ENDMAP
 
diff --git a/crawl-ref/source/dat/des/portals/bazaar.des b/crawl-ref/source/dat/des/portals/bazaar.des
index 438853f556..1aafdeba97 100644
--- a/crawl-ref/source/dat/des/portals/bazaar.des
+++ b/crawl-ref/source/dat/des/portals/bazaar.des
@@ -301,13 +301,12 @@ default-depth: Bazaar
 ##########################################################################
 
 ##########################################
-# bazaar lakeside with fish (jpeg)
+# bazaar lakeside (jpeg)
 # 5 shops
 NAME:    bazaar_lake
 TAGS:    no_rotate
 ORIENT:  encompass
 WEIGHT:  20
-MONS:    big fish / shark
 SUBST:   a = W.
 SHUFFLE: ABCDEF
 SUBST:   A = Y
@@ -345,7 +344,7 @@ xxxxxxxx..............aaaaa..............xxxxxxxxx
 xxxxxxxx.....E.......awwwwwaa......A.....xxxxxxxxx
 xxxxxxx............aawwwwwwwww............xxxxxxxx
 xxxxxxx...........awwwwwWwwwwa............xxxxxxxx
-xxxxxxx..........awwwww1WWwwwa............xxxxxxxx
+xxxxxxx..........awwwwwWWWwwwa............xxxxxxxx
 xxxxxxxY.T........awwwwwwWWwwwa........T.Yxxxxxxxx
 xxxxxxx............awwwwwwwwaX............xxxxxxxx
 xxxxxxx.............aawwwwwwwwa...........xxxxxxxx
diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des
index 2ba8826d0d..0479455321 100644
--- a/crawl-ref/source/dat/des/portals/sewer.des
+++ b/crawl-ref/source/dat/des/portals/sewer.des
@@ -113,10 +113,10 @@ ENDMAP
 
 NAME:   portal_sewer_entry_d
 : sewer_portal(_G)
-KMONS:  1 = big fish
+KMONS:  1 = giant mite
 MAP
 xxxxxxxxxx
-xWOW1WWWWW@
+x.O.1.....@
 xxxxxxxxxx
 ENDMAP
 
@@ -285,9 +285,6 @@ SUBST:    ? = .x
 KFEAT:    Y = deep_water
 KFEAT:    y = shallow_water
 KFEAT:    E = altar_zin / altar_elyvilon w:30
-KMONS:    q = big fish
-KFEAT:    q = w
-COLOUR:   q = green
 MONS:     jackal / w:3 nothing, kobold / w:5 nothing, big kobold
 SHUFFLE:  de
 ITEM:     potion of curing / potion of heal wounds
@@ -318,7 +315,7 @@ MAP
       c.'WwW''c
       c.WWwWW'c
       c'WwwwW'c
-      c'WwqwW'c
+      c'WwwwW'c
       c'WwwwW'c
       c.'WWW''c
       c..''''.c
@@ -396,7 +393,6 @@ MONS:    kobold / big kobold w:2
 MONS:    bat / rat / ooze w:5 / ball python / giant newt w:5 / \
          giant cockroach w:5 / giant mite w:5 / adder w:1
 KMONS:   . = plant w:1 / fungus w:1 / nothing w:80
-KMONS:   3 = big fish
 KMONS:   p = plant
 SUBST:   p = ppW
 ITEM:    potion of curing / potion of heal wounds / potion of might w:4 /\
@@ -409,9 +405,8 @@ NSUBST:  F = 5:1 / 4:d / *:!
 NSUBST:  E = 2:1 / 3:d / *:!
 NSUBST:  H = 2:1 / 3:d / *:!
 NSUBST:  . = 10:2 / *:.
-NSUBST:  W = 3:3 / *:W
-KFEAT:   p3 = shallow_water
-COLOUR:  p3 = lightgreen
+KFEAT:   p = shallow_water
+COLOUR:  p = lightgreen
 KFEAT:   ! = floor
 : sewer_setup(_G)
 MAP
@@ -719,7 +714,7 @@ KFEAT:   1 = w
 COLOUR:  1 = green
 KMONS:   1 = giant newt / ball python w:5 / \
          generate_awake giant newt / generate_awake ball python w:5 / \
-         adder w:4 / big fish w:3 / nothing w:6
+         adder w:4 / nothing w:6
 #      loot
 SUBST:   e = !!!!????%
 KITEM:   ? = potion of flight q:2 w:15 / potion of curing /\
@@ -828,10 +823,10 @@ SUBST:    Q = 4, E = 5, D : fgh, S = $
 NSUBST:   f = 1:f / *:'
 NSUBST:   g = 2:g / *:'
 NSUBST:   h = 3:h / *:'
-#       some random monsters I: flying or big fish
+#       some random monsters I: bat or nothing
 NSUBST:   w = 4:" / *:w
 KFEAT:    " = w
-KMONS:    " = big fish w:2 / bat / nothing
+KMONS:    " = bat / nothing
 COLOUR:   " = green
 #       some random monsters II: standard Sewers set
 NSUBST:   W = 4:? / *:W
@@ -1127,7 +1122,7 @@ ORIENT:  encompass
 MONS:    giant newt / ball python w:5 / \
          generate_awake giant newt / generate_awake ball python w:5 / \
          adder w:2 / nothing w:4
-KMONS:   2 = adder / big fish
+KMONS:   2 = adder
 KFEAT:   2 = W
 COLOUR:  2 = lightgreen
 #      generate first path.
@@ -1202,7 +1197,7 @@ KMONS:   P = plant / nothing
 KFEAT:   1 = W
 COLOUR:  1 = lightgreen
 KMONS:   1 = giant newt / ball python w:5 /  generate_awake ball python w:5 / \
-         adder w:7 / big fish w:5
+         adder w:7
 SUBST:   1 = 1111W
 #      other monsters
 KMONS:   2 = jackal / kobold, w:5 big kobold / w:5 green rat, rat
@@ -1401,10 +1396,9 @@ KMONS:   6 = kobold demonologist name:apprentice n_adj n_noc \
              spells:summon_minor_demon;cantrip;summon_minor_demon;\
              cantrip;cantrip;cantrip
 SHUFFLE: 456
-KMONS:   - = big fish / big fish zombie w:5 / nothing w:90
+KITEM:   456 = star_item
 KFEAT:   - = deep_water
 KPROP:   W- = no_tele_into
-KITEM:   456 = star_item
 SUBST:   W = WWWw.
 COLOUR:  - = lightgreen
 SUBST:   - = wwwW-
diff --git a/crawl-ref/source/dat/des/serial/aquarium.des b/crawl-ref/source/dat/des/serial/aquarium.des
index d41015b35f..2e078f62c0 100644
--- a/crawl-ref/source/dat/des/serial/aquarium.des
+++ b/crawl-ref/source/dat/des/serial/aquarium.des
@@ -10,8 +10,8 @@
 #  branch.  The contents are as follows:
 #   -> D:1-3   grass, bushes, butterfly
 #   -> D:4-6   some shallow water, fungus, bat
-#   -> D:7-12  deep water, shark, big fish
-#   -> D:13-15 deep water, electric eel, shark, sea snake, snapping turtle
+#   -> D:7-12  deep water, electric eel,
+#   -> D:13-15 deep water, electric eel, sea snake, snapping turtle
 #   -> D:16-18 ice, polar bear, yak, death yak, wolf
 #   -> D:19-21 ice, ice beast, simulacrum, freezing clouds
 #   -> D:22-24 lava, fire vortex, lava snake, salamander
@@ -117,14 +117,10 @@ function init_aquarium(e)
   elseif you.absdepth() <= 9 then
     e.kfeat('w = w')
     e.kmons('w = w:' .. nothing_weight .. [[ nothing /
-                 w:6  generate_awake shark /
-                 w:6  generate_awake big fish /
                  w:3  generate_awake electric eel]] )
   elseif you.absdepth() <= 12 then
     e.kfeat('w = w')
     e.kmons('w = w:' .. nothing_weight .. [[ nothing /
-                 w:6  generate_awake big fish /
-                 w:4  generate_awake shark /
                  w:1  generate_awake sea snake /
                  w:4  generate_awake snapping turtle]] )
   elseif you.absdepth() <= 15 then
diff --git a/crawl-ref/source/dat/des/sprint/menkaure.des b/crawl-ref/source/dat/des/sprint/menkaure.des
index 58df1ea692..e2d06c9b45 100644
--- a/crawl-ref/source/dat/des/sprint/menkaure.des
+++ b/crawl-ref/source/dat/des/sprint/menkaure.des
@@ -28,7 +28,7 @@ ORIENT: encompass
 SHUFFLE: 123
 SUBST:  ' = '......
 KFEAT:  ' = net trap / needle trap / bolt trap / spear trap / arrow trap
-MONS:   Menkaure, baby alligator, crocodile, big fish, kraken, shark
+MONS:   Menkaure, baby alligator, crocodile, kraken, shark
 MARKER: a = lua:fog_machine { \
              pow_min = 1, pow_max = 2, delay = 3, \
              size = 2, walk_dist = 8, spread_rate= -1, \
@@ -38,7 +38,8 @@ MARKER: d = lua:fog_machine { \
              pow_min = 3, pow_max = 6, delay = 3, \
              size = 2, walk_dist = 16, spread_rate= -1, \
              cloud_type= "grey smoke" }
-KFEAT:  d = shallow_water
+KFEAT:  dV = shallow_water
+KMONS:  V = crocodile
 KMONS:  b = orange rat / scorpion / vampire mosquito / blink frog
 KITEM:  b = star_item
 SUBVAULT: A : sprint2_stairs_cluster
@@ -84,17 +85,17 @@ cmBBBBBBBBmWAAAAAAAAAAAAA..IIII''GGGGoDDDDDDDDoOOOOO'XPPPPPPPP
 cmBBBBBBBB+WAAAAAAAAAAAAA..IIII''GGGGoDDDDDDDDoOOOOO'XPPPPPPPP
 cmBBBBBBBBmWAAAAAAAAAAAAA....III''GGGooooooo+ooOOOOO'XPPPPPPPP
 cooooooommmWAAAAAAAAAAAAA1.....WWWWWWWWWWWWW...wwwXUUUUUUUUccc
-ccLLLLLccccWWAAAAAAAAAAAWW.....Wm+mmmmmmmmWccc.w5wXUUUUUUUcc
-ccLLLLLLLLccWWWAAAAAAAWWWWWWW..WmCCCCCCCCmWW4ccwwwXUUUUUUcc
-ccLLLLLLm+cc+cWAAAAAAAWWWWWWWW3WmCCCCCCCCmW4wwccccXXXXXWcc
-ccLLLLLmmKccbcWWAAAAAWWWlllaWWWWmCCCCCCCCmWWW4wccTTTTTXWc
-ccLLLLmmKKKccccWWWWWWWWWWllllWWWmCCCCCCCCmWW4wwwTTTTTTXWc
-ccLLLLmKKKKKc|c+++m+++cWlllllllWmCCCCCCCCmWWdW4wTTTTTTXWc
-ccLLLLmKKKKKcccEEEEEEEcclllcccllmCCCCCCCCmW4WWw4TTTTTTXWc
-ccLLLLmKKKKKccEEEEEEEEEccllc|cllmCCCCCCCCmWWww4wXTTTTTXWc
+ccLLLLLccccWWAAAAAAAAAAAWW.....Wm+mmmmmmmm+ccc.w4wXUUUUUUUcc
+ccLLLLLLLLccWWWAAAAAAAWWWWWWW..WmCCCCCCCCmWWWccwwwXUUUUUUcc
+ccLLLLLLm+cc+cWAAAAAAAWWWWWWWW3WmCCCCCCCCmWWwwccccXXXXXWcc
+ccLLLLLmmKccbcWWAAAAAWWWlllaWWWWmCCCCCCCCmWWWWwccTTTTTXWc
+ccLLLLmmKKKccccWWWWWWWWWWllllWWWmCCCCCCCCmWWVwwwTTTTTTXWc
+ccLLLLmKKKKKc|c+++m+++cWlllllllWmCCCCCCCCmWWdWWwTTTTTTXWc
+ccLLLLmKKKKKcccEEEEEEEcclllcccllmCCCCCCCCmWVWWwVTTTTTTXWc
+ccLLLLmKKKKKccEEEEEEEEEccllc|cllmCCCCCCCCmWWwwwwXTTTTTXWc
 ccLLLL+KKKKK+EEEEEEEEEEE+llc+cllmCCCCCCCCmWwwwXXXXXXXXXWc
-ccLLLLcKKKKKccEEEEEEEEEcclllllllmmmmmmmmmmWwwwo666wwwwWWc
-ccLLLLcKKKKKcccEEEEEEEccmmmmmmmmmWWWWWWWWWwwwwo666wwwwWWc
+ccLLLLcKKKKKccEEEEEEEEEcclllllllmmmmmmmmmmWwwwo555wwwwWWc
+ccLLLLcKKKKKcccEEEEEEEccmmmmmmmmmWWWWWWWWWwwwwo555wwwwWWc
 ccLLLLcKKKKKcNcccc+ccccFFFFFFFmmmWccccccccwXXXXXXXXXwwWWc
 ccLLLLccKKKccNNNNmmmccFFFFFFFFFmmWcNNNNNNcXXSSSSSSSXXwWWc
 ccLLLLcccKccNNNNNNNN+FFFFFFFFFFF+WcNNNNNNcXSSSSSSSSSXXWWc
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index c9450bba02..257bc7173f 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -1067,11 +1067,10 @@ ENDMAP
 NAME:  guppyfry_early_lair_pool
 TAGS:  patrolling no_monster_gen transparent
 DEPTH: D:2-5
-KMONS: 1 = big fish
 KMONS: 2 = adder
 KMONS: 3 = plant
 ITEM:  fruit
-SUBST: - = wwwwwwWWW1
+SUBST: - = wwwwwwWWW
 SUBST: . = ........33
 SUBST: ? = .wwt3%dd22
 : if you.absdepth() < 4 then