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

Sparkle shield effect and accessibility

Browse Source 
When sparkle is turned off, there are some places where
a monster resisting the effect did not give any message.

This fixes some of those.
This commit is contained in:
Pasi Kallinen
2024-12-14 14:34:19 +02:00
parent b2b9b685c5
commit fd23463941
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/zap.c
View File

@@ -265,7 +265,7 @@ bhitm(struct monst *mtmp, struct obj *otmp)
} else if (resists_magm(mtmp)) {
/* magic resistance protects from polymorph traps, so make
it guard against involuntary polymorph attacks too... */
shieldeff(mtmp->mx, mtmp->my);
shieldeff_mon(mtmp);
} else if (!resist(mtmp, otmp->oclass, 0, NOTELL)) {
boolean polyspot = (otyp != POT_POLYMORPH),
give_msg = (!Hallucination
@@ -510,7 +510,7 @@ bhitm(struct monst *mtmp, struct obj *otmp)
if (otyp == SPE_DRAIN_LIFE)
dmg = spell_damage_bonus(dmg);
if (resists_drli(mtmp)) {
shieldeff(mtmp->mx, mtmp->my);
shieldeff_mon(mtmp);
} else if (!resist(mtmp, otmp->oclass, dmg, NOTELL)
&& !DEADMONSTER(mtmp)) {
mtmp->mhp -= dmg;
@@ -6068,10 +6068,8 @@ resist(struct monst *mtmp, char oclass, int damage, int tell)
resisted = rn2(100 + alev - dlev) < mtmp->data->mr;
if (resisted) {
if (tell) {
shieldeff(mtmp->mx, mtmp->my);
pline("%s resists!", Monnam(mtmp));
}
if (tell)
shieldeff_mon(mtmp);
damage = (damage + 1) / 2;
}