From: <gi...@cr...> - 2025-07-21 22:20:11
|
via 17903823d94ce39328fbfdf6120fdddecece2451 (commit) via f1afc118e7520f5d9aaa82a7e9a3960265966717 (commit) via c60012f9c2790db15e42212a264ca5cef592e103 (commit) from c8c058ed602c7e783f1b8c1d7b1810a4241932e8 (commit) ----------------------------------------------------------------------- commit 17903823d94ce39328fbfdf6120fdddecece2451 Author: regret-index <clo...@ho...> Date: Mon Jul 21 19:38:07 2025 -0230 Quick fix-ups vault review (+ #4572, #4574, #4649) A fistful of minor adjustments, like fixing up some hidden or missing monsters, tweaking the flavour displays of various vaults, and moving a vault to the right file after its depths were changed. Alongside this, I've also put the midnight gem back in spin_cycle after eee5569 broke it (which fixes #4649), added a little bit of connectors to due_jungle_book after 57f10a3 introduced a teleport closet (which fixes #4574, and fixed up bad connector placements in swamp_pool_[3|4|5] as eadf994 mishandled (which fixes #4572). commit f1afc118e7520f5d9aaa82a7e9a3960265966717 Author: regret-index <clo...@ho...> Date: Mon Jul 21 18:27:29 2025 -0230 Juggernaut simulacrum tile (LemurRobot) Adjusted a little bit in colour and details from the submission. Now we just need a spectral juggernaut tile to finish off the full set. commit c60012f9c2790db15e42212a264ca5cef592e103 Author: regret-index <clo...@ho...> Date: Mon Jul 21 17:55:00 2025 -0230 Adjust various tiles old and new * The spell icon for Gloom was missed in 589dcd5, which this adds in properly. As before, it is composited from Denzi's old Abjuration icon plus ontoclasm's previous Dazzling Flash tile. * I've got some interest in making a new cyclops monster later this version, which inevitably ends up highlighting how CanOfWorms's Polyphemus tile added in de3053d isn't very easy to distinguish from the base cyclops itself. To try and help this state for the future, I've recoloured his cape and bracelets to hopefully stand out more against the default terrain colours of Shoals. * An accidental older draft of the dragon draugr tile added in 98bede3 and missed for being misspelt has been removed from the repository, while the old arenasprint orbs have been moved to rltiles/UNUSED after being removed in 9245ba7. ----------------------------------------------------------------------- Summary of changes: crawl-ref/source/dat/des/arrival/small.des | 31 ++++++++++--------- .../source/dat/des/branches/depths_encompass.des | 2 ++ crawl-ref/source/dat/des/branches/lair.des | 19 +++++++++++- crawl-ref/source/dat/des/branches/orc.des | 18 ++++++----- crawl-ref/source/dat/des/branches/swamp.des | 8 ++--- crawl-ref/source/dat/des/portals/trove.des | 5 +-- crawl-ref/source/dat/des/variable/d_encompass.des | 2 +- crawl-ref/source/dat/des/variable/float.des | 2 +- .../source/dat/des/variable/mini_monsters.des | 34 ++------------------- .../monsters}/orb_of_electricity.png | Bin .../{mon/sprint => UNUSED/monsters}/orb_of_ice.png | Bin crawl-ref/source/rltiles/dc-mon.txt | 3 -- crawl-ref/source/rltiles/dc-spells.txt | 2 +- crawl-ref/source/rltiles/dc-zombie.txt | 1 + .../gui/spells/enchantment/dazzling_flash.png | Bin 7198 -> 0 bytes .../rltiles/gui/spells/enchantment/gloom.png | Bin 0 -> 7586 bytes .../rltiles/mon/undead/draugr/draugur_dragon.png | Bin 1401 -> 0 bytes .../mon/undead/simulacra/simulacrum_juggernaut.png | Bin 0 -> 1379 bytes crawl-ref/source/rltiles/mon/unique/polyphemus.png | Bin 561 -> 9359 bytes crawl-ref/source/spl-data.h | 2 +- crawl-ref/source/tilepick.cc | 3 +- 21 files changed, 64 insertions(+), 68 deletions(-) rename crawl-ref/source/rltiles/{mon/sprint => UNUSED/monsters}/orb_of_electricity.png (100%) rename crawl-ref/source/rltiles/{mon/sprint => UNUSED/monsters}/orb_of_ice.png (100%) delete mode 100644 crawl-ref/source/rltiles/gui/spells/enchantment/dazzling_flash.png create mode 100644 crawl-ref/source/rltiles/gui/spells/enchantment/gloom.png delete mode 100644 crawl-ref/source/rltiles/mon/undead/draugr/draugur_dragon.png create mode 100644 crawl-ref/source/rltiles/mon/undead/simulacra/simulacrum_juggernaut.png diff --git a/crawl-ref/source/dat/des/arrival/small.des b/crawl-ref/source/dat/des/arrival/small.des index 377457bd9b..fc1b537803 100644 --- a/crawl-ref/source/dat/des/arrival/small.des +++ b/crawl-ref/source/dat/des/arrival/small.des @@ -2654,31 +2654,33 @@ xxDxxxDxxxDxxxDxx ENDMAP ############################################################################## -NAME: sevenhm_arrival_forest_fort_small_1 -TAGS: arrival no_monster_gen -ORIENT: float -WEIGHT: 1 -KPROP: 1 = no_tele_into -NSUBST: { = { / T> , z = + / n+ -SUBST: T = TTG +NAME: sevenhm_arrival_forest_fort_small_1 +TAGS: arrival no_monster_gen +ORIENT: float +WEIGHT: 1 +KMONS: 12 = bullfrog / cane toad / yak +KPROP: 1 = no_tele_into +NSUBST: { = { / T> , z = + / n+ +SUBST: T = TTG : if crawl.one_chance_in(4) then SUBST: " : +, ' : . , - : ccc. : else SUBST: "'- : c : end -MONS: bullfrog / cane toad / yak / death yak w:1 / elephant +SHUFFLE: 2N / `` +SUBST: ` = t MAP ccccccccc cccctccccctcccc - cctt1tc...ct1ttcc - cccttttnc.{.cnttttccc + cctt1tc...ct2ttcc + cccttttnc.{.cNttttccc ccccccccn...ncccccccc WWcc..+.......+..ccWW @WWz..."'-----'"...zWW@ WWcc..+.......+..ccWW ccccccccn...ncccccccc - ccctttttc.{.ctttttccc - cctt1tc...ct1ttcc + cccttttNc.{.cnttttccc + cctt2tc...ct1ttcc cccctccccctcccc ccccccccc ENDMAP @@ -2835,8 +2837,9 @@ ORIENT: float COLOUR: W# = lightgreen NSUBST: W = 6:% / 7:# KITEM: % = nothing / w:5 river rat skeleton -MARKER: # = lua:fog_machine { cloud_type = "foul pestilence", pow_max = 10, \ - delay = 5, size = 5, excl_rad = 0 } +MARKER: # = lua:fog_machine { cloud_type = "foul pestilence", pow_min = 5, \ + pow_max = 10, delay = 30, size = 5, \ + start_clouds = 5, walk_dist = 3, excl_rad = 0 } KFEAT: %# = W KPROP: W#% = no_tele_into MAP diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des index 1342e069eb..68c2b6b20c 100644 --- a/crawl-ref/source/dat/des/branches/depths_encompass.des +++ b/crawl-ref/source/dat/des/branches/depths_encompass.des @@ -795,6 +795,7 @@ MONS: spriggan defender w:30 / titan w:30 / ancient lich w:30 / \ draconian annihilator / draconian knight KMONS: Zd = draconian knight / draconian annihilator KITEM: d = midnight gem +KITEM: * = * KFEAT: z^ = harlequin's trap KFEAT: Z = enter_zot KFEAT: ~ = zot_statue @@ -818,6 +819,7 @@ SUBST: )]}> = ., e = ~, ?_ = ^, fghi"` = ' SUBST: defghi'"`Z?_ = . : end MARKER: Y = lua:props_marker { portal=1 } +: decorative_floor(_G, '*', "flower patch") FTILE: Z~'^ = floor_marble LFLOORTILE: floor_depthstone MAP diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des index 3668632d51..6a00326c2e 100644 --- a/crawl-ref/source/dat/des/branches/lair.des +++ b/crawl-ref/source/dat/des/branches/lair.des @@ -3634,6 +3634,23 @@ PwwwwwwP;-+---;x".""""xx xx ENDMAP +NAME: nzn_masters_of_martial_movement +TAGS: no_pool_fixup no_monster_gen +DEPTH: Lair +KFEAT: D = altar_wu_jian +KFEAT: E = altar_uskayaw +MONS: patrolling boulder beetle +SUBST: W : W:50 w:40 l +MAP + x...@...x +xxW.W.W.Wxx +.W.W.W.W.W. +@.W.D1E.W.@ +.W.W.W.W.W. +xxW.W.W.Wxx + x...@...x +ENDMAP + NAME: nicolae_lair_grazing_beasts TAGS: no_pool_fixup patrolling transparent DEPTH: Lair @@ -4251,7 +4268,7 @@ xxxc*DE..qccccccc-cccWqcccGpGcccqqccc-cccccccq..HF*cc. xxxcGEEqqqccttaccp-pcccccGpYpGccnncp-pccattccqqqHHGcc. xxcccccccctq..qccc-----------------cccq..qtcccccccc.. .axacccatq.. .qtcccccccc+++cccccccctq. .qqtcccatq. - .......... .........8@@@....a..... ........ + .......... .........8@@@....a...@@ ........ ENDMAP ############################################################################## diff --git a/crawl-ref/source/dat/des/branches/orc.des b/crawl-ref/source/dat/des/branches/orc.des index 620f84b074..ddef7c9cac 100644 --- a/crawl-ref/source/dat/des/branches/orc.des +++ b/crawl-ref/source/dat/des/branches/orc.des @@ -217,22 +217,26 @@ ORIENT: float MONS: orc warrior, orc priest / orc wizard, orc w:100 / orc warrior : if you.absdepth() >= 10 and crawl.one_chance_in(10) then MONS: orc knight -SUBST: G = . +SUBST: ? = . : else -MONS: orc warrior -SUBST: G = 4 +MONS: orc warrior +SUBST: ? = 4 : end -SUBST: c = c:1000 x KFEAT: O = enter_orcish_mines +: if crawl.one_chance_in(100) then +SUBST: X = x +: else +SUBST: X = c +: end MAP ............................. .Iwwwwwwwwwwwwwwwwwwwwwwwwww. .wIwwwwwwwwwwwwwwwwwwwwwwwww. .ww2+cccccccccccccccccccccww. .ww.c.......3.3.3......w2cww. -.wwxx........3.3.......cccww. -.122........3.I.3.....G4Ocww. -.wwxx........3.3.......cccww. +.wwxx........3.3.......XXXww. +.122........3.I.3.....?4Ocww. +.wwxx........3.3.......XXXww. .ww.c.......3.3.3......w2cww. .ww2+cccccccccccccccccccccww. .wIwwwwwwwwwwwwwwwwwwwwwwwww. diff --git a/crawl-ref/source/dat/des/branches/swamp.des b/crawl-ref/source/dat/des/branches/swamp.des index f75757e85d..26ff5f6611 100644 --- a/crawl-ref/source/dat/des/branches/swamp.des +++ b/crawl-ref/source/dat/des/branches/swamp.des @@ -387,7 +387,7 @@ MAP '""w"tt twwww"t '""wwtt - ttw"t' + ttw"tt 'tt' ENDMAP @@ -401,7 +401,7 @@ MAP ''www't 'twwwwwtt wwwww"tt -'twww"tt' +'twww"ttt ttwww"tt ttw'tt ENDMAP @@ -414,8 +414,8 @@ KFEAT: 1 = deep_water SUBST: " = ttttw NSUBST: ' = 1:@ / * = ttW MAP - 't't' -tt"""t' + 't'tt +ttw""tt t"w1w"tt ww1ww"tt t"w1t"t diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des index 05c4f859f5..c5ebc5ef47 100644 --- a/crawl-ref/source/dat/des/portals/trove.des +++ b/crawl-ref/source/dat/des/portals/trove.des @@ -766,8 +766,9 @@ ENDMAP # Layout directly adjusting due's trove_library. NAME: regret_index_trove_ozocubu : trove_setup(_G) -MONS: block of ice -# dream sheep / hell hog / alligator / anaconda / hydra / caustic shrike +MONS: dream sheep-shaped block of ice / hell hog-shaped block of ice / \ + anaconda-shaped block of ice / alligator-shaped block of ice / \ + hydra-shaped block of ice / caustic shrike-shaped block of ice w:2 NSUBST: d = 6:d / *:?, g = 6:g / *:? {{ trove_offense(_G, trove_weap_brand(_G, "freezing"), diff --git a/crawl-ref/source/dat/des/variable/d_encompass.des b/crawl-ref/source/dat/des/variable/d_encompass.des index 5df0b51a73..c6d09a3cb6 100644 --- a/crawl-ref/source/dat/des/variable/d_encompass.des +++ b/crawl-ref/source/dat/des/variable/d_encompass.des @@ -197,7 +197,7 @@ KFEAT: B = zot_statue KFEAT: Z = enter_zot KITEM: r = midnight gem NSUBST: (D = 1:Z -SUBST: f = B, 2 = t +SUBST: f = B, 2 = r : end : else SUBST: A&@ = a, _ = -, l = W diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des index 4cf5ab6be5..eb14dd1c8e 100644 --- a/crawl-ref/source/dat/des/variable/float.des +++ b/crawl-ref/source/dat/des/variable/float.des @@ -2167,6 +2167,7 @@ NAME: onia_ninara_swampy_vault TAGS: no_pool_fixup no_monster_gen DEPTH: Lair:3-, !Lair:$, Depths, !Depths:$ ORIENT: float +SUBST: " = .:2 x:1 W:4 P:1 w:3, - = .:9 W:2 : if you.in_branch("Lair") then KMONS: 1 = tyrant leech / swamp worm w:50 / \ vampire mosquito band / goliath frog / swamp drake w:15 @@ -2193,7 +2194,6 @@ KFEAT: 1324P = W NSUBST: @ = 1:@ / *:X SUBST: x = w:30 x:4, X = x SUBST: ` = wwwxxt, ~ = w:9 x:1 t:1 -SUBST: " = .:2 x:1 W:4 P:1 w:3, - = .:9 W:2 KPROP: wP = no_tele_into MAP XXXXXXXXXXXXXXxxx@xxxxxxxxxxxxxxx diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des index 3e2d7235c8..b1dcee25b2 100644 --- a/crawl-ref/source/dat/des/variable/mini_monsters.des +++ b/crawl-ref/source/dat/des/variable/mini_monsters.des @@ -351,23 +351,6 @@ MAP .... ENDMAP -NAME: nzn_masters_of_martial_movement -TAGS: no_pool_fixup no_monster_gen -DEPTH: Lair -KFEAT: D = altar_wu_jian -KFEAT: E = altar_uskayaw -MONS: patrolling boulder beetle -SUBST: W : W:50 w:40 l -MAP - x...@...x -xxW.W.W.Wxx -.W.W.W.W.W. -@.W.D1E.W.@ -.W.W.W.W.W. -xxW.W.W.Wxx - x...@...x -ENDMAP - NAME: nzn_sisyphean_effort DEPTH: D:9-12, Lair MONS: patrolling boulder beetle @@ -2555,7 +2538,7 @@ ENDMAP # Very hungry Elvish explorers and their campfire, mounts and pet. # Sometimes they have starved to death. NAME: beargit_elvish_explorers -DEPTH: D:12-, Depths, Swamp, Snake, Spider, Crypt +DEPTH: D:12-, Depths, Crypt TAGS: transparent patrolling no_monster_gen no_trap_gen : if you.in_branch("D") then : if you.depth() < 14 then @@ -2570,14 +2553,6 @@ MONS: deep elf knight; lajatang good_item . scale mail good_item MONS: elephant / dire elephant, warg / hell hound / raiju : end MONS: plant / fungus, nothing -: elseif you.in_branch("Swamp") or you.in_branch("Spider") -: or you.in_branch("Snake") then -MONS: deep elf archer; longbow good_item . quarterstaff \ - . robe good_item -MONS: deep elf knight; lajatang good_item . chain mail good_item -MONS: dire elephant -MONS: hell hound / raiju -MONS: fungus / nothing, nothing : elseif you.in_branch("Crypt") then KITEM: 1 = longbow good_item, quarterstaff, robe good_item KITEM: 2 = lajatang good_item, chain mail good_item @@ -2587,7 +2562,7 @@ KMONS: 3 = spectral hellephant KMONS: 4 = spectral shadow dragon KMONS: 6 = deep elf death mage w:30 / vampire mage / \ lich / ancient lich / dread lich -KITEM: P = rat +KITEM: P = rat skeleton SUBST: 5 = - : else # The elves have mastered the dungeon and allied with the darkness. @@ -2604,11 +2579,6 @@ COLOUR: t = brown TILE: t = dngn_tree_dead : set_feature_name("tree", "dead tree") FTILE: - = floor_crypt -: elseif you.in_branch("Swamp") then -SUBST: - = --....W, x = t -FTILE: -123456t = floor_grass -: elseif you.in_branch("Spider") then -SUBST: t = x : else FTILE: -123456t = floor_grass FTILE: P = floor_sand diff --git a/crawl-ref/source/rltiles/mon/sprint/orb_of_electricity.png b/crawl-ref/source/rltiles/UNUSED/monsters/orb_of_electricity.png similarity index 100% rename from crawl-ref/source/rltiles/mon/sprint/orb_of_electricity.png rename to crawl-ref/source/rltiles/UNUSED/monsters/orb_of_electricity.png diff --git a/crawl-ref/source/rltiles/mon/sprint/orb_of_ice.png b/crawl-ref/source/rltiles/UNUSED/monsters/orb_of_ice.png similarity index 100% rename from crawl-ref/source/rltiles/mon/sprint/orb_of_ice.png rename to crawl-ref/source/rltiles/UNUSED/monsters/orb_of_ice.png diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 18faeb760c..d5dc2d53a7 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -1367,9 +1367,6 @@ nobody2 ## Sprint specials %sdir mon/sprint dimme MONS_DIMME -%rim 0 -orb_of_ice MONS_ORB_OF_ICE -orb_of_electricity MONS_ORB_OF_ELECTRICITY %rim 1 %include dc-zombie.txt diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt index a7bde18744..35e9e20b65 100644 --- a/crawl-ref/source/rltiles/dc-spells.txt +++ b/crawl-ref/source/rltiles/dc-spells.txt @@ -44,10 +44,10 @@ cause_fear CAUSE_FEAR confuse CONFUSE confusing_touch CONFUSING_TOUCH corona CORONA -dazzling_flash DAZZLING_FLASH discord DISCORD enfeeble ENFEEBLE charming CHARMING +gloom GLOOM haste HASTE invisibility INVISIBILITY jinxbite JINXBITE diff --git a/crawl-ref/source/rltiles/dc-zombie.txt b/crawl-ref/source/rltiles/dc-zombie.txt index 74427de424..fa1340805a 100644 --- a/crawl-ref/source/rltiles/dc-zombie.txt +++ b/crawl-ref/source/rltiles/dc-zombie.txt @@ -131,6 +131,7 @@ simulacrum_spider MONS_SIMULACRUM_SPIDER simulacrum_slime MONS_SIMULACRUM_SLIME simulacrum_eye MONS_SIMULACRUM_EYE simulacrum_x MONS_SIMULACRUM_X +simulacrum_juggernaut MONS_SIMULACRUM_JUGGERNAUT simulacrum_dragon MONS_SIMULACRUM_DRAGON simulacrum_kraken MONS_SIMULACRUM_KRAKEN simulacrum_drake MONS_SIMULACRUM_DRAKE diff --git a/crawl-ref/source/rltiles/gui/spells/enchantment/dazzling_flash.png b/crawl-ref/source/rltiles/gui/spells/enchantment/dazzling_flash.png deleted file mode 100644 index c69ea3040d..0000000000 Binary files a/crawl-ref/source/rltiles/gui/spells/enchantment/dazzling_flash.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/gui/spells/enchantment/gloom.png b/crawl-ref/source/rltiles/gui/spells/enchantment/gloom.png new file mode 100644 index 0000000000..e043206eee Binary files /dev/null and b/crawl-ref/source/rltiles/gui/spells/enchantment/gloom.png differ diff --git a/crawl-ref/source/rltiles/mon/undead/draugr/draugur_dragon.png b/crawl-ref/source/rltiles/mon/undead/draugr/draugur_dragon.png deleted file mode 100644 index 9942981ad9..0000000000 Binary files a/crawl-ref/source/rltiles/mon/undead/draugr/draugur_dragon.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/mon/undead/simulacra/simulacrum_juggernaut.png b/crawl-ref/source/rltiles/mon/undead/simulacra/simulacrum_juggernaut.png new file mode 100644 index 0000000000..550b298467 Binary files /dev/null and b/crawl-ref/source/rltiles/mon/undead/simulacra/simulacrum_juggernaut.png differ diff --git a/crawl-ref/source/rltiles/mon/unique/polyphemus.png b/crawl-ref/source/rltiles/mon/unique/polyphemus.png index 40cd699d35..7867563543 100644 Binary files a/crawl-ref/source/rltiles/mon/unique/polyphemus.png and b/crawl-ref/source/rltiles/mon/unique/polyphemus.png differ diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 7be84c76ec..837a42ca0e 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -2115,7 +2115,7 @@ static const struct spell_desc spelldata[] = 50, 2, 3, 0, - TILEG_DAZZLING_FLASH, + TILEG_GLOOM, }, { diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 3bd754869a..4b5a4a0204 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1253,9 +1253,10 @@ static tileidx_t _zombie_tile_to_simulacrum(const tileidx_t z_tile) case TILEP_MONS_ZOMBIE_LARGE: case TILEP_MONS_ZOMBIE_OGRE: case TILEP_MONS_ZOMBIE_TROLL: - case TILEP_MONS_ZOMBIE_JUGGERNAUT: case TILEP_MONS_ZOMBIE_UGLY_THING: return TILEP_MONS_SIMULACRUM_LARGE; + case TILEP_MONS_ZOMBIE_JUGGERNAUT: + return TILEP_MONS_SIMULACRUM_JUGGERNAUT; case TILEP_MONS_ZOMBIE_QUADRUPED_SMALL: case TILEP_MONS_ZOMBIE_BEAR: case TILEP_MONS_ZOMBIE_DREAM_SHEEP: -- Dungeon Crawl Stone Soup |