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

Add magic traps to the list of traps marked with victims early

Browse Source 
These can generate on dlvl1 and be immediately fatal, so should be
marked to prevent near-unavoidable early game instadeaths.
This commit is contained in:
Alex Smith
2023-11-23 16:34:47 +00:00
parent 300d936fb0
commit 99141b3242
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mklev.c
+6 -4
View File
@@ -1724,9 +1724,11 @@ mktrap(
nonlethal, even indirectly. We also exclude all of the nonlethal, even indirectly. We also exclude all of the
later/fancier traps because they tend to have special later/fancier traps because they tend to have special
considerations (e.g. webs, portals), often are indirectly considerations (e.g. webs, portals), often are indirectly
lethal, and tend not to generate on shallower levels anyway. lethal, and tend not to generate on shallower levels anyway
Finally, pits are excluded because it's weird to see an item (exception: magic traps can generate on dlvl 1 and be
in a pit and yet not be able to identify that the pit is there. */ immediately lethal). Finally, pits are excluded because it's
weird to see an item in a pit and yet not be able to identify
that the pit is there. */
if (kind != NO_TRAP && !(mktrapflags & MKTRAP_NOVICTIM) if (kind != NO_TRAP && !(mktrapflags & MKTRAP_NOVICTIM)
&& lvl <= (unsigned) rnd(4) && lvl <= (unsigned) rnd(4)
&& kind != SQKY_BOARD && kind != RUST_TRAP && kind != SQKY_BOARD && kind != RUST_TRAP
@@ -1735,7 +1737,7 @@ mktrap(
which case tx,ty==launch.x,y; no boulder => no dead predecessor */ which case tx,ty==launch.x,y; no boulder => no dead predecessor */
&& !(kind == ROLLING_BOULDER_TRAP && !(kind == ROLLING_BOULDER_TRAP
&& t->launch.x == t->tx && t->launch.y == t->ty) && t->launch.x == t->tx && t->launch.y == t->ty)
&& !is_pit(kind) && kind < HOLE) { && !is_pit(kind) && (kind < HOLE || kind == MAGIC_TRAP)) {
mktrap_victim(t); mktrap_victim(t);
} }
} }