nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

wear/remove commands, P & R vs W & T

Browse Source 
Allow 'P' and 'R' commands to accept armor and wear/take-off the chosen
item, and 'W' and 'T' commands to accept accessories and put-on/remove
the item.  The which-object prompt only lists the type(s) of items that
traditionally go with each command, as does an inventory menu if the
user picks '?', but items of the alternate type(s) can be chosen, by
unshown letter or by the inventory menu given for '*'.

There shouldn't be much difference if you continue picking items that
go with the original commands, although you will somestimes get
"which object? [*]" when the only choices are for alternate command.
And you won't see the all-four-accessories-are-already-worn message
for 'P' unless you also have something worn in all seven armor slots.

The Guidebook.mn changes have been tested (that's how/why I noticed
the preface glitch) but the corresponding Guidebook.tex ones haven't.
This commit is contained in:
PatR
2015-08-03 18:38:38 -07:00
parent ff823095ee
commit 35cabe53bf
4 changed files with 436 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
doc/Guidebook.mn
View File

@@ -1,4 +1,4 @@
.\" $NHDT-Branch: master $:$NHDT-Revision: 1.179 $ $NHDT-Date: 1435003374 2015/06/22 20:02:54 $ .\" $NHDT-Branch: master $:$NHDT-Revision: 1.180 $ $NHDT-Date: 1438652308 2015/08/04 01:38:28 $
.ds h0 "NetHack Guidebook .ds h0 "NetHack Guidebook
.ds h1 .ds h1
.ds h2 % .ds h2 %
@@ -643,9 +643,13 @@ game rather than with the `O' command; see the section on options below.
.lp p .lp p
Pay your shopping bill. Pay your shopping bill.
.lp P .lp P
Put on a ring or other accessory (amulet, blindfold). Put on an accessory (ring, amulet, or blindfold).
.lp "" .lp ""
Use the 'W' command to wear armor. This command may also be used to wear armor. The prompt for
which inventory item to use will only list accessories, but choosing
an unlisted item of armor will attempt to wear it.
(See the `W' command below. It lists armor as the inventory
choices but will accept an accessory and attempt to put that on.)
.lp ^P .lp ^P
Repeat previous message. Repeat previous message.
.lp "" .lp ""
@@ -659,20 +663,26 @@ Quaff (drink) something (potion, water, etc).
Select an object for your quiver, quiver sack, or just generally at Select an object for your quiver, quiver sack, or just generally at
the ready (only one of these is available at a time). You can then throw the ready (only one of these is available at a time). You can then throw
this (or one of these) using this (or one of these) using
the `f' command. (In versions prior to 3.3 this was the command to quit the `f' command.
the game, which has now been moved to `#quit'.) .lp ""
(In versions prior to 3.3 this was the command to quit
the game, which has been moved to ``#quit''.)
.lp r .lp r
Read a scroll or spellbook. Read a scroll or spellbook.
.lp R .lp R
Remove an accessory (ring, amulet, etc). Remove a worn accessory (ring, amulet, or blindfold).
.lp "" .lp ""
If you're wearing more than one, you'll be prompted for which one to If you're wearing more than one, you'll be prompted for which one to
remove. If you're only wearing one, then by default it will be removed remove. When you're only wearing one, then by default it will be removed
without asking, but you can set the without asking, but you can set the
.op paranoid_confirmation .op paranoid_confirmation
option to require a prompt. option to require a prompt.
.lp "" .lp ""
Use the 'T' command to take off armor. This command may also be used to take off armor. The prompt for which
inventory item to remove only lists worn accessories, but an item of
worn armor can be chosen.
(See the `T' command below. It lists armor as the inventory
choices but will accept an accessory and attempt to remove it.)
.lp ^R .lp ^R
Redraw the screen. Redraw the screen.
.lp s .lp s
@@ -687,12 +697,19 @@ Throw an object or shoot a projectile.
Take off armor. Take off armor.
.lp "" .lp ""
If you're wearing more than one piece, you'll be prompted for which If you're wearing more than one piece, you'll be prompted for which
one to take off. If you're only wearing one, then by default it will one to take off. (Note that this treats a cloak covering a suit
and/or a shirt, or a suit covering a shirt, as if the underlying items
weren't there.)
When you're only wearing one, then by default it will
be taken off without asking, but you can set the be taken off without asking, but you can set the
.op paranoid_confirmation .op paranoid_confirmation
option to require a prompt. option to require a prompt.
.lp "" .lp ""
Use the 'R' command to remove accessories. This command may also be used to remove accessories. The prompt
for which inventory item to take off only lists worn armor, but a worn
accessory can be chosen.
(See the `R' command above. It lists accessories as the inventory
choices but will accept an item of armor and attempt to take it off.)
.lp ^T .lp ^T
Teleport, if you have the ability. Teleport, if you have the ability.
.lp v .lp v
@@ -706,12 +723,16 @@ Wield weapon.
w- - wield nothing, use your bare hands. w- - wield nothing, use your bare hands.
.ei .ei
.ed .ed
Some characters can wield two weapons and once; use the ``#twoweapon'' Some characters can wield two weapons at once; use the `X' command
extended command to do so. (or the ``#twoweapon'' extended command) to do so.
.lp W .lp W
Wear armor. Wear armor.
.lp "" .lp ""
Use the 'P' command to put on accessories. This command may also be used to put on an accessory (ring, amulet, or
blindfold). The prompt for which inventory item to use will only list
armor, but choosing an unlisted accessory will attempt to put it on.
(See the `P' command above. It lists accessories as the inventory
choices but will accept an item of armor and attempt to wear it.)
.lp x .lp x
Exchange your wielded weapon with the item in your alternate weapon slot. Exchange your wielded weapon with the item in your alternate weapon slot.
.lp "" .lp ""
@@ -720,7 +741,11 @@ two-weapon combat. Note that if one of these slots is empty,
the exchange still takes place. the exchange still takes place.
.lp X .lp X
Toggle two-weapon combat, if your character can do it. Also available Toggle two-weapon combat, if your character can do it. Also available
via the ``#twoweapon'' extended command via the ``#twoweapon'' extended command.
.lp ""
(In versions prior to 3.6 this was the command to switch from normal
play to "explore mode", also known as "discovery mode", which has now
been moved to ``#explore''.)
.lp ^X .lp ^X
Display basic information about your character. Display basic information about your character.
.lp "" .lp ""

51
doc/Guidebook.tex
View File

@@ -785,9 +785,13 @@ game rather than with the `{\tt O}' command; see the section on options below.
Pay your shopping bill. Pay your shopping bill.
%.lp %.lp
\item[\tb{P}] \item[\tb{P}]
Put on a ring or other accessory (amulet, blindfold).\\ Put on an accessory (ring, amulet, blindfold).\\
%.lp "" %.lp ""
Use the `{\tt W}' command to wear armor. This command may also be used to wear armor. The prompt for
which inventory item to use will only list accessories, but choosing
an unlisted item of armor will attempt to wear it.
(See the `{\tt W}' command below. It lists armor as the inventory
choices but will accept an accessory and attempt to put that on.)
%.lp %.lp
\item[\tb{\^{}P}] \item[\tb{\^{}P}]
Repeat previous message.\\ Repeat previous message.\\
@@ -802,22 +806,28 @@ Quaff (drink) something (potion, water, etc).
Select an object for your quiver, quiver sack, or just generally at Select an object for your quiver, quiver sack, or just generally at
the ready (only one of these is available at a time). You can then throw the ready (only one of these is available at a time). You can then throw
this (or one of these) using this (or one of these) using
the `f' command. (In versions prior to 3.3 this was the command to quit the `f' command.\\
the game, which has now been moved to `{\tt \#quit}'.) %.lp ""
(In versions prior to 3.3 this was the command to quit
the game, which has been moved to ``{\tt \#quit}''.)
%.lp %.lp
\item[\tb{r}] \item[\tb{r}]
Read a scroll or spellbook. Read a scroll or spellbook.
%.lp %.lp
\item[\tb{R}] \item[\tb{R}]
Remove an accessory (ring, amulet, etc).\\ Remove a worn accessory (ring, amulet, or blindfold).\\
%.lp "" %.lp ""
If you're wearing more than one, you'll be prompted for which one to If you're wearing more than one, you'll be prompted for which one to
remove. If you're only wearing one, then by default it will be removed remove. When you're only wearing one, then by default it will be removed
without asking, but you can set the without asking, but you can set the
{\it paranoid\verb+_+confirmation\/} {\it paranoid\verb+_+confirmation\/}
option to require a prompt.\\ option to require a prompt.\\
%.lp "" %.lp ""
Use the `{\tt T}' command to take off armor. This command may also be used to take off armor. The prompt for which
inventory item to remove only lists worn accessories, but an item of
worn armor can be chosen.
(See the `{\tt T}' command below. It lists armor as the inventory
choices but will accept an accessory and attempt to remove it.)
%.lp %.lp
\item[\tb{\^{}R}] \item[\tb{\^{}R}]
Redraw the screen. Redraw the screen.
@@ -837,12 +847,19 @@ Throw an object or shoot a projectile.
Take off armor.\\ Take off armor.\\
%.lp "" %.lp ""
If you're wearing more than one piece, you'll be prompted for which If you're wearing more than one piece, you'll be prompted for which
one to take off. If you're only wearing one, then by default it will one to take off. (Note that this treats a cloak covering a suit
and/or a shirt, or a suit covering a shirt, as if the underlying items
weren't there.)
When you're only wearing one, then by default it will
be taken off without asking, but you can set the be taken off without asking, but you can set the
{\it paranoid\verb+_+confirmation\/} {\it paranoid\verb+_+confirmation\/}
option to require a prompt.\\ option to require a prompt.\\
%.lp "" %.lp ""
Use the `{\tt R}' command to remove accessories. This command may also be used to remove accessories. The prompt
for which inventory item to take off only lists worn armor, but a worn
accessory can be chosen.
(See the `{\tt R}' command above. It lists accessories as the inventory
choices but will accept an item of armor and attempt to take it off.)
%.lp %.lp
\item[\tb{\^{}T}] \item[\tb{\^{}T}]
Teleport, if you have the ability. Teleport, if you have the ability.
@@ -860,13 +877,17 @@ Wield weapon.\\
{\tt w-} --- wield nothing, use your bare hands.\\ {\tt w-} --- wield nothing, use your bare hands.\\
%.ei %.ei
%.ed %.ed
Some characters can wield two weapons and once; use the ``{\tt \#twoweapon}'' Some characters can wield two weapons at once; use the `{\tt X}' command
extended command to do so. (or the ``{\tt \#twoweapon}'' extended command) to do so.
%.lp %.lp
\item[\tb{W}] \item[\tb{W}]
Wear armor.\\ Wear armor.\\
%.lp "" %.lp ""
Use the `{\tt P}' command to put on accessories. This command may also be used to put on an accessory (ring, amulet, or
blindfold). The prompt for which inventory item to use will only list
armor, but choosing an unlisted accessory will attempt to put it on.
(See the `{\tt P}' command above. It lists accessories as the inventory
choices but will accept an item of armor and attempt to wear it.)
%.lp %.lp
\item[\tb{x}] \item[\tb{x}]
Exchange your wielded weapon with the item in your alternate weapon slot.\\ Exchange your wielded weapon with the item in your alternate weapon slot.\\
@@ -877,7 +898,11 @@ the exchange still takes place.
%.lp %.lp
\item[\tb{X}] \item[\tb{X}]
Toggle two-weapon combat, if your character can do it. Also available Toggle two-weapon combat, if your character can do it. Also available
via the ``{\tt \#twoweapon}'' extended command via the ``{\tt \#twoweapon}'' extended command.\\
+.lp ""
+(In versions prior to 3.6 this was the command to switch from normal
+play to ``explore mode'', also known as ``discovery mode'', which has now
+been moved to ``{\tt \#explore}''.)
%.lp %.lp
\item[\tb{\^{}X}] \item[\tb{\^{}X}]
Display basic information about your character.\\ Display basic information about your character.\\

639
src/do_wear.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 do_wear.c $NHDT-Date: 1437877177 2015/07/26 02:19:37 $ $NHDT-Branch: master $:$NHDT-Revision: 1.83 $ */ /* NetHack 3.6 do_wear.c $NHDT-Date: 1438652304 2015/08/04 01:38:24 $ $NHDT-Branch: master $:$NHDT-Revision: 1.84 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -37,6 +37,9 @@ STATIC_PTR int FDECL(select_off, (struct obj *));
STATIC_DCL struct obj *NDECL(do_takeoff); STATIC_DCL struct obj *NDECL(do_takeoff);
STATIC_PTR int NDECL(take_off); STATIC_PTR int NDECL(take_off);
STATIC_DCL int FDECL(menu_remarm, (int)); STATIC_DCL int FDECL(menu_remarm, (int));
STATIC_DCL void FDECL(count_worn_stuff, (struct obj **, BOOLEAN_P));
STATIC_PTR int FDECL(armor_or_accessory_off, (struct obj *));
STATIC_PTR int FDECL(accessory_or_armor_on, (struct obj *));
STATIC_DCL void FDECL(already_wearing, (const char *)); STATIC_DCL void FDECL(already_wearing, (const char *));
STATIC_DCL void FDECL(already_wearing2, (const char *, const char *)); STATIC_DCL void FDECL(already_wearing2, (const char *, const char *));
@@ -83,9 +86,9 @@ boolean on;
if (on ? initial_don : context.takeoff.cancelled_don) if (on ? initial_don : context.takeoff.cancelled_don)
return; return;
if (!oldprop && /* extrinsic stealth from something else */ if (!oldprop /* extrinsic stealth from something else */
!HStealth && /* intrinsic stealth */ && !HStealth /* intrinsic stealth */
!BStealth) { /* stealth blocked by something */ && !BStealth) { /* stealth blocked by something */
if (obj->otyp == RIN_STEALTH) if (obj->otyp == RIN_STEALTH)
learnring(obj, TRUE); learnring(obj, TRUE);
else else
@@ -117,19 +120,21 @@ boolean on;
if (on ? initial_don : context.takeoff.cancelled_don) if (on ? initial_don : context.takeoff.cancelled_don)
return; return;
if (!oldprop && /* extrinsic displacement from something else */ if (!oldprop /* extrinsic displacement from something else */
!(u.uprops[DISPLACED].intrinsic) && /* (theoretical) */ && !(u.uprops[DISPLACED].intrinsic) /* (theoretical) */
!(u.uprops[DISPLACED].blocked) && /* (also theoretical) */ && !(u.uprops[DISPLACED].blocked) /* (also theoretical) */
/* we don't use canseeself() here because it augments vision /* we don't use canseeself() here because it augments vision
with touch, which isn't appropriate for deciding whether with touch, which isn't appropriate for deciding whether
we'll notice that monsters have trouble spotting the hero */ we'll notice that monsters have trouble spotting the hero */
((!Blind && /* see anything */ && ((!Blind /* see anything */
!u.uswallow && /* see surroundings */ && !u.uswallow /* see surroundings */
!Invisible) || /* see self */ && !Invisible) /* see self */
/* actively sensing nearby monsters via telepathy or extended /* actively sensing nearby monsters via telepathy or extended
monster detection overrides vision considerations because monster detection overrides vision considerations because
hero also senses self in this situation */ hero also senses self in this situation */
(Unblind_telepat || (Blind_telepat && Blind) || Detect_monsters))) { || (Unblind_telepat
|| (Blind_telepat && Blind)
|| Detect_monsters))) {
makeknown(obj->otyp); makeknown(obj->otyp);
You_feel("that monsters%s have difficulty pinpointing your location.", You_feel("that monsters%s have difficulty pinpointing your location.",
@@ -1180,9 +1185,11 @@ struct obj *obj; /* if null, do all worn items; otherwise just obj itself */
initial_don = FALSE; initial_don = FALSE;
} }
/* check whether the target object is currently being put on (or taken off) */ /* check whether the target object is currently being put on (or taken off--
boolean donning(otmp) /* also checks for doffing */ also checks for doffing) */
register struct obj *otmp; boolean
donning(otmp)
struct obj *otmp;
{ {
/* long what = (occupation == take_off) ? context.takeoff.what : 0L; */ /* long what = (occupation == take_off) ? context.takeoff.what : 0L; */
long what = context.takeoff.what; /* if nonzero, occupation is implied */ long what = context.takeoff.what; /* if nonzero, occupation is implied */
@@ -1302,37 +1309,103 @@ struct obj *stolenobj; /* no message if stolenobj is already being doffing */
return result; return result;
} }
static NEARDATA const char clothes[] = { ARMOR_CLASS, 0 }; /* both 'clothes' and 'accessories' now include both armor and accessories;
static NEARDATA const char accessories[] = { RING_CLASS, AMULET_CLASS, TOOL_CLASS is for eyewear, FOOD_CLASS is for MEAT_RING */
TOOL_CLASS, FOOD_CLASS, 0 }; static NEARDATA const char clothes[] = {
ARMOR_CLASS, RING_CLASS, AMULET_CLASS, TOOL_CLASS, FOOD_CLASS, 0
};
static NEARDATA const char accessories[] = {
RING_CLASS, AMULET_CLASS, TOOL_CLASS, FOOD_CLASS, ARMOR_CLASS, 0
};
STATIC_VAR NEARDATA int Narmorpieces, Naccessories;
/* assign values to Narmorpieces and Naccessories */
STATIC_OVL void
count_worn_stuff(which, accessorizing)
struct obj **which; /* caller wants this when count is 1 */
boolean accessorizing;
{
struct obj *otmp;
Narmorpieces = Naccessories = 0;
#define MOREWORN(x,wtyp) do { if (x) { wtyp++; otmp = x; } } while (0)
otmp = 0;
MOREWORN(uarmh, Narmorpieces);
MOREWORN(uarms, Narmorpieces);
MOREWORN(uarmg, Narmorpieces);
MOREWORN(uarmf, Narmorpieces);
/* for cloak/suit/shirt, we only count the outermost item so that it
can be taken off without confirmation if final count ends up as 1 */
if (uarmc)
MOREWORN(uarmc, Narmorpieces);
else if (uarm)
MOREWORN(uarm, Narmorpieces);
else if (uarmu)
MOREWORN(uarmu, Narmorpieces);
if (!accessorizing)
*which = otmp; /* default item iff Narmorpieces is 1 */
otmp = 0;
MOREWORN(uleft, Naccessories);
MOREWORN(uright, Naccessories);
MOREWORN(uamul, Naccessories);
MOREWORN(ublindf, Naccessories);
if (accessorizing)
*which = otmp; /* default item iff Naccessories is 1 */
#undef MOREWORN
}
/* take off one piece or armor or one accessory;
shared by dotakeoff('T') and doremring('R') */
STATIC_OVL int
armor_or_accessory_off(obj)
struct obj *obj;
{
if (!(obj->owornmask & (W_ARMOR | W_ACCESSORY))) {
You("are not wearing that.");
return 0;
}
reset_remarm(); /* clear context.takeoff.mask and context.takeoff.what */
(void) select_off(obj);
if (!context.takeoff.mask)
return 0;
/* none of armoroff()/Ring_/Amulet/Blindf_off() use context.takeoff.mask */
reset_remarm();
if (obj->owornmask & W_ARMOR) {
(void) armoroff(obj);
} else if (obj == uright || obj == uleft) {
/* Sometimes we want to give the off_msg before removing and
* sometimes after; for instance, "you were wearing a moonstone
* ring (on right hand)" is desired but "you were wearing a
* square amulet (being worn)" is not because of the redundant
* "being worn".
*/
off_msg(obj);
Ring_off(obj);
} else if (obj == uamul) {
Amulet_off();
off_msg(obj);
} else if (obj == ublindf) {
Blindf_off(obj); /* does its own off_msg */
} else {
impossible("removing strange accessory?");
if (obj->owornmask)
remove_worn_item(obj, FALSE);
}
return 1;
}
/* the 'T' command */ /* the 'T' command */
int int
dotakeoff() dotakeoff()
{ {
register struct obj *otmp = (struct obj *) 0; struct obj *otmp = (struct obj *) 0;
int armorpieces = 0;
#define MOREARM(x) \ count_worn_stuff(&otmp, FALSE);
if (x) { \ if (!Narmorpieces && !Naccessories) {
armorpieces++; \
otmp = x; \
}
MOREARM(uarmh);
MOREARM(uarms);
MOREARM(uarmg);
MOREARM(uarmf);
if (uarmc) {
armorpieces++;
otmp = uarmc;
} else if (uarm) {
armorpieces++;
otmp = uarm;
} else if (uarmu) {
armorpieces++;
otmp = uarmu;
}
if (!armorpieces) {
/* assert( GRAY_DRAGON_SCALES > YELLOW_DRAGON_SCALE_MAIL ); */ /* assert( GRAY_DRAGON_SCALES > YELLOW_DRAGON_SCALE_MAIL ); */
if (uskin) if (uskin)
pline_The("%s merged with your skin!", pline_The("%s merged with your skin!",
@@ -1340,23 +1413,15 @@ dotakeoff()
? "dragon scales are" ? "dragon scales are"
: "dragon scale mail is"); : "dragon scale mail is");
else else
pline("Not wearing any armor.%s", pline("Not wearing any armor or accessories.");
(iflags.cmdassist && (uleft || uright || uamul || ublindf))
? " Use 'R' command to remove accessories."
: "");
return 0; return 0;
} }
if (armorpieces > 1 || ParanoidRemove) if (Narmorpieces != 1 || ParanoidRemove)
otmp = getobj(clothes, "take off"); otmp = getobj(clothes, "take off");
if (!otmp) if (!otmp)
return 0; return 0;
if (!(otmp->owornmask & W_ARMOR)) { if (otmp == uskin
You("are not wearing that."); || ((otmp == uarm) && uarmc)
return 0;
}
/* note: the `uskin' case shouldn't be able to happen here; dragons
can't wear any armor so will end up with `armorpieces == 0' above */
if (otmp == uskin || ((otmp == uarm) && uarmc)
|| ((otmp == uarmu) && (uarmc || uarm))) { || ((otmp == uarmu) && (uarmc || uarm))) {
char why[BUFSZ], what[BUFSZ]; char why[BUFSZ], what[BUFSZ];
@@ -1375,74 +1440,26 @@ dotakeoff()
return 0; return 0;
} }
reset_remarm(); /* clear context.takeoff.mask and context.takeoff.what */ return armor_or_accessory_off(otmp);
(void) select_off(otmp);
if (!context.takeoff.mask)
return 0;
reset_remarm(); /* armoroff() doesn't use context.takeoff.mask */
(void) armoroff(otmp);
return (1);
} }
/* the 'R' command */ /* the 'R' command */
int int
doremring() doremring()
{ {
register struct obj *otmp = 0; struct obj *otmp = 0;
int Accessories = 0;
#define MOREACC(x) \ count_worn_stuff(&otmp, TRUE);
if (x) { \ if (!Naccessories && !Narmorpieces) {
Accessories++; \ pline("Not wearing any accessories or armor.");
otmp = x; \ return 0;
} }
MOREACC(uleft); if (Naccessories != 1 || ParanoidRemove)
MOREACC(uright);
MOREACC(uamul);
MOREACC(ublindf);
if (!Accessories) {
pline("Not wearing any accessories.%s",
(iflags.cmdassist && (uarm || uarmc || uarmu || uarms || uarmh
|| uarmg || uarmf))
? " Use 'T' command to take off armor."
: "");
return (0);
}
if (Accessories > 1 || ParanoidRemove)
otmp = getobj(accessories, "remove"); otmp = getobj(accessories, "remove");
if (!otmp) if (!otmp)
return 0; return 0;
if (!(otmp->owornmask & W_ACCESSORY)) {
You("are not wearing that.");
return 0;
}
reset_remarm(); /* clear context.takeoff.mask and context.takeoff.what */ return armor_or_accessory_off(otmp);
(void) select_off(otmp);
if (!context.takeoff.mask)
return 0;
reset_remarm(); /* not used by Ring_/Amulet_/Blindf_off() */
if (otmp == uright || otmp == uleft) {
/* Sometimes we want to give the off_msg before removing and
* sometimes after; for instance, "you were wearing a moonstone
* ring (on right hand)" is desired but "you were wearing a
* square amulet (being worn)" is not because of the redundant
* "being worn".
*/
off_msg(otmp);
Ring_off(otmp);
} else if (otmp == uamul) {
Amulet_off();
off_msg(otmp);
} else if (otmp == ublindf) {
Blindf_off(otmp); /* does its own off_msg */
} else {
impossible("removing strange accessory?");
}
return (1);
} }
/* Check if something worn is cursed _and_ unremovable. */ /* Check if something worn is cursed _and_ unremovable. */
@@ -1457,9 +1474,9 @@ register struct obj *otmp;
You("can't. %s cursed.", use_plural ? "They are" : "It is"); You("can't. %s cursed.", use_plural ? "They are" : "It is");
otmp->bknown = TRUE; otmp->bknown = TRUE;
return (1); return 1;
} }
return (0); return 0;
} }
int int
@@ -1516,7 +1533,7 @@ register struct obj *otmp;
off_msg(otmp); off_msg(otmp);
} }
context.takeoff.mask = context.takeoff.what = 0L; context.takeoff.mask = context.takeoff.what = 0L;
return (1); return 1;
} }
STATIC_OVL void STATIC_OVL void
@@ -1549,12 +1566,16 @@ boolean noisy;
int err = 0; int err = 0;
const char *which; const char *which;
which = is_cloak(otmp) ? c_cloak : is_shirt(otmp) which = is_cloak(otmp)
? c_shirt ? c_cloak
: is_suit(otmp) ? c_suit : 0; : is_shirt(otmp)
if (which && cantweararm(youmonst.data) && ? c_shirt
: is_suit(otmp)
? c_suit
: 0;
if (which && cantweararm(youmonst.data)
/* same exception for cloaks as used in m_dowear() */ /* same exception for cloaks as used in m_dowear() */
(which != c_cloak || youmonst.data->msize != MZ_SMALL) && (which != c_cloak || youmonst.data->msize != MZ_SMALL)
&& (racial_exception(&youmonst, otmp) < 1)) { && (racial_exception(&youmonst, otmp) < 1)) {
if (noisy) if (noisy)
pline_The("%s will not fit on your body.", which); pline_The("%s will not fit on your body.", which);
@@ -1703,202 +1724,226 @@ boolean noisy;
return !err; return !err;
} }
STATIC_OVL int
accessory_or_armor_on(obj)
struct obj *obj;
{
long mask = 0L;
boolean armor, ring, eyewear;
if (obj->owornmask & (W_ACCESSORY | W_ARMOR)) {
already_wearing(c_that_);
return 0;
}
armor = (obj->oclass == ARMOR_CLASS);
ring = (obj->oclass == RING_CLASS || obj->otyp == MEAT_RING);
eyewear = (obj->otyp == BLINDFOLD || obj->otyp == TOWEL
|| obj->otyp == LENSES);
/* checks which are performed prior to actually touching the item */
if (armor) {
if (!canwearobj(obj, &mask, TRUE))
return 0;
if (obj->otyp == HELM_OF_OPPOSITE_ALIGNMENT
&& qstart_level.dnum == u.uz.dnum) { /* in quest */
if (u.ualignbase[A_CURRENT] == u.ualignbase[A_ORIGINAL])
You("narrowly avoid losing all chance at your goal.");
else /* converted */
You("are suddenly overcome with shame and change your mind.");
u.ublessed = 0; /* lose your god's protection */
makeknown(obj->otyp);
context.botl = 1; /*for AC after zeroing u.ublessed */
return 1;
}
} else {
/* accessory */
if (ring) {
char answer, qbuf[QBUFSZ];
int res = 0;
if (nolimbs(youmonst.data)) {
You("cannot make the ring stick to your body.");
return 0;
}
if (uleft && uright) {
There("are no more %s%s to fill.",
humanoid(youmonst.data) ? "ring-" : "",
makeplural(body_part(FINGER)));
return 0;
}
if (uleft) {
mask = RIGHT_RING;
} else if (uright) {
mask = LEFT_RING;
} else {
do {
Sprintf(qbuf, "Which %s%s, Right or Left?",
humanoid(youmonst.data) ? "ring-" : "",
body_part(FINGER));
answer = yn_function(qbuf, "rl", '\0');
switch (answer) {
case '\0':
return 0;
case 'l':
case 'L':
mask = LEFT_RING;
break;
case 'r':
case 'R':
mask = RIGHT_RING;
break;
}
} while (!mask);
}
if (uarmg && uarmg->cursed) {
res = !uarmg->bknown;
uarmg->bknown = 1;
You("cannot remove your gloves to put on the ring.");
return res; /* uses move iff we learned gloves are cursed */
}
if (uwep) {
res = !uwep->bknown; /* check this before calling welded() */
if ((mask == RIGHT_RING || bimanual(uwep)) && welded(uwep)) {
const char *hand = body_part(HAND);
/* welded will set bknown */
if (bimanual(uwep))
hand = makeplural(hand);
You("cannot free your weapon %s to put on the ring.",
hand);
return res; /* uses move iff we learned weapon is cursed */
}
}
} else if (obj->oclass == AMULET_CLASS) {
if (uamul) {
already_wearing("an amulet");
return 0;
}
} else if (eyewear) {
if (ublindf) {
if (ublindf->otyp == TOWEL)
Your("%s is already covered by a towel.",
body_part(FACE));
else if (ublindf->otyp == BLINDFOLD) {
if (obj->otyp == LENSES)
already_wearing2("lenses", "a blindfold");
else
already_wearing("a blindfold");
} else if (ublindf->otyp == LENSES) {
if (obj->otyp == BLINDFOLD)
already_wearing2("a blindfold", "some lenses");
else
already_wearing("some lenses");
} else {
already_wearing(something); /* ??? */
}
return 0;
}
} else {
/* neither armor nor accessory */
You_cant("wear that!");
return 0;
}
}
if (!retouch_object(&obj, FALSE))
return 1; /* costs a turn even though it didn't get worn */
if (armor) {
int delay;
obj->known = 1; /* since AC is shown on the status line */
/* if the armor is wielded, release it for wearing */
if (obj->owornmask & W_WEAPON)
remove_worn_item(obj, FALSE);
setworn(obj, mask);
delay = -objects[obj->otyp].oc_delay;
if (delay) {
nomul(delay);
multi_reason = "dressing up";
if (is_boots(obj))
afternmv = Boots_on;
if (is_helmet(obj))
afternmv = Helmet_on;
if (is_gloves(obj))
afternmv = Gloves_on;
if (obj == uarm)
afternmv = Armor_on;
nomovemsg = "You finish your dressing maneuver.";
} else {
if (is_cloak(obj))
(void) Cloak_on();
if (is_shield(obj))
(void) Shield_on();
if (is_shirt(obj))
(void) Shirt_on();
on_msg(obj);
}
context.takeoff.mask = context.takeoff.what = 0L;
} else { /* not armor */
boolean give_feedback = FALSE;
/* [releasing wielded accessory handled in Xxx_on()] */
if (ring) {
setworn(obj, mask);
Ring_on(obj);
give_feedback = TRUE;
} else if (obj->oclass == AMULET_CLASS) {
setworn(obj, W_AMUL);
Amulet_on();
/* no feedback here if amulet of change got used up */
give_feedback = (uamul != 0);
} else if (eyewear) {
/* setworn() handled by Blindf_on() */
Blindf_on(obj);
/* message handled by Blindf_on(); leave give_feedback False */
}
/* feedback for ring or for amulet other than 'change' */
if (give_feedback && is_worn(obj))
prinv((char *) 0, obj, 0L);
}
return 1;
}
/* the 'W' command */ /* the 'W' command */
int int
dowear() dowear()
{ {
struct obj *otmp; struct obj *otmp;
int delay;
long mask = 0;
/* cantweararm checks for suits of armor */ /* cantweararm() checks for suits of armor, not what we want here;
/* verysmall or nohands checks for shields, gloves, etc... */ verysmall() or nohands() checks for shields, gloves, etc... */
if ((verysmall(youmonst.data) || nohands(youmonst.data))) { if ((verysmall(youmonst.data) || nohands(youmonst.data))) {
pline("Don't even bother."); pline("Don't even bother.");
return (0); return 0;
}
if (uarm && uarmu && uarmc && uarmh && uarms && uarmg && uarmf
&& uleft && uright && uamul && ublindf) {
/* 'W' message doesn't mention accessories */
You("are already wearing a full complement of armor.");
return 0;
} }
otmp = getobj(clothes, "wear"); otmp = getobj(clothes, "wear");
if (!otmp) return otmp ? accessory_or_armor_on(otmp) : 0;
return (0);
if (!canwearobj(otmp, &mask, TRUE))
return (0);
if (!retouch_object(&otmp, FALSE))
return 1; /* costs a turn even though it didn't get worn */
if (otmp->otyp == HELM_OF_OPPOSITE_ALIGNMENT
&& qstart_level.dnum == u.uz.dnum) { /* in quest */
if (u.ualignbase[A_CURRENT] == u.ualignbase[A_ORIGINAL])
You("narrowly avoid losing all chance at your goal.");
else /* converted */
You("are suddenly overcome with shame and change your mind.");
u.ublessed = 0; /* lose your god's protection */
makeknown(otmp->otyp);
context.botl = 1;
return 1;
}
otmp->known = 1; /* since AC is shown on the status line */
/* if the armor is wielded, release it for wearing */
if (otmp->owornmask & W_WEAPON)
remove_worn_item(otmp, FALSE);
setworn(otmp, mask);
delay = -objects[otmp->otyp].oc_delay;
if (delay) {
nomul(delay);
multi_reason = "dressing up";
if (is_boots(otmp))
afternmv = Boots_on;
if (is_helmet(otmp))
afternmv = Helmet_on;
if (is_gloves(otmp))
afternmv = Gloves_on;
if (otmp == uarm)
afternmv = Armor_on;
nomovemsg = "You finish your dressing maneuver.";
} else {
if (is_cloak(otmp))
(void) Cloak_on();
if (is_shield(otmp))
(void) Shield_on();
if (is_shirt(otmp))
(void) Shirt_on();
on_msg(otmp);
}
context.takeoff.mask = context.takeoff.what = 0L;
return (1);
} }
/* the 'P' command */
int int
doputon() doputon()
{ {
struct obj *otmp; struct obj *otmp;
long mask = 0L;
if (uleft && uright && uamul && ublindf) { if (uleft && uright && uamul && ublindf
&& uarm && uarmu && uarmc && uarmh && uarms && uarmg && uarmf) {
/* 'P' message doesn't mention armor */
Your("%s%s are full, and you're already wearing an amulet and %s.", Your("%s%s are full, and you're already wearing an amulet and %s.",
humanoid(youmonst.data) ? "ring-" : "", humanoid(youmonst.data) ? "ring-" : "",
makeplural(body_part(FINGER)), makeplural(body_part(FINGER)),
(ublindf->otyp == LENSES) ? "some lenses" : "a blindfold"); (ublindf->otyp == LENSES) ? "some lenses" : "a blindfold");
return (0); return 0;
} }
otmp = getobj(accessories, "put on"); otmp = getobj(accessories, "put on");
if (!otmp) return otmp ? accessory_or_armor_on(otmp) : 0;
return (0);
if (otmp->owornmask & W_ACCESSORY) {
already_wearing(c_that_);
return (0);
}
if (welded(otmp)) {
weldmsg(otmp);
return (0);
}
#if 0 /* defer til Xxx_on(); various failures below now leave item wielded */
/* accessory might be wielded; release it for wearing */
if (otmp->owornmask & W_WEAPON)
remove_worn_item(otmp, FALSE);
#endif
if (otmp->oclass == RING_CLASS || otmp->otyp == MEAT_RING) {
if (nolimbs(youmonst.data)) {
You("cannot make the ring stick to your body.");
return (0);
}
if (uleft && uright) {
There("are no more %s%s to fill.",
humanoid(youmonst.data) ? "ring-" : "",
makeplural(body_part(FINGER)));
return (0);
}
if (uleft)
mask = RIGHT_RING;
else if (uright)
mask = LEFT_RING;
else
do {
char qbuf[QBUFSZ];
char answer;
Sprintf(qbuf, "Which %s%s, Right or Left?",
humanoid(youmonst.data) ? "ring-" : "",
body_part(FINGER));
if (!(answer = yn_function(qbuf, "rl", '\0')))
return (0);
switch (answer) {
case 'l':
case 'L':
mask = LEFT_RING;
break;
case 'r':
case 'R':
mask = RIGHT_RING;
break;
}
} while (!mask);
if (uarmg && uarmg->cursed) {
uarmg->bknown = TRUE;
You("cannot remove your gloves to put on the ring.");
return (0);
}
if (welded(uwep) && bimanual(uwep)) {
/* welded will set bknown */
You("cannot free your weapon hands to put on the ring.");
return (0);
}
if (welded(uwep) && mask == RIGHT_RING) {
/* welded will set bknown */
You("cannot free your weapon hand to put on the ring.");
return (0);
}
if (!retouch_object(&otmp, FALSE))
return 1; /* costs a turn even though it didn't get worn */
setworn(otmp, mask);
Ring_on(otmp);
} else if (otmp->oclass == AMULET_CLASS) {
if (uamul) {
already_wearing("an amulet");
return (0);
}
if (!retouch_object(&otmp, FALSE))
return 1;
setworn(otmp, W_AMUL);
Amulet_on();
/* finished now if an amulet of change got used up */
if (!uamul)
return 1;
} else { /* it's a blindfold, towel, or lenses */
if (ublindf) {
if (ublindf->otyp == TOWEL)
Your("%s is already covered by a towel.", body_part(FACE));
else if (ublindf->otyp == BLINDFOLD) {
if (otmp->otyp == LENSES)
already_wearing2("lenses", "a blindfold");
else
already_wearing("a blindfold");
} else if (ublindf->otyp == LENSES) {
if (otmp->otyp == BLINDFOLD)
already_wearing2("a blindfold", "some lenses");
else
already_wearing("some lenses");
} else
already_wearing(something); /* ??? */
return (0);
}
if (otmp->otyp != BLINDFOLD && otmp->otyp != TOWEL
&& otmp->otyp != LENSES) {
You_cant("wear that!");
return (0);
}
if (!retouch_object(&otmp, FALSE))
return 1;
Blindf_on(otmp);
return (1);
}
if (is_worn(otmp))
prinv((char *) 0, otmp, 0L);
return (1);
} }
void void
@@ -2046,7 +2091,7 @@ struct monst *victim;
otmp = (victim == &youmonst) ? uarms : which_armor(victim, W_ARMS); otmp = (victim == &youmonst) ? uarms : which_armor(victim, W_ARMS);
if (otmp && (!otmph || !rn2(4))) if (otmp && (!otmph || !rn2(4)))
otmph = otmp; otmph = otmp;
return (otmph); return otmph;
} }
/* used for praying to check and fix levitation trouble */ /* used for praying to check and fix levitation trouble */
@@ -2206,7 +2251,7 @@ register struct obj *otmp;
else else
impossible("select_off: %s???", doname(otmp)); impossible("select_off: %s???", doname(otmp));
return (0); return 0;
} }
STATIC_OVL struct obj * STATIC_OVL struct obj *
@@ -2275,7 +2320,7 @@ do_takeoff()
impossible("do_takeoff: taking off %lx", doff->what); impossible("do_takeoff: taking off %lx", doff->what);
} }
return (otmp); return otmp;
} }
/* occupation callback for 'A' */ /* occupation callback for 'A' */
@@ -2290,7 +2335,7 @@ take_off(VOID_ARGS)
if (doff->what) { if (doff->what) {
if (doff->delay > 0) { if (doff->delay > 0) {
doff->delay--; doff->delay--;
return (1); /* still busy */ return 1; /* still busy */
} else { } else {
if ((otmp = do_takeoff())) if ((otmp = do_takeoff()))
off_msg(otmp); off_msg(otmp);
@@ -2366,7 +2411,7 @@ take_off(VOID_ARGS)
doff->delay--; doff->delay--;
set_occupation(take_off, doff->disrobing, 0); set_occupation(take_off, doff->disrobing, 0);
return (1); /* get busy */ return 1; /* get busy */
} }
/* clear saved context to avoid inappropriate resumption of interrupted 'A' */ /* clear saved context to avoid inappropriate resumption of interrupted 'A' */
@@ -2521,7 +2566,7 @@ register struct obj *atmp;
#undef DESTROY_ARM #undef DESTROY_ARM
stop_occupation(); stop_occupation();
return (1); return 1;
} }
void void

