Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.34-a0-2099-ge1d2b83f61
|
From: <gi...@cr...> - 2026-01-25 22:25:11
|
via e1d2b83f61f62d7936308bf84c7dc3a1702f0389 (commit)
via c88066364f5068e801482ff7eec1b9f78fd12095 (commit)
from c69c41b5cdbd464c3288e958d9875121da642cdd (commit)
-----------------------------------------------------------------------
commit e1d2b83f61f62d7936308bf84c7dc3a1702f0389
Author: regret-index <clo...@ho...>
Date: Sun Jan 25 18:51:29 2026 -0330
Adjust morphogenic ooze slimification accumulation
While the original af_slimify timing was roughly based off of bat cloud
drowinsess numbers, clouds are much more consistent at applying their
effects than attack brands are in combat. It's very plausible to be killed
by a morphogenic ooze band well before one actually gets slimified in the
first place, due to each turn where an ooze fails to hit allows one to
work off the effect build-up without really bothering with any
counterplay, since each hit only applies 35-45 aut of a status that needs
to reach 100 to activate that also goes down 10 each turn. Rather than
making them apply the status in one or two hits entirely, I am doubling
the status application and threshold numbers both, which thus halves the
rate the status wears off mid-fight. As rare monsters with a singular
gimmick far less instantly lethal than other summoning or conjurations
mechanics added to the branch this version, we might as well test a
version of the monster with a functional version of the gimmick first.
(This commit also adjusts the colour schema of DUR_SLIMIFYING to reduce
the ambiguity of going across multiple shades of magenta. No save-compat
code has been included with this commit, as there is rather little benefit
in tactically converting an older save mid-fight to try and prevent
slimification against exactly one encounter. I am also fixing a notable
bug where one could cancel jelly form immediately after actually getting
it, which I hope hasn't been distorting the testing of the monster
entirely....)
commit c88066364f5068e801482ff7eec1b9f78fd12095
Author: regret-index <clo...@ho...>
Date: Sun Jan 25 18:31:12 2026 -0330
Yet further small tiles adjustments
* Azure jellies and colossal amoeba have had their colours and brightness
adjusted away from each other, to help with those with poor eyesight
and poor pixel miscaling confusing the two very different blue jellies
in Slime.
* Antimagic Gaze no longer accidentally uses the Draining Gaze tile
animation flash, as was introduced in 6213b69.
* The Draining Gaze animation flash from eyes of draining now lasts
very slightly longer when it targets players, and now also lasts
increasingly longer the more the player is drained overall.
* Fannar and player doll broad axes have had their palettes simplified.
* Rapier and broad axe randarts now have unique player doll tiles,
based off of roctavian's good_item rapiers and broad axe doll tiles.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/melee-attack.cc | 7 ++++---
crawl-ref/source/mon-cast.cc | 6 ++++--
crawl-ref/source/rltiles/dc-player.txt | 6 +++++-
.../source/rltiles/mon/amorphous/azure_jelly.png | Bin 423 -> 1565 bytes
.../source/rltiles/mon/amorphous/colossal_amoeba.png | Bin 8966 -> 2304 bytes
crawl-ref/source/rltiles/mon/unique/fannar.png | Bin 1142 -> 2377 bytes
crawl-ref/source/rltiles/player/hand1/broad_axe2.png | Bin 322 -> 6817 bytes
crawl-ref/source/rltiles/player/hand1/broad_axe3.png | Bin 0 -> 7041 bytes
.../laced_with_chaos.png => player/hand1/rapier3.png} | Bin 5553 -> 5523 bytes
crawl-ref/source/status.cc | 8 ++++----
10 files changed, 17 insertions(+), 10 deletions(-)
create mode 100644 crawl-ref/source/rltiles/player/hand1/broad_axe3.png
copy crawl-ref/source/rltiles/{misc/icons/laced_with_chaos.png => player/hand1/rapier3.png} (53%)
diff --git a/crawl-ref/source/melee-attack.cc b/crawl-ref/source/melee-attack.cc
index 04b3d96469..eb86251b51 100644
--- a/crawl-ref/source/melee-attack.cc
+++ b/crawl-ref/source/melee-attack.cc
@@ -4372,12 +4372,13 @@ void melee_attack::mons_apply_attack_flavour(attack_flavour flavour)
else
{
bool initial = you.duration[DUR_SLIMIFYING] == 0;
- you.duration[DUR_SLIMIFYING] += random_range(35, 45);
- if (you.duration[DUR_SLIMIFYING] >= 100)
+ you.duration[DUR_SLIMIFYING] += random_range(70, 90);
+ if (you.duration[DUR_SLIMIFYING] >= 200)
{
you.duration[DUR_SLIMIFYING] = 0;
transform(20 + roll_dice(3, 10),
- transformation::jelly, true, false);
+ transformation::jelly, true, false);
+ you.transform_uncancellable = true;
}
else
{
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index f0dc6067ef..b7921cde3a 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -495,7 +495,7 @@ static const map<spell_type, mons_spell_logic> spell_to_logic = {
{ SPELL_ANTIMAGIC_GAZE, {
_caster_sees_foe,
[](monster &caster, mon_spell_slot slot, bolt&) {
- flash_tile(caster.get_foe()->pos(), MAGENTA, 120, TILE_BOLT_DRAINING_GAZE);
+ flash_tile(caster.get_foe()->pos(), MAGENTA, 120, TILE_BOLT_ANTIMAGIC_GAZE);
caster.get_foe()->drain_magic(&caster, mons_spellpower(caster, slot.spell));
},
} },
@@ -1468,8 +1468,10 @@ static void _cast_draining_gaze(monster &caster, mon_spell_slot, bolt&)
{
// 10% of max HP post-draining: takes 8 casts to drain to 50% at rN0,
// 15 at rN+, and 29 at rN++. No minimum amount.
- flash_tile(foe->pos(), CYAN, 160, TILE_BOLT_DRAINING_GAZE);
drain = 75 * you.hp_max / (you.hp_max - you.hp_max_adj_temp);
+ flash_tile(foe->pos(), CYAN,
+ 175 + (75 * -you.hp_max_adj_temp / you.hp_max),
+ TILE_BOLT_DRAINING_GAZE);
drain_player(drain, false, false, false);
}
else
diff --git a/crawl-ref/source/rltiles/dc-player.txt b/crawl-ref/source/rltiles/dc-player.txt
index c568e789c6..26a971197c 100644
--- a/crawl-ref/source/rltiles/dc-player.txt
+++ b/crawl-ref/source/rltiles/dc-player.txt
@@ -750,8 +750,10 @@ sword_twist SWORD_TWIST
knife KNIFE
heavy_sword HEAVY_SWORD
rapier RAPIER
-%enchant_variation RAPIER shiny runed glowing randart
+%enchant_variation RAPIER shiny runed glowing
rapier2 RAPIER_MAGIC
+%enchant_variation RAPIER randart
+rapier3 RAPIER_RANDART
sword_three SWORD3
sword_breaker SWORD_BREAKER
sword_jag SWORD_JAG
@@ -920,6 +922,8 @@ war_axe2 WAR_AXE_MAGIC
broad_axe BROAD_AXE
%enchant_variation BROAD_AXE shiny runed glowing randart
broad_axe2 BROAD_AXE_MAGIC
+%enchant_variation BROAD_AXE randart
+broad_axe3 BROAD_AXE_RANDART
battleaxe BATTLEAXE
%enchant_variation BATTLEAXE shiny runed glowing randart
battleaxe2 BATTLEAXE_MAGIC
diff --git a/crawl-ref/source/rltiles/mon/amorphous/azure_jelly.png b/crawl-ref/source/rltiles/mon/amorphous/azure_jelly.png
index 5fea7f07a1..a9451b43e2 100644
Binary files a/crawl-ref/source/rltiles/mon/amorphous/azure_jelly.png and b/crawl-ref/source/rltiles/mon/amorphous/azure_jelly.png differ
diff --git a/crawl-ref/source/rltiles/mon/amorphous/colossal_amoeba.png b/crawl-ref/source/rltiles/mon/amorphous/colossal_amoeba.png
index 679e0f9a02..cab679e488 100644
Binary files a/crawl-ref/source/rltiles/mon/amorphous/colossal_amoeba.png and b/crawl-ref/source/rltiles/mon/amorphous/colossal_amoeba.png differ
diff --git a/crawl-ref/source/rltiles/mon/unique/fannar.png b/crawl-ref/source/rltiles/mon/unique/fannar.png
index 325cb715be..f49eb39ca7 100644
Binary files a/crawl-ref/source/rltiles/mon/unique/fannar.png and b/crawl-ref/source/rltiles/mon/unique/fannar.png differ
diff --git a/crawl-ref/source/rltiles/player/hand1/broad_axe2.png b/crawl-ref/source/rltiles/player/hand1/broad_axe2.png
index 61ff90c9b1..18feb2c5ab 100644
Binary files a/crawl-ref/source/rltiles/player/hand1/broad_axe2.png and b/crawl-ref/source/rltiles/player/hand1/broad_axe2.png differ
diff --git a/crawl-ref/source/rltiles/player/hand1/broad_axe3.png b/crawl-ref/source/rltiles/player/hand1/broad_axe3.png
new file mode 100644
index 0000000000..3924b2f583
Binary files /dev/null and b/crawl-ref/source/rltiles/player/hand1/broad_axe3.png differ
diff --git a/crawl-ref/source/rltiles/misc/icons/laced_with_chaos.png b/crawl-ref/source/rltiles/player/hand1/rapier3.png
similarity index 53%
copy from crawl-ref/source/rltiles/misc/icons/laced_with_chaos.png
copy to crawl-ref/source/rltiles/player/hand1/rapier3.png
index b8e6d0f9e4..41c437568c 100644
Binary files a/crawl-ref/source/rltiles/misc/icons/laced_with_chaos.png and b/crawl-ref/source/rltiles/player/hand1/rapier3.png differ
diff --git a/crawl-ref/source/status.cc b/crawl-ref/source/status.cc
index f39d61fe4b..931dc334c4 100644
--- a/crawl-ref/source/status.cc
+++ b/crawl-ref/source/status.cc
@@ -973,12 +973,12 @@ bool fill_status_info(int status, status_info& inf)
break;
case DUR_SLIMIFYING:
- if (you.duration[DUR_SLIMIFYING] > 70)
+ if (you.duration[DUR_SLIMIFYING] > 140)
inf.light_colour = LIGHTMAGENTA;
- else if (you.duration[DUR_SLIMIFYING] >= 35)
- inf.light_colour = MAGENTA;
- else
+ else if (you.duration[DUR_SLIMIFYING] >= 75)
inf.light_colour = RED;
+ else
+ inf.light_colour = YELLOW;
break;
case STATUS_MNEMOPHAGE:
--
Dungeon Crawl Stone Soup
|
