Teleport traps don't teleport you on no-teleport levels
In previous versions of NetHack, this wasn't a problem because teleport traps didn't *generate* on such levels, but more recent changes have made this situation possible (e.g. a demon lord migrates to a Gehennom filler level that already had a teleport trap on it). This change causes a "wrenching sensation", like stepping onto a teleport trap with magic resistance does.
This commit is contained in:
@@ -2210,6 +2210,8 @@ when reading an engraving, suppress the addition of a trailing period if the
|
|||||||
text already has one
|
text already has one
|
||||||
cursed magic whistle could teleport hero on no-teleport levels
|
cursed magic whistle could teleport hero on no-teleport levels
|
||||||
give a brief explanation when receiving a wish for acquiring the Amulet
|
give a brief explanation when receiving a wish for acquiring the Amulet
|
||||||
|
teleportation traps no longer teleport you on levels made temporarily
|
||||||
|
no-teleport by the presence of a monster
|
||||||
|
|
||||||
|
|
||||||
Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository
|
Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository
|
||||||
|
|||||||
+1
-1
@@ -1494,7 +1494,7 @@ tele_trap(struct trap *trap)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
in_tele_trap = TRUE;
|
in_tele_trap = TRUE;
|
||||||
if (In_endgame(&u.uz) || Antimagic) {
|
if (In_endgame(&u.uz) || Antimagic || noteleport_level(&gy.youmonst)) {
|
||||||
if (Antimagic)
|
if (Antimagic)
|
||||||
shieldeff(u.ux, u.uy);
|
shieldeff(u.ux, u.uy);
|
||||||
You_feel("a wrenching sensation.");
|
You_feel("a wrenching sensation.");
|
||||||
|
|||||||
Reference in New Issue
Block a user