24
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 invent.c $NHDT-Date: 1437877178 2015/07/26 02:19:38 $ $NHDT-Branch: master $:$NHDT-Revision: 1.169 $ */ /* NetHack 3.6 invent.c $NHDT-Date: 1438652306 2015/08/04 01:38:26 $ $NHDT-Branch: master $:$NHDT-Revision: 1.170 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -977,11 +977,11 @@ register const char *let, *word;
let++, allowall = TRUE; let++, allowall = TRUE;
if (*let == ALLOW_NONE) if (*let == ALLOW_NONE)
let++, allownone = TRUE; let++, allownone = TRUE;
/* "ugly check" for reading fortune cookies, part 1 */ /* "ugly check" for reading fortune cookies, part 1.
/* The normal 'ugly check' keeps the object on the inventory list. * The normal 'ugly check' keeps the object on the inventory list.
* We don't want to do that for shirts/cookies, so the check for * We don't want to do that for shirts/cookies, so the check for
* them is handled a bit differently (and also requires that we set * them is handled a bit differently (and also requires that we set
* allowall in the caller) * allowall in the caller).
*/ */
if (allowall && !strcmp(word, "read")) if (allowall && !strcmp(word, "read"))
allowall = FALSE; allowall = FALSE;
@@ -1097,10 +1097,17 @@ register const char *let, *word;
) { ) {
foo--; foo--;
} }
/* ugly check for unworn armor that can't be worn */ /* Third ugly check: acceptable but not listed as likely
* candidates in the prompt or in the inventory subset if
* player responds with '?'.
*/
else if ( else if (
/* ugly check for unworn armor that can't be worn */
(putting_on(word) && *let == ARMOR_CLASS (putting_on(word) && *let == ARMOR_CLASS
&& !canwearobj(otmp, &dummymask, FALSE)) && !canwearobj(otmp, &dummymask, FALSE))
/* or armor with 'P' or 'R' or accessory with 'W' or 'T' */
|| ((putting_on(word) || taking_off(word))
&& ((*let == ARMOR_CLASS) ^ (otmp->oclass == ARMOR_CLASS)))
/* or unsuitable items rubbed on known touchstone */ /* or unsuitable items rubbed on known touchstone */
|| (!strncmp(word, "rub on the stone", 16) || (!strncmp(word, "rub on the stone", 16)
&& *let == GEM_CLASS && otmp->dknown && *let == GEM_CLASS && otmp->dknown
@@ -1310,6 +1317,9 @@ silly_thing(word, otmp)
const char *word; const char *word;
struct obj *otmp; struct obj *otmp;
{ {
#if 1 /* 'P','R' vs 'W','T' handling is obsolete */
nhUse(otmp);
#else
const char *s1, *s2, *s3, *what; const char *s1, *s2, *s3, *what;
int ocls = otmp->oclass, otyp = otmp->otyp; int ocls = otmp->oclass, otyp = otmp->otyp;
@@ -1336,9 +1346,9 @@ struct obj *otmp;
if (otyp == LENSES || is_gloves(otmp) || is_boots(otmp)) if (otyp == LENSES || is_gloves(otmp) || is_boots(otmp))
what = "those"; what = "those";
pline("Use the '%s' command to %s %s%s.", s1, s2, what, s3); pline("Use the '%s' command to %s %s%s.", s1, s2, what, s3);
} else { } else
#endif
pline(silly_thing_to, word); pline(silly_thing_to, word);
}
} }
STATIC_PTR int STATIC_PTR int