From 4f541fe21670648b72abfc60e33c7b2418ace4df Mon Sep 17 00:00:00 2001 From: PatR Date: Wed, 7 Nov 2018 14:50:44 -0800 Subject: [PATCH] ^X about armor Enlightenment feedback for "nudist" was added 3.5 years ago. Ever since, ^X has been reporting "you are not wearing any armor" when wearing a shield without any other armor. Since Valkyrie starts in that situation, it's very surprising that no one ever noticed 'til now (or did notice and didn't bother to report). --- doc/fixes36.2 | 1 + src/cmd.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/fixes36.2 b/doc/fixes36.2 index d12493d22..fe1b5736f 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -186,6 +186,7 @@ with menustyle:Full, picking 'A - autoselect all' when putting items into a add missing 'A - autoselect all' choice for menustyle:Full when taking items out while looting a container fix odd wording "The boulder triggers and fills a pit" +^X status feedback: don't report "not wearing any armor" when wearing a shield Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository diff --git a/src/cmd.c b/src/cmd.c index 9b4579857..52766a773 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 cmd.c $NHDT-Date: 1541235664 2018/11/03 09:01:04 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.298 $ */ +/* NetHack 3.6 cmd.c $NHDT-Date: 1541631031 2018/11/07 22:50:31 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.299 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2426,7 +2426,7 @@ int final; you_are(buf, ""); } /* report 'nudity' */ - if (!uarm && !uarmu && !uarmc && !uarmg && !uarmf && !uarmh) { + if (!uarm && !uarmu && !uarmc && !uarms && !uarmg && !uarmf && !uarmh) { if (u.uroleplay.nudist) enl_msg(You_, "do", "did", " not wear any armor", ""); else