From c9cf924da718bc2efd2e3ad38ee30e585e32e8e0 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 6 Sep 2020 14:57:18 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#40514=20calc=5Fvuln=5Fcold=5Frate(?= =?utf8?q?)=20=E3=82=92=E9=81=A9=E7=94=A8=EF=BC=8E=20/=20Apply=20calc=5Fvu?= =?utf8?q?ln=5Fcold=5Frate().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/object/warning.c | 6 +----- src/player/player-damage.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/object/warning.c b/src/object/warning.c index 323be703e..3d6cb8a70 100644 --- a/src/object/warning.c +++ b/src/object/warning.c @@ -127,11 +127,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I ignore_wraith_form = TRUE; break; } - - if (target_ptr->muta3 & MUT3_VULN_ELEM) - dam *= 2; - if (target_ptr->special_defense & KATA_KOUKIJIN) - dam += dam / 3; + dam = dam * calc_vuln_cold_rate(target_ptr) / 100; if (target_ptr->resist_cold) dam = (dam + 2) / 3; if (is_oppose_cold(target_ptr)) diff --git a/src/player/player-damage.c b/src/player/player-damage.c index 1446dad79..e48436eab 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -295,10 +295,7 @@ HIT_POINT cold_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int } /* Vulnerability (Ouch!) */ - if (creature_ptr->muta3 & MUT3_VULN_ELEM) - dam *= 2; - if (creature_ptr->special_defense & KATA_KOUKIJIN) - dam += dam / 3; + dam = dam * calc_vuln_acid_rate(creature_ptr) / 100; /* Resist the damage */ if (creature_ptr->resist_cold) -- 2.11.0