-/* NetHack 3.6 do_wear.c $NHDT-Date: 1514072526 2017/12/23 23:42:06 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.100 $ */
+/* NetHack 3.6 do_wear.c $NHDT-Date: 1551138255 2019/02/25 23:44:15 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.108 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
/* JNetHack Copyright */
/* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000 */
-/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2018 */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2019 */
/* JNetHack may be freely redistributed. See license for details. */
#include "hack.h"
static NEARDATA const char see_yourself[] = "see yourself";
#endif
static NEARDATA const char unknown_type[] = "Unknown type of %s (%d)";
-#if 0 /*JP*/
+#if 0 /*JP:T*/
static NEARDATA const char c_armor[] = "armor", c_suit[] = "suit",
c_shirt[] = "shirt", c_cloak[] = "cloak",
c_gloves[] = "gloves", c_boots[] = "boots",
|| Detect_monsters))) {
makeknown(obj->otyp);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_feel("that monsters%s have difficulty pinpointing your location.",
on ? "" : " no longer");
#else
- You_feel("\89ö\95¨\82Í\82 \82È\82½\82Ì\88Ê\92u\82ª\82Í\82Á\82«\82è\82Æ\95ª\82©%s\82È\82Á\82½\82æ\82¤\82¾\81D",
+ pline("\89ö\95¨\82Í\82 \82È\82½\82Ì\88Ê\92u\82ª\82Í\82Á\82«\82è\82Æ\95ª\82©%s\82È\82Á\82½\82æ\82¤\82¾\81D",
on ? "\82ç\82È\82" : "\82é\82æ\82¤\82É");
#endif
}
/* though not better than potion speed */
if (!oldprop && !(HFast & TIMEOUT)) {
makeknown(uarmf->otyp);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_feel("yourself speed up%s.",
(oldprop || HFast) ? " a bit more" : "");
#else
incr_itimeout(&HFumbling, rnd(20));
break;
case LEVITATION_BOOTS:
- if (!oldprop && !HLevitation && !BLevitation) {
+ if (!oldprop && !HLevitation && !(BLevitation & FROMOUTSIDE)) {
makeknown(uarmf->otyp);
float_up();
- spoteffects(FALSE);
+ if (Levitation)
+ spoteffects(FALSE); /* for sink effect */
} else {
float_vs_flight(); /* maybe toggle (BFlying & I_SPECIAL) */
}
default:
impossible(unknown_type, c_boots, uarmf->otyp);
}
+ uarmf->known = 1; /* boots' +/- evident because of status line AC */
return 0;
}
HFumbling = EFumbling = 0;
break;
case LEVITATION_BOOTS:
- if (!oldprop && !HLevitation && !BLevitation
+ if (!oldprop && !HLevitation && !(BLevitation & FROMOUTSIDE)
&& !context.takeoff.cancelled_don) {
(void) float_down(0L, 0L);
makeknown(otyp);
/* Note: it's already being worn, so we have to cheat here. */
if ((HInvis || EInvis) && !Blind) {
newsym(u.ux, u.uy);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("can %s!", See_invisible ? "no longer see through yourself"
: see_yourself);
#else
if (!oldprop && !HInvis && !Blind) {
makeknown(uarmc->otyp);
newsym(u.ux, u.uy);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("Suddenly you can%s yourself.",
See_invisible ? " see through" : "not see");
#else
default:
impossible(unknown_type, c_cloak, uarmc->otyp);
}
+ uarmc->known = 1; /* cloak's +/- evident because of status line AC */
return 0;
}
case MUMMY_WRAPPING:
if (Invis && !Blind) {
newsym(u.ux, u.uy);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("can %s.", See_invisible ? "see through yourself"
: "no longer see yourself");
#else
if (!oldprop && !HInvis && !Blind) {
makeknown(CLOAK_OF_INVISIBILITY);
newsym(u.ux, u.uy);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("Suddenly you can %s.",
See_invisible ? "no longer see through yourself"
: see_yourself);
*/
pline("%s\82Í\88ê\8fu\90k\82¦\82½\81D", xname(uarmh));
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s for a moment.", Tobjnam(uarmh, "glow"),
hcolor(NH_BLACK));
#else
}
context.botl = 1; /* reveal new alignment or INT & WIS */
if (Hallucination) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("My brain hurts!"); /* Monty Python's Flying Circus */
#else
pline("\82Ì\81[\82Ý\82»\83o\81[\83\93\81I"); /*\83\82\83\93\83e\83B\83p\83C\83\\83\93\82Æ\82Í\82¿\82å\82Á\82Æ\88á\82¤\82¯\82Ç*/
#endif
} else if (uarmh && uarmh->otyp == DUNCE_CAP) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_feel("%s.", /* track INT change; ignore WIS */
ACURR(A_INT)
<= (ABASE(A_INT) + ABON(A_INT) + ATEMP(A_INT))
default:
impossible(unknown_type, c_helmet, uarmh->otyp);
}
+ uarmh->known = 1; /* helmet's +/- evident because of status line AC */
return 0;
}
default:
impossible(unknown_type, c_gloves, uarmg->otyp);
}
+ uarmg->known = 1; /* gloves' +/- evident because of status line AC */
return 0;
}
return;
if (touch_petrifies(&mons[obj->corpsenm]) && !Stone_resistance) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("now wield %s in your bare %s.",
corpse_xname(obj, (const char *) 0, CXN_ARTICLE),
makeplural(body_part(HAND)));
corpse_xname(obj, (const char *) 0, CXN_ARTICLE),
body_part(HAND));
#endif
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(kbuf, "%s gloves while wielding %s",
voluntary ? "removing" : "losing", killer_xname(obj));
#else
Shield_on(VOID_ARGS)
{
/* no shield currently requires special handling when put on, but we
- keep this uncommented in case somebody adds a new one which does */
+ keep this uncommented in case somebody adds a new one which does
+ [reflection is handled by setting u.uprops[REFLECTION].extrinsic
+ in setworn() called by armor_or_accessory_on() before Shield_on()] */
switch (uarms->otyp) {
case SMALL_SHIELD:
case ELVEN_SHIELD:
default:
impossible(unknown_type, c_shield, uarms->otyp);
}
-
+ uarms->known = 1; /* shield's +/- evident because of status line AC */
return 0;
}
default:
impossible(unknown_type, c_shirt, uarmu->otyp);
}
-
+ uarmu->known = 1; /* shirt's +/- evident because of status line AC */
return 0;
}
return 0;
}
-/* This must be done in worn.c, because one of the possible intrinsics
- * conferred is fire resistance, and we have to immediately set
- * HFire_resistance in worn.c since worn.c will check it before returning.
- */
STATIC_PTR
int
Armor_on(VOID_ARGS)
{
+ /*
+ * No suits require special handling. Special properties conferred by
+ * suits are set up as intrinsics (actually 'extrinsics') by setworn()
+ * which is called by armor_or_accessory_on() before Armor_on().
+ */
+ uarm->known = 1; /* suit's +/- evident because of status line AC */
return 0;
}
}
/* The gone functions differ from the off functions in that if you die from
- * taking it off and have life saving, you still die.
+ * taking it off and have life saving, you still die. [Obsolete reference
+ * to lack of fire resistance being fatal in hell (nethack 3.0) and life
+ * saving putting a removed item back on to prevent that from immediately
+ * repeating.]
*/
int
Armor_gone()
/* Don't use same message as polymorph */
if (orig_sex != poly_gender()) {
makeknown(AMULET_OF_CHANGE);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("are suddenly very %s!",
flags.female ? "feminine" : "masculine");
#else
setworn((struct obj *) 0, W_AMUL);
if (!breathless(youmonst.data) && !amphibious(youmonst.data)
&& !Swimming) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("suddenly inhale an unhealthy amount of %s!",
hliquid("water"));
#else
}
break;
case RIN_LEVITATION:
- if (!oldprop && !HLevitation && !BLevitation) {
+ if (!oldprop && !HLevitation && !(BLevitation & FROMOUTSIDE)) {
float_up();
learnring(obj, TRUE);
- spoteffects(FALSE); /* for sinks */
+ if (Levitation)
+ spoteffects(FALSE); /* for sinks */
} else {
float_vs_flight(); /* maybe toggle (BFlying & I_SPECIAL) */
}
goto adjust_attrib;
case RIN_ADORNMENT:
which = A_CHA;
- adjust_attrib:
+ adjust_attrib:
old_attrib = ACURR(which);
ABON(which) += obj->spe;
observable = (old_attrib != ACURR(which));
case RIN_INVISIBILITY:
if (!Invis && !BInvis && !Blind) {
newsym(u.ux, u.uy);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("body seems to unfade%s.",
See_invisible ? " completely" : "..");
#else
}
break;
case RIN_LEVITATION:
- if (!BLevitation) {
+ if (!(BLevitation & FROMOUTSIDE)) {
(void) float_down(0L, 0L);
if (!Levitation)
learnring(obj, TRUE);
goto adjust_attrib;
case RIN_ADORNMENT:
which = A_CHA;
- adjust_attrib:
+ adjust_attrib:
old_attrib = ACURR(which);
ABON(which) -= obj->spe;
observable = (old_attrib != ACURR(which));
void
Blindf_on(otmp)
-register struct obj *otmp;
+struct obj *otmp;
{
boolean already_blind = Blind, changed = FALSE;
You("\96Ú\82ª\8c©\82¦\82é\82æ\82¤\82É\82È\82Á\82½\81I");
}
if (changed) {
- /* blindness has just been toggled */
- if (Blind_telepat || Infravision)
- see_monsters();
- vision_full_recalc = 1; /* recalc vision limits */
- if (!Blind)
- learn_unseen_invent();
- context.botl = 1;
+ toggle_blindness(); /* potion.c */
}
}
void
Blindf_off(otmp)
-register struct obj *otmp;
+struct obj *otmp;
{
boolean was_blind = Blind, changed = FALSE;
}
}
if (changed) {
- /* blindness has just been toggled */
- if (Blind_telepat || Infravision)
- see_monsters();
- vision_full_recalc = 1; /* recalc vision limits */
- if (!Blind)
- learn_unseen_invent();
- context.botl = 1;
+ toggle_blindness(); /* potion.c */
}
}
}
/* check whether the target object is currently being taken off,
- so that stop_donning() and steal() can vary messages */
+ so that stop_donning() and steal() can vary messages and doname()
+ can vary "(being worn)" suffix */
boolean
doffing(otmp)
struct obj *otmp;
by unmul() since the on or off action isn't completing */
afternmv = (int NDECL((*))) 0;
if (putting_on || otmp != stolenobj) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(buf, "You stop %s %s.",
putting_on ? "putting on" : "taking off",
thesimpleoname(otmp));
dotakeoff()
{
struct obj *otmp = (struct obj *) 0;
-#if 1 /*JP*/
- const char *j;
- const char *m;
-#endif
count_worn_stuff(&otmp, FALSE);
if (!Narmorpieces && !Naccessories) {
/* assert( GRAY_DRAGON_SCALES > YELLOW_DRAGON_SCALE_MAIL ); */
if (uskin)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline_The("%s merged with your skin!",
uskin->otyp >= GRAY_DRAGON_SCALES
? "dragon scales are"
}
/* Curses, like chickens, come home to roost. */
if ((otmp == uwep) ? welded(otmp) : (int) otmp->cursed) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
boolean use_plural = (is_boots(otmp) || is_gloves(otmp)
|| otmp->otyp == LENSES || otmp->quan > 1L);
} else if (Upolyd && has_horns(youmonst.data) && !is_flimsy(otmp)) {
/* (flimsy exception matches polyself handling) */
if (noisy)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline_The("%s won't fit over your horn%s.",
helm_simple_name(otmp),
plur(num_horns(youmonst.data)));
err++;
} else if (Upolyd && slithy(youmonst.data)) {
if (noisy)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("have no feet..."); /* not body_part(FOOT) */
#else
You("\91«\82ª\82È\82¢\81D\81D\81D"); /* not body_part(FOOT) */
/* break_armor() pushes boots off for centaurs,
so don't let dowear() put them back on... */
if (noisy)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("You have too many hooves to wear %s.",
c_boots); /* makeplural(body_part(FOOT)) yields
"rear hooves" which sounds odd */
Your("%s\82Íã©\82É\82©\82©\82Á\82Ä\82¢\82é\81I", body_part(FOOT));
} else if (u.utraptype == TT_INFLOOR || u.utraptype == TT_LAVA) {
if (noisy)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("%s are stuck in the %s!",
makeplural(body_part(FOOT)), surface(u.ux, u.uy));
#else
#endif
} else { /*TT_BURIEDBALL*/
if (noisy)
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("%s is attached to the buried ball!",
body_part(LEG));
#else
return 0;
}
if (uleft && uright) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
There("are no more %s%s to fill.",
humanoid(youmonst.data) ? "ring-" : "",
makeplural(body_part(FINGER)));
mask = LEFT_RING;
} else {
do {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(qbuf, "Which %s%s, Right or Left?",
humanoid(youmonst.data) ? "ring-" : "",
body_part(FINGER));
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 the armor is wielded, release it for wearing (won't be
+ welded even if cursed; that only happens for weapons/weptools) */
if (obj->owornmask & W_WEAPON)
remove_worn_item(obj, FALSE);
+ /*
+ * Setting obj->known=1 is done because setworn() causes hero's AC
+ * to change so armor's +/- value is evident via the status line.
+ * We used to set it here because of that, but then it would stick
+ * if a nymph stole the armor before it was fully worn. Delay it
+ * until the aftermv action. The player may still know this armor's
+ * +/- amount if donning gets interrupted, but the hero won't.
+ *
+ obj->known = 1;
+ */
setworn(obj, mask);
+ /* if there's no delay, we'll execute 'aftermv' immediately */
+ if (obj == uarm)
+ afternmv = Armor_on;
+ else if (obj == uarmh)
+ afternmv = Helmet_on;
+ else if (obj == uarmg)
+ afternmv = Gloves_on;
+ else if (obj == uarmf)
+ afternmv = Boots_on;
+ else if (obj == uarms)
+ afternmv = Shield_on;
+ else if (obj == uarmc)
+ afternmv = Cloak_on;
+ else if (obj == uarmu)
+ afternmv = Shirt_on;
+ else
+ panic("wearing armor not worn as armor? [%08lx]", obj->owornmask);
+
delay = -objects[obj->otyp].oc_delay;
if (delay) {
nomul(delay);
multi_reason = "dressing up";
*/
multi_reason = "\91\95\94õ\82µ\82Ä\82¢\82é\8e\9e\82É";
- 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;
/*JP
nomovemsg = "You finish your dressing maneuver.";
*/
nomovemsg = "\91\95\94õ\82µ\8fI\82¦\82½\81D";
} else {
- if (is_cloak(obj))
- (void) Cloak_on();
- if (is_shield(obj))
- (void) Shield_on();
- if (is_shirt(obj))
- (void) Shirt_on();
+ unmul(""); /* call (*aftermv)(), clear it+nomovemsg+multi_reason */
on_msg(obj);
}
context.takeoff.mask = context.takeoff.what = 0L;
if (uleft && uright && uamul && ublindf
&& uarm && uarmu && uarmc && uarmh && uarms && uarmg && uarmf) {
/* 'P' message doesn't mention armor */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("%s%s are full, and you're already wearing an amulet and %s.",
humanoid(youmonst.data) ? "ring-" : "",
makeplural(body_part(FINGER)),
rightfall = (uright && !uright->cursed && (!welded(uwep)));
if (!uarmg && (leftfall || rightfall) && !nolimbs(youmonst.data)) {
/* changed so cursed rings don't fall off, GAN 10/30/86 */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Your("%s off your %s.",
(leftfall && rightfall) ? "rings slip" : "ring slips",
(leftfall && rightfall) ? makeplural(body_part(FINGER))
if (otmp->quan > 1L)
otherwep = makeplural(otherwep);
hand = body_part(HAND);
+/*JP
which = "left ";
-#if 0 /*JP*/
+*/
+ which = "\8d¶";
+#if 0 /*JP:T*/
Your("%s %s%s from your %s%s.", otherwep, xfl ? "also " : "",
otense(otmp, "slip"), which, hand);
#else
- You("%s%s%s\82©\82ç\8a\8a\82è\97\8e\82Æ\82µ\82½\81D", otherwep, xfl ? "\82à\82Ü\82½" : "\82ð",
- body_part(HAND));
+ You("%s%s%s%s\82©\82ç\8a\8a\82è\97\8e\82Æ\82µ\82½\81D", otherwep, xfl ? "\82à\82Ü\82½" : "\82ð",
+ which, body_part(HAND));
#endif
xfl++;
wastwoweap = TRUE;
if (bimanual(otmp))
hand = makeplural(hand);
else if (wastwoweap)
+#if 0 /*JP:T*/
which = "right "; /* preceding msg was about left */
-#if 0 /*JP*/
+#else
+ which = "\89E"; /* preceding msg was about left */
+#endif
+#if 0 /*JP:T*/
pline("%s %s%s %s%s from your %s%s.",
!strncmp(thiswep, "corpse", 6) ? "The" : "Your",
otherwep ? "other " : "", thiswep, xfl ? "also " : "",
otense(otmp, "slip"), which, hand);
#else
- You("%s%s%s%s\82©\82ç\8a\8a\82è\97\8e\82Æ\82µ\82½\81D",
+ You("%s%s%s%s%s\82©\82ç\8a\8a\82è\97\8e\82Æ\82µ\82½\81D",
otherwep ? "\82à\82¤\82Ð\82Æ\82Â\82Ì" : "", thiswep,
xfl ? "\82à\82Ü\82½" : "\82ð",
- body_part(HAND));
+ which, body_part(HAND));
#endif
/* xfl++; */
otmp->quan = savequan;
/* special ring checks */
if (otmp == uright || otmp == uleft) {
if (nolimbs(youmonst.data)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline_The("ring is stuck.");
#else
pline("\8ew\97Ö\82Í\91Ì\82É\96\84\82Ü\82Á\82Ä\82µ\82Ü\82Á\82Ä\82¢\82é\81D");
/* special glove checks */
if (otmp == uarmg) {
if (welded(uwep)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("are unable to take off your %s while wielding that %s.",
c_gloves, is_sword(uwep) ? c_sword : c_weapon);
#else
uwep->bknown = TRUE;
return 0;
} else if (Glib) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You_cant("take off the slippery %s with your slippery %s.",
c_gloves, makeplural(body_part(FINGER)));
#else
Sprintf(buf, "%s\82ª\92E\82°\82È\82¢", c_suit);
why = uarm;
} else if (welded(uwep) && bimanual(uwep)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(buf, "release your %s",
is_sword(uwep) ? c_sword : (uwep->otyp == BATTLE_AXE)
? c_axe
/*JP
Your("gloves vanish!");
*/
- Your("\8f¬\8eè\82Í\8fÁ\82¦\82½\81I");
+ Your("\8f¬\8eè\82Í\8fÁ\82¦\82½\81I");
(void) Gloves_off();
useup(otmp);
/*JP
OSDN Git Service
