[Refactor] #40514 calc_vuln_acid_rate() を適用． / Apply calc_vuln_acid_rate().

diff --git a/src/object/warning.c b/src/object/warning.c
index d5281b8..d041ce5 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -119,10 +119,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
             break;
         }
 
-        if (target_ptr->muta3 & MUT3_VULN_ELEM)
-            dam *= 2;
-        if (target_ptr->special_defense & KATA_KOUKIJIN)
-            dam += dam / 3;
+        dam = dam * calc_vuln_acid_rate(target_ptr) / 100;
         if (target_ptr->resist_acid)
             dam = (dam + 2) / 3;
         if (is_oppose_acid(target_ptr))

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index e354ee2..366a551 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -157,10 +157,7 @@ HIT_POINT acid_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_acid)