From b0872d064fc570716840203012edb9a6b012bc5b Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Wed, 15 May 2002 06:48:46 +0000 Subject: [PATCH] twoweapon feedback When #twoweapon fails, the message referring to "your current form" sounds pretty odd when you're not polymorphed. --- doc/fixes34.1 | 1 + src/wield.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index fe8477c81..ebf4b1a58 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -103,6 +103,7 @@ disallow mounting a trapped steed to avoid inappropriate trap effects suppress redundant message when stoning effect transforms a golem clear worn bits of any object grabbed by shopkeeper to avoid extract_nobj panic looting any container on a location should suppress looting nearby monsters +give more specific message when forbidden role attempts to use twoweapon mode Platform- and/or Interface-Specific Fixes diff --git a/src/wield.c b/src/wield.c index f4774d438..2b8c975f9 100644 --- a/src/wield.c +++ b/src/wield.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)wield.c 3.4 2002/04/16 */ +/* SCCS Id: @(#)wield.c 3.4 2002/05/13 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -407,9 +407,14 @@ can_twoweapon() struct obj *otmp; #define NOT_WEAPON(obj) (!is_weptool(obj) && obj->oclass != WEAPON_CLASS) - if (!could_twoweap(youmonst.data)) - You_cant("use two weapons in your current form."); - else if (!uwep || !uswapwep) + if (!could_twoweap(youmonst.data)) { + if (Upolyd) + You_cant("use two weapons in your current form."); + else + pline("%s aren't able to use two weapons at once.", + makeplural((flags.female && urole.name.f) ? + urole.name.f : urole.name.m)); + } else if (!uwep || !uswapwep) Your("%s%s%s empty.", uwep ? "left " : uswapwep ? "right " : "", body_part(HAND), (!uwep && !uswapwep) ? "s are" : " is"); else if (NOT_WEAPON(uwep) || NOT_WEAPON(uswapwep)) { -- 2.40.0