Make Crawl a little uglier (upgrade ugly things)

Ugly things now have the stats of old very ugly things; very
ugly things are now... miniature elemental dire elephants, more
or less. (A little weaker.) They've been adjusted to not spawn
in bands below a certain depth (d:13 for ugly things), ala
the famous d:1 gnoll.

Ideally, they'll be potentially threatening in Vaults/Depths
now. (Their primary spawning spot.)

13 files changed, 42 insertions, 41 deletions

diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index 7bd0658c12..231d10bb6d 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -267,8 +267,8 @@ MONS:   worker ant w:40 / goliath beetle w:20 / vampire mosquito
 KMONS:  8 = demonic crawler
 KMONS:  9 = emperor scorpion
 KMONS:  D = place:D:1 perm_ench:shapeshifter w:30 / \
-            small abomination w:15 / ugly thing w:15 / chaos spawn
-KMONS:  E = very ugly thing
+            small abomination w:15 / chaos spawn
+KMONS:  E = ugly thing
 KMONS:  F = large abomination / glowing shapeshifter w:7
 SHUFFLE: 123 / 456 / 789 / DEF
 SUBST:  C = xccv, w : w:8 l:1 .:1, W : .:9 W:1
@@ -538,7 +538,7 @@ ENDMAP
 NAME:    hangedman_shadowy_showcase
 TAGS:    transparent no_monster_gen
 MONS:    shadow wraith / unseen horror / thrashing horror, lurking horror
-MONS:    shapeshifter / very ugly thing / large abomination w:2, wretched star
+MONS:    shapeshifter / ugly thing / large abomination w:2, wretched star
 MONS:    large abomination / ghoul / death ooze w:2, ancient zyme
 MONS:    large slime creature w:12 / very large slime creature w:8 / rakshasa w:2
 KMONS:   8 = starcursed mass
@@ -573,7 +573,7 @@ ENDMAP
 
 NAME:    hangedman_relentless_pull
 TAGS:    no_monster_gen no_item_gen
