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

Fix: name confusion after MB cancels shapeshifter

Browse Source 
The cancellation effect of Magicbane can cause shapeshifters to change
to their base forms.  Since the name of the monster being attacked is
cached earlier, the name used for subsequent messages from Mb_hit would
be outdated after this happened.  For example, as encountered in a
recent game: "The magic-absorbing blade cancels the vampire bat! The
vampire bat turns into a vampire lord! The vampire bat is confused."
Insert the new name into hittee[] if cancellation caused the targeted
monster to change form.
This commit is contained in:
Michael Meyer
2023-08-23 15:22:39 -04:00
committed by PatR
parent 6ad9eef25d
commit 9a5b6e8e77
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/artifact.c
View File

@@ -1145,7 +1145,7 @@ Mb_hit(struct monst *magr, /* attacker */
boolean vis, /* whether the action can be seen */
char *hittee) /* target's name: "you" or mon_nam(mdef) */
{
struct permonst *old_uasmon;
struct permonst *old_mdat;
const char *verb;
boolean youattack = (magr == &gy.youmonst),
youdefend = (mdef == &gy.youmonst),
@@ -1204,7 +1204,7 @@ Mb_hit(struct monst *magr, /* attacker */
/* now perform special effects */
switch (attack_indx) {
case MB_INDEX_CANCEL:
old_uasmon = gy.youmonst.data;
old_mdat = youdefend ? gy.youmonst.data : mdef->data;
/* No mdef->mcan check: even a cancelled monster can be polymorphed
* into a golem, and the "cancel" effect acts as if some magical
* energy remains in spellcasting defenders to be absorbed later.
@@ -1214,7 +1214,7 @@ Mb_hit(struct monst *magr, /* attacker */
} else {
do_stun = FALSE;
if (youdefend) {
if (gy.youmonst.data != old_uasmon)
if (gy.youmonst.data != old_mdat)
*dmgptr = 0; /* rehumanized, so no more damage */
if (u.uenmax > 0) {
u.uenmax--;
@@ -1224,6 +1224,10 @@ Mb_hit(struct monst *magr, /* attacker */
You("lose magical energy!");
}
} else {
/* canceled shapeshifter/vamp may have changed forms, so
update its name if necessary */
if (mdef->data != old_mdat)
Strcpy(hittee, mon_nam(mdef));
if (mdef->data == &mons[PM_CLAY_GOLEM])
mdef->mhp = 1; /* cancelled clay golems will die */
if (youattack && attacktype(mdef->data, AT_MAGC)) {