[crawl-ref-commits] master branch updated: 0.34-a0-447-ga178a525af

[<gi...@cr...>]

       via  a178a525af15de52ffd37f9d9af99cecd33e6ca3 (commit)
      from  2e3327b29e69bd22a3ced2d9ad79ca744aa0995a (commit)

-----------------------------------------------------------------------
commit a178a525af15de52ffd37f9d9af99cecd33e6ca3
Author: regret-index <clo...@ho...>
Date:   Thu Jul 24 17:49:06 2025 -0230

    Further adjust Kiku's wrath (Oneirical)
    
    When b6bfbb2 reduced Kikubaaqudgha's draining wrath effect (from a range
    between ~23.3% to 40% max hp to a new range of ~16.6% to 30% max hp) and
    removed the ability to resist it via rN simultaneously (so an rN+++
    character couldn't ignore a large part of the wrath), it made the wrath
    still capable of dragging former worshippers down to single-digit percents
    of their max HP (through the randomness of when the wrath actually
    triggers), but without very much potential recourse to handle such.
    Gifting god wrath should be dangerous, but even Okawaru wrath summons have
    more potential responses than this, so I'm further adjusting the numbers
    and adding another angle.
    
    The new Kiku zero-tension wrath effect is mildly reduced at the top end,
    with a range of ~16.6% to ~26.6% max HP, and more importantly will not
    apply at all if the player is already drained for 50% or more of their max
    HP. In exchange, Kiku wrath now also directly inflicts 35% to 50% Doom
    regardless of whether or not draining occurred, as is somewhat linked to
    the undead between draugr attacks and mummy death curses. Banes are still
    reasonably rare to encounter currently (without entering optional /
    extended branches), are evidently currently reasonably survivable, and
    add to the strategic-damage emphasis prior; as such, it should be safe to
    emphasize these over the relatively conventional draining angle.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/descript/gods.txt | 10 +++++-----
 crawl-ref/source/god-wrath.cc          | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/crawl-ref/source/dat/descript/gods.txt b/crawl-ref/source/dat/descript/gods.txt
index 10a8e61f65..1adff973a0 100644
--- a/crawl-ref/source/dat/descript/gods.txt
+++ b/crawl-ref/source/dat/descript/gods.txt
@@ -577,11 +577,11 @@ stripped away from them.
 Kikubaaqudgha wrath
 
 Kikubaaqudgha's wrath brings forth all the dread powers of necromancy. Victims
-may witness the devastating Sign of Ruin form upon themselves, or be drained
-without any respect for their negative energy resistance. Furthermore,
-Kikubaaqudgha's gifts become tainted: the dead rise again as foes, and those
-that attempt to use necromantic magic to fend off wrath will find it backfiring
-on them when least expected.
+may witness the devastating Sign of Ruin form upon themselves, or both doomed
+and drained without any respect for their negative energy resistance.
+Furthermore, Kikubaaqudgha's gifts become tainted: the dead rise again as foes,
+and those that attempt to use necromantic magic to fend off wrath will find it
+backfiring on them when least expected.
 %%%%
 Lugonu wrath
 
diff --git a/crawl-ref/source/god-wrath.cc b/crawl-ref/source/god-wrath.cc
index c547a1d2eb..994eea0b1d 100644
--- a/crawl-ref/source/god-wrath.cc
+++ b/crawl-ref/source/god-wrath.cc
@@ -650,7 +650,19 @@ static bool _kikubaaqudgha_retribution()
         _reset_avatar(*avatar);
     }
     else
-        drain_player(random_range(125, 225), false, true, false);
+    {
+        // Drain for ~16.6% to ~26.6% if you're not below 50% drained hp.
+        if (-you.hp_max_adj_temp < you.hp_max / 2)
+            drain_player(random_range(75, 150), false, true, false);
+
+        // Regardless of draining, apply some Doom.
+        int doom_pow = random_range(35, 50);
+
+        if (!(you.attribute[ATTR_DOOM] + doom_pow >= 100))
+            mprf(MSGCH_DANGER, "Your doom draws closer.");
+
+        you.doom(doom_pow);
+    }
 
     return true;
 }


-- 
Dungeon Crawl Stone Soup