From 8b08fbb35648570bee6ea60099e973e05b2ec4b2 Mon Sep 17 00:00:00 2001 From: theTower Date: Wed, 17 Sep 2014 23:37:38 -0400 Subject: [PATCH] Ziggurat set / pillar tweaks * Shoals: Increase the raw (relatively weak) numbers through band use. * Snake: Lower the quicksilver dragon and guardian serpent spam. * Swamp: Up extra hydrae heads, add in extra shambling mangroves. * Crypt: Buff to use out-of-depths. Nearly no chaff and mostly top undead now. * Dis: Replace extra iron dragons with extra war gargoyles, dragons are used a lot throughout the zig sets already. * Earth: Exist once more. Aside from the hell sentinels, is basically about a rain of projectiles from highly defensive monsters. * Chaos: Slip in a tiny chance for greater demons, since the pan lords looked lonely without their old demon friends. * Re-arrange some text. * Slip nonbase demonspawn into the grates ring pillar vault. * Let torpor snails join the boring beetle pillar vault. * Have a watching imp in the glass box pillar vault. * Let the monster drop pillar vault use rakshasas too. --- crawl-ref/source/dat/des/portals/ziggurat.des | 27 +++++++++-------- crawl-ref/source/dat/dlua/ziggurat.lua | 42 +++++++++++++++------------ 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/crawl-ref/source/dat/des/portals/ziggurat.des b/crawl-ref/source/dat/des/portals/ziggurat.des index ce966ac..410e00e 100644 --- a/crawl-ref/source/dat/des/portals/ziggurat.des +++ b/crawl-ref/source/dat/des/portals/ziggurat.des @@ -315,22 +315,24 @@ ENDMAP NAME: ziggurat_pillar_centre_c TAGS: ziggurat_pillar centered unrand no_exits -# This is evil. Monster sets are: summoners (1), stares (2), harmless (3). +# This is evil. Monster sets are: summoners (1), smites (2), harmless (3). # This pillar has tactical implications: you will have to stay away from it, # and teleports are more risky. -MONS: ancient lich / shadow demon / ironbrand convoker / curse skull -MONS: eye of draining / eye of devastation / giant eyeball / ghost moth +MONS: ancient lich / shadow demon / curse skull / \ + ironbrand convoker / corrupter / deep elf demonologist +MONS: eye of draining / eye of devastation / \ + giant eyeball / ghost moth / black sun MONS: plant : if you.depth() > 21 then SUBST: 3 = 12222 : elseif you.depth() > 15 or you.depth() > 8 and crawl.coinflip() then SUBST: 3 = 12 : end -KFEAT: n = iron_grate +KFEAT: m = iron_grate MAP -nnn -n3n -nnn +mmm +m3m +mmm ENDMAP NAME: ziggurat_pillar_centre_monster @@ -356,10 +358,11 @@ ENDMAP NAME: ziggurat_pillar_centre_h TAGS: ziggurat_pillar centered no_dump unrand no_exits +MONS: crimson imp MAP ccncc c...c -n...n +n.1.n c...c ccncc ENDMAP @@ -383,8 +386,8 @@ ENDMAP NAME: ziggurat_pillar_centre_k TAGS: ziggurat_pillar centered unrand no_exits -MONS: boring beetle, boulder beetle, orb spider -SUBST: 2 : 2:19 3:1 +MONS: boring beetle, boulder beetle, torpor snail, orb spider +SUBST: 2 : 2:14 3:5 4:1 MAP xxxxx xx2xx @@ -515,11 +518,11 @@ NAME: ziggurat_pillar_centre_drop TAGS: ziggurat_pillar centered generate_awake unrand no_exits DEPTH: Zig:10- WEIGHT: 5 -MONS: lost soul +MONS: lost soul, rakshasa KFEAT: ~ = known permanent teleport trap SUBST: 9 : 00., x : bcvx, X : bcnv : if you.depth() > 18 then -SUBST: 0 : 011 +SUBST: 0 : 0112 : end MAP xxx diff --git a/crawl-ref/source/dat/dlua/ziggurat.lua b/crawl-ref/source/dat/dlua/ziggurat.lua index c0d2532..5365977 100644 --- a/crawl-ref/source/dat/dlua/ziggurat.lua +++ b/crawl-ref/source/dat/dlua/ziggurat.lua @@ -204,12 +204,12 @@ mset(with_props("place:Lair:$ w:165 / dire elephant w:12 / " .. "catoblepas w:12 / hellephant w:6 / spriggan druid w:1 / " .. "guardian serpent w:1 / deep troll shaman w:1 / " .. "raiju w:1 / hell beast w:1", { weight = 5 }), - with_props("place:Shoals:$ w:125 / merfolk aquamancer / water nymph w:5 / " .. - "merfolk impaler w:5 / merfolk javelineer / " .. - "octopode crusher w:12", { weight = 5 }), + with_props("place:Shoals:$ w:125 band / merfolk aquamancer / " .. + "water nymph w:5 / merfolk impaler w:5 / " .. + "merfolk javelineer / octopode crusher w:12", { weight = 5 }), "place:Spider:$ w:115 / ghost moth w:15 / red wasp / " .. "orb spider", - "place:Crypt:$ w:260 / curse skull w:5 / profane servitor w:5 / " .. + "place:Crypt:$ 9 w:260 / curse skull w:5 / profane servitor w:5 / " .. "bone dragon / ancient lich / revenant", "place:Abyss:$ w:1990 / corrupter", with_props("place:Slime:$", { jelly_protect = true }), @@ -218,7 +218,7 @@ mset(with_props("place:Lair:$ w:165 / dire elephant w:12 / " .. with_props("place:Geh:$ w:460 / Brimstone Fiend / " .. "balrug w:30", { weight = 5 }), with_props("place:Dis:$ w:460 / Hell Sentinel / " .. - "dancing weapon / iron dragon w:20", { weight = 5 }), + "dancing weapon / war gargoyle w:20", { weight = 5 }), with_props("place:Tar:$ w:460 / Shadow Fiend / " .. "curse toe / shadow demon w:20", { weight = 5 }), with_props("daeva / angel / cherub / pearl dragon / " .. @@ -233,10 +233,13 @@ mset(with_props("place:Lair:$ w:165 / dire elephant w:12 / " .. with_props("insubstantial wisp / air elemental / titan / raiju / " .. "storm dragon / electric golem / spriggan air mage / " .. "shock serpent", { weight = 2 }), - with_props("spectral thing / shadow wraith / eidolon w:4 / shadow dragon / " .. - "deep elf death mage w:6 / death knight w:4 / " .. - "revenant w:4 / profane servitor w:6 / soul eater / " .. - "shadow fiend / black sun", { weight = 2 }), + with_props("gargoyle / earth elemental / torpor snail / boulder beetle / " .. + "stone giant / iron dragon / crystal guardian / " .. + "war gargoyle / iron golem / hell sentinel", { weight = 2 }), + with_props("spectral thing / shadow wraith / eidolon w:4 / " .. + "shadow dragon / deep elf death mage w:6 / " .. + "death knight w:4 / revenant w:4 / profane servitor w:6 / " .. + "soul eater / shadow fiend / black sun", { weight = 2 }), with_props("swamp drake / fire drake / wind drake w:2 / death drake / " .. "wyvern w:5 / hydra w:5 / steam dragon / mottled dragon / " .. "swamp dragon / fire dragon / ice dragon / storm dragon / " .. @@ -274,23 +277,25 @@ mset(spec_fn(function () end)) mset(spec_fn(function () - local d = math.max(3, you.depth() - 1) - local e = math.max(1, you.depth() - 20) - return "place:Snake:$ w:65 / guardian serpent w:5 / " .. + local d = math.max(6, you.depth() * 2 - 2) + local e = math.max(1, you.depth() - 18) + return "place:Snake:$ w:130 / guardian serpent w:5 / " .. "greater naga w:" .. d .. " / quicksilver dragon w:" .. e end)) mset(spec_fn(function () local d = math.max(120, 280 - 10 * you.depth()) local e = math.max(1, you.depth() - 9) - return "place:Swamp:$ w:" .. d .. " / hydra / " .. - "swamp dragon / green death w:6 / death drake w:1 / " .. - "golden dragon w:1 / tentacled monstrosity w:" .. e + local f = math.max(1, math.floor((you.depth() - 9) / 3)) + return "place:Swamp:$ w:" .. d .. " / eight-headed hydra w:8 / " .. + "swamp dragon w:8 / tentacled monstrosity w:" .. e .. + " / shambling mangrove w:" .. f .. " / green death w:6 / " .. + "death drake w:1 / golden dragon w:1" end)) mset(spec_fn(function () local d = math.max(1, you.depth() - 11) - return "place:Vaults:$ 9 w:30 / place:Vaults:$ w:60 / " .. + return "place:Vaults:$ w:60 / place:Vaults:$ 9 w:30 / " .. "titan w:" .. d .. " / golden dragon w:" .. d .. " / ancient lich w:" .. d end)) @@ -305,9 +310,10 @@ mset(spec_fn(function () local e = math.min(8, math.floor((you.depth()) / 5) + 4) local f = math.max(1, you.depth() - 5) return "chaos spawn w:" .. d .. " / ugly thing w:" .. d .. - " / very ugly thing w:5 / apocalypse crab w:5 / " .. + " / very ugly thing w:4 / apocalypse crab w:4 / " .. "shapeshifter hd:16 w:" ..e .. " / glowing shapeshifter w:" .. e .. - " / killer klown w:8 / chaos champion w:2 / pandemonium lord w:" .. f + " / killer klown w:8 / chaos champion w:2 / " .. + "greater demon w:2 / pandemonium lord w:" .. f end)) mset(spec_fn(function () -- 1.8.5