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

Unify ad_elec

Browse Source
This commit is contained in:
Pasi Kallinen
2020-11-30 20:15:13 +02:00
parent 6abfe7e548
commit 8a78c49fea
4 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mhitm.c
View File

@@ -1026,22 +1026,9 @@ int dieroll;
return mhm.hitflags;
break;
case AD_ELEC:
if (cancelled) {
mhm.damage = 0;
break;
}
if (g.vis && canseemon(mdef))
pline("%s gets zapped!", Monnam(mdef));
mhm.damage += destroy_mitem(mdef, WAND_CLASS, AD_ELEC);
if (resists_elec(mdef)) {
if (g.vis && canseemon(mdef))
pline_The("zap doesn't shock %s!", mon_nam(mdef));
shieldeff(mdef->mx, mdef->my);
golemeffects(mdef, AD_ELEC, mhm.damage);
mhm.damage = 0;
}
/* only rings damage resistant players in destroy_item */
mhm.damage += destroy_mitem(mdef, RING_CLASS, AD_ELEC);
mhitm_ad_elec(magr, mattk, mdef, &mhm);
if (mhm.done)
return mhm.hitflags;
break;
case AD_ACID:
if (magr->mcan) {