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

github issue #1060 - crystal helmet

Browse Source 
Issue reported by vultur-cadens:  changing helm of brilliance to
crystal made it stop being classified as "hard helmet" so it gave
less protection against things falling onto the hero's head.

Change the is_metallic() tests used on helmets to new hard_helmet().
Unlike when thrown, crystal helmets don't break when objects fall
on them.

Fixes #1060
This commit is contained in:
PatR
2023-06-14 06:13:11 -07:00
parent 0440eb5091
commit 450f060132
14 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/read.c
View File

@@ -2164,7 +2164,11 @@ seffects(struct obj *sobj) /* sobj - scroll or fake spellbook for spell */
}
void
drop_boulder_on_player(boolean confused, boolean helmet_protects, boolean byu, boolean skip_uswallow)
drop_boulder_on_player(
boolean confused,
boolean helmet_protects,
boolean byu,
boolean skip_uswallow)
{
int dmg;
struct obj *otmp2;
@@ -2185,7 +2189,7 @@ drop_boulder_on_player(boolean confused, boolean helmet_protects, boolean byu, b
You("are hit by %s!", doname(otmp2));
dmg = (int) (dmgval(otmp2, &gy.youmonst) * otmp2->quan);
if (uarmh && helmet_protects) {
if (is_metallic(uarmh)) {
if (hard_helmet(uarmh)) {
pline("Fortunately, you are wearing a hard helmet.");
if (dmg > 2)
dmg = 2;
@@ -2237,7 +2241,7 @@ drop_boulder_on_monster(coordxy x, coordxy y, boolean confused, boolean byu)
mdmg = dmgval(otmp2, mtmp) * otmp2->quan;
if (helmet) {
if (is_metallic(helmet)) {
if (hard_helmet(helmet)) {
if (canspotmon(mtmp))
pline("Fortunately, %s is wearing a hard helmet.",
mon_nam(mtmp));