From 07be388ea6bb8c55297cc3595ef369b1ce23fcbc Mon Sep 17 00:00:00 2001 From: nothere Date: Tue, 15 Jul 2003 15:53:23 +0000 Subject: [PATCH] =?utf8?q?1.91=E3=81=A7=E6=AE=B4=E3=82=8A=E3=81=AB?= =?utf8?q?=E5=AF=BE=E3=81=97=E3=81=A6=E5=B9=BD=E4=BD=93=E5=8C=96=E3=81=8C?= =?utf8?q?=E8=80=83=E6=85=AE=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90?= =?utf8?q?=E3=82=B0=E3=81=B8=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E8=A1=8C?= =?utf8?q?=E3=81=A3=E3=81=9F=E3=81=8C,=20=E3=81=93=E3=81=AE=E6=99=82=20?= =?utf8?q?=E3=81=ABACID,=20ELEC,=20FIRE,=20COLD=E3=81=AE=E6=AE=B4=E3=82=8A?= =?utf8?q?=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E3=81=AF2=E9=87=8D=E3=81=AB?= =?utf8?q?=E5=B9=BD=E4=BD=93=E5=8C=96=E3=81=AE=E5=88=A4=E5=AE=9A=E3=82=92?= =?utf8?q?=E8=A1=8C=E3=81=A3=E3=81=A6=E3=81=97=20=E3=81=BE=E3=81=A3?= =?utf8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?= =?utf8?q?=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/object2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/object2.c b/src/object2.c index 4f521cd05..1695eedd9 100644 --- a/src/object2.c +++ b/src/object2.c @@ -6559,7 +6559,7 @@ static int blow_damcalc(monster_type *m_ptr, monster_blow *blow_ptr) { int dam = blow_ptr->d_dice * blow_ptr->d_side; int dummy_max = 0; - bool complete_immune = FALSE; + bool check_wraith_form = TRUE; if (blow_ptr->method != RBM_EXPLODE) { @@ -6582,37 +6582,37 @@ static int blow_damcalc(monster_type *m_ptr, monster_blow *blow_ptr) case RBE_ACID: spell_damcalc(m_ptr, GF_ACID, dam, 0, &dummy_max); dam = dummy_max; - complete_immune = p_ptr->immune_acid; + check_wraith_form = FALSE; break; case RBE_ELEC: spell_damcalc(m_ptr, GF_ELEC, dam, 0, &dummy_max); dam = dummy_max; - complete_immune = p_ptr->immune_elec; + check_wraith_form = FALSE; break; case RBE_FIRE: spell_damcalc(m_ptr, GF_FIRE, dam, 0, &dummy_max); dam = dummy_max; - complete_immune = p_ptr->immune_fire; + check_wraith_form = FALSE; break; case RBE_COLD: spell_damcalc(m_ptr, GF_COLD, dam, 0, &dummy_max); dam = dummy_max; - complete_immune = p_ptr->immune_cold; + check_wraith_form = FALSE; break; case RBE_DR_MANA: dam = 0; - complete_immune = TRUE; + check_wraith_form = FALSE; break; } - if (p_ptr->wraith_form) + if (check_wraith_form && p_ptr->wraith_form) { dam /= 2; - if (!dam && !complete_immune) dam = 1; + if (!dam) dam = 1; } } else -- 2.11.0