From: nethack.rankin <nethack.rankin>
Date: Wed, 2 Nov 2005 02:35:31 +0000 (+0000)
Subject: chest trap bit
X-Git-Tag: MOVE2GIT~1217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa708fe73b8004330b03812163b40840e6f83c5b;p=nethack

chest trap bit

     From a bug report, the "you stagger"
message when a trapped chest releases a cloud of gas shouldn't include the
inaccurate phrase "and your vision blurs" if hallucination is blocked by
Grayswandir.  Suppress it in that case.
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index f988bdaa8..681a7637f 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -152,6 +152,7 @@ incubi react to mirrors
 alignment of Angels was handled inconsistently
 pets capable of digging could pass through walls and stone on the Rogue level
 avoid inappropriate "the corridor disappears" when vault guard gets killed
+adjust message for gas effect from chest trap if hero resists hallucination
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/trap.c b/src/trap.c
index 7026bde5d..213e39146 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)trap.c	3.5	2005/06/22	*/
+/*	SCCS Id: @(#)trap.c	3.5	2005/11/01	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -3919,12 +3919,12 @@ boolean disarm;
 			if(!Stunned) {
 			    if (Hallucination)
 				pline("What a groovy feeling!");
-			    else if (Blind)
-				You("%s and get dizzy...",
-				    stagger(youmonst.data, "stagger"));
 			    else
-				You("%s and your vision blurs...",
-				    stagger(youmonst.data, "stagger"));
+				You("%s%s...",
+				    stagger(youmonst.data, "stagger"),
+				    Halluc_resistance ? "" :
+					Blind ? " and get dizzy" :
+					    " and your vision blurs");
 			}
 			make_stunned(HStun + rn1(7, 16),FALSE);
 			(void) make_hallucinated(HHallucination + rn1(5, 16),FALSE,0L);