1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-31 09:52:25 +01:00

Fix unintentional addition of +basedmg to PotV and Magicbane-like weapons

AKA, a pre-quest no-spirits Pen of the Void was acting as a 2x damage artifact like Grayswandir. Oops!
This commit is contained in:
NeroOneTrueKing 2020-12-23 23:06:07 -06:00
parent a063b52592
commit 420331c6fc

View file

@ -3707,12 +3707,14 @@ boolean * messaged;
/* Magicbane's special attacks (possibly modifies hittee[]) */
*messaged = Mb_hit(magr, mdef, otmp, &dmg, dieroll, vis, hittee,
oartifact == ART_STAFF_OF_WILD_MAGIC ? "staff" : "blade");
dmg -= min(dmg, basedmg); /* take back the basedmg that was passed to Mb_hit() */
/* assumes all bonus damage from Mb_hit should ignore resistances */
*truedmgptr += dmg;
}
if(oartifact == ART_PEN_OF_THE_VOID){
int dmg = basedmg;
*messaged = voidPen_hit(magr, mdef, otmp, &dmg, dieroll, vis, hittee);
dmg -= min(dmg, basedmg); /* take back the basedmg that was passed to voidPen_hit() */
/* assumes all bonus damage from voidPen_hit should ignore resistances */
*truedmgptr += dmg;
}