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

Amulet-covetting monsters attack Wizard

Browse Source 
Another entry in $cvsroot/shared/bugs/buglist, this one reported by
<email deleted>:  if the Wizard had the Amulet and used
his "double trouble" spell, his clone would attack him in order to try to
get the Amulet.  This prevents any monster who's after the Amulet from
attacking the Wizard to get it.
This commit is contained in:
nethack.rankin
2007-06-21 02:35:30 +00:00
parent d34e557df5
commit a7e312aedc
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.4
View File

@@ -357,6 +357,7 @@ using weapon to kill tame engulfer from inside triggered "placing defunct
nymphs could steal carried boulders
amnesia of object discoveries would never forget the very last one
code controlling item drops by small monsters still used pre-3.1.0 weight
monsters who want the Amulet won't attack the Wizard to try to get it
Platform- and/or Interface-Specific Fixes

4
src/wizard.c
View File

@@ -225,7 +225,9 @@ target_on(mask, mtmp)
return(STRAT(STRAT_PLAYER, u.ux, u.uy, mask));
else if((otmp = on_ground(otyp)))
return(STRAT(STRAT_GROUND, otmp->ox, otmp->oy, mask));
else if((mtmp2 = other_mon_has_arti(mtmp, otyp)))
else if ((mtmp2 = other_mon_has_arti(mtmp, otyp)) != 0 &&
/* avoid targetting the Wizard for the Amulet */
(!mtmp2->iswiz || otyp != AMULET_OF_YENDOR))
return(STRAT(STRAT_MONSTR, mtmp2->mx, mtmp2->my, mask));
}
return (unsigned long)STRAT_NONE;