pull request #1138 - hands glowing red
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:
19
src/read.c
19
src/read.c
@@ -1292,6 +1292,7 @@ seffect_confuse_monster(struct obj **sobjp)
|
||||
scursed = sobj->cursed,
|
||||
confused = (Confusion != 0),
|
||||
altfeedback = (Blind || Invisible);
|
||||
const char *const hands = makeplural(body_part(HAND));
|
||||
|
||||
if (gy.youmonst.data->mlet != S_HUMAN || scursed) {
|
||||
if (!HConfusion)
|
||||
@@ -1299,7 +1300,7 @@ seffect_confuse_monster(struct obj **sobjp)
|
||||
make_confused(HConfusion + rnd(100), FALSE);
|
||||
} else if (confused) {
|
||||
if (!sblessed) {
|
||||
Your("%s begin to %s%s.", makeplural(body_part(HAND)),
|
||||
Your("%s begin to %s%s.", hands,
|
||||
altfeedback ? "tingle" : "glow ",
|
||||
altfeedback ? "" : hcolor(NH_PURPLE));
|
||||
make_confused(HConfusion + rnd(100), FALSE);
|
||||
@@ -1314,18 +1315,20 @@ seffect_confuse_monster(struct obj **sobjp)
|
||||
int incr = (sobj->oclass == SCROLL_CLASS) ? 3 : 0;
|
||||
|
||||
if (!sblessed) {
|
||||
Your("%s%s %s%s.", makeplural(body_part(HAND)),
|
||||
altfeedback ? "" : " begin to glow",
|
||||
altfeedback ? (const char *) "tingle" : hcolor(NH_RED),
|
||||
u.umconf ? " even more" : "");
|
||||
if (altfeedback)
|
||||
Your("%s tingle%s.", hands, u.umconf ? " even more" : "");
|
||||
else if (!u.umconf)
|
||||
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);
|
||||
} else {
|
||||
if (altfeedback)
|
||||
Your("%s tingle %s sharply.", makeplural(body_part(HAND)),
|
||||
Your("%s tingle %s sharply.", hands,
|
||||
u.umconf ? "even more" : "very");
|
||||
else
|
||||
Your("%s glow %s brilliant %s.",
|
||||
makeplural(body_part(HAND)),
|
||||
Your("%s glow %s brilliant %s.", hands,
|
||||
u.umconf ? "an even more" : "a", hcolor(NH_RED));
|
||||
incr += rn1(8, 2);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user