nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

pull request #1138 - hands glowing red

Browse Source 
Pull request from entrez:  "Your hands begin glowing red even more"
when hands are already glowing red is inaccurate and poorly phrased.

Closes #1138
This commit is contained in:
PatR
2023-11-29 12:13:45 -08:00
parent 8764ae123b 4e008bb52f
commit 6332b17177
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/read.c
+11 -8
View File
@@ -1292,6 +1292,7 @@ seffect_confuse_monster(struct obj **sobjp)
scursed = sobj->cursed, scursed = sobj->cursed,
confused = (Confusion != 0), confused = (Confusion != 0),
altfeedback = (Blind || Invisible); altfeedback = (Blind || Invisible);
const char *const hands = makeplural(body_part(HAND));
if (gy.youmonst.data->mlet != S_HUMAN || scursed) { if (gy.youmonst.data->mlet != S_HUMAN || scursed) {
if (!HConfusion) if (!HConfusion)
@@ -1299,7 +1300,7 @@ seffect_confuse_monster(struct obj **sobjp)
make_confused(HConfusion + rnd(100), FALSE); make_confused(HConfusion + rnd(100), FALSE);
} else if (confused) { } else if (confused) {
if (!sblessed) { if (!sblessed) {
Your("%s begin to %s%s.", makeplural(body_part(HAND)), Your("%s begin to %s%s.", hands,
altfeedback ? "tingle" : "glow ", altfeedback ? "tingle" : "glow ",
altfeedback ? "" : hcolor(NH_PURPLE)); altfeedback ? "" : hcolor(NH_PURPLE));
make_confused(HConfusion + rnd(100), FALSE); make_confused(HConfusion + rnd(100), FALSE);
@@ -1314,18 +1315,20 @@ seffect_confuse_monster(struct obj **sobjp)
int incr = (sobj->oclass == SCROLL_CLASS) ? 3 : 0; int incr = (sobj->oclass == SCROLL_CLASS) ? 3 : 0;
if (!sblessed) { if (!sblessed) {
Your("%s%s %s%s.", makeplural(body_part(HAND)), if (altfeedback)
altfeedback ? "" : " begin to glow", Your("%s tingle%s.", hands, u.umconf ? " even more" : "");
altfeedback ? (const char *) "tingle" : hcolor(NH_RED), else if (!u.umconf)
u.umconf ? " even more" : ""); Your("%s begin to glow %s.", hands, hcolor(NH_RED));
else
pline_The("%s glow of your %s intensifies.", hcolor(NH_RED),
hands);
incr += rnd(2); incr += rnd(2);
} else { } else {
if (altfeedback) if (altfeedback)
Your("%s tingle %s sharply.", makeplural(body_part(HAND)), Your("%s tingle %s sharply.", hands,
u.umconf ? "even more" : "very"); u.umconf ? "even more" : "very");
else else
Your("%s glow %s brilliant %s.", Your("%s glow %s brilliant %s.", hands,
makeplural(body_part(HAND)),
u.umconf ? "an even more" : "a", hcolor(NH_RED)); u.umconf ? "an even more" : "a", hcolor(NH_RED));
incr += rn1(8, 2); incr += rn1(8, 2);
} }