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

Reduce code duplication in extrinsics-protect-items code

Browse Source 
The same checks were being repeated for every damage type; this
sends them through two centralised functions (one for checking
whether an extrinsic blocks a specific instance of item destruction
and one for the enlightenment message), so that new mechanisms of
item destruction prevention will need to change only one point in
the code.
This commit is contained in:
Alex Smith
2023-12-05 04:34:24 +00:00
parent 2d8ba944e1
commit 7ca9951996
5 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/trap.c
View File

@@ -198,7 +198,7 @@ erode_obj(
switch (type) {
case ERODE_BURN:
if (uvictim && u_adtyp_resistance_obj(AD_FIRE) && rn2(100))
if (uvictim && inventory_resistance_check(AD_FIRE))
return ER_NOTHING;
vulnerable = is_flammable(otmp);
check_grease = FALSE;
@@ -215,7 +215,7 @@ erode_obj(
cost_type = COST_ROT;
break;
case ERODE_CORRODE:
if (uvictim && u_adtyp_resistance_obj(AD_ACID) && rn2(100))
if (uvictim && inventory_resistance_check(AD_ACID))
return ER_NOTHING;
vulnerable = is_corrodeable(otmp);
is_primary = FALSE;
@@ -4362,7 +4362,7 @@ acid_damage(struct obj* obj)
victim = carried(obj) ? &gy.youmonst : mcarried(obj) ? obj->ocarry : NULL;
vismon = victim && (victim != &gy.youmonst) && canseemon(victim);
if (victim == &gy.youmonst && u_adtyp_resistance_obj(AD_ACID) && rn2(100))
if (victim == &gy.youmonst && inventory_resistance_check(AD_ACID))
return;
if (obj->greased) {