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

hats vs horns

Browse Source 
Some recent newsgroup discussion claiming that a pet ki-rin was
wearing a helmet (I think poster was hallucinating) caused me to look
at some of the hat handling code.  There were a couple of noticeable
problems and one latent one in code added for 3.4.1.  Polymorphing
into a minotaur pushes hard helmets off hero's head, but nothing
prevented you from putting one right back on.  Helmet wearing monsters
who polymorphed into minotaurs weren't affected at all.  And message
handling always assumed multiple horns even though we have some singled
horned monsters, but since all those have no hands they can't wear any
armor and that potential pluralization issue wasn't noticeable.
This commit is contained in:
nethack.rankin
2003-01-09 01:20:49 +00:00
parent 9988440b2e
commit f52b94336f
6 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/worn.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)worn.c 3.4 2002/11/07 */
/* SCCS Id: @(#)worn.c 3.4 2003/01/08 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -436,6 +436,8 @@ boolean racialexception;
break;
case W_ARMH:
if (!is_helmet(obj)) continue;
/* (flimsy exception matches polyself handling) */
if (has_horns(mon->data) && !is_flimsy(obj)) continue;
break;
case W_ARMS:
if (!is_shield(obj)) continue;
@@ -596,6 +598,7 @@ boolean polyspot;
register struct obj *otmp;
struct permonst *mdat = mon->data;
boolean vis = cansee(mon->mx, mon->my);
boolean handless_or_tiny = (nohands(mdat) || verysmall(mdat));
const char *pronoun = mhim(mon),
*ppronoun = mhis(mon);
@@ -675,7 +678,7 @@ boolean polyspot;
}
#endif
}
if (nohands(mdat) || verysmall(mdat)) {
if (handless_or_tiny) {
/* [caller needs to handle weapon checks] */
if ((otmp = which_armor(mon, W_ARMG)) != 0) {
if (vis)
@@ -693,7 +696,11 @@ boolean polyspot;
if (polyspot) bypass_obj(otmp);
m_lose_armor(mon, otmp);
}
if ((otmp = which_armor(mon, W_ARMH)) != 0) {
}
if (handless_or_tiny || has_horns(mdat)) {
if ((otmp = which_armor(mon, W_ARMH)) != 0 &&
/* flimsy test for horns matches polyself handling */
(handless_or_tiny || !is_flimsy(otmp))) {
if (vis)
pline("%s helmet falls to the %s!",
s_suffix(Monnam(mon)), surface(mon->mx, mon->my));
@@ -703,8 +710,7 @@ boolean polyspot;
m_lose_armor(mon, otmp);
}
}
if (nohands(mdat) || verysmall(mdat) || slithy(mdat) ||
mdat->mlet == S_CENTAUR) {
if (handless_or_tiny || slithy(mdat) || mdat->mlet == S_CENTAUR) {
if ((otmp = which_armor(mon, W_ARMF)) != 0) {
if (vis) {
if (is_whirly(mon->data))