From 77aa61a59bb2a1180767412a82a6c1399df7fe8d Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 8 Jul 2019 17:38:00 -0700 Subject: [PATCH] looking at a trapped monster would describe it as trapped if you could see its location, but if the trap was unseen that trap would remain unseen, at least in some circumstances. Mark the trap as seen. --- doc/fixes36.3 | 3 ++- src/pager.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/fixes36.3 b/doc/fixes36.3 index c40383917..b7f2c43bb 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.88 $ $NHDT-Date: 1562630265 2019/07/08 23:57:45 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.89 $ $NHDT-Date: 1562632673 2019/07/09 00:37:53 $ This fixes36.3 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.2 in May 2019. Please note, however, @@ -101,6 +101,7 @@ if an engulfer has any worn items, hero could pick them up from inside and kicking an altar ignored god's wrath if hero injured himself during the kick detect unseen/secret door detection/^E failed to find monsters hiding under objects and failed to find monsters hiding at trap locations +when farlook describes a monster at a visible spot as trapped, reveal the trap Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository diff --git a/src/pager.c b/src/pager.c index ce1aae41b..02c61f966 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 pager.c $NHDT-Date: 1558045586 2019/05/16 22:26:26 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.153 $ */ +/* NetHack 3.6 pager.c $NHDT-Date: 1562632673 2019/07/09 00:37:53 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.154 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */ /* NetHack may be freely redistributed. See license for details. */ @@ -297,9 +297,11 @@ int x, y; int tt = t ? t->ttyp : NO_TRAP; /* newsym lets you know of the trap, so mention it here */ - if (tt == BEAR_TRAP || is_pit(tt) || tt == WEB) + if (tt == BEAR_TRAP || is_pit(tt) || tt == WEB) { Sprintf(eos(buf), ", trapped in %s", an(defsyms[trap_to_defsym(tt)].explanation)); + t->tseen = 1; + } } /* we know the hero sees a monster at this location, but if it's shown