updates to hallucinatory trap names and fixes37.0 entry
This commit is contained in:
@@ -32,6 +32,7 @@ Platform- and/or Interface-Specific New Features
|
||||
|
||||
NetHack Community Patches (or Variation) Included
|
||||
-------------------------------------------------
|
||||
hallucinatory trap names from github pull request #174
|
||||
|
||||
|
||||
Code Cleanup and Reorganization
|
||||
|
||||
@@ -2513,7 +2513,6 @@ struct obj *otmp;
|
||||
You("aren't very skilled at reaching from %s.", mon_nam(u.usteed));
|
||||
Sprintf(buf, "Continue your attempt to set %s?",
|
||||
the(trapname(ttyp, FALSE)));
|
||||
.explanation));
|
||||
if (yn(buf) == 'y') {
|
||||
if (chance) {
|
||||
switch (ttyp) {
|
||||
|
||||
@@ -1616,8 +1616,7 @@ struct trap *trap;
|
||||
behaviour might need a rework in the hallucination case
|
||||
(e.g. to not prompt if any trap glyph appears on the square). */
|
||||
if (Hallucination ||
|
||||
levl[trap->tx][trap->ty].glyph !=
|
||||
trap_to_glyph(trap, rn2_on_display_rng)) {
|
||||
levl[trap->tx][trap->ty].glyph != trap_to_glyph(trap)) {
|
||||
/* There's too much clutter to see your find otherwise */
|
||||
cls();
|
||||
map_trap(trap, 1);
|
||||
@@ -1864,7 +1863,7 @@ int default_glyph, which_subset;
|
||||
|| glyph_is_invisible(glyph))
|
||||
&& keep_traps && !covers_traps(x, y)) {
|
||||
if ((t = t_at(x, y)) != 0 && t->tseen)
|
||||
glyph = trap_to_glyph(t, rn2_on_display_rng);
|
||||
glyph = trap_to_glyph(t);
|
||||
}
|
||||
if ((glyph_is_object(glyph) && !keep_objs)
|
||||
|| (glyph_is_trap(glyph) && !keep_traps)
|
||||
|
||||
@@ -228,7 +228,7 @@ register struct trap *trap;
|
||||
register int show;
|
||||
{
|
||||
register int x = trap->tx, y = trap->ty;
|
||||
register int glyph = trap_to_glyph(trap, newsym_rn2);
|
||||
register int glyph = trap_to_glyph(trap);
|
||||
|
||||
if (g.level.flags.hero_memory)
|
||||
levl[x][y].glyph = glyph;
|
||||
|
||||
Reference in New Issue
Block a user