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

Unify ad_acid

Browse Source
This commit is contained in:
Pasi Kallinen
2020-11-30 20:19:49 +02:00
parent 8a78c49fea
commit b7899ee014
4 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mhitm.c
View File

@@ -1031,23 +1031,9 @@ int dieroll;
return mhm.hitflags;
break;
case AD_ACID:
if (magr->mcan) {
mhm.damage = 0;
break;
}
if (resists_acid(mdef)) {
if (g.vis && canseemon(mdef))
pline("%s is covered in %s, but it seems harmless.",
Monnam(mdef), hliquid("acid"));
mhm.damage = 0;
} else if (g.vis && canseemon(mdef)) {
pline("%s is covered in %s!", Monnam(mdef), hliquid("acid"));
pline("It burns %s!", mon_nam(mdef));
}
if (!rn2(30))
erode_armor(mdef, ERODE_CORRODE);
if (!rn2(6))
acid_damage(MON_WEP(mdef));
mhitm_ad_acid(magr, mattk, mdef, &mhm);
if (mhm.done)
return mhm.hitflags;
break;
case AD_RUST:
mhitm_ad_rust(magr, mattk, mdef, &mhm);