From 9828a05bbbe165de3a796a80d2e75ce78bcb55b4 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Sun, 21 Dec 2025 10:44:50 +0000 Subject: [PATCH] Don't treat low monster-form HP while polymorphed as a major trouble Running low on HP in monster form isn't the same sort of critical problem that running low on HP while not polymorphed is, because the character changes back when the monster form HP runs out rather than dying. (Indeed, running out of HP in monster form is often intentional.) The exception is when wearing unchanging (which implies both that the monster form is intentional and that running out of monster HP would be fatal), so low monster-form HP is treated as a major trouble in that case. Inspired by . --- doc/fixes3-7-0.txt | 2 ++ src/pray.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index 586e42a63..4263a6007 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1552,6 +1552,8 @@ you cannot sacrifice objects/corpses while stunned or confused that they work; /y and /n for them now only work when lootabc is off writing on an unidentified scroll of blank paper identifies blank paper dumplogs include spells and skills +praying will not restore monster-form HP while polymorphed, unless you + have unchanging Fixes to 3.7.0-x General Problems Exposed Via git Repository diff --git a/src/pray.c b/src/pray.c index 075711400..281ce64e7 100644 --- a/src/pray.c +++ b/src/pray.c @@ -217,7 +217,7 @@ in_trouble(void) return TROUBLE_STARVING; if (region_danger()) return TROUBLE_REGION; - if (critically_low_hp(FALSE)) + if ((!Upolyd || Unchanging) && critically_low_hp(FALSE)) return TROUBLE_HIT; if (ismnum(u.ulycn)) return TROUBLE_LYCANTHROPE;