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

covetous mons vs temple priests (trunk only)

Browse Source 
Prevent monsters who kill other monsters to obtain the Amulet from
targetting a priest inside his temple.  Blocks players from just staying
on the Sanctum stairs while a teleporting arch-lich or Asmodeus fetchs the
Amulet from Moloch's high priest for them.  A previous post-3.4.3 change
prevented monsters from targetting the Wizard; this extends that (and
assumes that we can ignore the possibility of other temple priests ever
handling the Amulet).  The earlier patch went into the branch code, but
inhistemple() isn't available there so this one is trunk only.
This commit is contained in:
nethack.rankin
2007-09-13 01:00:05 +00:00
parent 01f954a855
commit 9df113a973
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wizard.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)wizard.c 3.5 2007/04/15 */
/* SCCS Id: @(#)wizard.c 3.5 2007/08/26 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -226,8 +226,10 @@ target_on(mask, mtmp)
else if((otmp = on_ground(otyp)))
return(STRAT(STRAT_GROUND, otmp->ox, otmp->oy, mask));
else if ((mtmp2 = other_mon_has_arti(mtmp, otyp)) != 0 &&
/* avoid targetting the Wizard for the Amulet */
(!mtmp2->iswiz || otyp != AMULET_OF_YENDOR))
/* when seeking the Amulet, avoid targetting the Wizard
or temple priests (to protect Moloch's high priest) */
(otyp != AMULET_OF_YENDOR ||
(!mtmp2->iswiz && !inhistemple(mtmp2))))
return(STRAT(STRAT_MONSTR, mtmp2->mx, mtmp2->my, mask));
}
return (unsigned long)STRAT_NONE;