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

enlightenment for unarmored, also blindness

Browse Source 
Augment the existing enlightenment feedback for blindness:  "innately"
blind if poly'd into something without eyes, "permanently" blind if
using the blind-from-birth option, "deliberately" blind if blindness
is  solely due to a blindfold, or "temporarily" blind otherwise.

Add status of "not wearing any armor" when applicable, with slightly
different phrasing if it's due to adhering the OPTIONS:nudist conduct.
This commit is contained in:
PatR
2015-06-02 17:39:19 -07:00
parent a1aebc336c
commit 64e0c99b62
1 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+41 -24
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 cmd.c $NHDT-Date: 1433050877 2015/05/31 05:41:17 $ $NHDT-Branch: master $:$NHDT-Revision: 1.193 $ */ /* NetHack 3.6 cmd.c $NHDT-Date: 1433291955 2015/06/03 00:39:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.194 $ */
/* 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. */
@@ -1604,11 +1604,10 @@ int final;
int cap; int cap;
char buf[BUFSZ], youtoo[BUFSZ]; char buf[BUFSZ], youtoo[BUFSZ];
boolean Riding = (u.usteed boolean Riding = (u.usteed
&&
/* if hero dies while dismounting, u.usteed will still /* if hero dies while dismounting, u.usteed will still
be set; we want to ignore steed in that situation */ be set; we want to ignore steed in that situation */
!(final == ENL_GAMEOVERDEAD && !(final == ENL_GAMEOVERDEAD
&& !strcmp(killer.name, "riding accident"))); && !strcmp(killer.name, "riding accident")));
const char *steedname = const char *steedname =
!Riding !Riding
? (char *) 0 ? (char *) 0
@@ -1650,13 +1649,10 @@ int final;
you_are(Swimming ? "swimming" : "in water", from_what(SWIMMING)); you_are(Swimming ? "swimming" : "in water", from_what(SWIMMING));
} else if (walking_on_water()) { } else if (walking_on_water()) {
/* show active Wwalking here, potential Wwalking elsewhere */ /* show active Wwalking here, potential Wwalking elsewhere */
Sprintf( Sprintf(buf, "walking on %s",
buf, "walking on %s", is_pool(u.ux, u.uy) ? "water"
is_pool(u.ux, u.uy) : is_lava(u.ux, u.uy) ? "lava"
? "water" : surface(u.ux, u.uy)); /* catchall; shouldn't happen */
: is_lava(u.ux, u.uy)
? "lava"
: surface(u.ux, u.uy)); /* catchall; shouldn't happen */
you_are(buf, from_what(WWALKING)); you_are(buf, from_what(WWALKING));
} }
if (Upolyd && (u.uundetected || youmonst.m_ap_type != M_AP_NOTHING)) if (Upolyd && (u.uundetected || youmonst.m_ap_type != M_AP_NOTHING))
@@ -1692,8 +1688,21 @@ int final;
you_are("confused", ""); you_are("confused", "");
if (Hallucination) if (Hallucination)
you_are("hallucinating", ""); you_are("hallucinating", "");
if (Blind) if (Blind) {
you_are("blind", from_what(BLINDED)); /* from_what() (currently wizard-mode only) checks !haseyes()
before u.uroleplay.blind, so we should too */
Sprintf(buf, "%s blind",
!haseyes(youmonst.data) ? "innately"
: u.uroleplay.blind ? "permanently"
/* better phrasing desparately wanted... */
: Blindfolded_only ? "deliberately"
: "temporarily");
if (wizard && (Blinded & TIMEOUT) != 0L
&& !u.uroleplay.blind && haseyes(youmonst.data))
Sprintf(eos(buf), " (%ld)", (Blinded & TIMEOUT));
/* !haseyes: avoid "you are innately blind innately" */
you_are(buf, !haseyes(youmonst.data) ? "" : from_what(BLINDED));
}
if (Deaf) if (Deaf)
you_are("deaf", from_what(DEAF)); you_are("deaf", from_what(DEAF));
@@ -1823,26 +1832,27 @@ int final;
(cap < OVERLOADED) ? " slowed" : ""); (cap < OVERLOADED) ? " slowed" : "");
you_are(buf, ""); you_are(buf, "");
} else { } else {
/* last resort entry, guarantees Status section is non-empty */ /* last resort entry, guarantees Status section is non-empty
(no longer needed for that purpose since weapon status added;
still useful though) */
you_are("unencumbered", ""); you_are("unencumbered", "");
} }
/* report being weaponless; distinguish whether gloves are worn */ /* report being weaponless; distinguish whether gloves are worn */
if (!uwep) if (!uwep) {
you_are(uarmg ? "empty handed" : /* gloves imply hands */ you_are(uarmg ? "empty handed" /* gloves imply hands */
/* no weapon and no gloves */ /* no weapon and no gloves */
humanoid(youmonst.data) : humanoid(youmonst.data)
? "bare handed" ? "bare handed"
: /* alternate phrasing for paws or lack of hands */
/* alternate phrasing for paws or lack of hands */ : "not wielding anything",
"not wielding anything",
""); "");
/* two-weaponing implies a weapon (not other odd stuff) in each hand */ /* two-weaponing implies a weapon (not other odd stuff) in each hand */
else if (u.twoweap) } else if (u.twoweap) {
you_are("wielding two weapons at once", ""); you_are("wielding two weapons at once", "");
/* report most weapons by their skill class (so a katana will be /* report most weapons by their skill class (so a katana will be
described as a long sword, for instance; mattock and hook are described as a long sword, for instance; mattock and hook are
exceptions), or wielded non-weapon item by its object class */ exceptions), or wielded non-weapon item by its object class */
else { } else {
const char *what = weapon_descr(uwep); const char *what = weapon_descr(uwep);
if (!strcmpi(what, "armor") || !strcmpi(what, "food") if (!strcmpi(what, "armor") || !strcmpi(what, "food")
@@ -1853,6 +1863,13 @@ int final;
(uwep->quan == 1L) ? an(what) : makeplural(what)); (uwep->quan == 1L) ? an(what) : makeplural(what));
you_are(buf, ""); you_are(buf, "");
} }
/* report 'nudity' */
if (!uarm && !uarmu && !uarmc && !uarmg && !uarmf && !uarmh) {
if (u.uroleplay.nudist)
enl_msg(You_, "do", "did", " not wear any armor", "");
else
you_are("not wearing any armor", "");
}
} }
/* attributes: intrinsics and the like, other non-obvious capabilities */ /* attributes: intrinsics and the like, other non-obvious capabilities */