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

Allow monsters to zap wands of teleportation at the player.

Browse Source 
According to comments in the code, this feature was disabled
because it never triggered, making it useless. I enabled the code
again, and monsters demonstrated a willingness to zap the player
with wands of teleportation. I am not sure of what exactly changed,
but I think this feature could trigger some interesting situations,
and absolutely deserves to make a comeback.
This commit is contained in:
Kestrel Gregorich-Trevor
2022-01-20 11:05:35 -06:00
committed by Pasi Kallinen
parent 3dac38eb0f
commit f83eaade32
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/muse.c
View File

@@ -1136,7 +1136,7 @@ rnd_defensive_item(struct monst* mtmp)
#define MUSE_FROST_HORN 12
#define MUSE_FIRE_HORN 13
#define MUSE_POT_ACID 14
/*#define MUSE_WAN_TELEPORTATION 15*/
#define MUSE_WAN_TELEPORTATION 15
#define MUSE_POT_SLEEPING 16
#define MUSE_SCR_EARTH 17
/*#define MUSE_WAN_UNDEAD_TURNING 20*/ /* also a defensive item so don't
@@ -1282,7 +1282,7 @@ find_offensive(struct monst* mtmp)
g.m.offensive = obj;
g.m.has_offense = MUSE_WAN_STRIKING;
}
#if 0 /* use_offensive() has had some code to support wand of teleportation
/* use_offensive() has had some code to support wand of teleportation
* for a long time, but find_offensive() never selected one;
* so for the time being, this is still disabled */
nomore(MUSE_WAN_TELEPORTATION);
@@ -1291,11 +1291,10 @@ find_offensive(struct monst* mtmp)
&& !Teleport_control
/* do try to move hero to a more vulnerable spot */
&& (onscary(u.ux, u.uy, mtmp)
|| (stairway_at(u.ux, u.uy))) {
|| (stairway_at(u.ux, u.uy)))) {
g.m.offensive = obj;
g.m.has_offense = MUSE_WAN_TELEPORTATION;
}
#endif
nomore(MUSE_POT_PARALYSIS);
if (obj->otyp == POT_PARALYSIS && g.multi >= 0) {
g.m.offensive = obj;
@@ -1399,7 +1398,6 @@ mbhitm(register struct monst* mtmp, register struct obj* otmp)
makeknown(WAN_STRIKING);
}
break;
#if 0 /* disabled because find_offensive() never picks WAN_TELEPORTATION */
case WAN_TELEPORTATION:
if (hits_you) {
tele();
@@ -1414,7 +1412,6 @@ mbhitm(register struct monst* mtmp, register struct obj* otmp)
(void) rloc(mtmp, RLOC_MSG);
}
break;
#endif
case WAN_CANCELLATION:
case SPE_CANCELLATION:
(void) cancel_monst(mtmp, otmp, FALSE, TRUE, FALSE);