New monsters: alderkings, death trees for Depths and rarely Crypt

While plants have been very slowly added to Crawl due to the innate difficulties of designing more immobile monsters, the motile plant glyph ('f') is one of the few console glyphs mostly wide open for additional monsters. There's a lot of easy flavourful design space for more plants, and in particular, adding one of them in Depths has multiple benefits: it can connect the various spriggans moved there closer to a branch otherwise mostly preoccupied with giants and undead, it can make Fedhas's plant pacification mean a little more throughout the game, and it can help further split apart the artificial fortification spirit of the Vaults versus the more uncontrolled cavern-dungeon of the Depths. Alderkings are a translated name of something from various works of Germanic literature, a storied figure of a darkwood elf king that haunts deep forests and absconds with or kills trespassers. (Crawl's elves aren't particularly fey, so it's deployed around the main fey threats of spriggans instead. The translation drift between the Danish elverkonge and German erlkönig is a couple centuries old, so it feels fine to make it literally a tree as the artistic tradition still includes rather than some fey spirit. Without a name to the title and with a lot of differing takes in centuries of tradition, demoting them to a non-unique feels fine enough to me.) These are deep out-of-depth walking trees in Depths with mildly-below-ettin level melee damage, reasonable hp and AC but poor EV and rF-, plus three notable spells: * Grasping Roots, the ranged constriction spell used by shambling mangroves: aside from using a little more constriction in Depths as is less present in Vaults with tentacled monstrosities moved out from the branch, it also slows running away from its short-range other spells. * Siphon Essence, the range-2 torment into self-healing ability provided by talismans of death: an experiment in trying out more highly dangerous short-range spells and means of healing monsters in a more reasonably tangible fashion, a means of endangering lategame characters with very high defenses, and a chance to establish yet another unique way to deal unholy damage as Crawl's large focus on unholy threats regularly needs. Unlike Torment, this range can be avoided for a large number of characters, and it also can avoid hurting living allies as Depths still contains plenty of. * Dispel Undead, the not-ranged version players, their ghosts, and burial acolytes use: a chance to further emphasize that monsters can have varying Dispel Undead ranges, and one short enough to still emphasize their Grasping Roots. Thus, they pin their foes in place, cast high-damage short-range spells with various non-standard resistance checks, and then finish them off with heavy melee. Hopefully the obvious synergies between these spells and the rarity of a character caring about both Siphon Essence and Dispel Undead will be straightforward enough for players to learn and fear. They're quite scary in practice, but Depths threatens a lot with large bands of monsters; they'll mostly endanger reckless spell-less characters, who would be just as imperilled if not more so by shrike and spark wasp bands. One can always teleport before they get close, after all.... Aside from placing around once or twice per game in generic threat vaults and regular floor spawns, they also appear in a number of forested, necromantic, and magical vaults throughout Depths. As strong necromantic casters, these also appear in a sparse Crypt vaults that already used dead trees; since the branch has plenty of regular living necromancers already, this shouldn't be too out of place. (This also comes with some tweaking of various other uses of dead trees and petrified trees, to deal with the automagic feature-recolouring-to-tile match-up mess.) Their tile is an amalgamation of CanOfWorms's hill giant, Sastreii's demonic trees, roctavian's shambling mangrove, and ontoclasm plus lingerstink's Asterion. It animates in a mildly experimental fashion to bridge tree foilage and necromancy colours.
crawl · Nov 25, 2024 · 18c7c0e · 18c7c0e
1 parent e55ba79
commit 18c7c0e
Show file tree

Hide file tree

Showing 41 changed files with 282 additions and 96 deletions.
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
@@ -7388,6 +7388,21 @@ orb spider charge
 
 @The_monster@ begins to weave its threads into a brightly glowing ball.
 %%%%
+################## Alderking ###############################
+alderking
+
+VISUAL:@The_monster@ beckons and sways in an unseen wind.
+
+VISUAL:@The_monster_possessive@ foilage glows and foams.
+
+@The_monster@ says, "If you're unwilling to [dance|bow], then I'll see you out." @player_only@
+
+w:20
+__NONE
+%%%%
+alderking triumphant
+
+@The_monster@ vanishes in a satisfied sigh of withering leaves.
 ################## Bennu ###################################
 %%%%
 bennu

diff --git a/crawl-ref/source/dat/database/monspell.txt b/crawl-ref/source/dat/database/monspell.txt
@@ -136,6 +136,14 @@ Eruption cast
 
 @The_monster@ rends the earth beneath @target@!
 %%%%
+Grasping Roots cast
+
+@The_monster@ reaches out to the roots within the earth.
+%%%%
+Grasping Roots natural cast
+
+@The_monster@ runs its roots beneath @target@!
+%%%%
 Harpoon Shot cast
 
 @The_monster@ fires a harpoon shot @at@ @target@.
@@ -152,14 +160,6 @@ Hoarfrost Bullet cast finale
 
 @The_monster@ launches the last of @reflexive@ @at@ @target@ with a shrill rumble.
 %%%%
-Shadow Shot cast
-
-@The_monster@ fires @at@ @target@.
-%%%%
-Launch Bomblet cast
-
-@The_monster@ launches a bomblet.
-%%%%
 Holy Flames cast
 
 @The_monster@ calls forth blessed flames!
@@ -168,6 +168,10 @@ unseen Holy Flames cast
 
 Blessed flames are called forth!
 %%%%
+Launch Bomblet cast
+
+@The_monster@ launches a bomblet.
+%%%%
 Legendary Destruction cast
 
 @Major Destruction cast@
@@ -218,6 +222,14 @@ Pyroclastic Surge cast
 
 @The_monster@ calls gouts of flame from the lava!
 %%%%
+Shadow Shot cast
+
+@The_monster@ fires @at@ @target@.
+%%%%
+Siphon Essence cast
+
+@The_monster@ draws nearby souls into @reflexive@!
+%%%%
 Symbol of Torment cast
 
 @The_monster@ calls on the powers of darkness!

diff --git a/crawl-ref/source/dat/des/altar/ecumenical.des b/crawl-ref/source/dat/des/altar/ecumenical.des
@@ -65,9 +65,9 @@ KMASK:  - = no_monster_gen
 KPROP:  - = no_tele_into
 SUBST:  - = tt.
 : if crawl.one_chance_in(4) then
-: set_feature_name("tree", "dead tree")
 TILE:   t = dngn_tree_dead
-COLOUR: t = w:5 lightgrey / brown
+COLOUR: t = brown
+:   set_feature_name("tree", "dead tree")
 : elseif crawl.one_chance_in(4) then
 COLOUR: t = lightred / red w:4 / yellow w:4
 TILE:   t = dngn_tree_lightred / dngn_tree_red w:4 / dngn_tree_yellow w:4

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
@@ -3812,13 +3812,16 @@ TAGS: transparent patrolling uniq_altar_yredelemnul
 # Statistically, the probability that none of the edge glyphs will end up as .
 # and the level builder won't be able to connect the vault is extremely small.
 # ...but not zero. Thus:
-MONS:   zombie
-NSUBST: D = . / E
-NSUBST: t = . / ttE
-SUBST:  E = tt.
-: nsubst( ". = " .. you.absdepth() .. "=1 / 1=1. / ." )
+MONS:   zombie, alderking
+NSUBST: D = 1:. / *:E, t = 1:. / * = TTE
 KFEAT:  _ = altar_yredelemnul
-COLOUR: t = lightgrey w:5 / brown
+KFEAT:  T = petrified_tree
+SUBST:  E = t:4 T:2 .:3
+: nsubst( ". = " .. you.absdepth() .. " = 1 / 1 = 1. / ." )
+: if you.in_branch("Depths") then
+NSUBST: 1 = 1:2 / *:1
+: end
+COLOUR: t = brown
 TILE:   t = dngn_tree_dead
 : set_feature_name("tree", "dead tree")
 MAP

diff --git a/crawl-ref/source/dat/des/arrival/simple.des b/crawl-ref/source/dat/des/arrival/simple.des
@@ -1136,8 +1136,7 @@ TAGS:   arrival no_monster_gen transparent
 ORIENT: float
 SUBST:  T : t.TTTTT
 SUBST:  T = t:66 .:33 >:1
-COLOUR: . = brown
-COLOUR: t = lightgrey w:5 / brown
+COLOUR: .t = brown
 TILE:   t = dngn_tree_dead
 : set_feature_name("tree", "dead tree")
 MAP

diff --git a/crawl-ref/source/dat/des/branches/crypt.des b/crawl-ref/source/dat/des/branches/crypt.des
@@ -2285,8 +2285,8 @@ ENDMAP
 NAME:   nicolae_crypt_lichyard
 TAGS:   transparent
 DEPTH:  Crypt
-MONS:   lich, ancient lich / dread lich
-NSUBST: 1 = 3 = 111112 / *:1
+MONS:   lich, alderking, ancient lich / dread lich
+NSUBST: 1 = 3 = 111123 / *:1
 SUBST:  t = ttt., G = GGG., ` = ._, L = LL...
 CLEAR:  _
 TILE:   t = dngn_tree_dead
@@ -2957,12 +2957,14 @@ ORIENT: encompass
 PLACE:  Crypt:$
 MONS:   w:3 patrolling lich / w:1 patrolling revenant
 MONS:   patrolling zombie / nothing
-MONS:   jumping spider / wolf spider / redback / w:19 nothing
+MONS:   alderking
 MONS:   w:5 wraith / phantasmal warrior / eidolon / w:5 freezing wraith / w:5 nothing
 MONS:   wyvern skeleton / w:30 nothing
 MONS:   w:2 ushabti / w:3 guardian mummy / w:2 mummy
 MONS:   w:5 patrolling mummy priest / w:1 patrolling royal mummy
 KMONS:  z = patrolling curse skull
+KMONS:  s = meliai zombie / spriggan berserker zombie / \
+            spectral broodmother / spectral spriggan defender
 KMONS:  p = withered plant
 : if crawl.coinflip() then
 # Temple of yred
@@ -3033,8 +3035,8 @@ ttttttT.t.".v-4-v4-v...c------ccccc------c....T.vvvT...t..t......Ttttt.ttcnnnctt
 ttttT.t.....vvvvvvvv..cccc+cccc$$$cccc+cccc.....v4--.T..t....t..tTttttt..c***ctt
 tttT.t........v-%-4v..ccc--Bcc0---0ccB--ccc.T...v4%4-v.T...t.....Ttttt...c%%%ctt
 ttT....T...T..v4--.....n--cccccc+cccccc--n......vvvvvv...T..T..t..Tttcc+cc---ctt
-tttT.t........vvvvvv...n--ccccc---ccccc--n.........T...............Ttc3333333ctt
-ttttT.t.T.............ccc-cccc-C'C-cccc-ccc..T...............T...t..tc3333333ctt
+tttT.t........vvvvvv...n--ccccc---ccccc--n.........T...............Ttc.s...s.ctt
+ttttT.t.T.............ccc-cccc-C'C-cccc-ccc..T...............T...t..tc3.s.s.3ctt
 tttttT.....cccccccccccccc-cVcC-'''-CcVc-cccccccccccccc.........T...tpcccnnnccctt
 ttttT..t..cc----+---------c-+-''Z''-+-c---------+--E-cc....vvvv.T.t.Tttttttttttt
 ttttTt.....n-B--cccmmcccccc-c--'''--c-ccccccmmcccEEE-n..T..v44vT....Tttttttttttt

diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des
@@ -176,7 +176,7 @@
         elseif set_weight == 10 then
             e.mons("spriggan rider")
             e.mons("spriggan air mage / spriggan berserker / spriggan defender")
-            e.mons("spriggan defender")
+            e.mons("spriggan defender / alderking w:3")
             e.kmons("D = the Enchantress")
             e.subst("3 = D3")
             e.subst("A = t")
@@ -339,7 +339,7 @@ MONS:   tengu reaver / deep elf annihilator / deep elf high priest \
 : else
 MONS:   spriggan berserker / spriggan air mage / ettin / stone giant \
         / frost giant / fire giant / nothing
-MONS:   spriggan defender / titan / juggernaut
+MONS:   spriggan defender / alderking / titan / juggernaut
 : end
 KMONS:   L = fire dragon
 KMONS:   ~ = ice dragon
@@ -786,8 +786,8 @@ MONS:    sphinx / spark wasp / flayed ghost / \
          tentacled monstrosity / juggernaut zombie w:2
 MONS:    spriggan defender w:30 / titan w:30 / ancient lich w:30 / \
          walking crystal tome / walking frostbound tome / \
-         draconian monk / draconian annihilator / draconian knight / \
-         juggernaut w:20
+         juggernaut w:20 / alderking w:15 / draconian monk / \
+         draconian annihilator / draconian knight
 KMONS:   Z = draconian knight / draconian annihilator
 KITEM:   Z = midnight gem
 KFEAT:   z^ = zot trap / dispersal trap

diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des
@@ -2424,7 +2424,8 @@ KFEAT:  F = cache of fruit
 :   d = d - 1
 : else
 TAGS:   no_pool_fixup
-MONS:   death yak zombie, lich / revenant, ancient lich / dread lich
+MONS:   death yak zombie, lich / revenant
+MONS:   ancient lich / dread lich / alderking
 KMONS:  P = withered plant
 KFEAT:  t = petrified_tree
 :   decorative_floor(_G, 'F', "mourning vase")

diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des
@@ -2924,7 +2924,6 @@ KMONS:  HZ = bloated husk
 KFEAT:  H = W
 NSUBST: D = t / .
 SUBST:  ' = ..t__, E = .Wt
-COLOUR: t = lightgrey w:5 / brown
 TILE:   t = dngn_tree_dead
 MARKER: H = lua:fog_machine { cloud_type = "foul pestilence", \
             pow_min = 3, pow_max = 4, delay_min = 35, delay_max = 45, \

diff --git a/crawl-ref/source/dat/des/portals/wizlab.des b/crawl-ref/source/dat/des/portals/wizlab.des
@@ -9,8 +9,8 @@
 #Hellbinder|Demons, summoners,      |fire / summoning /       |
 #          |Hellbinder              |demonic items            |
 #--------------------------------------------------------------
-#Doroklohe |Demons or liches        |scrolls or armour        |
-#          |and mummies             |or random                |
+#Doroklohe |Earth or necromantic    |scrolls or armour        |
+#          |themed undead, demons   |or random                |
 #--------------------------------------------------------------
 #Wucad Mu  |Random summon "monks",  |potions of experience,   |
 #          |summoning OCS           |crystal ball of Wucad Mu |

diff --git a/crawl-ref/source/dat/des/portals/ziggurat.des b/crawl-ref/source/dat/des/portals/ziggurat.des
@@ -416,10 +416,16 @@ DEPTH:   Zig:18-
 WEIGHT:  5
 MONS:    demonic plant, plant, bush
 MONS:    patrolling thorn hunter, patrolling shambling mangrove
+MONS:    patrolling alderking
 KMONS:   0 = sacred lotus
 SHUFFLE: 1t / 2t / t2
 NSUBST:  1 = 2 : 001 / 2:1
-SUBST:   2 : 23, 4 : 45..., x : bcmvxG
+SUBST:   2 : 23, x : bcmvxG
+: if (you.zigs_completed() > 1) then
+SUBST:   4 = 6
+: else
+SUBST:   4 : 45...
+: end
 : megazig_zot_traps(_G)
 MAP
   .t.

diff --git a/crawl-ref/source/dat/des/serial/library.des b/crawl-ref/source/dat/des/serial/library.des
@@ -50,7 +50,7 @@ function init_serial_library_setup(e)
 
   if you.in_branch('Crypt') then
      e.subst('T = V:75 c:25 t:5 G:5 Y:5 B:1')
-     e.colour('t = darkgrey / brown')
+     e.colour('t = brown')
      e.tile('t = dngn_tree_dead')
      e.set_feature_name('tree', 'dead tree')
   elseif you.in_branch('Vaults') then

diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -534,7 +534,7 @@ function arena_sprint_get_monster_set(round, boss)
                     void ooze",
                 "dancing weapon ; bardiche",
                 "spriggan defender / spriggan air mage / spriggan druid /\
-                    spriggan berserker / spriggan rider",
+                    spriggan berserker / alderking",
                 "lich / w:5 ancient lich / w:1 curse skull / w:5 curse toe",
                 "any demon w:20 / pandemonium lord",
                 "place:Tomb:$ w:30 / sphinx w:20 / royal mummy",
@@ -607,7 +607,7 @@ function arena_sprint_get_monster_set(round, boss)
                 "nagaraja w:20 / guardian serpent / salamander tyrant",
                 "acid blob w:30 / rockslime / glass eye / void ooze",
                 "dancing weapon ; bardiche ego:speed",
-                "spriggan air mage",
+                "spriggan air mage / alderking",
                 "ancient lich / w:6 curse skull",
                 "greater demon / pandemonium lord",
                 "sphinx w:20 / royal mummy",

diff --git a/crawl-ref/source/dat/des/sprint/fedhas.des b/crawl-ref/source/dat/des/sprint/fedhas.des
@@ -46,6 +46,7 @@ KMONS:  V = Agnes
 KMONS:  W = spriggan defender
 KMONS:  X = spriggan rider ; storm_bow
 KMONS:  Y = bush
+KMONS:  Z = alderking
 KMONS:  a = hornet
 KMONS:  b = ghost moth
 KMONS:  d = oklob plant name:meteorologist n_suf \

diff --git a/crawl-ref/source/dat/des/sprint/menkaure.des b/crawl-ref/source/dat/des/sprint/menkaure.des
@@ -843,7 +843,7 @@ NSUBST: a = 3:1 / 3:2 / 27:$ / *:'
 SUBST:  ' = '............
 KFEAT:  ' = net trap
 KITEM:  $ = gold q:27
-MONS:   quicksilver dragon, sin beast, ballistomycete spore
+MONS:   quicksilver dragon / alderking w:2, sin beast, ballistomycete spore
 COLOUR: X = magenta
 COLOUR: + = magenta
 COLOUR: o = magenta

diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -99,11 +99,13 @@ function base_monster_setup(e)
                rockslime / moth of wrath w:15 / ghost moth /\
                killer klown / draconian monk w:4 / draconian stormcaller w:7 /\
                draconian scorcher w:7 / draconian annihilator w:7 /\
-               draconian knight w:7 / ancient champion / curse skull /\
-               royal mummy w:3 / hellephant / balrug band w:5 / cacodemon /\
-               hellion / tormentor / executioner / nekomata / nargun w:5 /\
-               demonspawn warmonger band w:5 / demonspawn blood saint band w:5 /\
-               demonspawn corrupter band w:5 / demonspawn soul scholar band w:5 /\
+               draconian knight w:7 / alderking / ancient champion /\
+               curse skull / royal mummy w:3 / hellephant / balrug band w:5 /\
+               cacodemon / hellion / tormentor / executioner / nekomata /\
+               nargun w:5 / demonspawn warmonger band w:5 /\
+               demonspawn blood saint band w:5 /\
+               demonspawn corrupter band w:5 /\
+               demonspawn soul scholar band w:5 /\
                quicksilver elemental w:5 / putrid mouth / doom hound w:5 /\
                bennu w:5 / fravashi w:5 / pearl dragon / apis w:2 /\
                primal mutant beast w:2 / iron elemental w:3")

diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -460,7 +460,7 @@ local rnd = crawl.random2(142)
     e.kmons("1 = pandemonium lord / place:Abyss w:500")
 -- "Forest"
   elseif rnd < 47 then
-    e.kmons("1 = place:Lair:$ w:50 / spriggan defender /\
+    e.kmons("1 = place:Lair:$ w:50 / alderking w:3 / spriggan defender /\
                spriggan air mage / spriggan druid w:3 / spriggan berserker")
 -- Shoals
   elseif rnd < 52 then

diff --git a/crawl-ref/source/dat/des/variable/arcadia.des b/crawl-ref/source/dat/des/variable/arcadia.des
@@ -30,10 +30,11 @@ KMONS:   0 = spark wasp / caustic shrike w:1 / stone giant w:5 / \
 KMONS:   9 = ettin ; giant club randart . giant club randart / \
              glowing shapeshifter hd:13 w:5 / quicksilver dragon w:15 / \
              tengu reaver w:5 / juggernaut w:5
+KMONS:   aA = alderking
 KMONS:   J = caustic shrike skeleton
 KMONS:   K = spriggan rider
 KMONS:   L = spriggan col:white name:baker n_suf ; robe . dagger
-KMONS:   M = death yak / thorn hunter w:5
+KMONS:   M = death yak / thorn hunter w:3
 KMONS:   N = spriggan ; quarterstaff . robe
 KMONS:   O = dire elephant / emperor scorpion / anaconda w:5
 KMONS:   Q = bush
@@ -45,13 +46,13 @@ KFEAT:   B7 = cache of baked goods
 ITEM:    dagger / short sword / rapier / flail / whip / shortbow
 ITEM:    robe / cloak / hat / buckler / steam dragon scales w:1
 KFEAT:   _ = altar_trog
-NSUBST:  . = 10:0 / 8 = 00... / 1:9 / 2:O / 1:3 / 1:5 / *:.
-NSUBST:  6 = 1:9 / 2 = 669 / *:6
+NSUBST:  . = 10:0 / 8 = 00... / 1:9 / 1:A / 2:O / 1:3 / 1:5 / *:.
+NSUBST:  6 = 1:A9 / 2 = 669 / *:6
 SUBST:   T = t:20 P .:40, P = RRQ., F = F..
 : old_forest_ends(_G)
 SUBST:   C = c
 COLOUR:  "MN = green
-FTILE:   -~de$*|679{}()[]Gu = floor_depthstone
+FTILE:   -~de$*|679A{}()[]Gu = floor_depthstone
 LFLOORTILE: floor_grass
 veto {{
   return crawl.game_started() and you.uniques("the Enchantress")
@@ -124,7 +125,7 @@ ttT""MM"MM"TTTttttttttttttt..tttttttttttttttttttttt...ttttttttt....xxxxxxxxxxxxx
 tt""""M""""Tttttttttttttttttt..ttt.......ttttttttt.......tttt...xxxxxxxxJxxxJxxx
 tt".MM""NTTtttttttttttttttttttt....tttt.......ttt...ttttt.......xxxxx..JxxxxJJxx
 tt""M""""Ttttttttttttttttttttttttttttttt...ttt..t..ttttttttxxxxx......xx.Jxx..xx
-ttt""""TTTtttttttttttttttttttttttttttttttttttttt.tttttttxxxxxxxxxx....xxx.1.xxxx
+ttt""""TTTtttttttttttttttttttttttttttttttttttttt.tttttttxxxxxxxxxx....xxx.a.xxxx
 tttttttttttttttttttttttttttttttttttttttttttttttttttttttttxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
@@ -139,8 +140,8 @@ MONS:   tengu warrior / ettin ; dire flail . dire flail / \
 MONS:   tengu conjurer w:20 / occultist w:5 / eleionoma w:20 / \
         rakshasa / glowing orange brain w:5
 KMONS:  8 = ettin ; giant club randart . giant club randart / \
-            glowing shapeshifter hd:13 w:5 / quicksilver dragon w:15 / \
-            tengu reaver w:5 / juggernaut w:5
+            glowing shapeshifter hd:13 w:5 / quicksilver dragon / \
+            tengu reaver w:5 / alderking w:15
 KFEAT:  C = cache of fruit
 NSUBST: 3 = 6:3 / 4:6 / * = 36., 7 = 4:7 / * = 77., 1 = 1:8 / 2 = 118 / *:1
 SUBST:  C : CC.
@@ -203,7 +204,7 @@ NAME:   grunt_forest_end_winery
 TAGS:   no_pool_fixup
 ORIENT: northeast
 MONS:   the Enchantress patrolling, thorn hunter / spriggan defender
-MONS:   tengu reaver / glowing shapeshifter hd:13
+MONS:   tengu reaver / glowing shapeshifter hd:13 w:5 / alderking
 MONS:   satyr w:15 / spriggan berserker w:15 / spriggan air mage, faun
 MONS:   tengu conjurer ; quarterstaff . robe . longbow | arbalest / \
         glowing orange brain w:5 / rakshasa w:20 / eleionoma w:15
@@ -261,7 +262,7 @@ NAME:   grunt_forest_end_shrine
 ORIENT: float
 MONS:   the Enchantress patrolling
 MONS:   spriggan defender w:14 / thorn hunter
-MONS:   sphinx w:20 / tengu reaver w:15 / quicksilver dragon / \
+MONS:   sphinx w:20 / tengu reaver w:15 / alderking w:15 / \
         ettin w:5 ; giant club randart . giant club randart / caustic shrike
 MONS:   spriggan air mage w:15 / spriggan druid / spriggan berserker / \
         dire elephant w:5 / shambling mangrove w:3 / anaconda w:2

diff --git a/crawl-ref/source/dat/des/variable/d_encompass.des b/crawl-ref/source/dat/des/variable/d_encompass.des
@@ -366,8 +366,8 @@ KMONS:    5 = deep elf blademaster ; mundane crystal plate armour . \
                                      rapier ego:flaming . rapier ego:freezing
 KMONS:    6 = deep elf master archer ; ice dragon scales . longbow ego:flaming / \
               deep elf master archer ; fire dragon scales . longbow ego:freezing
-KMONS:    7 = Vv w:2 / ancient lich / dread lich w:6, \
-              ancient lich / dread lich w:6
+KMONS:    7 = Vv w:2 / ancient lich / alderking w:6, \
+              ancient lich / alderking w:6
 KMONS:    8 = Frederick / titan / draconian annihilator w:5, \
               titan / draconian annihilator w:5
 KMONS:    A = golden dragon w:19 / golden dragon perm_ench:shapeshifter w:1 / \