From 14b0060e4266e01f7b37ff8cc1477d57821a8d65 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Thu, 10 May 2007 02:20:22 +0000 Subject: [PATCH] Sunsword vs shades _reversal_ Reverse the previous patch. It made other artifacts like Fire Brand also do full damage against shades, which wasn't inteded. Back to the drawing board.... --- doc/fixes34.4 | 1 - src/weapon.c | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index 6450cc927..119ee0356 100644 --- a/doc/fixes34.4 +++ b/doc/fixes34.4 @@ -349,7 +349,6 @@ increase damage bonus applies when kicking while polymorphed into a monster if magically removing steed's saddle is fatal, don't leave it saddled in bones charging prompt used wrong criteria when deciding whether to list rings an orc (or gnome) will respond to #chat if hero is also an orc (or gnome) -override non-silver vs shades for artifacts which deal extra damage to undead Platform- and/or Interface-Specific Fixes diff --git a/src/weapon.c b/src/weapon.c index e7a382a25..a3e46ca71 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)weapon.c 3.5 2007/05/09 */ +/* SCCS Id: @(#)weapon.c 3.5 2007/02/09 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -291,16 +291,11 @@ struct monst *mon; if (tmp < 0) tmp = 0; } - /* don't need hard material or silver if using an artifact which - gets a special bonus against this target (Sunsword vs shades) */ - if (tmp && (thick_skinned(ptr) || ptr == &mons[PM_SHADE]) && - (!otmp->oartifact || !spec_dbon(otmp, mon, tmp))) { - if (objects[otyp].oc_material <= LEATHER && thick_skinned(ptr)) + if (objects[otyp].oc_material <= LEATHER && thick_skinned(ptr)) /* thick skinned/scaled creatures don't feel it */ tmp = 0; - if (ptr == &mons[PM_SHADE] && objects[otyp].oc_material != SILVER) + if (ptr == &mons[PM_SHADE] && objects[otyp].oc_material != SILVER) tmp = 0; - } /* "very heavy iron ball"; weight increase is in increments of 160 */ if (otyp == HEAVY_IRON_BALL && tmp > 0) { -- 2.40.0