You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(15) |
Sep
(131) |
Oct
(149) |
Nov
(216) |
Dec
(222) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(152) |
Feb
(58) |
Mar
(184) |
Apr
(249) |
May
(96) |
Jun
(207) |
Jul
(248) |
Aug
(87) |
Sep
(232) |
Oct
(440) |
Nov
(248) |
Dec
(212) |
| 2008 |
Jan
(216) |
Feb
(118) |
Mar
(508) |
Apr
(796) |
May
(597) |
Jun
(896) |
Jul
(475) |
Aug
(124) |
Sep
(200) |
Oct
(248) |
Nov
(377) |
Dec
(373) |
| 2009 |
Jan
(807) |
Feb
(430) |
Mar
(276) |
Apr
(138) |
May
(161) |
Jun
(210) |
Jul
(390) |
Aug
(141) |
Sep
(286) |
Oct
(826) |
Nov
(1123) |
Dec
(419) |
| 2010 |
Jan
(671) |
Feb
(625) |
Mar
(328) |
Apr
(349) |
May
(296) |
Jun
(485) |
Jul
(396) |
Aug
(113) |
Sep
(582) |
Oct
(414) |
Nov
(248) |
Dec
(377) |
| 2011 |
Jan
(400) |
Feb
(225) |
Mar
(321) |
Apr
(264) |
May
(148) |
Jun
(249) |
Jul
(270) |
Aug
(217) |
Sep
(262) |
Oct
(356) |
Nov
(426) |
Dec
(359) |
| 2012 |
Jan
(203) |
Feb
(131) |
Mar
(317) |
Apr
(313) |
May
(170) |
Jun
(272) |
Jul
(363) |
Aug
(364) |
Sep
(330) |
Oct
(188) |
Nov
(178) |
Dec
(141) |
| 2013 |
Jan
(177) |
Feb
(258) |
Mar
(459) |
Apr
(352) |
May
(443) |
Jun
(364) |
Jul
(185) |
Aug
(175) |
Sep
(242) |
Oct
(237) |
Nov
(359) |
Dec
(300) |
| 2014 |
Jan
(331) |
Feb
(272) |
Mar
(446) |
Apr
(301) |
May
(577) |
Jun
(435) |
Jul
(365) |
Aug
(358) |
Sep
(306) |
Oct
(617) |
Nov
(863) |
Dec
(466) |
| 2015 |
Jan
(295) |
Feb
(165) |
Mar
(319) |
Apr
(201) |
May
(158) |
Jun
(148) |
Jul
(62) |
Aug
(91) |
Sep
(147) |
Oct
(203) |
Nov
(346) |
Dec
(382) |
| 2016 |
Jan
(242) |
Feb
(280) |
Mar
(229) |
Apr
(157) |
May
(297) |
Jun
(335) |
Jul
(157) |
Aug
(219) |
Sep
(307) |
Oct
(212) |
Nov
(177) |
Dec
(112) |
| 2017 |
Jan
(100) |
Feb
(203) |
Mar
(112) |
Apr
(124) |
May
(81) |
Jun
(43) |
Jul
(39) |
Aug
(49) |
Sep
(24) |
Oct
(55) |
Nov
(68) |
Dec
(95) |
| 2018 |
Jan
(130) |
Feb
(73) |
Mar
(47) |
Apr
(57) |
May
(62) |
Jun
(76) |
Jul
(159) |
Aug
(158) |
Sep
(81) |
Oct
(100) |
Nov
(62) |
Dec
(75) |
| 2019 |
Jan
(130) |
Feb
(138) |
Mar
(80) |
Apr
(61) |
May
(88) |
Jun
(65) |
Jul
(61) |
Aug
(37) |
Sep
(85) |
Oct
(155) |
Nov
(133) |
Dec
(91) |
| 2020 |
Jan
(59) |
Feb
(123) |
Mar
(121) |
Apr
(155) |
May
(300) |
Jun
(136) |
Jul
(330) |
Aug
(84) |
Sep
(56) |
Oct
(87) |
Nov
(154) |
Dec
(200) |
| 2021 |
Jan
(205) |
Feb
(203) |
Mar
(292) |
Apr
(165) |
May
(56) |
Jun
(135) |
Jul
(248) |
Aug
(218) |
Sep
(165) |
Oct
(150) |
Nov
(135) |
Dec
(266) |
| 2022 |
Jan
(194) |
Feb
(149) |
Mar
(49) |
Apr
(38) |
May
(145) |
Jun
(213) |
Jul
(150) |
Aug
(126) |
Sep
(188) |
Oct
(121) |
Nov
(34) |
Dec
(142) |
| 2023 |
Jan
(105) |
Feb
(82) |
Mar
(138) |
Apr
(125) |
May
(112) |
Jun
(90) |
Jul
(222) |
Aug
(279) |
Sep
(157) |
Oct
(100) |
Nov
(85) |
Dec
(295) |
| 2024 |
Jan
(123) |
Feb
(353) |
Mar
(220) |
Apr
(112) |
May
(162) |
Jun
(169) |
Jul
(205) |
Aug
(174) |
Sep
(73) |
Oct
(62) |
Nov
(95) |
Dec
(62) |
| 2025 |
Jan
(125) |
Feb
(90) |
Mar
(127) |
Apr
(188) |
May
(74) |
Jun
(59) |
Jul
(154) |
Aug
(117) |
Sep
(125) |
Oct
(157) |
Nov
(251) |
Dec
(177) |
| 2026 |
Jan
(115) |
Feb
(50) |
Mar
(63) |
Apr
(50) |
May
(61) |
Jun
(125) |
Jul
(99) |
Aug
(78) |
Sep
(135) |
Oct
(133) |
Nov
(80) |
Dec
|
|
From: <gi...@cr...> - 2026-11-16 21:57:48
|
via 3d2b70d1f18372083ee416f1922f2792fbd599e6 (commit)
from e4dd5e6c705b85044df68cbb06e92b4f47cdcae9 (commit)
-----------------------------------------------------------------------
commit 3d2b70d1f18372083ee416f1922f2792fbd599e6
Author: CrawlOdds <cra...@gm...>
Date: Mon Nov 16 21:47:26 2026 +0000
Make shop items resolve item sets
Clearing the semi-known flag when meeting an item is how we deal with
item sets including a starting item, but seeing items in shops did not
do it. Previously, a scroll of butterflies bought in a shop stacking
onto a hunter's one did not remove scrolls of summoning from the
unrecognised list.
Note that this is done even for an unknown item. This matches the
behaviour for ground items, which clear this flag on sight not on ID
(which doesn't change anything visible until ID).
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/shopping.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 9c8ea43042..d8088dbc02 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1586,6 +1586,7 @@ void shop()
{
const int cost = item_price(item, shop);
culled |= shopping_list.cull_identical_items(item, cost);
+ maybe_mark_set_known(item.base_type, item.sub_type);
}
if (culled)
more(); // make sure all messages appear before menu
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-16 14:45:12
|
via e4dd5e6c705b85044df68cbb06e92b4f47cdcae9 (commit)
from 33b38161b29362456836a82fa0bec80aeaebe396 (commit)
-----------------------------------------------------------------------
commit e4dd5e6c705b85044df68cbb06e92b4f47cdcae9
Author: yrdzrfxndfvh <273...@us...>
Date: Wed Oct 28 00:11:04 2026 -0400
Small handful of vaults (#5542)
A short collection of vaults from a current batch that I wanted to try
and submit sooner than later. Includes:
- a large (mostly low-threat) Abyss vault
- a mid-tier Vestibule entry
- a Dis downstairs vault
- a Tar upstairs 'ambush' vault
- a vaguely orc-themed monster closet
- a guarded_sphinx_sisters vault
- a Gulch entry
- a Trove entry
- 3 D / Depths decor vaults
[Committer's notes: Headers repeatedly cleaned up, house-styles of
randomization and line-spread set, and commits squashed all as usual.
Notably beyond this:
* The shadow wraith Tartarus vault was rejected as just an open
featureless circle spamming a disruptive monster used as fodder by
its depth.
* The lotus-themed Trove entry has been excluded out of Spider for
not particularly fitting it compared to the other branches.
* The Gulch entry placing mechanists in jail right outside the Gulch
has replaced these with flesh cages, as the mechanists inside Gulch
are more punished plumbers than actual criminals.
This closes #5542.]
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/branches/abyss.des | 32 +++++++++
crawl-ref/source/dat/des/branches/dis.des | 25 ++++++-
crawl-ref/source/dat/des/branches/hell.des | 21 ++++++
crawl-ref/source/dat/des/branches/tar.des | 16 +++++
crawl-ref/source/dat/des/portals/gulch.des | 28 ++++++++
crawl-ref/source/dat/des/portals/trove.des | 23 +++++++
.../source/dat/des/variable/mini_features.des | 59 ++++++++++++++++
.../source/dat/des/variable/mini_monsters.des | 79 ++++++++++++++++++++++
8 files changed, 282 insertions(+), 1 deletion(-)
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index a16a23f39c..2c519c3feb 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -1627,6 +1627,38 @@ xx.....O.....xx
x
ENDMAP
+# (An Unfavorable Semicircle reference of a vault.)
+NAME: tekkud_abyss_golden
+WEIGHT: 2
+KFEAT: T = dry_fountain
+KFEAT: s = abandoned_shop
+KFEAT: m = iron_grate
+NSUBST: . = 3:0 / 6:0. / 1:$ / * = .:670 +:25 x
+MAP
+ xxxxxxxxxxxxxx
+xxxT..........+x
+xx.............x
+xT.xx.......xx.x
+x..xxx.....xxx.xxxxxx
+x...xxx...xxx.......xx
+x....xx...xx.........xx
+x......x.x.......xxxxxx
+x..s....x.......x.....x
+x.....xx........x.....x
+xx0..xxxx.xx.....x....x
+ @....xx...x..GG..xxxxx
+ @................x
+ @.....x...xG.s..Gx
+xxxxxx.xx.xxG....Gx
+xxxxx.............x
+xxx....x...x..GG..++ G
+xxx.G.xx...xmxxxx+'+
+xxx...xx...xm +++x
+xxxxxxxx...x xx
+xxxxxxxx@@@x x
+ xxxxxxx xG G
+ENDMAP
+
###############################################################################
# Abyss rune vaults
#
diff --git a/crawl-ref/source/dat/des/branches/dis.des b/crawl-ref/source/dat/des/branches/dis.des
index b9920e0704..802abc3338 100644
--- a/crawl-ref/source/dat/des/branches/dis.des
+++ b/crawl-ref/source/dat/des/branches/dis.des
@@ -1168,7 +1168,7 @@ vlvlvlv...vlvlvlv
ENDMAP
NAME: tekkud_dis_hexagon_chokepoint
-TAGS: no_rotate
+TAGS: transparent no_rotate
DEPTH: Dis:2-
ORIENT: centre
MONS: crystal guardian, iron golem, orange crystal statue
@@ -1186,6 +1186,29 @@ vv2832..3..2382vv
vvv@vvv
ENDMAP
+NAME: tekkud_dis_hell_sentinel_island
+TAGS: transparent
+DEPTH: Dis, !Dis:$
+WEIGHT: 8
+MONS: hell sentinel
+KFEAT: ^ = trap_alarm
+NSUBST: - = 1 : ^'''' / *:'
+KMASK: 1^' = opaque
+KMASK: 1^' = no_monster_gen
+KMASK: 1^' = no_trap_gen
+KPROP: l = no_cloud_gen
+MAP
+vvvvvvvvvvvv
+@.......vvvv
+vv..lll...vv
+vv.ll-ll...v
+vv.l-1'l.}.v
+vv.ll-ll...v
+vv..lll...vv
+@.......vvvv
+vvvvvvvvvvvv
+ENDMAP
+
default-depth:
##############################################################################
# Dispater's castle - subvaulted, with three main versions
diff --git a/crawl-ref/source/dat/des/branches/hell.des b/crawl-ref/source/dat/des/branches/hell.des
index 5a75246b86..f844c41669 100644
--- a/crawl-ref/source/dat/des/branches/hell.des
+++ b/crawl-ref/source/dat/des/branches/hell.des
@@ -799,6 +799,27 @@ llllvv----lOl----vvllll
lllllll
ENDMAP
+NAME: tekkud_hell_entry_souls_on_fire
+TAGS: transparent patrolling
+MONS: balrug, spectral thing
+NSUBST: 2 = 2:2 / * = 2''
+FTILE: '+12 = floor_infernal_blank
+: hell_entry_feature(_G, 'O')
+: hell_entry_tier(_G, "mid")
+MAP
+.............
+.v.v.v.v.v.v.
+..vvvvvvvvv..
+.vv'''1'''vv.
+..v'2'''2'v..
+.vv2''O''2vv.
+..v'''''''v..
+.vv'''''''vv.
+..vvv+++vvv..
+.v.v.....v.v.
+.............
+ENDMAP
+
##############################################################################
# Vestibule of Hell and Geryon
##############################################################################
diff --git a/crawl-ref/source/dat/des/branches/tar.des b/crawl-ref/source/dat/des/branches/tar.des
index 9fc0371ab9..1aab2a8677 100644
--- a/crawl-ref/source/dat/des/branches/tar.des
+++ b/crawl-ref/source/dat/des/branches/tar.des
@@ -1168,6 +1168,22 @@ xx@@@xx
xx@@@xx
ENDMAP
+NAME: tekkud_tar_oblivion_access
+TAGS: transparent
+DEPTH: Tar:2-, !Tar:$
+MONS: oblivion hound / reaper w:2
+NSUBST: + = 2:+ / *:x, ' = 2:1 / 4 = 1. / *:.
+SUBST: - = x.
+MAP
+xxxxxxxxxxxx
+x'x-{-x.'.xx+x
+x.-.x-..xx-.'x
++......-x.''.x
+x.-.---..-.-.+
+xxx..x.x.x.x.x
+ xxx+xxxxx+xxx
+ENDMAP
+
##############################################################################
# Ereshkigal (Tartarus)
##############################################################################
diff --git a/crawl-ref/source/dat/des/portals/gulch.des b/crawl-ref/source/dat/des/portals/gulch.des
index f742324570..e8ba889f12 100644
--- a/crawl-ref/source/dat/des/portals/gulch.des
+++ b/crawl-ref/source/dat/des/portals/gulch.des
@@ -515,6 +515,34 @@ x..x.S1WxS.x..x
x..xxxxxxxxx..x
ENDMAP
+NAME: tekkud_gulch_entry_sunken_jail
+TAGS: vaults_orient_w vaults_orient_e
+: local d = you.depth()
+: kmons("1 = crawling flesh cage w:" .. 5 - d .. " / " ..
+: "rusted inspector w:" .. d)
+: kmons("2 = slime creature w:" .. 5 - d .. " / alligator w:2 / " ..
+: "formless jellyfish w:" .. d)
+KMONS: 3 = vault guard
+KMONS: SP = stack of scrap
+KFEAT: m = iron_grate
+SUBST: - = mW
+NSUBST: ' = 1:M. / * = S...
+: subst("1 = 1:8 .:" .. 5 - d)
+: subst("2 = 2 W:" .. 6 - d)
+: decorative_floor(_G, 'M', "mop and bucket")
+: gulch_portal(_G, "2PW", "w")
+MAP
+ xxxxxxxxxxxxx
+ x'1x'.xW2x2Wx
+ x..x1.xWWxWWx
+ xmmSmmP--P--x
+........3.WWWWWWW
+xmmSmmSmmS--x
+x..x..z1.zWWx
+x1.x'1zO.z2Wx
+xxxxxxzzzzxxx
+ENDMAP
+
###############################################################################
# <<3>> Gulch layout vaults and subvaults
###############################################################################
diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
index 1370203178..91309b4fb8 100644
--- a/crawl-ref/source/dat/des/portals/trove.des
+++ b/crawl-ref/source/dat/des/portals/trove.des
@@ -729,6 +729,29 @@ cc..cc..ccc..cc..cc
ccccccccccc
ENDMAP
+NAME: tekkud_trove_entry_lotus
+TAGS: transparent no_descent
+DEPTH: D:12-, Swamp, Snake, Shoals
+WEIGHT: 5 (Snake), 10
+KMONS: 0 = 0
+KMONS: p = plant
+KMONS: s = sacred lotus
+KFEAT: 0ps = W
+SUBST: A : AW
+NSUBST: p = 1:s / * = ppppWWW0
+: trove.portal(_G)
+MAP
+cc'''''cc
+cA'WWW'Ac
+'''WpW'''
+'WW.W.WW'
+'WpWOWpW'
+'WW.W.WW'
+'''WpW'''
+cA'WWW'Ac
+cc'''''cc
+ENDMAP
+
##############################################################################
#
# The portal vaults. As of 0.34:
diff --git a/crawl-ref/source/dat/des/variable/mini_features.des b/crawl-ref/source/dat/des/variable/mini_features.des
index 27e112de43..1d92642e70 100644
--- a/crawl-ref/source/dat/des/variable/mini_features.des
+++ b/crawl-ref/source/dat/des/variable/mini_features.des
@@ -3580,6 +3580,65 @@ MAP
.........
ENDMAP
+NAME: tekkud_striation
+TAGS: transparent extra decor
+DEPTH: D:4-, Depths
+: if crawl.coinflip() then
+SUBST: y = x, ' = .
+: else
+CLEAR: y'
+: end
+MAP
+yyyyyxxyy'''
+''''....'yyy
+yyyxxxxx.'''
+''......xxyy
+yxxxxxx....'
+.......xxxxx
+xxxxxx......
+'.....xxxxxy
+yyxxx.....''
+'''..xxxxyyy
+yyyy....''''
+''''yxxyyyyy
+ENDMAP
+
+NAME: tekkud_still_life_1
+TAGS: transparent extra decor buniq_still_life
+DEPTH: D:3-, Depths
+WEIGHT: 7
+SHUFFLE: cx
+TILE: x : wall_pebble_green / wall_pebble_cyan
+MAP
+ .....
+ ..xx.
+ .x.x.
+ ......x.
+ ..x.....
+ ..xx.
+ .x.x.
+.........
+.xxx.
+...x.
+..x..
+.....
+ENDMAP
+
+NAME: tekkud_still_life_2
+TAGS: transparent extra decor buniq_still_life
+DEPTH: D:3-, Depths
+WEIGHT: 7
+TILE: x = wall_pebble_darkgray
+MAP
+ .....
+ ...x.......
+..x...x..xx.....
+.x......xx.xxxx.
+.x....x..xxxxxx.
+.xxxxx....xxxx..
+....... ......
+ENDMAP
+
#####################################################################
#
# <<2>> Inaccessible items
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index 96c41c6602..1ee4472b7d 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -3976,6 +3976,45 @@ XxxxxccccxxxccccxxxxX
XXXXXXXXXXXXXXX
ENDMAP
+NAME: tekkud_another_orcish_slaughterbox
+TAGS: transparent no_monster_gen
+DEPTH: D:8-14
+WEIGHT: 2 (D:8-9), 10
+KMONS: 1d = orc / orc wizard / orc priest / gnoll / kobold brigand / ogre
+KMONS: 2e = orc warrior w:20 / centaur / two-headed ogre w:15 / \
+ troll / gnoll sergeant / kobold geomancer
+KMONS: 3f = warg w:30 / ogre mage / cyclops / kobold demonologist
+KMONS: 4g = orc knight w:25 / deep troll / \
+ deep elf pyromancer / centaur warrior w:3
+KITEM: defg4 = $ no_pickup
+KITEM: 23 = $ no_pickup / nothing w:15
+SHUFFLE: AB / DE , AB / ++ / C+
+SUBST: A = ' , B : xxI , C = x , DE = x
+: if you.depth() < 10 then
+NSUBST: 1 = 2 = de / 1:1 / 2:. / * = 111..
+: elseif you.depth() < 12 then
+NSUBST: 1 = 2 = ef / * = 11222.
+: else
+NSUBST: 1 = 2 = fg / * = 122333
+: end
+TILE: x = wall_orc
+FTILE: .I+x1234 = floor_orc
+MAP
+ '''''''''''
+''DxxABAxxD''
+'DE.......ED'
+'x.Ixx.xxI.x'
+'x.xx111xx.x'
+'A.x11111x.A'
+'B..11111..B'
+'A.x11111x.A'
+'x.xx111xx.x'
+'x.Ixx.xxI.x'
+'DE.......ED'
+''DxxABAxxD''
+ '''''''''''
+ENDMAP
+
################################################################################
#
# <<4>> Demons and undead
@@ -11164,6 +11203,46 @@ ccccccc.v..3..v.ccccccc
ccccccccccc
ENDMAP
+NAME: tekkud_guardbook_sphinx_sisters
+TAGS: transparent vaults_room vaults_orient_w vaults_orient_e no_wall_fixup
+DEPTH: D:12-, Vaults:1-3
+WEIGHT: 4 (Vaults), 2
+MONS: sphinx marauder, guardian sphinx
+: if you.branch() == "D" then
+ITEM: randbook disc:hexes spells:sphinx_sisters
+NSUBST: ~ = 1:1 / 1:2 / 1:d / *:~
+CLEAR: -
+: else -- Vaults
+ITEM: parchment of Sphinx Sisters
+ITEM: any magical staff randart artprops:hexes pre_id
+NSUBST: ~ = 2:1 / 2:2 / 1:d / 1:e / *:~
+SUBST: -+ = .
+TILE: b = dngn_crystal_magenta
+: end
+KFEAT: m = iron_grate
+KFEAT: F = cache_of_baked_goods
+SUBST: ' = x., m = m.
+KPROP: ~12deF = no_tele_into
+KMASK: ~deF = no_monster_gen
+TILE: x = wall_catacombs
+FTILE: ~12deFbn = floor_pebble_darkgray
+MAP
+..................
+.'mmmmmm'.'mmmmm'.
+.'......'.'.....'.
+.'......'.'.....'.
+.'......'.'.....'.
+..xx''.'xxx'''.xx.
+ -+.............+-
+ -+.............+--
+ .xx.'''xxbb=bbbbb.
+ .'.....'.b~~~~~Fb.
+ .'.....'.b~~~~~~b.
+ .'.....'.b~~~~~~b.
+ .'mmmmm'.bnnnnnnb.
+ ..................
+ENDMAP
+
###################################################################
#
# <<9>> Pre-Lair vaults with monsters guarding a manual
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-15 21:47:53
|
via 33b38161b29362456836a82fa0bec80aeaebe396 (commit)
from 60dbfdbf4fb9123f5a2234a8aed695af294012ff (commit)
-----------------------------------------------------------------------
commit 33b38161b29362456836a82fa0bec80aeaebe396
Author: CrawlOdds <cra...@gm...>
Date: Sun Nov 15 21:45:07 2026 +0000
Allow autofire through remembered invisible monsters
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/l-autofight.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/crawl-ref/source/l-autofight.cc b/crawl-ref/source/l-autofight.cc
index 64d6d9047a..f1ed62093c 100644
--- a/crawl-ref/source/l-autofight.cc
+++ b/crawl-ref/source/l-autofight.cc
@@ -96,8 +96,11 @@ static int _shot_score(coord_def target, coord_def aim, bool pierce, bool primar
{
map_cell& cell = env.map_knowledge(g);
monster_info *mi = cell.monsterinfo();
- if (mi && !mi->can_shoot_through_monster && mi->type != MONS_BUSH)
+ if (mi && !mi->is(MB_REMEMBERED_INVIS)
+ && !mi->can_shoot_through_monster && mi->type != MONS_BUSH)
+ {
num_blockers++;
+ }
}
}
if (!found_main_target || (primary_must_be_first && !found_main_target_first))
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-15 13:40:12
|
via 60dbfdbf4fb9123f5a2234a8aed695af294012ff (commit)
from 24bf4ba0372a885976726e39da232df1b49c92ff (commit)
-----------------------------------------------------------------------
commit 60dbfdbf4fb9123f5a2234a8aed695af294012ff
Author: CrawlOdds <cra...@gm...>
Date: Sun Nov 15 13:28:45 2026 +0000
Fix description of divinely granted spells
Remove some irrelevant/misleading lines from descriptions in eisegesis
and exegesis ability screens, as training does not affect these spells
and they cannot fail.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/describe.cc | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index d3b0b72a67..ccf2c31216 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -4576,6 +4576,11 @@ void inscribe_item(item_def &item)
quiver::set_needs_redraw();
}
+static bool _divine_casting()
+{
+ return you.divine_exegesis || you.chaos_eisegesis;
+}
+
/**
* List the simple calculated stats of a given spell, when cast by the player
* in their current condition.
@@ -4602,7 +4607,7 @@ static string _player_spell_stats(const spell_type spell)
string failure;
- if (you.divine_exegesis)
+ if (_divine_casting())
failure = "0%";
else if (spell_can_be_enkindled(spell) && you.has_mutation(MUT_MNEMOPHAGE)
&& !you.duration[DUR_ENKINDLED])
@@ -5034,12 +5039,15 @@ static string _player_spell_desc(spell_type spell)
ostringstream description;
- description << "Miscasting this spell causes magic contamination"
- << (fail_severity(spell) ?
- " and also " + _miscast_damage_string(spell) : "")
- << ".\n";
+ if (!_divine_casting())
+ {
+ description << "Miscasting this spell causes magic contamination"
+ << (fail_severity(spell) ?
+ " and also " + _miscast_damage_string(spell) : "")
+ << ".\n";
- description << _spell_fail_training_desc(spell);
+ description << _spell_fail_training_desc(spell);
+ }
if (spell == SPELL_BATTLESPHERE)
{
@@ -5109,8 +5117,11 @@ static string _player_spell_desc(spell_type spell)
<< " supports the use of this spell.\n";
}
- if (you.has_mutation(MUT_MNEMOPHAGE) && spell_can_be_enkindled(spell))
+ if (you.has_mutation(MUT_MNEMOPHAGE) && spell_can_be_enkindled(spell)
+ && !_divine_casting())
+ {
description << "This spell is empowered while you are enkindled.\n";
+ }
if (!you_can_memorise(spell))
{
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-15 05:00:10
|
via 24bf4ba0372a885976726e39da232df1b49c92ff (commit)
from 73e118c690727ef5e6780fe15789e9c0e1004e26 (commit)
-----------------------------------------------------------------------
commit 24bf4ba0372a885976726e39da232df1b49c92ff
Author: David Lawrence Ramsey <poo...@gm...>
Date: Sat Nov 14 22:55:28 2026 -0600
Fix typo (Astera).
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/descript/items.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 640f0ee829..2fe9255acc 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -1878,7 +1878,7 @@ vision talisman
A small charm bearing the likeness of an eye. It gives the wearer supernatural
sight, allowing them to perceive the clouds of magical residue left behind
whenever beings cast spells. Touching those clouds allows them to convert that
-leftover magic into unnerring projectiles against nearby foes.
+leftover magic into unerring projectiles against nearby foes.
This third eye even allows one to see from further distances than would
otherwise be possible{{
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-14 23:05:13
|
via 73e118c690727ef5e6780fe15789e9c0e1004e26 (commit)
via 2a1ee2751fa9ebdb3c28bcb6ebf58e773e189926 (commit)
via 26faf885dacd4dd1e87cb669d82222d305ecee60 (commit)
via 021aa32aa36e97703a5d84b3f2bd9c8ec995bf03 (commit)
from 85b862349b18d804c6fac74cd3cec21573c630e2 (commit)
-----------------------------------------------------------------------
commit 73e118c690727ef5e6780fe15789e9c0e1004e26
Author: DracoOmega <dra...@gm...>
Date: Sat Nov 14 19:28:05 2026 -0330
Add a cornucopia of Xom titles (regret-index)
Why should the most unpredictable and ever-changing god be satisfied with
just *one* capstone title when instead they could have 27?
Rather than being chosen at random, which title you get for worshipping
Xom depends on the day that the save game was started, rotating on a 27
day cycle.
It replaces the 27 Fighting title (rather than requiring players to max
Invocations, which is a pretty specific ask, and I suspect rather unfun
when there are so many titles to collect) if the player has worshipped Xom
since XL 8, without abandoning. (This means you don't *have* to be a Chaos
Knight to get it, but you don't get to just god-swap at the end of the
game, either.)
(All of the titles were witten by regret-index. Yes, there is a foo title
tied to a specific day of the 'month'; I think this is designed to
deliberately drive certain people mad.)
commit 2a1ee2751fa9ebdb3c28bcb6ebf58e773e189926
Author: DracoOmega <dra...@gm...>
Date: Sat Nov 14 18:02:37 2026 -0330
Refactor some title printing to more centrally handle spacing/prefixing
The fact that normal titles (starting in 'the') and titles starting with a
comma needed different spacing was handled in multiple different places
(and it was recently pointed out that one of them had gone overlooked; it
was still saying "the Who Hides the Stars" in death messages).
Instead, bake the spacing (or lack thereof) into player_title(true) itself,
and allow hiscore handling to access the title prefix directly. This should
hopefully be more resilient and tidy.
This closes #5558.
commit 26faf885dacd4dd1e87cb669d82222d305ecee60
Author: DracoOmega <dra...@gm...>
Date: Sat Nov 14 17:37:29 2026 -0330
Add many new titles, mostly for shapeshifting conducts (hellmonk)
Using the new form XP tracking added by 0f941a9 and c429827, this commit
adds numerous titles for using different forms exclusively after a certain
XL (and converts the current Pinnacle of Evolution to the same model).
All form titles require the player to exclusively use the form from
xl (5 + 3 * tier). That means the player must enter the form before
xl 8/11/14/17/20, by tier, and get all xp in the form from that point
(polymorph, !lig, Vessel of Slaughter and such are still okay). Most form
titles also have other requirements.
Most of the titles and associated code here was originally written by
hellmonk, with a handful of edits, additional contributions, and title
changes by myself and regret-index.
Titles added:
Papyrus Preeminent (scroll form, XL 18+)
Farsighted (vision form best skill shapeshifting, Kobold)
Veil Piercer (vision form best skill shapeshifting, any other species)
Leopard Gecko (gecko form best skill shapeshifting, Felid)
Hedgehog (quill form best skill shapeshifting, Spriggan)
Cordyceps Champion (spore form best skill shapeshifting, Formicid)
Genus O' War (medusa form best skill shapeshifting)
, Who Moves the Sun (scarab form best skill shapeshifting)
Little Ice Age (yak form best skill shapeshifting)
Brewmaster (mistmane best skill shapeshifting, Oni)
Arachnophile (spider form best skill shapeshifting)
Lone Wolf (werewolf form max shapeshifting, player allies forbidden by Ru
or Okawaru)
Apex Predator (werewolf form max shapeshifting, any other circumstance)
, Whose Coils Crush All (serpent form max shapeshifting)
Jellied Eel (eel form best skill shapeshifting, 6* piety with Jiyva)
Black Horse (maw form best skill shapeshifting, Gale Centaur worshiping a
non-good god)
Piranha (maw form best skill shapeshifting, Merfolk)
Insatiable (maw form best skill shapeshifting, any other circumstance)
Hippocampus (aqua form max shapeshifting, Gale Centaur)
Tideshaper (aqua form max shapeshifting, any other species)
Riddle's Answer (sphinx form best skill shapeshifting, Human)
Bloodprince (vampire form max shapeshifting)
Dragonlord (dragon form max summonings, Draconian)
Beeserker (hive form max shapeshifting, worshiping Trog)
Endless Swarm (hive form max shapeshifting, any other circumstance)
Golden Calf (statue form, Minotaur of Gozag with at least 10k gold)
of a Hundred Blades (blade form with max short blades or long blades)
Storm of the Century (storm form, 6* piety with Qazlal)
Pale Horse (death form, Gale Centaur)
Non-Form titles added:
White Horse (max fighting Gale Centaur worshiping a non-good god)
Nuckelavee (max alchemy Gale Centaur worshiping an evil god)
Red Horse (max invocations Gale Centaur of Trog)
Godsmith (max forgecraft Mountain Dwarf)
(I also removed two Oni-specific titles which didn't really fit either the
skill or the species flavour very well, now that there is at least one
other Oni-specific title.)
This commit also fixes punction of the 'Ex Machina' title to not use a
superfluous 'the'.
This closes #5520
commit 021aa32aa36e97703a5d84b3f2bd9c8ec995bf03
Author: DracoOmega <dra...@gm...>
Date: Sat Nov 14 17:10:12 2026 -0330
Adjust standard Shapeshifting titles (regret-index)
Crawl's use of Skinwalker is culturally-insensitive for no good reason.
Replace it with something else (and shuffle the titles around a little
while we're at it.)
Also add 'Copycat' as a felid-specific 27 shapeshifting title. Index was
genuinely surprised it hadn't been claimed for anything already.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/hiscores.cc | 6 +-
crawl-ref/source/ng-setup.cc | 2 +
crawl-ref/source/output.cc | 5 +-
crawl-ref/source/religion.cc | 3 +
crawl-ref/source/skills.cc | 261 +++++++++++++++++++--
crawl-ref/source/skills.h | 3 +-
.../source/webserver/game_data/static/player.js | 4 +-
crawl-ref/source/wiz-item.cc | 2 +-
crawl-ref/source/xom.h | 2 +
9 files changed, 261 insertions(+), 27 deletions(-)
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index b2ef33e01b..17122bbee9 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -2041,8 +2041,10 @@ scorefile_entry::character_description(death_desc_verbosity verbosity) const
// Please excuse the following bit of mess in the name of flavour ;)
if (verbose)
{
- desc = make_stringf("%8d %s the %s (level %d",
- points, name.c_str(), title.c_str(), lvl);
+ desc = make_stringf("%8d %s%s%s (level %d",
+ points, name.c_str(),
+ player_title_prefix(title).c_str(),
+ title.c_str(), lvl);
}
else
{
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 8eaab22a5b..03d3ae221f 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -33,6 +33,7 @@
#include "throw.h"
#include "transform.h"
#include "unwind.h"
+#include "xom.h"
#define MIN_START_STAT 3
@@ -276,6 +277,7 @@ void give_items_skills(const newgame_def& ng)
// hostile actions at the very start of the game.
you.gift_timeout = 4;
you.attribute[ATTR_XOM_BLESSING_TIMER] = 35;
+ you.props[XOM_EARLY_JOIN_KEY] = true;
if (species_apt(SK_ARMOUR) < species_apt(SK_DODGING))
you.skills[SK_DODGING]++;
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 3e0cc1744e..1cd60c4386 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1429,7 +1429,7 @@ static void _redraw_title()
{
const unsigned int WIDTH = crawl_view.hudsz.x;
string title = filtered_lang(player_title());
- title = you.your_name + (title[0] == ',' ? "" : " ") + title;
+ title = you.your_name + title;
const bool small_layout = _is_using_small_layout();
if (small_layout)
@@ -2214,8 +2214,7 @@ static void _print_overview_screen_equip(column_composer& cols,
static string _overview_screen_title(int sw)
{
- string title = player_title();
- title = (title[0] == ',' ? "" : " ") + title + " ";
+ string title = player_title() + " ";
string species_job = make_stringf("(%s %s)",
species::name(you.species).c_str(),
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index c2440e6917..91cf240a74 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3871,6 +3871,9 @@ static void _join_xom()
you.gift_timeout = 4;
you.attribute[ATTR_XOM_BLESSING_TIMER] = 80;
+
+ if (you.experience_level <= 8)
+ you.props[XOM_EARLY_JOIN_KEY] = true;
}
/// What special things happen when you join a god?
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index 72fb1a81f7..4ab4b71975 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -39,6 +39,7 @@
#include "stringutil.h"
#include "tag-version.h"
#include "unwind.h"
+#include "xom.h"
// MAX_COST_LIMIT is the maximum XP amount it will cost to raise a skill
// by 10 skill points (ie one standard practice).
@@ -123,7 +124,7 @@ static const char *skill_titles[NUM_SKILLS][7] =
// or, in U's case, invocations skill.
{"Invocations", "Unbeliever", "Agnostic", "Dissident", "Heretic", "Apostate", "Invo"},
{"Evocations", "Charlatan", "Prestidigitator", "Fetichist", "Evocator", "Ex Machina", "Evo"},
- {"Shapeshifting", "Changeling", "Mimic", "Metamorph", "Skinwalker", "Shapeless @Genus@", "Shft"},
+ {"Shapeshifting", "Changeling", "Metamorph", "Talismancer", "Shapeless @Genus@", "Protean", "Shft"},
};
static const char *martial_arts_titles[6] =
@@ -2076,6 +2077,39 @@ unsigned get_skill_rank(unsigned skill_lev)
/* level 27 */ : 4;
}
+// A unique title depending on the day that the current game was started.
+// (With titles rotating each day, in a 27 day cycle.)
+static const char *xom_title[27] =
+{
+ "Xom's Canvas",
+ "Aleatoric Ace",
+ "Hand of Misfortune",
+ "Avatar of the Absurd",
+ "Heavens' Harlequin",
+ "Bringer of Disorder",
+ "Hopelessly Reckless",
+ "Calamity-Blessed",
+ "Living Farce",
+ "Champion of Folly",
+ "Lord of Playthings",
+ "Circus Champion",
+ "Prime Anarchist",
+ "Unburdened By Reality",
+ "Connoisseur of Chaos",
+ "Procedurally Generated",
+ "Crown Chesspiece",
+ "Profoundly Silly",
+ "Dismantled Masterpiece",
+ "Ringmaster's Favourite",
+ "Divine Plaything",
+ "Riotous Rainbow",
+ "Extremely Free Spirit",
+ "Stunt@genus@",
+ "Godsjester",
+ "Whimsical Wunderkind",
+ "Survivor of Endless Pranks",
+};
+
/**
* Special conduct skill title tracking, extending the range of skill titles
* beyond what's covered in skill_title_by_rank. These titles are used only if
@@ -2134,11 +2168,179 @@ string special_conduct_title(skill_type best_skill, uint8_t skill_rank)
return "Keeper of the Flame";
}
- // Award for being very good at crab
- if (you.form == transformation::fortress_crab
- && best_skill == SK_SHAPESHIFTING && skill_rank == 5)
+ // Form conduct titles. These require exclusively using a form after a
+ // certain level threshold (XL 8/11/14/17/20, depending on form tier),
+ // possibly with some other requirement.
+ // Put the form exclusivity check last because it requires a lot of computation.
+ switch (you.default_form)
+ {
+ case transformation::walking_scroll:
+ if (player_exclusively_used_form_since(8) && you.experience_level > 17)
+ return "Papyrus Preeminent";
+ break;
+ case transformation::vision:
+ if (best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(8))
+ {
+ if (you.species == SP_KOBOLD)
+ return "Farsighted";
+ return "Veil Piercer";
+ }
+ break;
+ case transformation::hypnogecko:
+ if (you.species == SP_FELID && best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(8))
+ return "Leopard Gecko";
+ break;
+ case transformation::quill:
+ if (you.species == SP_SPRIGGAN && best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(8))
+ return "Hedgehog";
+ break;
+ case transformation::spore:
+ if (you.species == SP_FORMICID && best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(11))
+ return "Cordyceps Champion";
+ break;
+ case transformation::medusa:
+ if (best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(11))
+ return species::name(you.species, species::SPNAME_GENUS) + " O' War";
+ break;
+ case transformation::sun_scarab:
+ if (best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(11))
+ return "Who Moves the Sun";
+ break;
+ case transformation::rime_yak:
+ if (best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(11))
+ return "Little Ice Age";
+ break;
+ case transformation::mistmane:
+ if (you.species == SP_ONI
+ && best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(11))
+ {
+ return "Brewmaster";
+ }
+ break;
+ case transformation::spider:
+ if (best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(14))
+ return "Arachnophile";
+ break;
+ case transformation::werewolf:
+ if (best_skill == SK_SHAPESHIFTING && skill_rank == 5
+ && player_exclusively_used_form_since(14))
+ {
+ // Okawaru, or Ru sac love
+ if (you.allies_forbidden())
+ return "Lone Wolf";
+ return "Apex Predator";
+ }
+ break;
+ case transformation::serpent:
+ if (best_skill == SK_SHAPESHIFTING && skill_rank == 5
+ && player_exclusively_used_form_since(14))
+ {
+ return "Whose Coils Crush All";
+ }
+ break;
+ case transformation::eel_hands:
+ if (you_worship(GOD_JIYVA) && piety_rank(you.raw_piety) >= 6
+ && best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(14))
+ {
+ return "Jellied Eel";
+ }
+ break;
+ case transformation::maw:
+ if (best_skill == SK_SHAPESHIFTING && player_exclusively_used_form_since(14))
+ {
+ if (you.species == SP_GALE_CENTAUR && !is_good_god(you.religion))
+ return "Black Horse"; // Famine
+ else if (you.species == SP_MERFOLK)
+ return "Piranha";
+
+ return "Insatiable";
+ }
+ break;
+ case transformation::aqua:
+ if (best_skill == SK_SHAPESHIFTING && skill_rank == 5
+ && player_exclusively_used_form_since(14))
+ {
+ if (you.species == SP_GALE_CENTAUR)
+ return "Hippocampus";
+ return "Tideshaper";
+ }
+ break;
+ case transformation::fortress_crab:
+ if (best_skill == SK_SHAPESHIFTING && skill_rank == 5
+ && player_exclusively_used_form_since(14))
+ {
+ return "Pinnacle of Evolution";
+ }
+ break;
+ case transformation::sphinx:
+ if (you.species == SP_HUMAN && best_skill == SK_SHAPESHIFTING
+ && player_exclusively_used_form_since(17))
+ {
+ return "Riddle's Answer";
+ }
+ break;
+ case transformation::vampire:
+ if (best_skill == SK_SHAPESHIFTING && skill_rank == 5
+ && player_exclusively_used_form_since(17))
+ {
+ return "Bloodprince";
+ }
+ break;
+ case transformation::dragon:
+ if (species::is_draconian(you.species) && best_skill == SK_SUMMONINGS
+ && skill_rank == 5 && player_exclusively_used_form_since(17))
+ {
+ return "Dragonlord";
+ }
+ break;
+ case transformation::hive:
+ if (best_skill == SK_SHAPESHIFTING && skill_rank == 5
+ && player_exclusively_used_form_since(17))
+ {
+ if (you_worship(GOD_TROG))
+ return "Beeserker";
+ return "Endless Swarm";
+ }
+ break;
+ case transformation::statue:
+ if (you.species == SP_MINOTAUR && you_worship(GOD_GOZAG)
+ && you.gold >= 10000 && player_exclusively_used_form_since(17))
+ {
+ return "Golden Calf";
+ }
+ break;
+ case transformation::blade:
+ if ((best_skill == SK_SHORT_BLADES || best_skill == SK_LONG_BLADES)
+ && skill_rank == 5 && player_exclusively_used_form_since(17))
+ {
+ return "Hundred Blades";
+ }
+ break;
+ case transformation::storm:
+ if (you_worship(GOD_QAZLAL) && piety_rank(you.raw_piety) >= 6
+ && player_exclusively_used_form_since(20))
+ {
+ return "Storm of the Century";
+ }
+ break;
+ case transformation::death:
+ if (you.species == SP_GALE_CENTAUR && player_exclusively_used_form_since(20))
+ return "Pale Horse"; // Needs no introduction
+ break;
+ default:
+ break;
+ }
+
+ // Those who joined Xom by XL 8 and never left get a title that varies based
+ // on the day the game was started. (This isn't really a 'challenge' in the
+ // same sense as most of these, but is in this function because it is
+ // player-centric and doesn't work for ghosts.)
+ if (you_worship(GOD_XOM) && you.worshipped[GOD_XOM] == 1
+ && best_skill == SK_FIGHTING && skill_rank == 5
+ && you.props.exists(XOM_EARLY_JOIN_KEY))
{
- return "Pinnacle of Evolution";
+ const int day = (you.birth_time / 86400) % 27;
+ return xom_title[day];
}
return title;
@@ -2183,6 +2385,8 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
result = "Hell Knight";
else if (species == SP_HUMAN && skill_rank == 5 && god == GOD_YREDELEMNUL)
result = "Death Knight";
+ else if (species == SP_GALE_CENTAUR && skill_rank == 5 && !is_good_god(god))
+ result = "White Horse"; // Conquest, rather than Conqueror
break;
case SK_UNARMED_COMBAT:
@@ -2285,12 +2489,10 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
break;
case SK_FORGECRAFT:
- if (species == SP_ONI && skill_rank == 4)
- result = "Brimstone Smiter";
- else if (species == SP_ONI && skill_rank == 5)
- result = "Titancaster";
- else if (species == SP_BARACHI && skill_rank == 5)
+ if (species == SP_BARACHI && skill_rank == 5)
result = "Frogwright";
+ else if (species == SP_MOUNTAIN_DWARF && skill_rank == 5)
+ result = "Godsmith";
break;
case SK_SUMMONINGS:
@@ -2314,6 +2516,8 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
case SK_ALCHEMY:
if (species::is_draconian(species) && skill_rank == 5)
result = "Swamp Dragon";
+ else if (species == SP_GALE_CENTAUR && is_evil_god(god))
+ result = "Nuckelavee";
break;
case SK_FIRE_MAGIC:
@@ -2355,6 +2559,11 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
result = "Thief of Divinity";
break;
+ case SK_SHAPESHIFTING:
+ if (species == SP_FELID && skill_rank == 5)
+ result = "Copycat";
+ break;
+
case SK_INVOCATIONS:
if (species == SP_MUMMY && skill_rank == 5 && god == GOD_GOZAG)
result = "Royal Mummy";
@@ -2366,6 +2575,8 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
result = "Necrodancer";
else if (species::is_draconian(species) && skill_rank == 5 && is_good_god(god))
result = "Pearl Dragon";
+ else if (species == SP_GALE_CENTAUR && skill_rank == 5 && god == GOD_TROG)
+ result = "Red Horse"; // War
else if (species == SP_GARGOYLE && skill_rank == 5 && god == GOD_JIYVA)
result = "Rockslime";
else if (species == SP_VINE_STALKER && skill_rank == 5 && god == GOD_NEMELEX_XOBEH)
@@ -2442,19 +2653,35 @@ string skill_title_by_rank(skill_type best_skill, uint8_t skill_rank,
/** What is the player's current title.
*
- * @param the whether to prepend a definite article.
+ * @param use_prefix whether to prepend the title's prefix (usually 'the'),
+ * along with leading spacing.
* @returns the title.
*/
-string player_title(bool the)
+string player_title(bool use_prefix)
{
const skill_type best = best_skill(SK_FIRST_SKILL, SK_LAST_SKILL);
const string title =
skill_title_by_rank(best, get_skill_rank(you.skills[best]));
- const string article = !the ? ""
- : title == "Petite Mort" ? "La "
- : title == "Who Hides the Stars" ? ", "
- : "the ";
- return article + title;
+ const string prefix = !use_prefix ? "" : player_title_prefix(title);
+ return prefix + title;
+}
+
+// Note: Must including leading spacing, where appropriate, for proper UI formatting.
+string player_title_prefix(const string& title)
+{
+ if (title == "Petite Mort")
+ return " La ";
+ else if (title == "Ex Machina")
+ return " ";
+ else if (title == "Hundred Blades")
+ return " of a ";
+ else if (title == "Xom's Canvas"
+ || title == "Unburdened By Reality"
+ || title == "Survivor of Endless Pranks"
+ || title.rfind("Who", 0) == 0)
+ return ", ";
+ else
+ return " the ";
}
skill_type best_skill(skill_type min_skill, skill_type max_skill,
diff --git a/crawl-ref/source/skills.h b/crawl-ref/source/skills.h
index 4b1d0d30ab..16168a5b22 100644
--- a/crawl-ref/source/skills.h
+++ b/crawl-ref/source/skills.h
@@ -104,7 +104,8 @@ string skill_title_by_rank(
unsigned get_skill_rank(unsigned skill_lev);
-string player_title(bool the = true);
+string player_title(bool use_prefix = true);
+string player_title_prefix(const string& title);
skill_type best_skill(skill_type min_skill, skill_type max_skill,
skill_type excl_skill = SK_NONE);
diff --git a/crawl-ref/source/webserver/game_data/static/player.js b/crawl-ref/source/webserver/game_data/static/player.js
index a3060f7689..a385d84c5c 100644
--- a/crawl-ref/source/webserver/game_data/static/player.js
+++ b/crawl-ref/source/webserver/game_data/static/player.js
@@ -392,9 +392,7 @@ function ($, comm, client, enums, map_knowledge, messages, options, util) {
*/
function update_stats_pane()
{
- $("#stats_titleline").text(player.name
- + (player.title[0] === "," ? "" : " ")
- + player.title);
+ $("#stats_titleline").text(player.name + player.title);
$("#stats_wizmode").text(player.wizard ? "*WIZARD*" : player.explore ? "*EXPLORE*" : "");
var species_god = player.species_display_name;
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 1e5583edc4..7a84d767d9 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -870,7 +870,7 @@ static void _debug_acquirement_stats()
if (!you_worship(GOD_NO_GOD))
godname += " of " + god_name(you.religion);
- fprintf(ostat, "%s %s, Level %d %s %s%s\n\n",
+ fprintf(ostat, "%s%s, Level %d %s %s%s\n\n",
you.your_name.c_str(), player_title().c_str(),
you.experience_level,
species::name(you.species).c_str(),
diff --git a/crawl-ref/source/xom.h b/crawl-ref/source/xom.h
index af6d91c31a..de2c97e17e 100644
--- a/crawl-ref/source/xom.h
+++ b/crawl-ref/source/xom.h
@@ -21,6 +21,8 @@ using std::string;
#define XOM_DISGUISE_OBSERVER_KEY "xom_disguise_observers"
#define XOM_DISGUISE_RECOVERY_KEY "xom_disguise_recovery"
+#define XOM_EARLY_JOIN_KEY "xom_early_join"
+
struct item_def;
enum xom_message_type
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-14 22:00:11
|
via 85b862349b18d804c6fac74cd3cec21573c630e2 (commit)
from 11c26b1e0832c68598fa362abc77e272df4e19cc (commit)
-----------------------------------------------------------------------
commit 85b862349b18d804c6fac74cd3cec21573c630e2
Author: CrawlOdds <cra...@gm...>
Date: Sat Nov 14 21:51:09 2026 +0000
Fix uselessness of missiles in forms
In forms, missiles were marked permanently useless if the form's current
size could not use them (regardless of whether it had hands). We fix
uselessness for throwables in forms to respect the temp parameter and
check whether the form can wield. This fixes autopickup for javelins in
spider form, and descriptions.
Fixes #5579
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/item-name.cc | 5 ++++-
crawl-ref/source/item-prop.cc | 5 +++--
crawl-ref/source/item-prop.h | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/crawl-ref/source/item-name.cc b/crawl-ref/source/item-name.cc
index ce42f4c18f..3b1e216d05 100644
--- a/crawl-ref/source/item-name.cc
+++ b/crawl-ref/source/item-name.cc
@@ -3362,7 +3362,10 @@ bool is_useless_item(const item_def &item, bool temp, bool ident)
if (god_forbids_item(item, temp))
return true;
- return !is_throwable(&you, item);
+ if (temp && !form_can_wield())
+ return true;
+
+ return !is_throwable(&you, item, !temp);
case OBJ_ARMOUR:
if (!can_equip_item(item, temp))
diff --git a/crawl-ref/source/item-prop.cc b/crawl-ref/source/item-prop.cc
index 705333a0f0..22d6a51d91 100644
--- a/crawl-ref/source/item-prop.cc
+++ b/crawl-ref/source/item-prop.cc
@@ -2249,7 +2249,7 @@ string launched_projectile_name(const item_def &item)
}
// Returns true if item can be reasonably thrown without a launcher.
-bool is_throwable(const actor *actor, const item_def &wpn)
+bool is_throwable(const actor *actor, const item_def &wpn, bool base)
{
if (wpn.base_type != OBJ_MISSILES)
return false;
@@ -2258,7 +2258,8 @@ bool is_throwable(const actor *actor, const item_def &wpn)
if (wpn.sub_type == MI_LARGE_ROCK)
return actor->can_throw_large_rocks();
- return wpn.sub_type != MI_JAVELIN || actor->body_size() >= SIZE_MEDIUM;
+ return wpn.sub_type != MI_JAVELIN
+ || actor->body_size(PSIZE_TORSO, base) >= SIZE_MEDIUM;
}
/**
diff --git a/crawl-ref/source/item-prop.h b/crawl-ref/source/item-prop.h
index 5bc21d4e75..dc9e123cab 100644
--- a/crawl-ref/source/item-prop.h
+++ b/crawl-ref/source/item-prop.h
@@ -179,7 +179,7 @@ bool is_crossbow(const item_def &item) PURE;
bool is_slowed_by_armour(const item_def *item) PURE;
const char *missile_name(missile_type ammo) IMMUTABLE;
string launched_projectile_name(const item_def &item);
-bool is_throwable(const actor *actor, const item_def &wpn) PURE;
+bool is_throwable(const actor *actor, const item_def &wpn, bool base = false) PURE;
bool ammo_always_destroyed(const item_def &missile) PURE;
bool ammo_never_destroyed(const item_def &missile) PURE;
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-14 20:05:10
|
via 11c26b1e0832c68598fa362abc77e272df4e19cc (commit)
from db27307d4a5eb57c62316c85f1e5a9bf10351472 (commit)
-----------------------------------------------------------------------
commit 11c26b1e0832c68598fa362abc77e272df4e19cc
Author: Zigmound <nat...@gm...>
Date: Fri Nov 13 13:30:03 2026 -0500
Fix a crash when unequipping the toga "Victory"
If a player equips the toga "Victory" and then immediately unequips it,
the game crashes because the `VICTORY_STAT_KEY` has not yet been
initialized. This prevents the crash by initializing the item property
in `_VICTORY_equip`.
Committer's note: fixed so this interacts better with melding.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/art-func.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h
index 12312bb082..4a4613e2eb 100644
--- a/crawl-ref/source/art-func.h
+++ b/crawl-ref/source/art-func.h
@@ -1654,6 +1654,8 @@ static void _VICTORY_world_reacts(item_def *item)
static void _VICTORY_equip(item_def *item, bool */*show_msgs*/, bool /*unmeld*/)
{
+ if (!item->props.exists(VICTORY_STAT_KEY))
+ item->props[VICTORY_STAT_KEY].get_int() = 0;
_VICTORY_world_reacts(item);
}
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-14 19:45:15
|
via db27307d4a5eb57c62316c85f1e5a9bf10351472 (commit)
from d3d26409d2ab27c6f6d887c6d83eea082be228ee (commit)
-----------------------------------------------------------------------
commit db27307d4a5eb57c62316c85f1e5a9bf10351472
Author: hellmonk <nld...@gm...>
Date: Sat Nov 14 13:39:04 2026 -0600
Lightly damage wn starting acid scale
This is a wanderer good_item armour option for abnormal size species, since
they can't wear regular body armours. However, it's a much better long term
item than +2 scale or +0 chain, especially with orbs of entropy in 1/3 of
games. Start the acid scales with -1 enchant to make the item a bit more
comparable in quality to other wanderer gear and encourage swapping away
a bit more often.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/ng-wanderer.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc
index 6312b54a15..f044ada8d7 100644
--- a/crawl-ref/source/ng-wanderer.cc
+++ b/crawl-ref/source/ng-wanderer.cc
@@ -687,7 +687,7 @@ static vector<spell_type> _wanderer_good_equipment(skill_type skill, set<skill_t
case SK_ARMOUR:
if (you_can_wear(SLOT_BODY_ARMOUR) != true)
- newgame_make_item(OBJ_ARMOUR, ARM_ACID_DRAGON_ARMOUR);
+ newgame_make_item(OBJ_ARMOUR, ARM_ACID_DRAGON_ARMOUR, 1, -1);
else if (coinflip())
newgame_make_item(OBJ_ARMOUR, ARM_SCALE_MAIL, 1, 2);
else
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-14 19:40:23
|
via d3d26409d2ab27c6f6d887c6d83eea082be228ee (commit)
from 9b2db740e5b0102c3388855b5ef93120f30cd46a (commit)
-----------------------------------------------------------------------
commit d3d26409d2ab27c6f6d887c6d83eea082be228ee
Author: Draconius <Dra...@gm...>
Date: Tue Nov 3 17:37:58 2026 +1300
Fix Fortress Crab two-handed weapon untransform check.
Previously, while wielding a cursed two-handed weapon in Fortress Crab form, attempting to untransform was met with failure because it assumed you were changing slots and needed to break the curse.
This change duplicates the exemption for cursed weapons when shifting into Fortress Crab form to allow you to shift back or to another form entirely.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/transform.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc
index 48670ae11f..afc7308ce3 100644
--- a/crawl-ref/source/transform.cc
+++ b/crawl-ref/source/transform.cc
@@ -1942,6 +1942,7 @@ bool transforming_is_unsafe(transformation which_trans)
// Now check if there are any items that would break if we changed form in
// this way.
+ const transformation old_form = you.form;
unwind_var<player_equip_set> unwind_eq(you.equipment);
unwind_var<transformation> unwind_default_form(you.default_form);
unwind_var<transformation> unwind_form(you.form);
@@ -1950,6 +1951,11 @@ bool transforming_is_unsafe(transformation which_trans)
you.form = which_trans;
you.equipment.unmeld_all_equipment(true);
+
+ if (old_form == transformation::fortress_crab)
+ you.equipment.shift_twohander_to_slot(SLOT_OFFHAND);
+
+ you.equipment.update();
you.equipment.meld_equipment(get_form(which_trans)->blocked_slots, true);
// Pretend incompatible items fell away.
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-14 19:35:12
|
via 9b2db740e5b0102c3388855b5ef93120f30cd46a (commit)
via 3475e3e7edbbc2dd707fa049fc79131b80b13ea1 (commit)
via b3f2281fba80b47025b1aaadb81df9a3c8576d2e (commit)
from f79d9584f8e3138c02165d2a85167ccbf08bed76 (commit)
-----------------------------------------------------------------------
commit 9b2db740e5b0102c3388855b5ef93120f30cd46a
Author: Rosstin <ros...@gm...>
Date: Thu Oct 29 09:39:08 2026 -0700
add innate mut sprites for coglin, MD, Gnoll, etc (#5547)
[Committer's notes: This PR covers icons for the following species traits:
* Barachi: +LOS
* Coglins: no jewellery, offhand wielding, slow wielding, warm-up strikes
* Formicids: four strong arms
* Gnolls: treasure sense, distributed training
* Merfolk: nimble swimmer
* Mountain dwarves: artefact enchanting, runic magic
* Octopode: tentacles
Many of these tiles are appreciated as fulfilling previous official Art
Requests page listings, catching up on the longterm goal of all mutations
and species mutation-traits having their own unique icons. Beyond
squashing all of the PR's commits together, and actually implementing
their usage in Crawl rather than just leaving the icons in each folder,
a few further changes were made:
* Most colours were adjusted to closer match current Crawl tile
palettes for the species or close subjects, as well as to better fit
the style many mutation icons emphasize of colour contrasting against
standard generic darker greys.
* I've re-alphabetized and labelled the dc-mutation.txt section recieving
all of the species mutation icons, to make it easier to place future icons.
* I moved both of oni tiles to the rltiles/UNUSED folder, as the plans
for both of them are slated for further versions rather than this one.
This closes #5547.]
commit 3475e3e7edbbc2dd707fa049fc79131b80b13ea1
Author: regret-index <clo...@ho...>
Date: Fri Nov 13 09:42:37 2026 -0330
Tweak generic stone wall tile recolours
This tweaks the luminosity of the non-blue non-yellow recolours of the
generic stone wall (that Denzi drew and roctavian edited) used in a
variety of vaults to make darker and lighter colours contrast more against
each other, to help with vaults trying to contrast lighter and darker
shades together (e.g. nicolae_cheibriados_dopplering) and to provide more
total vault tile colour options rather than having e.g. cyan versus
lightcyan or red versus lightred being nearly identical in practice, as
well as white being blindingly unusable in most contexts. (This does mean
a default slight darkening of many vaults previously using these, but the
default colours for many walls in many branches are already pretty dark,
so it shouldn't stand out too much versus the palette of the rest of
Crawl.)
commit b3f2281fba80b47025b1aaadb81df9a3c8576d2e
Author: regret-index <clo...@ho...>
Date: Thu Nov 12 12:19:00 2026 -0330
Another living spell palette swap tile
This makes a new translocations one to differentiate Xom's general combat
Force Lances from the default one being deployed for Xom's Spellstride's
Bolts of Devastation. We're getting fairly high up on different types of
pink and purple living spell tiles, but purple is already strongly
associated consistently with irresistable spell damage in Crawl as matches
the current candidates, and getting in a Translocations-specific one can
help with any future uses of living spells visually splitting up further by
spell school.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/CREDITS.txt | 1 +
crawl-ref/source/mon-place.cc | 5 ++
crawl-ref/source/mutation-data.h | 12 ++++
.../monsters/erolcha_red.png} | Bin 3647 -> 4648 bytes
.../monsters/oni_judicator.png} | Bin 3581 -> 4659 bytes
crawl-ref/source/rltiles/dc-mon.txt | 1 +
crawl-ref/source/rltiles/dc-mutations.txt | 64 ++++++++++++++++-----
crawl-ref/source/rltiles/dc-wall.txt | 13 ++++-
.../rltiles/gui/mutations/artefact_enchanting.png | Bin 0 -> 1264 bytes
.../mutations/daystalker.png} | Bin 3647 -> 4315 bytes
.../rltiles/gui/mutations/distributed_training.png | Bin 0 -> 1135 bytes
.../rltiles/gui/mutations/four_strong_arms.png | Bin 0 -> 1349 bytes
.../rltiles/gui/mutations/nimble_swimmer_1.png | Bin 0 -> 1145 bytes
.../rltiles/gui/mutations/nimble_swimmer_2.png | Bin 0 -> 1217 bytes
.../source/rltiles/gui/mutations/no_jewellery.png | Bin 0 -> 1233 bytes
.../source/rltiles/gui/mutations/runic_magic.png | Bin 0 -> 1212 bytes
.../source/rltiles/gui/mutations/slow_wield.png | Bin 0 -> 1015 bytes
.../source/rltiles/gui/mutations/tentacles.png | Bin 0 -> 1256 bytes
.../rltiles/gui/mutations/treasure_sense.png | Bin 0 -> 1322 bytes
.../rltiles/gui/mutations/warmup_strikes.png | Bin 0 -> 1160 bytes
.../mutations/wield_offhand.png} | Bin 3645 -> 4218 bytes
.../rltiles/mon/nonliving/living_spell_warp.png | Bin 0 -> 7849 bytes
22 files changed, 79 insertions(+), 17 deletions(-)
copy crawl-ref/source/rltiles/{dngn/wall/icy_wall_overlay0.png => UNUSED/monsters/erolcha_red.png} (55%)
copy crawl-ref/source/rltiles/{dngn/wall/icy_wall_overlay1.png => UNUSED/monsters/oni_judicator.png} (55%)
create mode 100644 crawl-ref/source/rltiles/gui/mutations/artefact_enchanting.png
copy crawl-ref/source/rltiles/{dngn/wall/icy_wall_overlay0.png => gui/mutations/daystalker.png} (59%)
create mode 100644 crawl-ref/source/rltiles/gui/mutations/distributed_training.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/four_strong_arms.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_1.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_2.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/no_jewellery.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/runic_magic.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/slow_wield.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/tentacles.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/treasure_sense.png
create mode 100644 crawl-ref/source/rltiles/gui/mutations/warmup_strikes.png
copy crawl-ref/source/rltiles/{dngn/wall/icy_wall_overlay3.png => gui/mutations/wield_offhand.png} (61%)
create mode 100644 crawl-ref/source/rltiles/mon/nonliving/living_spell_warp.png
diff --git a/crawl-ref/CREDITS.txt b/crawl-ref/CREDITS.txt
index 046f634e9c..e0869d1df2 100644
--- a/crawl-ref/CREDITS.txt
+++ b/crawl-ref/CREDITS.txt
@@ -385,6 +385,7 @@
RollingRubic
Nate Rook
David Rose
+ Rosstin
runrin
rypofalem
Risto Saarelma
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index c462efefd8..a65f411a5f 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -944,6 +944,11 @@ static void _assign_living_spell_appearance(monster* mon)
mon->colour = LIGHTBLUE;
break;
+ case SPELL_FORCE_LANCE:
+ mon->props[MONSTER_TILE_KEY] = TILEP_MONS_LIVING_SPELL_WARP;
+ mon->colour = MAGENTA;
+ break;
+
case SPELL_CORROSIVE_BOLT:
mon->props[MONSTER_TILE_KEY] = TILEP_MONS_LIVING_SPELL_ACID;
mon->colour = YELLOW;
diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h
index b717d10997..72b02bbb70 100644
--- a/crawl-ref/source/mutation-data.h
+++ b/crawl-ref/source/mutation-data.h
@@ -647,6 +647,7 @@ static const mutation_def mut_data[] =
"", ""},
{"", "", ""},
{"", "", ""},
+ TILEG_MUT_WIELD_OFFHAND,
},
{ MUT_SLOW_WIELD, 0, 1, mutflag::bad,
@@ -656,6 +657,7 @@ static const mutation_def mut_data[] =
"", ""},
{"", "", ""},
{"", "", ""},
+ TILEG_MUT_SLOW_WIELD,
},
{ MUT_INITIALLY_ATTRACTIVE, 4, 2, mutflag::bad,
@@ -680,6 +682,7 @@ static const mutation_def mut_data[] =
"", ""},
{"", "", ""},
{"", "", ""},
+ TILEG_MUT_WARMUP_STRIKES,
},
{ MUT_NO_JEWELLERY, 0, 1, mutflag::bad,
@@ -689,6 +692,7 @@ static const mutation_def mut_data[] =
"", ""},
{"", "", ""},
{"", "", ""},
+ TILEG_MUT_NO_JEWELLERY,
},
{ MUT_HURL_DAMNATION, 0, 1, mutflag::good,
@@ -2147,6 +2151,7 @@ static const mutation_def mut_data[] =
{"You have an uncanny knack for detecting items.", "", ""},
{"You suddenly feel aware of treasure.", "", ""},
{"You no longer feel aware of treasure.", "", ""},
+ TILEG_MUT_TREASURE_SENSE,
},
{ MUT_ACID_RESISTANCE, 0, 1, mutflag::good | mutflag::substance,
@@ -2164,6 +2169,7 @@ static const mutation_def mut_data[] =
{"Your four strong arms can wield two-handed weapons with a shield.", "", ""},
{"Two of your arms shrink away.", "", ""},
{"You grow two extra arms.", "", ""},
+ TILEG_MUT_FOUR_STRONG_ARMS,
},
{ MUT_NO_DRINK, 0, 1, mutflag::bad,
@@ -2235,6 +2241,7 @@ static const mutation_def mut_data[] =
{"Your experience applies equally to all skills.", "", ""},
{"Your experience now applies equally to all skills.", "", ""},
{"Your experience no longer applies equally to all skills.", "", ""},
+ TILEG_MUT_DISTRIBUTED_TRAINING,
},
{ MUT_NIMBLE_SWIMMER, 0, 2, mutflag::good | mutflag::anatomy,
@@ -2246,6 +2253,7 @@ static const mutation_def mut_data[] =
"You feel very comfortable near water.", ""},
{"You feel less comfortable near water.",
"You feel less comfortable near water.", ""},
+ TILEG_MUT_NIMBLE_SWIMMER,
},
{ MUT_TENTACLE_ARMS, 0, 1, mutflag::good | mutflag::anatomy,
@@ -2254,6 +2262,7 @@ static const mutation_def mut_data[] =
{"You have tentacles for arms and can constrict enemies.", "", ""},
{"Your arms feel tentacular.", "", ""},
{"Your arms no longer feel tentacular.", "", ""},
+ TILEG_MUT_TENTACLES,
},
{ MUT_MERTAIL, 0, 1, mutflag::good | mutflag::anatomy,
@@ -2326,6 +2335,7 @@ static const mutation_def mut_data[] =
"", ""},
{"The darkness flees at your approach.", "", ""},
{"The shadows grow bolder once more.", "", ""},
+ TILEG_MUT_DAYSTALKER,
},
{ MUT_DIVINE_ATTRS, 0, 1, mutflag::good,
@@ -2395,6 +2405,7 @@ static const mutation_def mut_data[] =
{"You can use scrolls of enchantment on lesser artefacts.", "", ""},
{"You can now use scrolls of enchantment on lesser artefacts.", "", ""},
{"You can no longer use scrolls of enchantment on lesser artefacts.", "", ""},
+ TILEG_MUT_ARTEFACT_ENCHANTING,
},
{ MUT_RUNIC_MAGIC, 0, 1, mutflag::good,
@@ -2402,6 +2413,7 @@ static const mutation_def mut_data[] =
{"Your spellcasting is much less encumbered by armour.", "", ""},
{"Your spellcasting becomes less encumbered by armour.", "", ""},
{"Your spellcasting no longer less encumbered by armour.", "", ""},
+ TILEG_MUT_RUNIC_MAGIC,
},
{ MUT_FORMLESS, 0, 2, mutflag::good,
diff --git a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay0.png b/crawl-ref/source/rltiles/UNUSED/monsters/erolcha_red.png
similarity index 55%
copy from crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay0.png
copy to crawl-ref/source/rltiles/UNUSED/monsters/erolcha_red.png
index af78ccc8ba..fb58a6425c 100644
Binary files a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay0.png and b/crawl-ref/source/rltiles/UNUSED/monsters/erolcha_red.png differ
diff --git a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay1.png b/crawl-ref/source/rltiles/UNUSED/monsters/oni_judicator.png
similarity index 55%
copy from crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay1.png
copy to crawl-ref/source/rltiles/UNUSED/monsters/oni_judicator.png
index 646dedb477..acbe747d12 100644
Binary files a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay1.png and b/crawl-ref/source/rltiles/UNUSED/monsters/oni_judicator.png differ
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 8f66389ff3..bf690eb237 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -400,6 +400,7 @@ living_spell_flesh MONS_LIVING_SPELL_FLESH
living_spell_holy MONS_LIVING_SPELL_HOLY
living_spell_ice MONS_LIVING_SPELL_ICE
living_spell_quicksilver MONS_LIVING_SPELL_QUICKSILVER
+living_spell_warp MONS_LIVING_SPELL_WARP
splinterfrost_barricade MONS_SPLINTERFROST_BARRICADE
%rim 1
ball_lightning MONS_BALL_LIGHTNING /*'*'*/
diff --git a/crawl-ref/source/rltiles/dc-mutations.txt b/crawl-ref/source/rltiles/dc-mutations.txt
index 2fa0bdbac8..aa01f510df 100644
--- a/crawl-ref/source/rltiles/dc-mutations.txt
+++ b/crawl-ref/source/rltiles/dc-mutations.txt
@@ -170,6 +170,7 @@ deterioration_1 POOR_CONSTITUTION
deterioration_2
initially_attractive_1 INITIALLY_ATTRACTIVE
initially_attractive_2
+inhibited_regeneration INHIBITED_REGENERATION
persistent_drain PERSISTENT_DRAIN
potion_fungus POTION_FUNGUS
reckless RECKLESS
@@ -224,22 +225,32 @@ black_mark BLACK_MARK
silence_aura SILENCE_AURA
word_of_chaos WORD_OF_CHAOS
-# Per-species effects mutations
+# Per-species effects mutations, alphabetized by species.
+# Barachi:
+daystalker DAYSTALKER
hop_1 HOP
hop_2
-accursed ACCURSED
+# Coglin:
+no_jewellery NO_JEWELLERY
+slow_wield SLOW_WIELD
+warmup_strikes WARMUP_STRIKES
+wield_offhand WIELD_OFFHAND
+# Demigod:
divine_attributes DIVINE_ATTRIBUTES
forlorn FORLORN
+# Djinn:
flat_hp_1 FLAT_HP
flat_hp_2
flat_hp_3
hp_casting HP_CASTING
+# Draconian:
cold_blooded COLD_BLOODED
acid_res ACID_RES
acidic_bite ACIDIC_BITE
big_wings BIG_WINGS
inviolate_magic INVIOLATE_MAGIC
steam_res STEAM_RES
+# Felid:
shaggy_fur_1 SHAGGY_FUR
shaggy_fur_2
shaggy_fur_3
@@ -247,39 +258,64 @@ multilived MULTILIVED
no_armour NO_ARMOUR
no_grasping NO_GRASPING
paws PAWS
+# Formicid
+four_strong_arms FOUR_STRONG_ARMS
+# Gale Centaur:
+stampede_1 STAMPEDE
+stampede_2
+stampede_north STAMPEDE_NORTH
+stampede_south STAMPEDE_SOUTH
+stampede_east STAMPEDE_EAST
+stampede_west STAMPEDE_WEST
+# Gnoll:
+distributed_training DISTRIBUTED_TRAINING
+treasure_sense TREASURE_SENSE
+# Gargoyle:
petrification_res PETRIFICATION_RES
+# Human:
explore_regen EXPLORE_REGEN
+# Kobold:
nightstalker_1 NIGHTSTALKER
nightstalker_2
nightstalker_3
-inhibited_regeneration INHIBITED_REGENERATION
+# Merfolk:
mertail MERTAIL
+nimble_swimmer_1 NIMBLE_SWIMMER
+nimble_swimmer_2
+# Minotaur
reflexive_headbutt REFLEXIVE_HEADBUTT
+# Mountain Dwarf:
+artefact_enchanting ARTEFACT_ENCHANTING
+runic_magic RUNIC_MAGIC
+# Mummy:
+accursed ACCURSED
+faith FAITH
in_touch_with_death_1 IN_TOUCH_WITH_DEATH
in_touch_with_death_2
no_drink NO_DRINK
-faith FAITH
+# Naga:
naga_tail_1 NAGA_TAIL
naga_tail_2
spit_poison_1 SPIT_POISON
spit_poison_2
+# Octopode
+tentacles TENTACLES
+# Oni:
double_potion_heal DOUBLE_POTION_HEAL
-acrobatic ACROBATIC
-antimagic_bite ANTIMAGIC_BITE
-no_potion_heal_1 NO_POTION_HEAL
-no_potion_heal_2
+# Poltergeist:
float FLOAT
formless_1 FORMLESS
formless_2
trickster TRICKSTER
+# Revenant:
spellclaws SPELLCLAWS
mnemophage MNEMOPHAGE
-stampede_1 STAMPEDE
-stampede_2
-stampede_north STAMPEDE_NORTH
-stampede_south STAMPEDE_SOUTH
-stampede_east STAMPEDE_EAST
-stampede_west STAMPEDE_WEST
+# Tengu:
+acrobatic ACROBATIC
+# Vine Stalker
+antimagic_bite ANTIMAGIC_BITE
+no_potion_heal_1 NO_POTION_HEAL
+no_potion_heal_2
# Makhleb mutations
major_destruction_of_cocytus MAJOR_DESTRUCTION_OF_COCYTUS
diff --git a/crawl-ref/source/rltiles/dc-wall.txt b/crawl-ref/source/rltiles/dc-wall.txt
index 9f77ec3c90..3df5bc8f39 100644
--- a/crawl-ref/source/rltiles/dc-wall.txt
+++ b/crawl-ref/source/rltiles/dc-wall.txt
@@ -155,21 +155,25 @@ stone2_brown3
%variation DNGN_STONE_WALL green
%hue 240 140
+%lum 240 -4
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_GREEN
%resetcol
%variation DNGN_STONE_WALL cyan
%hue 240 180
+%lum 240 -4
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_CYAN
%resetcol
%variation DNGN_STONE_WALL red
-%hue 240 0
+%hue 240 5
+%lum 240 -2
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_RED
%resetcol
%variation DNGN_STONE_WALL magenta
%hue 240 270
+%lum 240 -4
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_MAGENTA
%resetcol
@@ -196,27 +200,30 @@ stone2_brown3
%variation DNGN_STONE_WALL lightgreen
%hue 240 110
+%lum 240 2
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_LIGHTGREEN
%resetcol
%variation DNGN_STONE_WALL lightcyan
%hue 240 180
+%lum 240 4
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_LIGHTCYAN
%resetcol
%variation DNGN_STONE_WALL lightred
%hue 240 0
-%lum 240 5
+%lum 240 8
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_LIGHTRED
%resetcol
%variation DNGN_STONE_WALL lightmagenta
%hue 240 290
+%lum 0 4
%repeat DNGN_STONE_WALL_BLUE DNGN_STONE_WALL_LIGHTMAGENTA
%resetcol
%variation DNGN_STONE_WALL white
-%lum 0 30
+%lum 0 24
%repeat DNGN_STONE_WALL DNGN_STONE_WALL_WHITE
%resetcol
diff --git a/crawl-ref/source/rltiles/gui/mutations/artefact_enchanting.png b/crawl-ref/source/rltiles/gui/mutations/artefact_enchanting.png
new file mode 100644
index 0000000000..ca04bb2a97
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/artefact_enchanting.png differ
diff --git a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay0.png b/crawl-ref/source/rltiles/gui/mutations/daystalker.png
similarity index 59%
copy from crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay0.png
copy to crawl-ref/source/rltiles/gui/mutations/daystalker.png
index af78ccc8ba..470ea748c0 100644
Binary files a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay0.png and b/crawl-ref/source/rltiles/gui/mutations/daystalker.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/distributed_training.png b/crawl-ref/source/rltiles/gui/mutations/distributed_training.png
new file mode 100644
index 0000000000..01885a814f
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/distributed_training.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/four_strong_arms.png b/crawl-ref/source/rltiles/gui/mutations/four_strong_arms.png
new file mode 100644
index 0000000000..8d54709fe1
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/four_strong_arms.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_1.png b/crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_1.png
new file mode 100644
index 0000000000..17b7ce1462
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_1.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_2.png b/crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_2.png
new file mode 100644
index 0000000000..415d126c51
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/nimble_swimmer_2.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/no_jewellery.png b/crawl-ref/source/rltiles/gui/mutations/no_jewellery.png
new file mode 100644
index 0000000000..35555c28ed
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/no_jewellery.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/runic_magic.png b/crawl-ref/source/rltiles/gui/mutations/runic_magic.png
new file mode 100644
index 0000000000..5c0c7a1938
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/runic_magic.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/slow_wield.png b/crawl-ref/source/rltiles/gui/mutations/slow_wield.png
new file mode 100644
index 0000000000..520f11ce03
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/slow_wield.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/tentacles.png b/crawl-ref/source/rltiles/gui/mutations/tentacles.png
new file mode 100644
index 0000000000..3577d06435
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/tentacles.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/treasure_sense.png b/crawl-ref/source/rltiles/gui/mutations/treasure_sense.png
new file mode 100644
index 0000000000..0316c23216
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/treasure_sense.png differ
diff --git a/crawl-ref/source/rltiles/gui/mutations/warmup_strikes.png b/crawl-ref/source/rltiles/gui/mutations/warmup_strikes.png
new file mode 100644
index 0000000000..2e1901c412
Binary files /dev/null and b/crawl-ref/source/rltiles/gui/mutations/warmup_strikes.png differ
diff --git a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay3.png b/crawl-ref/source/rltiles/gui/mutations/wield_offhand.png
similarity index 61%
copy from crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay3.png
copy to crawl-ref/source/rltiles/gui/mutations/wield_offhand.png
index 24776736ad..e6238e235a 100644
Binary files a/crawl-ref/source/rltiles/dngn/wall/icy_wall_overlay3.png and b/crawl-ref/source/rltiles/gui/mutations/wield_offhand.png differ
diff --git a/crawl-ref/source/rltiles/mon/nonliving/living_spell_warp.png b/crawl-ref/source/rltiles/mon/nonliving/living_spell_warp.png
new file mode 100644
index 0000000000..625674339c
Binary files /dev/null and b/crawl-ref/source/rltiles/mon/nonliving/living_spell_warp.png differ
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-13 19:25:10
|
via f79d9584f8e3138c02165d2a85167ccbf08bed76 (commit)
from 91f809ebc3aa1ac6ac5fe1581c64a3c46f97e438 (commit)
-----------------------------------------------------------------------
commit f79d9584f8e3138c02165d2a85167ccbf08bed76
Author: hellmonk <nld...@gm...>
Date: Fri Nov 13 13:17:38 2026 -0600
Improve wn shapeshifting good_item
This formerly gave out a tier 2 talisman or some baubles. Because wn has
extremely high variance starting skills and some shapeshifter items have
hard skill requirements, this could lead to a "good item" that was completely
useless for several levels. We intentionally allow some pretty bad wanderer
starts, but it's really not intended for their good item to not even be
theoretically helpful for a long time. Wn good item now provides either
a tier 1 talisman or two "decent" consumables, one of which is guaranteed
to be mutation or lignification, in addition to its former reward.
A future talisman feature planned for next version should allow further
variation for wn shapeshifting good item by making the starting t2 easier
to use some of the time.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/ng-wanderer.cc | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc
index 8e5f36f59e..6312b54a15 100644
--- a/crawl-ref/source/ng-wanderer.cc
+++ b/crawl-ref/source/ng-wanderer.cc
@@ -599,7 +599,7 @@ static void _wanderer_random_evokable()
}
// Create a random low-level talisman in the inventory.
-static void _wanderer_random_talisman(bool has_spells)
+static void _wanderer_good_talisman(bool has_spells)
{
talisman_type selected_talisman =
random_choose_weighted(10, TALISMAN_PROTEAN,
@@ -623,6 +623,14 @@ static void _wanderer_random_talisman(bool has_spells)
newgame_make_item(OBJ_TALISMANS, selected_talisman);
}
+static void _wanderer_decent_talisman(bool has_spells)
+{
+ if (has_spells && coinflip())
+ newgame_make_item(OBJ_TALISMANS, random_choose(TALISMAN_INKWELL, TALISMAN_VISION));
+ else
+ newgame_make_item(OBJ_TALISMANS, random_choose(TALISMAN_QUILL, TALISMAN_GECKO));
+}
+
static void _give_wanderer_aux_armour(int plus = 0)
{
vector<armour_type> auxs = { ARM_HAT, ARM_GLOVES, ARM_BOOTS, ARM_CLOAK };
@@ -756,8 +764,18 @@ static vector<spell_type> _wanderer_good_equipment(skill_type skill, set<skill_t
break;
case SK_SHAPESHIFTING:
- // Random low-level talisman
- _wanderer_random_talisman(_wanderer_has_spell_skill(gift_skills));
+ // Random tier 2 talisman or baubles, plus a tier 1 talisman or consumables
+ _wanderer_good_talisman(_wanderer_has_spell_skill(gift_skills));
+ if (coinflip())
+ _wanderer_decent_talisman(_wanderer_has_spell_skill(gift_skills));
+ else
+ {
+ _decent_potion_or_scroll();
+ if (coinflip())
+ newgame_make_item(OBJ_POTIONS, POT_LIGNIFY);
+ else
+ newgame_make_item(OBJ_POTIONS, POT_MUTATION);
+ }
break;
default:
@@ -831,14 +849,12 @@ static vector<spell_type> _wanderer_decent_equipment(skill_type skill,
break;
case SK_SHAPESHIFTING:
- if (_wanderer_has_spell_skill(gift_skills) && coinflip())
- newgame_make_item(OBJ_TALISMANS, random_choose(TALISMAN_INKWELL, TALISMAN_VISION));
- else if (one_chance_in(4))
+ if (coinflip())
+ _wanderer_decent_talisman(_wanderer_has_spell_skill(gift_skills));
+ else if (coinflip())
newgame_make_item(OBJ_BAUBLES, BAUBLE_CENTIPEDE, random_range(2, 4));
- else if (one_chance_in(3))
- newgame_make_item(OBJ_BAUBLES, BAUBLE_FLUX, random_range(2, 5));
else
- newgame_make_item(OBJ_TALISMANS, random_choose(TALISMAN_QUILL, TALISMAN_GECKO));
+ newgame_make_item(OBJ_BAUBLES, BAUBLE_FLUX, random_range(2, 5));
break;
case SK_STEALTH:
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-13 17:40:12
|
via 91f809ebc3aa1ac6ac5fe1581c64a3c46f97e438 (commit)
from 90666207cc889484e9f67cb5bf28ebf6df3e76d2 (commit)
-----------------------------------------------------------------------
commit 91f809ebc3aa1ac6ac5fe1581c64a3c46f97e438
Author: Eino Keskitalo <ein...@gm...>
Date: Fri Nov 13 19:37:58 2026 +0200
docs: remove todos from a tutorial
If something needs to be added, it'll come naturally.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/tutorial/lesson4.des | 2 --
1 file changed, 2 deletions(-)
diff --git a/crawl-ref/source/dat/des/tutorial/lesson4.des b/crawl-ref/source/dat/des/tutorial/lesson4.des
index b800b7e0a4..fbd5babb98 100644
--- a/crawl-ref/source/dat/des/tutorial/lesson4.des
+++ b/crawl-ref/source/dat/des/tutorial/lesson4.des
@@ -31,13 +31,11 @@ DESC: Lesson 4: Magic and Spellcasting
ORDER: 4
ORIENT: encompass
KFEAT: ABCDEFG = .
-# TODO: pad g here was for spell hunger, what else could go here?
COLOUR: ABCDEFGdef = lightblue
FTILE: ABCDEFGdef = tutorial_pad
ITEM: randbook numspells:2 spells:magic_dart&mephitic_cloud title:Introductory_Spellcasting owner:player
ITEM: ring of magical power
ITEM: ring of wizardry
-# TODO: g was rations for spell hunger, replace with something more modern
MONS: training dummy ; stone q:20
MONS: bat zombie, goblin zombie
MONS: rat, goblin
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-13 16:20:11
|
via 90666207cc889484e9f67cb5bf28ebf6df3e76d2 (commit)
from a1b2f448174c9992e789d126f53b7e2ec2dd1032 (commit)
-----------------------------------------------------------------------
commit 90666207cc889484e9f67cb5bf28ebf6df3e76d2
Author: David Lawrence Ramsey <poo...@gm...>
Date: Fri Nov 13 10:18:01 2026 -0600
Fix typo.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/descript/unrand.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crawl-ref/source/dat/descript/unrand.txt b/crawl-ref/source/dat/descript/unrand.txt
index 7f307370bf..3cf76eef5f 100644
--- a/crawl-ref/source/dat/descript/unrand.txt
+++ b/crawl-ref/source/dat/descript/unrand.txt
@@ -957,7 +957,7 @@ imagery, but the focus of the scene is obscured by a great dark stain {{
%%%%
boreal bulwark
-A towering wall of ancient tamarak and patterned steel, said to have been
+A towering wall of ancient tamarack and patterned steel, said to have been
quenched in the sweat of the North Wind itself. Despite its weight, those who
carry it find their steps bolstered by bracing gusts and given the strength to
endure even the toughest hardships.
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-13 15:30:14
|
via a1b2f448174c9992e789d126f53b7e2ec2dd1032 (commit)
via 4bd9127eb913a96126bba66a29baeed19cd29ab3 (commit)
from 01fcf34389b439fed06685f7c3dbaf2254d6dacf (commit)
-----------------------------------------------------------------------
commit a1b2f448174c9992e789d126f53b7e2ec2dd1032
Author: DracoOmega <dra...@gm...>
Date: Fri Nov 13 11:34:31 2026 -0330
New unique: Boreas, Scion of the North Wind
Here to provide some gale centaur monster representation in the same
version that introduces them (as well as to show off monster Stampede
behaviour outside of Gulch), Boreas is an S-branch unique who uses
Stampede, Sleetstrike, and Deflect Missiles. They also passively gain
Regeneration whenever they stampede, as a simpler version of player North
Wind mechanics.
They always generate with a barding of flying (partially to pad out midgame
barding acquisition, but also to avoid being defeated by the water of
Shoals and Swamp) and a tower shield (which has a 1-in-20 chance to be the
Boreal Bulwark, as is their namesake).
While primarily a melee threat, sleetstrike can make them relevant at a
distance while making it harder for you to dodge their stampede, and their
defenses and regeneration should hopefully make them a hard target to
crack, as befits the scion of the defensive wind.
-----------------------
Tiles made by regret-index, using Denzi's old centaur paladin tile once
altered for Nessos combined with roctavian's old Dispater tile and Darby's
Stampede vfx.
commit 4bd9127eb913a96126bba66a29baeed19cd29ab3
Author: DracoOmega <dra...@gm...>
Date: Fri Nov 13 10:51:54 2026 -0330
New unrand: The Boreal Bulwark
Intended as a North Wind reference (as Zephyr was retroactively made into
one), this is a +0 tower shield with rampage, rC+, slay-4, and SecondWind:
whenever the wielder drops to 40% of their max HP, they gain a large amount
of Indomitable (currently equal to 1/3rd of their max HP) and the shield
goes on an extended cooldown.
While this is a very large amount of extra endurance, the effect is fairly
delayed and the shield's other stats are mediocre for an artefact. (I
considered outright giving it a negative enchantment, but wasn't certain if
it would be necessary in practice - it's certainly on the table if this
proves too strong.)
----------------------
Tiles made by regret-index, with the floor tile combining Denzi's old
randart tower shield tile and Darby's Stampede vfx, and the paperdoll tile
using one of Denzi's customized-player-doll-only kite shields combined with
one of roctavian's tower shield paper doll tiles.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/art-data.txt | 12 ++++
crawl-ref/source/art-func.h | 18 ++++++
crawl-ref/source/dat/database/monspeak.txt | 65 +++++++++++++++++++++
crawl-ref/source/dat/database/montitle.txt | 4 ++
crawl-ref/source/dat/des/builder/uniques.des | 4 ++
crawl-ref/source/dat/descript/monsters.txt | 9 +++
crawl-ref/source/dat/descript/status.txt | 5 ++
crawl-ref/source/dat/descript/unrand.txt | 7 +++
crawl-ref/source/dat/mons/boreas.yaml | 21 +++++++
crawl-ref/source/duration-data.h | 5 ++
crawl-ref/source/duration-type.h | 1 +
crawl-ref/source/mon-act.cc | 2 +
crawl-ref/source/mon-gear.cc | 15 +++++
crawl-ref/source/mon-spell.h | 8 +++
crawl-ref/source/monster-type.h | 2 +
crawl-ref/source/monster.cc | 13 +++++
crawl-ref/source/ouch.cc | 15 +++++
crawl-ref/source/rltiles/dc-mon.txt | 4 +-
crawl-ref/source/rltiles/dc-player.txt | 1 +
.../item/armour/artefact/urand_boreal_bulwark.png | Bin 0 -> 2056 bytes
crawl-ref/source/rltiles/mon/unique/boreas.png | Bin 0 -> 1862 bytes
.../source/rltiles/mon/unique/boreas_stampede.png | Bin 0 -> 2134 bytes
.../source/rltiles/player/hand2/boreal_bulwark.png | Bin 0 -> 1050 bytes
crawl-ref/source/tilepick.cc | 8 ++-
24 files changed, 217 insertions(+), 2 deletions(-)
create mode 100644 crawl-ref/source/dat/mons/boreas.yaml
create mode 100644 crawl-ref/source/rltiles/item/armour/artefact/urand_boreal_bulwark.png
create mode 100644 crawl-ref/source/rltiles/mon/unique/boreas.png
create mode 100644 crawl-ref/source/rltiles/mon/unique/boreas_stampede.png
create mode 100644 crawl-ref/source/rltiles/player/hand2/boreal_bulwark.png
diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index 3daecadf72..43da12f31a 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -2133,6 +2133,18 @@ DESCRIP: Mist: It may create clouds of spectral mist when the wearer attacks
a greater chance to produce spectral mist.
MAX_LEVEL: 11
+NAME: Boreal Bulwark
+OBJ: OBJ_ARMOUR/ARM_TOWER_SHIELD
+INSCRIP: SecondWind
+COLOUR: LIGHTBLUE
+TILE: urand_boreal_bulwark
+TILE_EQ: BOREAL_BULWARK
+COLD: 1
+SLAY: -4
+BOOL: rampage
+DESCRIP: SecondWind: When you are badly injured, it rapidly regenerates a
+ percentage of your health.
+
# This entry must always be last.
ENUM: DUMMY2
NAME: DUMMY UNRANDART 2
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h
index 148bacf8cc..12312bb082 100644
--- a/crawl-ref/source/art-func.h
+++ b/crawl-ref/source/art-func.h
@@ -1905,3 +1905,21 @@ static void _FORGEWARDEN_equip(item_def */*item*/, bool *show_msgs, bool unmeld)
lose_piety(piety_loss);
}
}
+
+static void _BOREAL_BULWARK_equip(item_def */*item*/, bool *show_msgs, bool unmeld)
+{
+ if (!unmeld && you.has_mutation(MUT_NORTH_WIND))
+ {
+ const string msg = make_stringf("You feel a strange kinship with the steel in your %s.",
+ you.hand_name(true).c_str());
+ _equip_mpr(show_msgs, msg.c_str());
+ }
+
+ you.duration[DUR_BOREAL_BULWARK_COOLDOWN] = random_range(550, 750);
+ mprf(MSGCH_DURATION, "You feel a cold wind start to gather around you.");
+}
+
+static void _BOREAL_BULWARK_unequip(item_def */*item*/, bool */*show_msgs*/)
+{
+ you.duration[DUR_BOREAL_BULWARK_COOLDOWN] = 0;
+}
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 5899c5622a..b54dd11de3 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2078,6 +2078,71 @@ Blorkula the Orcula killed
A faint prismatic mist rises from Blorkula's broken form and then dissipates.
## END Blorkula the Orcula ##
%%%%
+############ BOREAS ### A prideful scion of the North Wind
+Boreas
+
+@The_monster@ says, "Swear fealty to me and I may show you leniency. Or I may not."
+
+@The_monster@ says, "If Zot does not daunt me, then what shall you accomplish?"
+
+@The_monster@ says, "So long as the wind still blows, I stand!"
+
+@The_monster@ says, "I will claim all that belongs to me."
+
+@The_monster@ says, "The North Wind endures."
+
+@The_monster@ says, "Kings and commoners alike take shelter from me!"
+
+w:30
+@The_monster@ says, "{{
+ if you.race() ~= "Gale Centaur" then
+ return "Know your place!"
+ elseif you.mutation("North Wind's embodiment") > 0 then
+ return "Kin? You are barely a mongrel compared to me."
+ elseif you.mutation("South Wind's embodiment") > 0 then
+ return "Is this the best the South Wind can send against me? You matter not."
+ elseif you.mutation("East Wind's embodiment") > 0 then
+ return "Is this the best the East Wind can send against me? You matter not."
+ elseif you.mutation("West Wind's embodiment") > 0 then
+ return "Is this the best the West Wind can send against me? You matter not."
+ end
+}}" @player_only@
+
+w:30
+@The_monster@ says, "{{
+ if you.race() ~= "Gale Centaur" then
+ return "Winter drives all other seasons before it."
+ elseif you.mutation("North Wind's embodiment") > 0 then
+ return "My Winter will swallow yours."
+ elseif you.mutation("South Wind's embodiment") > 0 then
+ return "Even Summer's warmth cannot stave off Winter forever."
+ elseif you.mutation("East Wind's embodiment") > 0 then
+ return "It is the nature of Fall to be conquered by Winter."
+ elseif you.mutation("West Wind's embodiment") > 0 then
+ return "My Winter will outlast your Spring."
+ end
+}}" @player_only@
+
+@The_monster@ says, {{
+ if you.zot_orb_monster() == "orbs of winter" then
+ return '"Winter dwells within the realm of Zot and Winter bows to me!"'
+ else
+ return '"The Orb belongs to me by right."'
+ end
+}}
+%%%%
+Boreas killed
+
+@The_monster@ rasps with @possessive@ dying breath, "{{
+ if you.mutation("North Wind's embodiment") > 0 then
+ return "Father... why would you choose... them?"
+ elseif you.race() == "Gale Centaur" then
+ return "I spit... on your blood...."
+ else
+ return "May you never again know warmth...."
+ end
+}}" @player_only@
+%%%%
############ BORIS ### An ancient lich with the nasty habit of coming back
Boris
diff --git a/crawl-ref/source/dat/database/montitle.txt b/crawl-ref/source/dat/database/montitle.txt
index 8289ce86ac..3531da8af9 100644
--- a/crawl-ref/source/dat/database/montitle.txt
+++ b/crawl-ref/source/dat/database/montitle.txt
@@ -39,6 +39,10 @@ Bai Suzhen title
Bai Suzhen, Madame White Snake
%%%%
+Boreas title
+
+Boreas, Scion of the North Wind
+%%%%
Boris title
Boris, Master of Life and Death
diff --git a/crawl-ref/source/dat/des/builder/uniques.des b/crawl-ref/source/dat/des/builder/uniques.des
index 8c996781b7..eed5d2930d 100644
--- a/crawl-ref/source/dat/des/builder/uniques.des
+++ b/crawl-ref/source/dat/des/builder/uniques.des
@@ -421,6 +421,10 @@ NAME: uniq_mlioglotl
DEPTH: Swamp, Snake, Shoals, Spider
: place_unique(_G, "Mlioglotl")
+NAME: uniq_boreas
+DEPTH: Swamp, Snake, Shoals, Spider
+: place_unique(_G, "Boreas")
+
NAME: uniq_wiglaf
DEPTH: Elf, Snake, Spider, Vaults:1-3
: place_unique(_G, "Wiglaf")
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 9e75046832..9ee30d0000 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -79,6 +79,15 @@ He wields magic tinged with every hue of the rainbow, and has mastered the art
of dividing his own form among its many colours to avoid killing blows - though
even he must rest a while before doing so a second time.
%%%%
+Boreas
+
+A muscular gale centaur, armoured from head to flank in heavy steel. He claims
+direct lineage from the North Wind itself and the blustering squall which
+wreathes him cows most who'd dare to doubt.
+
+Prideful and fierce in equal measure, any obstacle between him and the Orb
+exists only to be trampled over.
+%%%%
Boris
An ancient and powerful lich. Like all true liches, Boris is immortal, and will
diff --git a/crawl-ref/source/dat/descript/status.txt b/crawl-ref/source/dat/descript/status.txt
index 92cf8ec201..899e52dc92 100644
--- a/crawl-ref/source/dat/descript/status.txt
+++ b/crawl-ref/source/dat/descript/status.txt
@@ -1455,3 +1455,8 @@ ends, and there is nobody else around to see you, its cooldown will be skipped.
You have recently disguised yourself and must explore some more before being
able to do so again.
+%%%%
+-2ndWind status
+
+Your Boreal Bulwark must spend some time recharging its power before it can
+regenerate your health.
diff --git a/crawl-ref/source/dat/descript/unrand.txt b/crawl-ref/source/dat/descript/unrand.txt
index baa4786dfb..7f307370bf 100644
--- a/crawl-ref/source/dat/descript/unrand.txt
+++ b/crawl-ref/source/dat/descript/unrand.txt
@@ -954,3 +954,10 @@ imagery, but the focus of the scene is obscured by a great dark stain {{
return "that smells strongly "
end
}}of ashes and salt. It seems somehow blasphemous to wear.
+%%%%
+boreal bulwark
+
+A towering wall of ancient tamarak and patterned steel, said to have been
+quenched in the sweat of the North Wind itself. Despite its weight, those who
+carry it find their steps bolstered by bracing gusts and given the strength to
+endure even the toughest hardships.
diff --git a/crawl-ref/source/dat/mons/boreas.yaml b/crawl-ref/source/dat/mons/boreas.yaml
new file mode 100644
index 0000000000..5896bbf652
--- /dev/null
+++ b/crawl-ref/source/dat/mons/boreas.yaml
@@ -0,0 +1,21 @@
+name: "Boreas"
+glyph: {char: "c", colour: lightblue}
+flags: [speaks, fighter, warm_blood, unique, male]
+resists: {cold: 2}
+exp: 1700
+species: centaur
+will: 100
+attacks:
+ - {type: hit, damage: 28}
+ - {type: kick, damage: 22}
+hd: 15
+hp_10x: 1300
+ac: 5
+ev: 10
+spells: boreas
+has_corpse: true
+shout: shout
+intelligence: human
+uses: weapons_armour
+size: large
+shape: centaur
diff --git a/crawl-ref/source/duration-data.h b/crawl-ref/source/duration-data.h
index dec2f46497..def4ec463d 100644
--- a/crawl-ref/source/duration-data.h
+++ b/crawl-ref/source/duration-data.h
@@ -853,6 +853,11 @@ static const duration_def duration_data[] =
{ DUR_STUMBLING, 0, "",
"stumbling", "stumbling",
"You are stumbling and have reduced evasion.", D_NEGATIVE },
+ { DUR_BOREAL_BULWARK_COOLDOWN,
+ YELLOW, "-2ndWind",
+ "on second wind cooldown", "second wind cooldown",
+ "You have recently used your second wind",
+ D_COOLDOWN, {{"You feel your endurance being bolstered by the wind."}}},
// The following are visible in wizmode only, or are handled
// specially in the status lights and/or the % or @ screens.
diff --git a/crawl-ref/source/duration-type.h b/crawl-ref/source/duration-type.h
index d4beed5300..f6ec3598a4 100644
--- a/crawl-ref/source/duration-type.h
+++ b/crawl-ref/source/duration-type.h
@@ -323,6 +323,7 @@ enum duration_type
DUR_XOM_PROTEAN_COOLDOWN,
DUR_DISGUISED,
DUR_STUMBLING,
+ DUR_BOREAL_BULWARK_COOLDOWN,
NUM_DURATIONS
};
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index b0094f0f37..54938beef8 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -1493,6 +1493,8 @@ bool mon_do_stampede(monster& mon)
if (should_end)
mon.del_ench(ENCH_STAMPEDE);
+ else if (mons_base_type(mon) == MONS_BOREAS)
+ mon.add_ench(mon_enchant(ENCH_REGENERATION, &mon, 20));
return true;
}
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index a5e0def4c2..1f13b335d9 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -1067,6 +1067,10 @@ int make_mons_weapon(monster_type type, int level, bool melee_only)
{ SPWPN_CHAOS, 1 }, },
} },
{ MONS_CERULEAN_IMP, { { { WPN_SPEAR, 1 } }, {}, { { SPWPN_NORMAL, 1 } } } },
+ { MONS_BOREAS,
+ { { { WPN_SCIMITAR, 10 },
+ { WPN_MORNINGSTAR, 20 },
+ } } },
};
static const weapon_list ORC_KNIGHT_BOWS =
@@ -1900,6 +1904,12 @@ static void _give_shield(monster* mon, int level)
level * 2 + 1, 1);
break;
+ case MONS_BOREAS:
+ shield = make_item_for_monster(mon, OBJ_ARMOUR, ARM_TOWER_SHIELD, level);
+ if (one_chance_in(20) && !get_unique_item_status(UNRAND_BOREAL_BULWARK))
+ make_item_unrandart(*shield, UNRAND_BOREAL_BULWARK);
+ break;
+
case MONS_DEMONSPAWN_CORRUPTER:
case MONS_DEMONSPAWN_SOUL_SCHOLAR:
if (one_chance_in(3))
@@ -2081,6 +2091,7 @@ int make_mons_armour(monster_type type, int level)
case MONS_VAULT_WARDEN:
case MONS_ANCIENT_CHAMPION:
case MONS_MINOTAUR:
+ case MONS_BOREAS:
item.base_type = OBJ_ARMOUR;
item.sub_type = random_choose(ARM_CHAIN_MAIL, ARM_PLATE_ARMOUR);
break;
@@ -2398,6 +2409,10 @@ static void _give_extra_equipment(monster* mon, int level)
}
break;
+ case MONS_BOREAS:
+ give_specific_item(mon, items(false, OBJ_ARMOUR, ARM_BARDING, 0, SPARM_FLYING));
+ break;
+
case MONS_ERICA:
make_item_for_monster(mon, OBJ_JEWELLERY, NUM_RINGS, 0, 1);
break;
diff --git a/crawl-ref/source/mon-spell.h b/crawl-ref/source/mon-spell.h
index 5511a8f0c2..2b7f000c3d 100644
--- a/crawl-ref/source/mon-spell.h
+++ b/crawl-ref/source/mon-spell.h
@@ -1996,6 +1996,14 @@ static const mon_spellbook mspell_list[] =
}
},
+ { MST_BOREAS,
+ {
+ { SPELL_STAMPEDE, 120, MON_SPELL_NATURAL },
+ { SPELL_DEFLECT_MISSILES, 100, MON_SPELL_MAGICAL },
+ { SPELL_SLEETSTRIKE, 26, MON_SPELL_MAGICAL },
+ }
+ },
+
// ('d') Draconians.
{ MST_BAI_SUZHEN,
{
diff --git a/crawl-ref/source/monster-type.h b/crawl-ref/source/monster-type.h
index 6dc4397936..7928c5b770 100644
--- a/crawl-ref/source/monster-type.h
+++ b/crawl-ref/source/monster-type.h
@@ -1044,6 +1044,7 @@ enum monster_type // env.mons[].type
MONS_CASSANDRA,
MONS_GOJI,
MONS_GOJI_UNMOUNTED, // 'Fake' monster to handle mount death properly
+ MONS_BOREAS,
#endif
// Sprint uniques:
MONS_CHUCK,
@@ -1457,6 +1458,7 @@ enum monster_type // env.mons[].type
MONS_HYPNOTAIL,
MONS_MANNEQUIN,
MONS_CHAOS_BATTLESHAPE,
+ MONS_BOREAS,
#endif
NUM_MONSTERS, // used for polymorph
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index c195ffe6c0..f745ed67d6 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -6197,6 +6197,19 @@ void monster::react_to_damage(const actor *oppressor, int damage,
if (x_chance_in_y(scan_artefacts(ARTP_SILENCE), 100))
silence_monster(*this, oppressor, (4 + random2(7) * BASELINE_DELAY));
+ if (mons_get_damage_level(*this) >= MDAM_SEVERELY_DAMAGED
+ && unrand_equipped(UNRAND_BOREAL_BULWARK)
+ && !has_ench(ENCH_REGENERATION)
+ && !has_ench(ENCH_ORB_COOLDOWN))
+ {
+ if (you.can_see(*this))
+ {
+ mprf("A bracing wind gives %s the strength to keep fighting!",
+ name(DESC_THE).c_str());
+ add_ench(mon_enchant(ENCH_REGENERATION, this, random_range(80, 110)));
+ add_ench(mon_enchant(ENCH_ORB_COOLDOWN, this, random_range(550, 750)));
+ }
+ }
if (mons_species() == MONS_BUSH
&& res_fire() < 0 && flavour == BEAM_FIRE
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index 7631f4afe3..219cb513f3 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -1174,6 +1174,20 @@ static void _handle_indomitable(int dam)
you.duration[DUR_INDOMITABLE] += dam * 70;
}
+static void _handle_boreal_bulwark()
+{
+ if (!you.unrand_equipped(UNRAND_BOREAL_BULWARK)
+ || you.duration[DUR_BOREAL_BULWARK_COOLDOWN]
+ || you.hp * 10 >= you.hp_max * 4)
+ {
+ return;
+ }
+
+ you.duration[DUR_INDOMITABLE] += you.hp_max * 33;
+ you.duration[DUR_BOREAL_BULWARK_COOLDOWN] = random_range(550, 750);
+ mprf(MSGCH_DURATION, "You feel a bracing wind giving you strength to keep fighting!");
+}
+
static void _place_player_corpse(bool explode)
{
if (!in_bounds(you.pos()))
@@ -1522,6 +1536,7 @@ void ouch(int dam, kill_method_type death_type, mid_t source, const char *aux,
}
_handle_indomitable(dam);
+ _handle_boreal_bulwark();
_handle_poor_constitution(dam);
_maybe_ru_retribution(dam, source);
_maybe_inflict_anguish(dam, source);
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index befe3e99eb..8f66389ff3 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -1219,8 +1219,10 @@ orb_guardian MONS_ORB_GUARDIAN
%sdir mon/unique
nessos MONS_NESSOS
nessos_bowless MONS_NESSOS_BOWLESS
-%sdir mon/demihumanoids/taurs
%rim 0
+boreas MONS_BOREAS
+boreas_stampede MONS_BOREAS_STAMPEDE
+%sdir mon/demihumanoids/taurs
# 'melee' tiles must be immediately following the normal ones
centaur MONS_CENTAUR
centaur-melee MONS_CENTAUR_MELEE
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index 3de4440fef..cee776266c 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -1152,6 +1152,7 @@ kite_shield_storm_queen KITE_SHIELD_STORM_QUEEN
tower_shield_of_ignorance TOWER_SHIELD_OF_IGNORANCE
tower_shield_louise TOWER_SHIELD_LOUISE
+boreal_bulwark BOREAL_BULWARK
%sdir player/hand2/doll_only
diff --git a/crawl-ref/source/rltiles/item/armour/artefact/urand_boreal_bulwark.png b/crawl-ref/source/rltiles/item/armour/artefact/urand_boreal_bulwark.png
new file mode 100644
index 0000000000..f177d12f8b
Binary files /dev/null and b/crawl-ref/source/rltiles/item/armour/artefact/urand_boreal_bulwark.png differ
diff --git a/crawl-ref/source/rltiles/mon/unique/boreas.png b/crawl-ref/source/rltiles/mon/unique/boreas.png
new file mode 100644
index 0000000000..435925a000
Binary files /dev/null and b/crawl-ref/source/rltiles/mon/unique/boreas.png differ
diff --git a/crawl-ref/source/rltiles/mon/unique/boreas_stampede.png b/crawl-ref/source/rltiles/mon/unique/boreas_stampede.png
new file mode 100644
index 0000000000..e3a547e22e
Binary files /dev/null and b/crawl-ref/source/rltiles/mon/unique/boreas_stampede.png differ
diff --git a/crawl-ref/source/rltiles/player/hand2/boreal_bulwark.png b/crawl-ref/source/rltiles/player/hand2/boreal_bulwark.png
new file mode 100644
index 0000000000..b8dbb8ec94
Binary files /dev/null and b/crawl-ref/source/rltiles/player/hand2/boreal_bulwark.png differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index d5b37671d4..6117678af4 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2740,6 +2740,11 @@ static tileidx_t _tileidx_monster_no_props(const monster_info& mon)
return base + 1;
return base;
+ case MONS_BOREAS:
+ if (mon.is(MB_STAMPEDE))
+ return TILEP_MONS_BOREAS_STAMPEDE;
+ return base;
+
case MONS_DANCING_WEAPON:
{
// Use item tile.
@@ -3113,7 +3118,6 @@ static const map<monster_info_flags, tileidx_t> monster_status_icons = {
{ MB_SUNDERING_READY, TILEI_SUNDERING },
{ MB_MUTE, TILEI_MUTE },
{ MB_EXPOSED, TILEI_EXPOSED },
- { MB_STAMPEDE, TILEI_STAMPEDE },
{ MB_KNOWN_INVIS, TILEI_UNSEEN_INVIS_KNOWN },
{ MB_INVISIBLE, TILEI_SEEN_INVIS },
{ MB_DIVINE_SHIELD, TILEI_DIVINE_SHIELD },
@@ -3142,6 +3146,8 @@ set<tileidx_t> status_icons_for(const monster_info &mons)
icons.insert(TILEI_PHASE_SHIFT);
if (mons.is(MB_FULLY_CHARGED) && !mons_is_jade_crystal(mons.type))
icons.insert(TILEI_FULLY_CHARGED);
+ if (mons.is(MB_STAMPEDE) && mons.type != MONS_BOREAS)
+ icons.insert(TILEI_STAMPEDE);
return icons;
}
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-11 17:50:11
|
via 01fcf34389b439fed06685f7c3dbaf2254d6dacf (commit)
from 7ebb014cd129ca084148a488c337d821d6f2994c (commit)
-----------------------------------------------------------------------
commit 01fcf34389b439fed06685f7c3dbaf2254d6dacf
Author: advil <ra...@gm...>
Date: Wed Nov 11 12:36:37 2026 -0500
fix: some compiler warnings
Probably clang-specific:
* "%lx" in a format string is not safe for a uint64_t object, since
long may or may correspond on any given build. Use the correct
format string (and add a 0x here for clarity)
* EQF_NONE is unused (wouldn't be an issue if this were an enum)
* the >= HT_WALLS_ONLY check is guaranteed false on the current enum,
keep as a future sanity check but avoid the warning via a cast
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/directn.cc | 4 ++--
crawl-ref/source/transform.cc | 2 --
crawl-ref/source/wiz-mon.cc | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 910353fd2e..be0d8d3fc0 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2905,7 +2905,7 @@ static void _describe_oos_square(const coord_def& where)
if (!in_bounds(where))
dprf("(out of bounds)");
else
- dprf("(map: %lx)", env.map_knowledge(where).flags);
+ dprf("(map: 0x%" PRIx64 ")", env.map_knowledge(where).flags);
#endif
return;
}
@@ -3684,7 +3684,7 @@ static void _debug_describe_feature_at(const coord_def &where)
char32_t ch = get_cell_glyph(where).ch;
// TODO: expand out some of this in the cell description for console in a
// more readable fashion
- dprf("(%d,%d): %s - %s. (%d/%s)%s%s%s%s map: %lx%s",
+ dprf("(%d,%d): %s - %s. (%d/%s)%s%s%s%s map: 0x%" PRIx64 "%s",
where.x, where.y,
ch == '<' ? "<<" : stringize_glyph(ch).c_str(),
feature_desc.c_str(),
diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc
index 6de7b44c4b..48670ae11f 100644
--- a/crawl-ref/source/transform.cc
+++ b/crawl-ref/source/transform.cc
@@ -67,8 +67,6 @@ constexpr int SLOTF(equipment_slot s) {
return 1 << s;
}
-static constexpr int EQF_NONE = 0;
-
// Weapons and offhand items
static constexpr int EQF_HELD = SLOTF(SLOT_WEAPON) | SLOTF(SLOT_OFFHAND)
| SLOTF(SLOT_WEAPON_OR_OFFHAND);
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index 1fe43f16d6..c46eca88b9 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -258,7 +258,7 @@ static string _habitat_debug_name(habitat_type ht)
result += "malign_gateway|";
if (ht & HT_WALLS_ONLY)
result += "walls|";
- if (ht >= (HT_WALLS_ONLY << 1))
+ if (static_cast<int>(ht) >= (HT_WALLS_ONLY << 1))
result += "INVALID|";
if (result.empty())
return "none";
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-11 17:00:14
|
via 7ebb014cd129ca084148a488c337d821d6f2994c (commit)
from db4a5d7c48a0f64f07877f388aa74329e1e89d15 (commit)
-----------------------------------------------------------------------
commit 7ebb014cd129ca084148a488c337d821d6f2994c
Author: David Lawrence Ramsey <poo...@gm...>
Date: Wed Nov 11 10:54:36 2026 -0600
Add two more colours to the database.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/database/colourname.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/crawl-ref/source/dat/database/colourname.txt b/crawl-ref/source/dat/database/colourname.txt
index e2560a14c1..e50385b1b5 100644
--- a/crawl-ref/source/dat/database/colourname.txt
+++ b/crawl-ref/source/dat/database/colourname.txt
@@ -83,6 +83,8 @@ azurite
baby blue
+balge yellow
+
banana yellow
beetroot red
@@ -685,6 +687,8 @@ strawberry red
strontium yellow
+sunflower yellow
+
tamarind
tang blue
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-10 22:30:13
|
via db4a5d7c48a0f64f07877f388aa74329e1e89d15 (commit)
via 292d1d0bb393386e09290b8e36cfca04103093fb (commit)
via 6e1e5012a66324e58b457a05e7d37462113a1726 (commit)
from 181c61d5ab7287e21114405b3e77c4cd3d89733e (commit)
-----------------------------------------------------------------------
commit db4a5d7c48a0f64f07877f388aa74329e1e89d15
Author: regret-index <clo...@ho...>
Date: Tue Nov 10 18:56:57 2026 -0330
Another quick micro vault review
Of note:
* pdpol_wu_jian_five_deadly_venoms now uses the centipedes of 4f93e5e
instead of a demonic crawler redefinition and follows the Five Poisons
more directly to place a (wolf) spider instead of a frilled lizard.
* minislime_mu now places technically-reusable daggers of distortion in
all four prize quadrants to better deal with bad teleports.
* Grunt's old Forest clearing vaults now more consistently have
(randomized, symmetric, scattered) trees surrounding them, to make
them look nicer and more obviously highlights with how their placement
in Lair is already so full of open spaces compared to Forest.
commit 292d1d0bb393386e09290b8e36cfca04103093fb
Author: regret-index <clo...@ho...>
Date: Tue Nov 10 16:22:37 2026 -0330
Tweak naga player doll tiles
When Sastreii's naga player paper doll tiles were added in e9c4887, this
shifted all of the naga player doll tiles off by one pixel from every
other default player doll tile. This may have been done to better center
the player doll tile itself versus the lengths of these tails, which is
fairly reasonable, but also awkwardly warps most attempts at aligning
weapons, offhand items, and our increasingly lengthy transformation list.
Rather than set up a special case for most of those tile layers to align
solely for naga player dolls (which may cause webtiles rendering issues
without a bunch more additional tiles), this commit just nudges the tiles
back to the default player paper doll position, and re-adjusts various form
tiles to also fit this.
While I'm here, I've also done a recolouring job to the top human half of
each of these tiles, as was sourced from Denzi's workings in the original
rltiles project and has been out of sync with monster naga colourations
since way back ine53bd43.
commit 6e1e5012a66324e58b457a05e7d37462113a1726
Author: regret-index <clo...@ho...>
Date: Tue Nov 10 13:08:40 2026 -0330
A pair of Darby's vaults
To be exact, these game-long spanning vaults contain:
* One vault accidentally left off of the submission of 0383675,
finishing her set of vaults themed after D:1 monsters with some sprawl
of endoplasm(+) pools,
* and a vault filling out a set from that same commit's vault batch of
hidden full vaults only any accessible from the floor below.
Modifications from the submission include some mild weight, item, and
terrain adjustments in very early or late placements for both vaults, and
some minor header syntax house-style adjustments.
(As per request, this commit also lowers the weight of her other
uniq_backdoor vaults, so the vault gimmick and its uniq_ tag both have
higher weights towards more "normal" vault gimmick emphasis.)
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/altar/overflow.des | 11 +-
crawl-ref/source/dat/des/branches/lair.des | 176 +++++++++++----------
.../source/dat/des/branches/vaults_rooms_hard.des | 6 +-
.../dat/des/branches/vaults_rooms_standard.des | 5 +-
crawl-ref/source/dat/des/branches/zot.des | 16 +-
.../source/dat/des/variable/mini_monsters.des | 159 ++++++++++++++++++-
.../source/rltiles/player/base/naga_blue_f.png | Bin 16121 -> 1467 bytes
.../source/rltiles/player/base/naga_blue_m.png | Bin 16068 -> 1426 bytes
.../source/rltiles/player/base/naga_bushfire_f.png | Bin 1011 -> 1599 bytes
.../source/rltiles/player/base/naga_bushfire_m.png | Bin 979 -> 1558 bytes
.../source/rltiles/player/base/naga_cave_f.png | Bin 1032 -> 1625 bytes
.../source/rltiles/player/base/naga_cave_m.png | Bin 995 -> 1576 bytes
.../rltiles/player/base/naga_darkgreen_f.png | Bin 16118 -> 1467 bytes
.../rltiles/player/base/naga_darkgreen_m.png | Bin 16082 -> 1420 bytes
.../source/rltiles/player/base/naga_deep_f.png | Bin 1026 -> 1633 bytes
.../source/rltiles/player/base/naga_deep_m.png | Bin 986 -> 1578 bytes
.../source/rltiles/player/base/naga_dune_f.png | Bin 1031 -> 1621 bytes
.../source/rltiles/player/base/naga_dune_m.png | Bin 989 -> 1574 bytes
.../source/rltiles/player/base/naga_green_f.png | Bin 16109 -> 1485 bytes
.../source/rltiles/player/base/naga_green_m.png | Bin 16071 -> 1429 bytes
.../rltiles/player/base/naga_lightgreen_f.png | Bin 16174 -> 7723 bytes
.../rltiles/player/base/naga_lightgreen_m.png | Bin 16124 -> 7736 bytes
.../rltiles/player/base/naga_milksnake_f.png | Bin 1022 -> 1622 bytes
.../rltiles/player/base/naga_milksnake_m.png | Bin 986 -> 1561 bytes
.../source/rltiles/player/base/naga_orange_f.png | Bin 853 -> 1430 bytes
.../source/rltiles/player/base/naga_orange_m.png | Bin 809 -> 1384 bytes
.../source/rltiles/player/base/naga_purple_f.png | Bin 864 -> 1482 bytes
.../source/rltiles/player/base/naga_purple_m.png | Bin 824 -> 1437 bytes
.../rltiles/player/base/naga_rattlesnake_f.png | Bin 881 -> 1456 bytes
.../rltiles/player/base/naga_rattlesnake_m.png | Bin 846 -> 1412 bytes
.../source/rltiles/player/base/naga_red_f.png | Bin 16098 -> 1471 bytes
.../source/rltiles/player/base/naga_red_m.png | Bin 16062 -> 1420 bytes
.../source/rltiles/player/base/naga_river_f.png | Bin 857 -> 1476 bytes
.../source/rltiles/player/base/naga_river_m.png | Bin 821 -> 1432 bytes
.../source/rltiles/player/base/naga_shadow_f.png | Bin 857 -> 1477 bytes
.../source/rltiles/player/base/naga_shadow_m.png | Bin 822 -> 1429 bytes
.../source/rltiles/player/base/naga_stream_f.png | Bin 865 -> 1479 bytes
.../source/rltiles/player/base/naga_stream_m.png | Bin 825 -> 1433 bytes
.../source/rltiles/player/base/naga_swamp_f.png | Bin 866 -> 1475 bytes
.../source/rltiles/player/base/naga_swamp_m.png | Bin 827 -> 1433 bytes
.../player/transform/hypnogecko_form_naga.png | Bin 1697 -> 7646 bytes
.../transform/hypnogecko_form_naga_tailless.png | Bin 1645 -> 7516 bytes
.../rltiles/player/transform/jade_form_naga.png | Bin 1169 -> 6290 bytes
.../player/transform/jade_form_naga_charged.png | Bin 1598 -> 7906 bytes
.../rltiles/player/transform/quill_form_naga.png | Bin 1782 -> 1842 bytes
.../rltiles/player/transform/spore_form_naga.png | Bin 1275 -> 7022 bytes
.../rltiles/player/transform/statue_form_naga.png | Bin 18851 -> 10148 bytes
.../player/transform/werewolf_form_naga.png | Bin 8224 -> 8036 bytes
48 files changed, 262 insertions(+), 111 deletions(-)
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index 2edf6b1d48..8e7774d233 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -3394,7 +3394,6 @@ ENDMAP
NAME: nicolae_ru_awakened_eye
TAGS: transparent decor no_pool_fixup
-KFEAT: _ = altar_ru
: standard_overflow_setup(_G, { { "ru", "_" } }, true)
MAP
.......
@@ -4446,9 +4445,9 @@ ENDMAP
NAME: nicolae_vehumet_first_one's_free
TAGS: transparent decor
-KITEM: p = parchment of freeze / parchment of foxfire / parchment of shock / \
- parchment of poisonous vapours / parchment of magic dart / \
- parchment of kiss of death / parchment of sandblast
+: kitem("p = parchment of " .. util.random_from {"Freeze", "Foxfire",
+: "Ice Thorns", "Kiss of Death", "Magic Dart",
+: "Poisonous Vapours", "Sandblast", "Shock"})
: single_cloud(_G, "M", "flame", true)
: single_cloud(_G, "N", "freezing vapour", true)
: standard_overflow_setup(_G, { { "vehumet", "_" } }, true)
@@ -4556,10 +4555,10 @@ KPROP: F = no_tele_into
repeated=false,
data={
venoms={
- "spectral demonic crawler name:centipede name_species name_replace name_descriptor",
+ "spectral assassin centipede",
"spectral black mamba",
"spectral scorpion",
- "spectral frilled lizard",
+ "spectral wolf spider",
"spectral cane toad"
}
}
diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des
index 11ff4daf81..6404530759 100644
--- a/crawl-ref/source/dat/des/branches/lair.des
+++ b/crawl-ref/source/dat/des/branches/lair.des
@@ -2437,22 +2437,23 @@ ENDMAP
###############################################################################
# A set of vaults converted from the ultimately-dispersed Forest.
-NAME: grunt_forest_stairs_clearing
-DEPTH: Lair:2-, !Lair:$
-MONS: wolf, black bear, polar bear, spriggan
-KMONS: P = plant / bush
-NSUBST: t = 2:t / * = t.
-NSUBST: Q = 3:1 / 1:2 / 1:3 / 1:4 / *:.
-MAP
-.tt...tt.
-t..Q.Q..t
-t.t.Q.t.t
-.Q.P.P.Q.
-..Q.).Q..
-.Q.P.P.Q.
-t.t.Q.t.t
-t..Q.Q..t
-.tt...tt.
+NAME: grunt_forest_stairs_clearing
+DEPTH: Lair:2-, !Lair:$
+MONS: wolf, black bear, polar bear, spriggan
+KMONS: B = plant / bush
+SHUFFLE: opqrstOPQR
+SUBST: o = ., O : t., p : t., P : t., q : t., Q : t., r : t., R : t., s = t
+NSUBST: 0 = 3:1 / 1:2 / 1:3 / 1:4 / *:.
+MAP
+.op...qr.
+R..0.0..O
+Q.s.0.t.P
+.0.B.B.0.
+..0.).0..
+.0.B.B.0.
+P.t.0.s.Q
+O..0.0..R
+.rq...po.
ENDMAP
# A secluded grove.
@@ -2460,21 +2461,19 @@ NAME: forest_entry_grove
DEPTH: Lair:2-, !Lair:$
MONS: centaur w:4 / spriggan
MONS: wolf, black bear, polar bear / raven w:2
-KMONS: P = plant / bush
KFEAT: d = cache_of_baked_goods
-NSUBST: Q = 2:1 / *:.
-NSUBST: R = 3:2 / 1:3 / 1:4 / *:.
+NSUBST: 0 = 2:1 / *:., z = 3:2 / 1:3 / 1:4 / *:.
MAP
xxxxxxxxx
xxxttttxxxx
xxxttttttttxx
xxtttt.d.tttxxx
-xttt..Q.Q..ttxx
-xttt.Q.R.Q.tttx
+xttt..0.0..ttxx
+xttt.0.R.0.tttx
xtt.........ttx
-xtt.R..)..R.ttx
-xtt..R...R..ttx
-xttt..R.R..tttx
+xtt.z..)..z.ttx
+xtt..z...z..ttx
+xttt..z.z..tttx
xttt.......tttx
xxtttt...ttttxx
xxxtt..ttxxxx
@@ -2482,93 +2481,96 @@ xxtttt...ttttxx
xxtt@@ttx
ENDMAP
-NAME: grunt_forest_small_clearing_treed
-TAGS: transparent patrolling
-MONS: plant / bush
-NSUBST: t = 2:t / * = t..
-SUBST: T = t, * = **t
-KPROP: * = no_tele_into
-KMASK: * = opaque
-MAP
- tt@@@tt
-t.......t
-t.1...1.t
-@..TTT..@
-@..T*T..@
-@..GTT..@
-t.1...1.t
-t.......t
- tt@@@tt
+NAME: grunt_forest_small_clearing_treed
+TAGS: transparent patrolling
+MONS: plant / bush
+SHUFFLE: opqrOPQR
+SUBST: oO = ., p : t., P : t., q : t., Q : t., rR = t
+SUBST: * = **t
+KPROP: * = no_tele_into
+KMASK: * = opaque
+MAP
+ op@@@qr
+R.......O
+Q.1...1.P
+@..ttt..@
+@..t*t..@
+@..Gtt..@
+P.1...1.Q
+O.......R
+ rq@@@po
ENDMAP
# Previously large_clearing_fruit, _statues, _slash, _guards
NAME: grunt_forest_large_clearings
TAGS: transparent no_pool_fixup
WEIGHT: 15
-KMONS: p = plant / bush
+KMONS: B = plant / bush
MONS: wolf, black bear / polar bear, spriggan / centaur w:4
KMONS: 4 = spriggan rider / faun w:4
KMONS: 9 = 9
KITEM: 94 = *
KFEAT: 94 = W
KFEAT: C = cache_of_fruit
-SHUFFLE: wW'"-9 / ''GG'4 / 'C'0'% / ```C1G
-SUBST: t = t.., '. = p:49 .:405, W = WW., "w = wwwW
+SHUFFLE: wW'"-9 / ''GG'4 / 'C'0'% / ```C1G, opqrsOPQRS
+SUBST: oOp = ., P : t.., q : t.., Q : t.., r : t.., RsS = t
+SUBST: '. = B:49 .:405, - = W, "w = wwwW
NSUBST: 1 = 3:1 / 2:2 / 1:3 / *:.
TILE: G = dngn_statue_elephant / dngn_statue_hydra / \
dngn_statue_dragon / dngn_statue_snail / dngn_statue_cat w:5
MAP
- tt@@@tt
- ttt.....ttt
- ttt.........ttt
- tww...........t
- ttwww..........tt
- t..www..'.......t
-tt...w"w....'....tt
-t.....ww-.-.......t
+ SS@@@oo
+ RRS.....opp
+ QQR.........pqq
+ Qww...........q
+ PPwww..........rr
+ P..www..'.......r
+OO...w"w....'....ss
+O.....ww-.-.......s
@......-.W--......@
@....'..W9W..'....@
@......--W.-......@
-t.......-.-ww.....t
-tt....'....w"w...tt
- t.......'..www..t
- tt..........wwwtt
- t...........wwt
- ttt.........ttt
- ttt.....ttt
- tt@@@tt
+s.......-.-ww.....O
+ss....'....w"w...OO
+ r.......'..www..P
+ rr..........wwwPP
+ q...........wwQ
+ qqp.........RQQ
+ ppo.....SRR
+ oo@@@SS
ENDMAP
-NAME: grunt_forest_large_clearing_hut
-TAGS: transparent
-MONS: plant / bush
-KMONS: 2 = spriggan / centaur w:2
-KFEAT: 2 = cache_of_baked_goods
-SUBST: t = t..
-SUBST: . = 1 .:90
-COLOUR: -*29 = lightgrey
-FTILE: + = floor_sprouting_stone
-FTILE: -*29 = floor_sprouting_squares
-MAP
- tt@@@tt
- ttt.....ttt
- ttt.........ttt
- t.............t
- tt.............tt
- t...............t
-tt...............tt
-t......ccccc......t
+NAME: grunt_forest_large_clearing_hut
+TAGS: transparent
+MONS: plant / bush
+KMONS: 2 = spriggan / centaur w:2
+KFEAT: 2 = cache_of_baked_goods
+SHUFFLE: opqrsOPQRS
+SUBST: oOp = ., P : t.., q : t.., Q : t.., r : t.., RsS = t
+SUBST: . = 1 .:90
+COLOUR: -*29 = lightgrey
+FTILE: + = floor_sprouting_stone
+FTILE: -*29 = floor_sprouting_squares
+MAP
+ SS@@@oo
+ RRS.....opp
+ QQR.........pqq
+ Q.............q
+ PP.............rr
+ P...............r
+OO...............ss
+O......ccccc......s
@......c-9*c......@
@......+-*2c......@
@......c-9*c......@
-t......ccccc......t
-tt...............tt
- t...............t
- tt.............tt
- t.............t
- ttt.........ttt
- ttt.....ttt
- tt@@@tt
+s......ccccc......O
+ss...............OO
+ r...............P
+ rr.............PP
+ q.............Q
+ qqp.........RQQ
+ ppo.....SRR
+ oo@@@SS
ENDMAP
###############################################################################
diff --git a/crawl-ref/source/dat/des/branches/vaults_rooms_hard.des b/crawl-ref/source/dat/des/branches/vaults_rooms_hard.des
index 214ea3ca18..6999ba05c2 100644
--- a/crawl-ref/source/dat/des/branches/vaults_rooms_hard.des
+++ b/crawl-ref/source/dat/des/branches/vaults_rooms_hard.des
@@ -1978,13 +1978,13 @@ MONS: great orb of eyes, entropy weaver, glowing orange brain
MONS: formless jellyfish
KITEM: R = gold no_pickup q:1
ITEM: scroll of teleportation pre_id q:2 / wand of digging charges:2
-ITEM: scroll of teleportation pre_id q:2 w:20 / \
- wand of digging charges:2 w:20 / dagger ego:distortion pre_id
+ITEM: dagger ego:distortion pre_id
: local d = you.depth()
: nsubst('J = ' .. d .. ':4 / 3 = 5 6:' .. d * 4 .. ' 7:' .. d * 3 .. ' / *:1')
: subst('1 = 1 2:' .. 4 + d * 3 .. ' 3:' .. 3 + d * 2)
SHUFFLE: %!'"
-NSUBST: % = 1:d / * = %$, ! = 1:d / * = %$, ' = 1:d / * = %$, " = 1:e / * = %$
+NSUBST: % = 1:d / 1:e / * = %%$, ! = 1:d / 1:e / * = %%$
+NSUBST: ' = 1:d / 1:e / * = %$$, " = 1:e / * = %$
KMASK: %$de = opaque
KMASK: %$de = allow_tele_closets
TILE: m = dngn_transparent_wall_green
diff --git a/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des b/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
index 5c7712943d..b5ef102456 100644
--- a/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
+++ b/crawl-ref/source/dat/des/branches/vaults_rooms_standard.des
@@ -2576,7 +2576,7 @@ ENDMAP
NAME: nicolae_vaults_wine_cellar
TAGS: vaults_room vaults_orient_e
-KITEM: ' = any potion w:15 / potion of moonshine / nothing
+KITEM: ' = any potion w:15 / potion of moonshine
SHUFFLE: Pp/Qq/Rr
: if crawl.coinflip() then
NSUBST: J = 2=x.. / ., DEFH = x.. / .
@@ -2584,7 +2584,8 @@ NSUBST: J = 2=x.. / ., DEFH = x.. / .
NSUBST: D = x.. / ., E = x.. / ., F = x.. / ., H = x.. / ., J = .
: end
NSUBST: . = 2=0 / 2=0. / .
-SUBST: Pp = ., QR = x, qr = '
+SUBST: Pp = ., QR = x, qr = ', ' = ':25 !, ! : !.
+: decorative_floor(_G, '!', "set of bottled spirits")
MAP
x'x'x'xx
'.D.E.pP
diff --git a/crawl-ref/source/dat/des/branches/zot.des b/crawl-ref/source/dat/des/branches/zot.des
index d579c97ecc..a5f63528a8 100644
--- a/crawl-ref/source/dat/des/branches/zot.des
+++ b/crawl-ref/source/dat/des/branches/zot.des
@@ -3543,14 +3543,12 @@ MONS: nonbase draconian w:20 / protean progenitor / killer klown / \
death cob / curse toe w:5 / ancient lich / dread lich / \
electric golem / orb of appropriateness w:5
KFEAT: V = v
-SHUFFLE: EF
-SUBST: E : "
-SHUFFLE: ABCDF, GH / GH / GH / HG
+SHUFFLE: DE, ABCD, GH / GH / GH / HG
NSUBST: 1 = 3:1 / 2:2 / 2:112 / 1:122, 0 = 3:1 / 2:2 / 2:112 / 1:122
NSUBST: 3 = 3:3 / 2:4 / 2:334 / 1:344, 6 = 3:5 / 2:6 / 2:556 / 1:566
SUBST: % = $%, * = %:3 *:1, | = %:60 *:25 |:15, 1 = 1:3 ':2
SUBST: 2 = 2:2 ':1, 3 = 3:4 ':1, 4 = 4:6 ':1, 5 = 5:6 ':1, 6 = 6:5 ':1
-SUBST: A : V:4 ":1, B : V:7 ":3, C : V:1 ":4, DF = ", H = .
+SUBST: A : V:4 ":1, B : V:7 ":3, C : V:1 ":4, DE = ", H = .
SUBST: G : V:7 G:2 .:1, - : +', + : +:5 .:1, { : {:2 }:3 .:2
NSUBST: { = 1:{ / 1:( / 1:[ / 1:<, } = 1:} / 1:) / 1:] / 1:>
SUBST: ( = (:14 >:1 <:1 ):2, [ = [:14 >:1 <:1 ]:2, ) = ):70 >(, ] = ]:70 >[
@@ -3570,11 +3568,11 @@ xx...G...Vv4$v$4vV...G...xx
x..VVVV...Vv'v'vV...VVVV..x
@.VvvvvV.'1V"""V1'.VvvvvV.@
@Vvv3v0vV1'""A""'1Vv0v3vvV@
-Vvv'*v$4vV"BC{DB"Vv4$v*'vvV
-Vv6*|+%$'""DEFEC""'$%+|*6vV
-Vvvv-v-vv"A{F<F{A"vv-v-vvvV
-Vv6*|+%$'""CEFED""'$%+|*6vV
-Vvv'*v$4vV"BD{CB"Vv4$v*'vvV
+Vvv'*v$4vV""B{C""Vv4$v*'vvV
+Vv6*|+%$'""CDEDB""'$%+|*6vV
+Vvvv-v-vv"A{E<E{A"vv-v-vvvV
+Vv6*|+%$'""BDEDC""'$%+|*6vV
+Vvv'*v$4vV""C{B""Vv4$v*'vvV
@Vvv3v0vV1'""A""'1Vv0v3vvV@
@.VvvvvV.'1V"""V1'.VvvvvV.@
x..VVVV...Vv'v'vV...VVVV..x
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index 25b7c9bfd0..96c41c6602 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -3484,7 +3484,7 @@ ENDMAP
NAME: darby_backdoor_grove
TAGS: extra no_descent no_monster_gen uniq_backdoor
DEPTH: D:1-3, Lair, !Lair:$, Depths, !Depths:$, Zot, !Zot:$
-WEIGHT: 7
+WEIGHT: 5
: local gn = "att:good_neutral ; nothing"
KMONS: 1 = felid att:good_neutral
KMONS: 2 = generate_awake butterfly
@@ -3565,6 +3565,7 @@ ENDMAP
NAME: darby_backdoor_misty_motte
TAGS: extra no_descent no_monster_gen no_item_gen no_pool_fixup uniq_backdoor
DEPTH: D:1-3, Lair, !Lair:$, Depths, !Depths:$, Zot, !Zot:$
+WEIGHT: 7
: if you.in_branch("D") then
KMONS: 1 = bat
: if you.depth() == 1 then
@@ -3825,6 +3826,156 @@ xxxv.....D.....vxxx
..eee..........
ENDMAP
+# A slime-befouled pool, or a primeval birthplace?
+NAME: darby_primordial_soup
+TAGS: no_monster_gen no_pool_fixup
+DEPTH: D:1-8, D:12-, Zot
+: if you.in_branch("D") then
+: if you.depth() < 4 then
+KMONS: 1 = endoplasm
+# Dubious, but close enough. Better than only endoplasms.
+KMONS: 2 = dart slug
+: elseif you.depth() < 12 then
+KMONS: 1 = jelly
+KMONS: 2 = sleepcap
+SUBST: d = dde
+: else
+KMONS: 1 = slime creature band
+NSUBST: ! = 1:1 / *:S
+SUBST: ? = S, d = dde
+: end
+KMONS: F = fungus / toadstool
+KFEAT: t = mangrove
+SUBST: p = W
+: else
+KMONS: 1 = protean progenitor
+KMONS: 2 = glowing shapeshifter
+KMONS: p = demonic plant
+KMONS: F = fungus
+KFEAT: t = demonic_tree
+SUBST: W = .
+TILE: t = dngn_demonic_tree_2 w:5 / dngn_demonic_tree_3 w:5 / \
+ dngn_demonic_tree_6 / dngn_demonic_tree_7 / \
+ dngn_demonic_tree_12 w:20 / dngn_demonic_tree_13 w:20
+: end
+KITEM: d = potion of mutation pre_id / flux bauble
+KITEM: e = protean talisman
+KFEAT: s = deep_water
+KFEAT: deFS12 = shallow_water
+NSUBST: . = 1:@ / *:., ? = 2:2 / *:S
+SUBST: ! = 1, ? = 122SS, F = FFS
+COLOUR: s = green
+COLOUR: deFS12 = lightgreen
+MAP
+ t tt
+ ttttt
+ WWWtt
+ WWtWWtt
+ W WWWW
+ WpW . p
+ttWW FSSSSF
+ ttW.S?ss!s?S
+ tt SssssssS
+ t Ssssss!SF
+ F?s!dssSS
+ SSSssssS W
+ F?ss?S.WWtt
+ SSSF WWWtt
+ WWtWtt
+ pWWWtt
+ WWttt
+ ttt
+ t
+ENDMAP
+
+# To contrast the other backdoor vaults being open with relatively fixed themes
+# and gimmicks tenuously related to the surrounding branch: A minature dungeon
+# of fixed room layout but otherwise heavily randomized and trapped (though the
+# earliest traps are mostly player-favoring terrain), with mostly normal branch
+# tiles, low chance of faded altar and decent chance of shop.
+NAME: darby_backdoor_atticsprint
+TAGS: extra no_descent no_monster_gen uniq_backdoor
+DEPTH: D:1-3, Lair, !Lair:$, Depths, !Depths:$, Zot, !Zot:$
+WEIGHT: 5 (D:1), 10
+# Due to noise in the compressed layout, mostly avoid monsters that open doors,
+# except for slot 4, which only spawns in the first room.
+: if you.in_branch("D") then
+TAGS: uniq_ecumenical_altar
+MONS: bat / rat / frilled lizard
+MONS: ball python / endoplasm / dart slug / quokka, jackal band
+MONS: goblin / kobold / hobgoblin / gnoll w:5, plant / fungus
+ITEM: goblin skeleton / kobold skeleton / gnoll skeleton
+: elseif you.in_branch("Lair") then
+MONS: black bear / bullfrog / water moccasin / wyvern
+MONS: basilisk / rime drake / raven / torpor snail
+MONS: catoblepas / skyshark / hydra / mountainshell
+MONS: wolf band / yak band / blink frog band / elephant band, plant / fungus
+ITEM: naga skeleton / merfolk skeleton
+SUBST: X = Xx
+: elseif you.in_branch("Depths") then
+MONS: hell knight zombie / kobold fleshcrafter zombie / \
+ tengu warrior zombie / spriggan berserker zombie / \
+ occultist simulacrum
+MONS: glass eye w:45 / fire dragon / ice dragon / storm dragon / \
+ shadow dragon / walking frostbound tome / \
+ walking earthen tome / walking crystal tome / walking divine tome
+MONS: golden dragon / chonchon band / spark wasp band / caustic shrike band
+MONS: necromancer band, plant / fungus / demonic plant
+KFEAT: t = tree / demonic_tree w:5
+ITEM: human skeleton / kobold skeleton / tengu skeleton / spriggan skeleton
+SUBST: * = ***|, % = %%%*
+: elseif you.in_branch("Zot") then
+MONS: quicksilver dragon / shadow dragon / storm dragon / golden dragon
+MONS: moth of wrath / ghost moth, curse toe / orb of appropriateness
+MONS: nonbase draconian band, demonic plant / petrified flower
+KFEAT: t = demonic_tree / petrified_tree w:5
+ITEM: draconian skeleton
+SUBST: * = *|, % = %*
+: end
+KFEAT: ~ = broken_door
+KFEAT: ` = closed_clear_door
+KFEAT: B = altar_ecumenical
+KFEAT: C = any shop
+KFEAT: D = jewellery shop / scroll shop
+KFEAT: ; = web
+# Replace up to two random doors from two sets with windows or walls, chosen to
+# prevent any chance of disconnect, and never generate more traps than doors.
+NSUBST: - = 1:m / *:~, _ = 1:m / *:~, t = 1:B / 1:C / *:t, ^ = 2:. / *:^
+SUBST: 2 = 2., m = mmccc~, ~ = ~`++, ' : ~`++, " : ~`++, ^ = ^.
+: if you.in_branch("Lair") then
+SUBST: C = t
+: elseif you.in_branch("D") then
+SUBST: c : ccccxxxxxv
+: else
+SUBST: c : cccxxxxvvb
+: if you.in_branch("Zot") then
+SUBST: C = D
+: end
+: end
+SUBST: B = Btt, C = CCt, t = tGT, T = TTTUUV, ; = ;;55d.....
+CLEAR: X
+MAP
+ XXXXXXXXXXXXXXX
+ XxxxxxxxxxxxxxxxX
+ XxxxxxxxxxxxxxxxxxX
+XxxxxccccxxxccccxxxxX
+Xxxxcc1;ccccc;1ccxxxX
+Xxxcc%..c;1.-^t.ccxxX
+Xxxc*3>.'^t.c;^2%cxxX
+Xxxcc%..'.2.cc-cccxxX
+Xxxxcc1;c;.._^1;cxxxX
+Xxxxxccccc_cc.t%cxxxX
+Xxxxcc.;c;^._^2;cxxxX
+Xxxcc...".2.cc-cccxxX
+Xxxc;.}^".t4c;^2%cxxX
+Xxxcc...c;1^-.t.ccxxX
+Xxxxcc.;ccccc;1ccxxxX
+XxxxxccccxxxccccxxxxX
+ XxxxxxxxxxxxxxxxxxX
+ XxxxxxxxxxxxxxxxX
+ XXXXXXXXXXXXXXX
+ENDMAP
+
################################################################################
#
# <<4>> Demons and undead
@@ -10108,12 +10259,12 @@ NAME: hellmonk_guarded_unrand_vitality_bloodlust
TAGS: no_monster_gen
DEPTH: D:7-
WEIGHT: 3
-MONS: deep troll, deep troll shaman
+MONS: troll, deep troll, deep troll shaman
ITEM: amulet_of_vitality no_pickup / necklace_of_bloodlust no_pickup
: if you.depth() < 13 then
-NSUBST: 1 = 1:1 / 2:. / * = 1..
+NSUBST: 1 = 1:2 / 1:1 / 2:. / * = 12.
: else
-NSUBST: 1 = 1:2 / * = 1.
+NSUBST: 1 = 1:3 / * = 2.
: end
COLOUR: x. = lightred
TILE: x = wall_pebble_red
diff --git a/crawl-ref/source/rltiles/player/base/naga_blue_f.png b/crawl-ref/source/rltiles/player/base/naga_blue_f.png
index 5650e94e18..d9a0f03c94 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_blue_f.png and b/crawl-ref/source/rltiles/player/base/naga_blue_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_blue_m.png b/crawl-ref/source/rltiles/player/base/naga_blue_m.png
index f2f414f8c8..6aab8c813d 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_blue_m.png and b/crawl-ref/source/rltiles/player/base/naga_blue_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_bushfire_f.png b/crawl-ref/source/rltiles/player/base/naga_bushfire_f.png
index 57de1ab2d9..7e6f3e1970 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_bushfire_f.png and b/crawl-ref/source/rltiles/player/base/naga_bushfire_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_bushfire_m.png b/crawl-ref/source/rltiles/player/base/naga_bushfire_m.png
index 27fb0c00f8..1c98ddc2ec 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_bushfire_m.png and b/crawl-ref/source/rltiles/player/base/naga_bushfire_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_cave_f.png b/crawl-ref/source/rltiles/player/base/naga_cave_f.png
index 753b4f5709..9ff149507e 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_cave_f.png and b/crawl-ref/source/rltiles/player/base/naga_cave_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_cave_m.png b/crawl-ref/source/rltiles/player/base/naga_cave_m.png
index eb7deb4ab0..295cef4087 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_cave_m.png and b/crawl-ref/source/rltiles/player/base/naga_cave_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_darkgreen_f.png b/crawl-ref/source/rltiles/player/base/naga_darkgreen_f.png
index 61d0c3eb50..60becf96a0 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_darkgreen_f.png and b/crawl-ref/source/rltiles/player/base/naga_darkgreen_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_darkgreen_m.png b/crawl-ref/source/rltiles/player/base/naga_darkgreen_m.png
index 63b463fb47..ef967263ab 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_darkgreen_m.png and b/crawl-ref/source/rltiles/player/base/naga_darkgreen_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_deep_f.png b/crawl-ref/source/rltiles/player/base/naga_deep_f.png
index 6cd0d884c0..62119af290 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_deep_f.png and b/crawl-ref/source/rltiles/player/base/naga_deep_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_deep_m.png b/crawl-ref/source/rltiles/player/base/naga_deep_m.png
index 14a5dab2f3..a710c32ae1 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_deep_m.png and b/crawl-ref/source/rltiles/player/base/naga_deep_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_dune_f.png b/crawl-ref/source/rltiles/player/base/naga_dune_f.png
index cc1f9b16f5..1402437d33 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_dune_f.png and b/crawl-ref/source/rltiles/player/base/naga_dune_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_dune_m.png b/crawl-ref/source/rltiles/player/base/naga_dune_m.png
index ca73f619b8..e9a40743cb 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_dune_m.png and b/crawl-ref/source/rltiles/player/base/naga_dune_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_green_f.png b/crawl-ref/source/rltiles/player/base/naga_green_f.png
index 7b7b26466a..7db6aaac3b 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_green_f.png and b/crawl-ref/source/rltiles/player/base/naga_green_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_green_m.png b/crawl-ref/source/rltiles/player/base/naga_green_m.png
index 8d99e6bbb9..14744e0c7c 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_green_m.png and b/crawl-ref/source/rltiles/player/base/naga_green_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_lightgreen_f.png b/crawl-ref/source/rltiles/player/base/naga_lightgreen_f.png
index 17ab2a759f..8b76f49888 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_lightgreen_f.png and b/crawl-ref/source/rltiles/player/base/naga_lightgreen_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_lightgreen_m.png b/crawl-ref/source/rltiles/player/base/naga_lightgreen_m.png
index 8d5e23cadb..c3f6e15a7f 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_lightgreen_m.png and b/crawl-ref/source/rltiles/player/base/naga_lightgreen_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_milksnake_f.png b/crawl-ref/source/rltiles/player/base/naga_milksnake_f.png
index 5d0fa5b287..c12cca4881 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_milksnake_f.png and b/crawl-ref/source/rltiles/player/base/naga_milksnake_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_milksnake_m.png b/crawl-ref/source/rltiles/player/base/naga_milksnake_m.png
index fdadf709ad..8c254d00d5 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_milksnake_m.png and b/crawl-ref/source/rltiles/player/base/naga_milksnake_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_orange_f.png b/crawl-ref/source/rltiles/player/base/naga_orange_f.png
index 823e175b90..187fd35b01 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_orange_f.png and b/crawl-ref/source/rltiles/player/base/naga_orange_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_orange_m.png b/crawl-ref/source/rltiles/player/base/naga_orange_m.png
index 7e1f4e1599..ce70184312 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_orange_m.png and b/crawl-ref/source/rltiles/player/base/naga_orange_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_purple_f.png b/crawl-ref/source/rltiles/player/base/naga_purple_f.png
index b07e9a229f..9cc00a5b2b 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_purple_f.png and b/crawl-ref/source/rltiles/player/base/naga_purple_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_purple_m.png b/crawl-ref/source/rltiles/player/base/naga_purple_m.png
index 036c38a9d7..3abd77238b 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_purple_m.png and b/crawl-ref/source/rltiles/player/base/naga_purple_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_rattlesnake_f.png b/crawl-ref/source/rltiles/player/base/naga_rattlesnake_f.png
index ebc66fcfd7..dd739f49bb 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_rattlesnake_f.png and b/crawl-ref/source/rltiles/player/base/naga_rattlesnake_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_rattlesnake_m.png b/crawl-ref/source/rltiles/player/base/naga_rattlesnake_m.png
index a5f75d564b..8d1d5dec93 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_rattlesnake_m.png and b/crawl-ref/source/rltiles/player/base/naga_rattlesnake_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_red_f.png b/crawl-ref/source/rltiles/player/base/naga_red_f.png
index b4d4ec95a8..9d9c20ef74 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_red_f.png and b/crawl-ref/source/rltiles/player/base/naga_red_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_red_m.png b/crawl-ref/source/rltiles/player/base/naga_red_m.png
index eeb78b72e3..4b3c44ef58 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_red_m.png and b/crawl-ref/source/rltiles/player/base/naga_red_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_river_f.png b/crawl-ref/source/rltiles/player/base/naga_river_f.png
index 6b90c4e26a..1855214d33 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_river_f.png and b/crawl-ref/source/rltiles/player/base/naga_river_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_river_m.png b/crawl-ref/source/rltiles/player/base/naga_river_m.png
index 72452d726c..5a35d36941 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_river_m.png and b/crawl-ref/source/rltiles/player/base/naga_river_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_shadow_f.png b/crawl-ref/source/rltiles/player/base/naga_shadow_f.png
index 98cc0f3c8f..306317f685 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_shadow_f.png and b/crawl-ref/source/rltiles/player/base/naga_shadow_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_shadow_m.png b/crawl-ref/source/rltiles/player/base/naga_shadow_m.png
index 5af010b714..7ec8d2e5a9 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_shadow_m.png and b/crawl-ref/source/rltiles/player/base/naga_shadow_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_stream_f.png b/crawl-ref/source/rltiles/player/base/naga_stream_f.png
index 0e74a29dc4..78925dda74 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_stream_f.png and b/crawl-ref/source/rltiles/player/base/naga_stream_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_stream_m.png b/crawl-ref/source/rltiles/player/base/naga_stream_m.png
index 5ad3f8d93f..f75338465a 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_stream_m.png and b/crawl-ref/source/rltiles/player/base/naga_stream_m.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_swamp_f.png b/crawl-ref/source/rltiles/player/base/naga_swamp_f.png
index 081ec60f69..2e8f943a35 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_swamp_f.png and b/crawl-ref/source/rltiles/player/base/naga_swamp_f.png differ
diff --git a/crawl-ref/source/rltiles/player/base/naga_swamp_m.png b/crawl-ref/source/rltiles/player/base/naga_swamp_m.png
index bf6fba8324..8effea0b7f 100644
Binary files a/crawl-ref/source/rltiles/player/base/naga_swamp_m.png and b/crawl-ref/source/rltiles/player/base/naga_swamp_m.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga.png b/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga.png
index 1e2305814e..92ba084977 100644
Binary files a/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga.png and b/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga_tailless.png b/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga_tailless.png
index 41ea09f2ae..ee6432bb7b 100644
Binary files a/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga_tailless.png and b/crawl-ref/source/rltiles/player/transform/hypnogecko_form_naga_tailless.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/jade_form_naga.png b/crawl-ref/source/rltiles/player/transform/jade_form_naga.png
index ef387de296..bf6bdea7bf 100644
Binary files a/crawl-ref/source/rltiles/player/transform/jade_form_naga.png and b/crawl-ref/source/rltiles/player/transform/jade_form_naga.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/jade_form_naga_charged.png b/crawl-ref/source/rltiles/player/transform/jade_form_naga_charged.png
index 25a3c55f87..8ba006b7c6 100644
Binary files a/crawl-ref/source/rltiles/player/transform/jade_form_naga_charged.png and b/crawl-ref/source/rltiles/player/transform/jade_form_naga_charged.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/quill_form_naga.png b/crawl-ref/source/rltiles/player/transform/quill_form_naga.png
index 162b33af4c..b1b1ce93fa 100644
Binary files a/crawl-ref/source/rltiles/player/transform/quill_form_naga.png and b/crawl-ref/source/rltiles/player/transform/quill_form_naga.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/spore_form_naga.png b/crawl-ref/source/rltiles/player/transform/spore_form_naga.png
index 798732a70f..c94ade5669 100644
Binary files a/crawl-ref/source/rltiles/player/transform/spore_form_naga.png and b/crawl-ref/source/rltiles/player/transform/spore_form_naga.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/statue_form_naga.png b/crawl-ref/source/rltiles/player/transform/statue_form_naga.png
index 88b8269f64..551e40ef37 100644
Binary files a/crawl-ref/source/rltiles/player/transform/statue_form_naga.png and b/crawl-ref/source/rltiles/player/transform/statue_form_naga.png differ
diff --git a/crawl-ref/source/rltiles/player/transform/werewolf_form_naga.png b/crawl-ref/source/rltiles/player/transform/werewolf_form_naga.png
index a885c163de..13099172d3 100644
Binary files a/crawl-ref/source/rltiles/player/transform/werewolf_form_naga.png and b/crawl-ref/source/rltiles/player/transform/werewolf_form_naga.png differ
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-10 04:07:36
|
via 181c61d5ab7287e21114405b3e77c4cd3d89733e (commit)
from 39282e9b42e733b4596f0c0d85ac2111b04fca8f (commit)
-----------------------------------------------------------------------
commit 181c61d5ab7287e21114405b3e77c4cd3d89733e
Author: Isaac Clancy <ik...@ya...>
Date: Tue Nov 10 16:57:57 2026 +1300
Make opt and option options respect runscripts
An option such as option=lua_file:name would attempt to run a lua file
when we were trying to pass the options without running lua. Is isn't
great as the lua interpreter isn't fully initialized at this point.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/initfile.cc | 14 +++++++++-----
crawl-ref/source/options.h | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 82aec2a66f..8db9845121 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -3594,7 +3594,7 @@ void game_options::set_longwalk_range(const string &field)
}
}
-void base_game_options::set_option_fragment(const string &s, bool /*prepend*/)
+void base_game_options::set_option_fragment(const string &s, bool runscripts)
{
if (s.empty())
return;
@@ -3604,14 +3604,15 @@ void base_game_options::set_option_fragment(const string &s, bool /*prepend*/)
{
// Boolean option.
if (s[0] == '!')
- read_option_line(s.substr(1) + " = false", true);
+ read_option_line(s.substr(1) + " = false", runscripts);
else
- read_option_line(s + " = true", true);
+ read_option_line(s + " = true", runscripts);
}
else
{
// key:val option.
- read_option_line(s.substr(0, st) + " = " + s.substr(st + 1), true);
+ read_option_line(s.substr(0, st) + " = " + s.substr(st + 1),
+ runscripts);
}
}
@@ -3898,7 +3899,10 @@ void base_game_options::read_option_line(const string &str, bool runscripts)
{
// does this need the ability to escape `,` for some reason?
_base_split_parse(state.raw_field, ",",
- [this](const string & s, bool b) { set_option_fragment(s, b); });
+ [this, runscripts](const string & s, bool /*prepend*/)
+ {
+ set_option_fragment(s, runscripts);
+ });
return;
}
else if (state.key == "lua_max_memory")
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h
index c34f792613..c1029dd4a9 100644
--- a/crawl-ref/source/options.h
+++ b/crawl-ref/source/options.h
@@ -401,7 +401,7 @@ protected:
string unalias(const string &key) const;
string expand_vars(const string &field) const;
void add_alias(const string &alias, const string &name);
- void set_option_fragment(const string &s, bool prepend);
+ void set_option_fragment(const string &s, bool runscripts);
};
/// This class implements most of crawl's options as well as their state.
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-10 03:42:36
|
via 39282e9b42e733b4596f0c0d85ac2111b04fca8f (commit)
from 1f190fcf18f81387034b9e285a791ce586b56d22 (commit)
-----------------------------------------------------------------------
commit 39282e9b42e733b4596f0c0d85ac2111b04fca8f
Author: Isaac Clancy <ik...@ya...>
Date: Tue Nov 10 16:19:02 2026 +1300
Make extra opts first/last respect runscripts
We pass the options without running lua and then when the player starts
a new character or loads one we pass the options again this time running
lua. However, options supplied on the command line with
--extra-opt-first or --extra-opt-last would run lua both times we passed
the options. This is not great as the lua interpreter isn't even fully
initialized when we first pass the options.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/initfile.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 323b9d0a8f..82aec2a66f 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2342,7 +2342,7 @@ void read_init_file(bool runscripts)
for (const string &extra : SysEnv.extra_opts_first)
{
Options.line_num++;
- Options.read_option_line(extra, true);
+ Options.read_option_line(extra, runscripts);
}
// Load init.txt.
@@ -2400,7 +2400,7 @@ void read_init_file(bool runscripts)
for (const string &extra : SysEnv.extra_opts_last)
{
Options.line_num++;
- Options.read_option_line(extra, true);
+ Options.read_option_line(extra, runscripts);
}
Options.filename = init_file_name;
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-10 03:07:42
|
via 1f190fcf18f81387034b9e285a791ce586b56d22 (commit)
from 1610be3752b215063b76d0066ebd450f701fe2a4 (commit)
-----------------------------------------------------------------------
commit 1f190fcf18f81387034b9e285a791ce586b56d22
Author: Isaac Clancy <ik...@ya...>
Date: Tue Nov 10 16:04:21 2026 +1300
Add eforgacs to the credits
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/CREDITS.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/crawl-ref/CREDITS.txt b/crawl-ref/CREDITS.txt
index 8261cc7e41..046f634e9c 100644
--- a/crawl-ref/CREDITS.txt
+++ b/crawl-ref/CREDITS.txt
@@ -469,6 +469,7 @@
Brian 'buehler' Faires
Dossy Shiobara
Jewel
+ eforgacs
The Dungeon Crawl Stone Soup development team is:
advil
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-10 01:37:37
|
via 1610be3752b215063b76d0066ebd450f701fe2a4 (commit)
from 2544cd89dc25f6a27f566a2cb5e326a55761d775 (commit)
-----------------------------------------------------------------------
commit 1610be3752b215063b76d0066ebd450f701fe2a4
Author: Edward Forgacs <edd...@gm...>
Date: Tue Nov 10 10:32:45 2026 +0900
ci: Fix builds on the ubuntu-26.04 runner image
ubuntu-latest now resolves to ubuntu-26.04, which broke two things:
- install_llvm() purged hardcoded llvm-14/python3-lldb-14 packages, which
don't exist on 26.04, so apt-get failed. Only purge LLVM packages that
are actually installed.
- actions/setup-python has no Python 3.8 build for 26.04. 3.8 has been
EOL since 2024, so drop it from the webserver matrix.
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 2 +-
.github/workflows/deps.py | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 893531dda3..21ebf72d7d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -603,7 +603,7 @@ jobs:
# oldest non-eol security release + current bugfix version
# https://devguide.python.org/versions/
# TODO: 3.12 is currently broken because of requirements.txt brittleness
- python-version: [3.8, 3.11, 3.13]
+ python-version: [3.11, 3.13]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/deps.py b/.github/workflows/deps.py
index ce85800da5..846e4dea53 100755
--- a/.github/workflows/deps.py
+++ b/.github/workflows/deps.py
@@ -99,7 +99,23 @@ def apt_install(args: argparse.Namespace) -> None:
def install_llvm() -> None:
run(["wget", "-O", "/tmp/llvm.sh", "https://apt.llvm.org/llvm.sh"])
- run(["sudo", "apt-get", "purge", "--auto-remove", "llvm", "python3-lldb-14", "llvm-14", "-y"])
+ # Remove the runner image's preinstalled LLVM so it doesn't conflict with
+ # llvm.sh. Which versions are present depends on the image, so only purge
+ # packages that are actually installed (apt fails on unknown packages).
+ query = subprocess.run(
+ [
+ "dpkg-query", "-W", "-f", "${db:Status-Abbrev} ${Package}\\n",
+ "llvm", "llvm-[0-9]*", "python3-lldb-[0-9]*",
+ ],
+ text=True,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.DEVNULL,
+ ).stdout
+ installed = [
+ line.split()[1] for line in query.splitlines() if line.startswith("ii")
+ ]
+ if installed:
+ run(["sudo", "apt-get", "purge", "--auto-remove", "-y", *installed])
run(["sudo", "bash", "/tmp/llvm.sh"])
for binary in os.scandir("/usr/bin"):
if binary.name.startswith("clang-") or binary.name.startswith("clang++-"):
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-10 01:32:36
|
via 2544cd89dc25f6a27f566a2cb5e326a55761d775 (commit)
via 56eb6ad9dcc9b76c630316595cef64a050a59fe2 (commit)
from d8b291878f627b99b3df5024d496ca942c4ced2a (commit)
-----------------------------------------------------------------------
commit 2544cd89dc25f6a27f566a2cb5e326a55761d775
Author: David Lawrence Ramsey <poo...@gm...>
Date: Mon Nov 9 19:29:05 2026 -0600
Alphabetise a costume shop vault set list.
commit 56eb6ad9dcc9b76c630316595cef64a050a59fe2
Author: Edward Forgacs <edd...@gm...>
Date: Tue Nov 10 09:25:41 2026 +0900
Fix costume shop vault monster names
regret_index_costume_shops picks three names from set/late_set and looks
them up in the costumes table, but "tengu" didn't match the
"tengu conjurer" key and the key "sphinx marauader" was misspelled.
When either was picked, builddb failed with "attempt to index a nil
value", making CI fail randomly.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/des/builder/shops.des | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/dat/des/builder/shops.des b/crawl-ref/source/dat/des/builder/shops.des
index 4614164cbd..42cf9566da 100644
--- a/crawl-ref/source/dat/des/builder/shops.des
+++ b/crawl-ref/source/dat/des/builder/shops.des
@@ -2458,12 +2458,12 @@ local costumes =
["quicksilver dragon"] =
{"quicksilver dragon scales", qs_item,
"parchment of Yara's Violent Unravelling"},
- ["sphinx marauader"] =
+ ["sphinx marauder"] =
{"riddle talisman", "manual of Hexes", "barding"}
}
local set = {"angel", "bombardier beetle", "death yak", "fire giant",
- "redback", "troll", "tengu", "storm dragon",
+ "redback", "storm dragon", "troll", "tengu conjurer",
"wandering mushroom", "wolf", "vampire"}
local late_set = {"crystal guardian", "deep elf elementalist", "electric eel",
"lich", "quicksilver dragon", "sphinx marauder"}
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-09 16:20:12
|
via d8b291878f627b99b3df5024d496ca942c4ced2a (commit)
from de8ebd9d4a9c148ab2ca2f2ea50ab298a8ba71a0 (commit)
-----------------------------------------------------------------------
commit d8b291878f627b99b3df5024d496ca942c4ced2a
Author: pocketzot <285...@us...>
Date: Mon Nov 9 09:46:02 2026 -0600
Fix typo in fountain decor line
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/database/decorlines.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crawl-ref/source/dat/database/decorlines.txt b/crawl-ref/source/dat/database/decorlines.txt
index c608923761..e6dc13f3bf 100644
--- a/crawl-ref/source/dat/database/decorlines.txt
+++ b/crawl-ref/source/dat/database/decorlines.txt
@@ -327,7 +327,7 @@ The fountain of blood pulses a joyous rhythm of life and death.
%%%%
Vehumet fountain_blood
-You sense the potent destructive power at rest in within this fountain.
+You sense the potent destructive power at rest within this fountain.
%%%%
Wu Jian peaceful fountain_blue
--
Dungeon Crawl Stone Soup
|
|
From: <gi...@cr...> - 2026-11-09 08:30:30
|
via de8ebd9d4a9c148ab2ca2f2ea50ab298a8ba71a0 (commit)
from 1336687056cf6a39149c415b2ad80f4a0a958887 (commit)
-----------------------------------------------------------------------
commit de8ebd9d4a9c148ab2ca2f2ea50ab298a8ba71a0
Author: Isaac Clancy <ik...@ya...>
Date: Mon Nov 9 21:01:47 2026 +1300
Fix a crash on demand from pcall when closing the game
When the game has been closed and user defined lua code is still
running, we let the lua code run for a while before killing it by
raising an error. However, there wasn't anything to stop the user
defined lua code from catching the error with pcall and continuing
running which would eventually result in a crash when the server decided
to kill the unresponsive game.
Fix this by setting crawl_state.lua_script_killed to true before raising
the error which lets the pcall function exposed to user lua know to stop
catching errors (the pcall function exposed to user defined lua isn't
the default lua pcall function).
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/clua.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 6fee0424e9..3c4ecbc914 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -1164,8 +1164,14 @@ static void _clua_throttle_hook(lua_State *ls, lua_Debug *dbg)
{
UNUSED(dbg);
+ // XXX: this won't kill the script early in local tiles unless the script
+ // is pumping the sdl event queue (e.g. by calling crawl.getch). However,
+ // it should still eventually be killed.
if (crawl_state.seen_hups)
+ {
+ crawl_state.lua_script_killed = true;
luaL_error(ls, "Aborting clua code on SIGHUP");
+ }
CLua *lua = lua_call_throttle::find_clua(ls);
--
Dungeon Crawl Stone Soup
|