-MONS:    very ugly thing / large abomination / ynoxinul / unseen horror / smoke demon
+MONS:    ugly thing / large abomination / ynoxinul / unseen horror / smoke demon
 MONS:    tentacled starspawn / starcursed mass
 MONS:    very ugly thing, wretched star, lurking horror, ancient zyme
 SHUFFLE: 2d, 34eAB / 34eAB / '''CD, 34 / 56
@@ -599,7 +599,7 @@ NAME:    hangedman_steaming_rock
 TAGS:    transparent
 MONS:    eye of devastation w:9 / nothing w:1
 KMONS:   2 = ynoxinul / smoke demon / thrashing horror / unseen horror / \
-             very ugly thing w:5/ rakshasa w:5 / chaos spawn w:5
+             ugly thing w:5/ rakshasa w:5 / chaos spawn w:5
 KMONS:   3 = smoke demon / green death / catoblepas w:8 / ophan w:7 / \
              fire crab w:5
 KMONS:   4 = apocalypse crab / death drake w:5
@@ -643,7 +643,7 @@ NAME:    hangedman_classic_abyss_death
 TAGS:    transparent no_monster_gen
 MONS:    large abomination / ynoxinul / unseen horror / \
          skeleton / sixfirhy / smoke demon / neqoxec / \
-         efreet / rakshasa / giant orange brain / very ugly thing / \
+         efreet / rakshasa / giant orange brain / ugly thing / \
          golden eye / hell hog
 MONS:    lich / hellephant / tentacled monstrosity / profane servitor / \
          death drake / daeva / angel / bone dragon / balrug w:4 / \
@@ -892,7 +892,7 @@ TAGS:    no_monster_gen patrolling allow_dup
 WEIGHT:  5
 MONS:    rakshasa / efreet / smoke demon / wizard / base draconian w:5 / \
          guardian serpent w:1 / vampire w:3 / necromancer w:3
-MONS:    thrashing horror / blink frog / very ugly thing / \
+MONS:    thrashing horror / blink frog / ugly thing / \
          large abomination / unseen horror / shapeshifter / \
          wretched star w:5 / air elemental / raiju / worldbinder
 MONS:    draconian shifter w:5 / shadow demon w:5 / lich / \
diff --git a/crawl-ref/source/dat/des/branches/depths.des b/crawl-ref/source/dat/des/branches/depths.des
index dd6237b053..70347b83a1 100644
--- a/crawl-ref/source/dat/des/branches/depths.des
+++ b/crawl-ref/source/dat/des/branches/depths.des
@@ -102,7 +102,7 @@ bb...1...bb
 ENDMAP
 
 NAME: gammafunk_enter_depths_forms
-MONS: very ugly thing w:8 / shapeshifter / rakshasa w:2
+MONS: ugly thing w:8 / shapeshifter / rakshasa w:2
 MONS: giant orange brain / boggart band w:6, slime creature band
 MONS: glowing shapeshifter
 NSUBST: . = 4:1 / *:., 3 = 1:2 / 1:3
@@ -156,8 +156,9 @@ ENDMAP
 
 NAME:    hangedman_depths_entry_try_elsewhere_first
 TAGS:    no_pool_fixup
-MONS:    hydra / very ugly thing w:2, salamander / naga mage w:2
-MONS:    wolf spider / emperor scorpion w:2, manticore / merfolk w:2
+MONS:    hydra / ugly thing w:2, salamander / naga mage w:2
+MONS:    wolf spider / very ugly thing w:2 / emperor scorpion w:2, manticore /\
+         merfolk w:2
 MONS:    large slime creature / giant eyeball w:2
 KMONS:   O = dire elephant / glowing shapeshifter w:4
 SHUFFLE: 12345, +'X / XX'
diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des
index b8fb1ee327..2a3740c265 100644
--- a/crawl-ref/source/dat/des/branches/depths_encompass.des
+++ b/crawl-ref/source/dat/des/branches/depths_encompass.des
@@ -658,7 +658,7 @@ MONS:    deep elf conjurer / deep elf knight w:7 / wizard / ogre mage / \
          two-headed ogre w:5 ; great mace ego:freezing ident:type . \
          great mace ego:flaming ident:type / efreet w:5 / \
          rakshasa w:5 ; wand of flame | wand of frost . whip . robe
-MONS:    very ugly thing w:15 / shapeshifter / unseen horror w:15 / \
+MONS:    ugly thing w:15 / shapeshifter / unseen horror w:15 / \
          chaos spawn / fire elemental / water elemental w:5 / \
          air elemental / earth elemental w:5 / mana viper w:5 / \
          insubstantial wisp / gargoyle w:5 / wolf spider simulacrum w:3 / \
@@ -732,7 +732,7 @@ MARKER:  T = lua:props_marker { portal=1 }
 : _G.set_random_mon_list("place:" .. you.where() .. " w:150 / " ..
 :   "fire giant / frost giant / rakshasa w:5 / deep elf knight w:5 / " ..
 :   "glowing shapeshifter w:8 / simulacrum w:5 / dancing weapon w:2 / " ..
-:   "fire crab w:5 / boulder beetle / mana viper w:5 / very ugly thing band w:5")
+:   "fire crab w:5 / boulder beetle / mana viper w:5 / ugly thing band w:5")
 TILE:    b = wall_emerald
 TILE:    c = wall_crystal_squares
 TILE:    v = dngn_metal_wall_darkgray
diff --git a/crawl-ref/source/dat/des/branches/geh.des b/crawl-ref/source/dat/des/branches/geh.des
index 85ee49b1a6..f35c780803 100644
--- a/crawl-ref/source/dat/des/branches/geh.des
+++ b/crawl-ref/source/dat/des/branches/geh.des
@@ -242,10 +242,10 @@ SUBST:   l = w, F = f, %* = ., 2 = 1, 3456 = 2
 :  elseif you.branch() == "Abyss" then
 MONS:    blizzard demon / frost giant / dancing weapon ; battleaxe ego:freezing ident:type w:5
 MONS:    simulacrum w:12 / white draconian / water elemental w:5 / \
-         white very ugly thing w:15 / ice devil w:8
+         white ugly thing w:15 / ice devil w:8
 MONS:    balrug / hellion / fire crab w:5 / hellephant w:5
 MONS:    hell hound w:8 / red draconian / fire elemental w:5 / \
-         red very ugly thing w:15 / efreet w:12
+         red ugly thing w:15 / efreet w:12
 SUBST:   * = *||, {}[] = ***|, xc = xxxccb, 5 = 2, 6 = 4
 :  else
 KMONS:   123 = fire dragon
diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des
index 9cfd0d83ce..acdcd3e0b4 100644
--- a/crawl-ref/source/dat/des/branches/swamp.des
+++ b/crawl-ref/source/dat/des/branches/swamp.des
@@ -938,9 +938,9 @@ ENDMAP
 NAME:    hangedman_swamp_muck
 TAGS:    no_pool_fixup no_monster_gen patrolling transparent
 DEPTH:   Swamp:1-4
-KMONS:   1 = slime creature
-KMONS:   2 = slime creature / brown ugly thing
-KMONS:   3 = jelly
+KMONS:   1 = slime creature / jelly
+KMONS:   2 = slime creature
+KMONS:   3 = brown very ugly thing
 KFEAT:   12 = shallow_water
 SHUFFLE: })
 SUBST:   T = w:4 t, M = ~:4 t, } = }:20 >, ) = ):25 <>
@@ -1994,8 +1994,9 @@ NAME:    swamp_vile
 PLACE:   Swamp:$
 TAGS:    no_pool_fixup no_monster_gen
 ORIENT:  southeast
-MONS:    bog body / very ugly thing w:8, ugly thing / orange demon
-MONS:    large abomination / thrashing horror w:8, green death
+MONS:    bog body / ugly thing, shadow / orange demon / small abomination w:2
+MONS:    large abomination / very ugly thing / thrashing horror w:6, \
+         green death
 MONS:    hell beast, death ooze, titanic slime creature
 KMONS:   8 = hydra / swamp dragon
 KMONS:   9 = tentacled monstrosity
@@ -2004,7 +2005,7 @@ KITEM:   O = decaying rune of zot
 KFEAT:   8 = shallow_water
 SHUFFLE: yz, '", ~`
 SUBST:   yX = x:20 t:4 W:1, z = ..wwwWWW, ' = ....W, " = wWWW, 5 : 59
-NSUBST:  7 = 1:4 / 1:8 / *:7, 0 = 8:1 / 2:. / *:2
+NSUBST:  7 = 1:4 / 1:8 / *:7, 0 = 6:1 / 3:. / *:2
 NSUBST:  5 = 1:5 / 1:6 / * = 56 &:2, 9 = 1 = 9 &:1 / *:.
 MAP
 @@ "' Xxccxcxcct
diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des
index 09a6347694..a1abadfabd 100644
--- a/crawl-ref/source/dat/des/branches/zot.des
+++ b/crawl-ref/source/dat/des/branches/zot.des
@@ -1703,19 +1703,19 @@ ENDMAP
 NAME:    hangedman_zot_spectrum
 TAGS:    no_monster_gen
 DEPTH:   Zot, !Zot:$
-KMONS:   A = red very ugly thing
+KMONS:   A = red ugly thing
 KMONS:   B = red draconian
 KMONS:   C = salamander firebrand / nonbase red draconian w:6
-KMONS:   D = cyan very ugly thing
+KMONS:   D = cyan ugly thing
 KMONS:   E = black draconian
 KMONS:   F = electric golem / nonbase black draconian w:6
-KMONS:   G = green very ugly thing
+KMONS:   G = green ugly thing
 KMONS:   H = green draconian
 KMONS:   I = green death / nonbase green draconian w:6
-KMONS:   J = white very ugly thing
+KMONS:   J = white ugly thing
 KMONS:   K = white draconian
 KMONS:   L = white draconian knight / nonbase white draconian w:6
-KMONS:   M = brown very ugly thing
+KMONS:   M = brown ugly thing
 KMONS:   N = yellow draconian
 KMONS:   O = acid blob / nonbase yellow draconian w:6
 KMONS:   Z = golden dragon / killer klown / Tiamat, golden dragon / killer klown
diff --git a/crawl-ref/source/dat/des/portals/icecave.des b/crawl-ref/source/dat/des/portals/icecave.des
index 5fa8974849..bd326e1d30 100644
--- a/crawl-ref/source/dat/des/portals/icecave.des
+++ b/crawl-ref/source/dat/des/portals/icecave.des
@@ -168,7 +168,7 @@ function ice_cave_caverns_undead_demon_monster_set(e)
   e.mons("ice statue")
   e.mons("ice devil")
   e.mons(cruel_ice)
-  e.mons("freezing wraith / blue devil / white very ugly thing w:1")
+  e.mons("freezing wraith / blue devil / white ugly thing w:1")
   e.mons("patrolling ice fiend")
   e.kmons("8 = blizzard demon")
   e.shuffle("7` / 7` / `8")
@@ -432,7 +432,7 @@ TAGS:     no_monster_gen no_item_gen transparent
 DEPTH:    D:14-, Elf, Swamp, Shoals, Snake, Spider
 WEIGHT:   2
 SUBST:    : = 1.
-NSUBST:   2 = 1:2 / 1:12 / * = 1.
+NSUBST:   2 = 1:12 / 3 = 1. / *:.
 NSUBST:   1 = 7:1 / 1:1. / *:.
 MONS:     white ugly thing
 MONS:     white very ugly thing
diff --git a/crawl-ref/source/dat/des/portals/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des
index 2f010f2d5b..9f568a5c05 100644
--- a/crawl-ref/source/dat/des/portals/volcano.des
+++ b/crawl-ref/source/dat/des/portals/volcano.des
@@ -310,8 +310,7 @@ function fiery_guardians (e, intelligent, village)
                    .. " / fire crab w:1")
         elseif set_weight < 5 then
             -- "Demonic" monster pack.
-            e.mons("crimson imp / red ugly thing / toenail golem"
-                   .. " / hell hound w:8"
+            e.mons("crimson imp / toenail golem / hell hound w:8"
                    .. " / red devil ; trident ego:flaming ident:type")
             e.mons("efreet / sun demon / smoke demon / " .. hellknight)
         elseif set_weight < 7 then
diff --git a/crawl-ref/source/dat/des/portals/wizlab.des b/crawl-ref/source/dat/des/portals/wizlab.des
index 03e63d1059..0e5ecee265 100644
--- a/crawl-ref/source/dat/des/portals/wizlab.des
+++ b/crawl-ref/source/dat/des/portals/wizlab.des
@@ -1592,12 +1592,12 @@ KMONS:   04 = large abomination w:15 / small abomination w:15 / unseen horror w:
               thrashing horror w:30 / skeleton w:30 / freezing wraith w:5 /  \
               hellwing / chaos spawn w:5 / orange demon / blue devil /  \
               hell hound / red devil w:5 / lesser demon w:25 / mana viper w:5 / \
-              ugly thing w:30 / fire elemental w:5 / air elemental w:5
+              worldbinder w:30 / fire elemental w:5 / air elemental w:5
 KMONS:   95 = ynoxinul / smoke demon / sixfirhy / sun demon w:5 / efreet w:5 / \
               soul eater w:5 / hell knight w:5 / demonic crawler / raiju / \
               ancient zyme w:20 / lurking horror / tentacled starspawn w:30 / \
               wind drake w:5 / earth elemental w:5 / water elemental / \
-              very ugly thing / base draconian / guardian serpent / brain worm / \
+              ugly thing / base draconian / guardian serpent / brain worm / \
               eidolon w:5 / shadow wraith / anaconda skeleton w:5 / \
               great orb of eyes w:5 / giant orange brain
 KMONS:   6 = executioner w:5 / balrug w:5 / cacodemon / shadow demon / hellion w:5 / \
@@ -1686,7 +1686,7 @@ set_random_mon_list([[rakshasa w:15 / deep elf summoner w:15 / wizard w:15 / spa
                     boggart / blink frog w:5 / shadow wraith w:5 / unseen horror /
                     raiju / ynoxinul / neqoxec / chaos spawn / giant orange brain /
                     large abomination w:15 / small abomination w:15 / skeleton w:20 /
-                    hellwing w:5 / smoke demon w:5 / hell hound w:5 / very ugly thing w:5 /
+                    hellwing w:5 / smoke demon w:5 / hell hound w:5 / ugly thing w:5 /
                     golden eye w:5 / executioner w:3 / shadow demon w:4 / hellion w:3 /
                     thrashing horror w:25 / tentacled starspawn w:25 / ]])
 
diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
index eed9a0d224..beba81f5bf 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -360,7 +360,7 @@ function arena_sprint_get_monster_set(round, boss)
                 "wraith / eidolon / phantasmal warrior / w:2 nergalle",
                 -- Misc
                 "centaur w:15 / centaur warrior w:5 / nessos w:1",
-                "ugly thing w:30 / w:15 very ugly thing / w:1 kirke",
+                "w:15 ugly thing / w:1 kirke",
                 "vampire mosquito / red wasp w:5 / yellow wasp",
                 "ogre mage / w:5 deep elf mage / vampire mage / naga mage",
                 "troll / deep troll / iron troll",
@@ -416,7 +416,7 @@ function arena_sprint_get_monster_set(round, boss)
                 -- Misc
                 "centaur / centaur warrior",
                 "yaktaur w:15 / yaktaur captain w:5",
-                "ugly thing w:15 / w:15 very ugly thing / w:1 kirke",
+                "ugly thing w:15 / w:1 kirke",
                 "ogre mage / w:5 deep elf mage / vampire mage / naga mage /\
                     lich / w:5 ancient lich / w:1 frederick",
                 "hill giant / stone giant / w:5 frost giant / w:5 fire giant /\
@@ -486,7 +486,7 @@ function arena_sprint_get_monster_set(round, boss)
                 -- Misc
                 "centaur warrior",
                 "yaktaur / yaktaur captain",
-                "very ugly thing",
+                "ugly thing",
                 "lich / w:5 ancient lich / w:5 unborn / w:2 boris",
                 "stone giant / frost giant / fire giant / titan / w:1 chuck",
                 "fire dragon / ice dragon / storm dragon / shadow dragon /\
diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
index 9c14d6e6c8..9d234b989a 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -28,7 +28,7 @@ function base_monster_setup(e)
            hill giant / komodo dragon / wraith / soldier ant / unseen horror /\
            trapdoor spider / basilisk / cyclops band / efreet /\
            mottled dragon / blink frog band / vampire mosquito band /\
-           griffon / ugly thing / gargoyle / molten gargoyle /\
+           griffon / gargoyle / molten gargoyle /\
            kobold demonologist band / deep troll /\
            deep elf fighter band / boulder beetle / red wasp /\
            orc high priest band w:5 / boring beetle /\
@@ -46,7 +46,7 @@ function base_monster_setup(e)
   e.kmons("C = eye of devastation / hydra / skeletal warrior band w:5 /\
            catoblepas / vampire / wandering mushroom /\
            guardian serpent / rakshasa w:5 / slime creature band w:5 /\
-           centaur warrior band w:5 / ugly thing band w:5 / wizard /\
+           centaur warrior band w:5 / ugly thing w:5 / wizard /\
            simulacrum / ogre mage band w:5 /\
            wolf spider / yaktaur / air elemental / fire elemental /\
            water elemental / earth elemental / deep elf knight band w:5 /\
@@ -66,7 +66,7 @@ function base_monster_setup(e)
            chaos spawn / ice devil / sun demon / iron devil /\
            hell hog band w:5 / alligator band w:5 / minotaur")
   e.kmons("D = fire dragon w:20 / yaktaur band w:5 / ice dragon w:20 /\
-           very ugly thing band w:5 / sphinx / iron troll /\
+           ugly thing band w:5 / sphinx / iron troll /\
            orc warlord band / yaktaur captain band w:5 /\
            deep troll shaman band w:5 / fire giant w:20 / frost giant w:20 /\
            hell knight band / storm dragon / glowing shapeshifter /\
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index 22ae73c5b9..97683cc8dd 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -939,7 +939,7 @@ SUBST: * = *|
 SUBST: | = |||$
 SUBST: f = f..
 NSUBST: . = 15:M / *:.
-KMONS: M = very ugly thing / slime creature / glowing shapeshifter
+KMONS: M = ugly thing / slime creature / glowing shapeshifter
 KITEM: % = silver rune of zot
 KITEM: " = ring of flight ident:all, potion of flight ident:all q:3, \
  scroll of acquirement ident:all, wand of disintegration / wand of fire, \
diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des
index 1bd43d37d5..aa3749e357 100644
--- a/crawl-ref/source/dat/des/variable/float.des
+++ b/crawl-ref/source/dat/des/variable/float.des
@@ -2994,8 +2994,8 @@ DEPTH: D:10-
 ORIENT: float
 MONS: wizard, ugly thing, very ugly thing
 SUBST: y = * |:4, r = *:2 %
-NSUBST: ' = 9:2 / *:.
-NSUBST: " = 3:3 / *:.
+NSUBST: ' = 6:2 / *:.
+NSUBST: " = 1:3 / *:.
 MAP
     cccccccccc         cccccccccc
    cccccGcccccc       ccccccGccccc