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

eating rings

Browse Source 
Found on the newsgroup: someone pointed out that you don't get a message
when you eat a ring of increase damage.  They thought it was intentional--
it's not.
This commit is contained in:
arromdee
2002-08-07 05:17:45 +00:00
parent 66fe66b09a
commit 0247ab5c1c
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.1
View File

@@ -187,6 +187,7 @@ armor vs cursed two-handed weapon anomalies: with 'T', couldn't remove armor,
don't print ape data.base description for other words that end in "ape"
prevent crash after animating a statue via stone to flesh by avoiding use
of the obj in newsym() after it was deleted
print "magic spreads" message when eating ring of increase damage, etc.
Platform- and/or Interface-Specific Fixes

26
src/eat.c
View File

@@ -1394,6 +1394,14 @@ struct obj *otmp;
}
}
STATIC_OVL void
accessory_has_effect(otmp)
struct obj *otmp;
{
pline("Magic spreads through your body as you digest the %s.",
otmp->oclass == RING_CLASS ? "ring" : "amulet");
}
STATIC_OVL void
eataccessory(otmp)
struct obj *otmp;
@@ -1409,14 +1417,13 @@ struct obj *otmp;
if (u.uhp <= 0) return; /* died from sink fall */
}
otmp->known = otmp->dknown = 1; /* by taste */
if (!rn2(otmp->oclass == RING_CLASS ? 3 : 5))
if (!rn2(otmp->oclass == RING_CLASS ? 3 : 5)) {
switch (otmp->otyp) {
default:
if (!objects[typ].oc_oprop) break; /* should never happen */
if (!(u.uprops[objects[typ].oc_oprop].intrinsic & FROMOUTSIDE))
pline("Magic spreads through your body as you digest the %s.",
otmp->oclass == RING_CLASS ? "ring" : "amulet");
accessory_has_effect(otmp);
u.uprops[objects[typ].oc_oprop].intrinsic |= FROMOUTSIDE;
@@ -1455,35 +1462,44 @@ struct obj *otmp;
}
break;
case RIN_ADORNMENT:
accessory_has_effect(otmp);
if (adjattrib(A_CHA, otmp->spe, -1))
makeknown(typ);
break;
case RIN_GAIN_STRENGTH:
accessory_has_effect(otmp);
if (adjattrib(A_STR, otmp->spe, -1))
makeknown(typ);
break;
case RIN_GAIN_CONSTITUTION:
accessory_has_effect(otmp);
if (adjattrib(A_CON, otmp->spe, -1))
makeknown(typ);
break;
case RIN_INCREASE_ACCURACY:
accessory_has_effect(otmp);
u.uhitinc += otmp->spe;
break;
case RIN_INCREASE_DAMAGE:
accessory_has_effect(otmp);
u.udaminc += otmp->spe;
break;
case RIN_PROTECTION:
accessory_has_effect(otmp);
HProtection |= FROMOUTSIDE;
u.ublessed += otmp->spe;
flags.botl = 1;
break;
case RIN_FREE_ACTION:
/* Give sleep resistance instead */
if (!(HSleep_resistance & FROMOUTSIDE))
accessory_has_effect(otmp);
if (!Sleep_resistance)
You_feel("wide awake.");
HSleep_resistance |= FROMOUTSIDE;
break;
case AMULET_OF_CHANGE:
accessory_has_effect(otmp);
makeknown(typ);
change_sex();
You("are suddenly very %s!",
@@ -1491,9 +1507,12 @@ struct obj *otmp;
flags.botl = 1;
break;
case AMULET_OF_STRANGULATION: /* bad idea! */
/* no message--this gives no permanent effect */
choke(otmp);
break;
case AMULET_OF_RESTFUL_SLEEP: /* another bad idea! */
if (!(HSleeping & FROMOUTSIDE))
accessory_has_effect(otmp);
HSleeping = FROMOUTSIDE | rnd(100);
break;
case RIN_SUSTAIN_ABILITY:
@@ -1505,6 +1524,7 @@ struct obj *otmp;
*/
break;
}
}
}
STATIC_OVL void