[Refactor] #40514 calc_conf_damage_rate() 実装． / Implement calc_conf_damage_rate().

[hengband/hengband.git] / src / object / warning.c

diff --git a/src/object/warning.c b/src/object/warning.c
index 25eaeaa..c18ab91 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -89,36 +89,26 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
     switch (typ) {
     case GF_ELEC:
         if (is_immune_elec(target_ptr)) {
-            dam = 0;
             ignore_wraith_form = TRUE;
-            break;
         }
         dam = dam * calc_elec_damage_rate(target_ptr) / 100;
         break;
 
     case GF_POIS:
-        if (target_ptr->resist_pois)
-            dam = (dam + 2) / 3;
-        if (is_oppose_pois(target_ptr))
-            dam = (dam + 2) / 3;
+        dam = dam * calc_pois_damage_rate(target_ptr) / 100;
         break;
 
     case GF_ACID:
         if (is_immune_acid(target_ptr)) {
-            dam = 0;
             ignore_wraith_form = TRUE;
-            break;
         }
-
         dam = dam * calc_acid_damage_rate(target_ptr) / 100;
         break;
 
     case GF_COLD:
     case GF_ICE:
         if (is_immune_cold(target_ptr)) {
-            dam = 0;
             ignore_wraith_form = TRUE;
-            break;
         }
         dam = dam * calc_cold_damage_rate(target_ptr) / 100;
         break;
@@ -137,41 +127,32 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
 
     case GF_ARROW:
         if (!target_ptr->blind
-            && ((target_ptr->inventory_list[INVEN_RARM].k_idx && (target_ptr->inventory_list[INVEN_RARM].name1 == ART_ZANTETSU))
-                || (target_ptr->inventory_list[INVEN_LARM].k_idx && (target_ptr->inventory_list[INVEN_LARM].name1 == ART_ZANTETSU)))) {
+            && (has_invuln_arrow(target_ptr))) {
             dam = 0;
             ignore_wraith_form = TRUE;
         }
-
         break;
 
     case GF_LITE:
-        if (target_ptr->resist_lite)
-            dam /= 2; /* Worst case of 4 / (d4 + 7) */
-        dam = dam * calc_vuln_lite_rate(target_ptr) / 100;
+        dam = dam * calc_lite_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_DARK:
-        if (is_specific_player_race(target_ptr, RACE_VAMPIRE) || (target_ptr->mimic_form == MIMIC_VAMPIRE) || target_ptr->wraith_form) {
-            dam = 0;
+        dam = dam * calc_dark_damage_rate(target_ptr, CALC_MAX) / 100;
+        if (is_specific_player_race(target_ptr, RACE_VAMPIRE) || (target_ptr->mimic_form == MIMIC_VAMPIRE) || target_ptr->wraith_form)
             ignore_wraith_form = TRUE;
-        } else if (target_ptr->resist_dark)
-            dam /= 2; /* Worst case of 4 / (d4 + 7) */
         break;
 
     case GF_SHARDS:
-        if (target_ptr->resist_shard)
-            dam = dam * 3 / 4; /* Worst case of 6 / (d4 + 7) */
+        dam = dam * calc_shards_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_SOUND:
-        if (target_ptr->resist_sound)
-            dam = dam * 5 / 8; /* Worst case of 5 / (d4 + 7) */
+        dam = dam * calc_sound_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_CONFUSION:
-        if (target_ptr->resist_conf)
-            dam = dam * 5 / 8; /* Worst case of 5 / (d4 + 7) */
+        dam = dam * calc_conf_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_CHAOS:
@@ -180,11 +161,11 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
         break;
 
     case GF_NETHER:
+        dam = dam * calc_nether_damage_rate(target_ptr, CALC_MAX) / 100;
         if (is_specific_player_race(target_ptr, RACE_SPECTRE)) {
-            dam = 0;
             ignore_wraith_form = TRUE;
-        } else if (target_ptr->resist_neth)
-            dam = dam * 3 / 4; /* Worst case of 6 / (d4 + 7) */
+            dam = 0;
+        }
         break;
 
     case GF_DISENCHANT:
@@ -213,10 +194,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
         break;
 
     case GF_NUKE:
-        if (target_ptr->resist_pois)
-            dam = (2 * dam + 2) / 5;
-        if (is_oppose_pois(target_ptr))
-            dam = (2 * dam + 2) / 5;
+        dam = dam * calc_nuke_damage_rate(target_ptr) / 100;
         break;
 
     case GF_DEATH_RAY:
@@ -244,15 +222,11 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
         break;
 
     case GF_HOLY_FIRE:
-        if (target_ptr->align > 10)
-            dam /= 2;
-        else if (target_ptr->align < -10)
-            dam *= 2;
+        dam = dam * calc_holy_fire_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_HELL_FIRE:
-        if (target_ptr->align > 10)
-            dam *= 2;
+        dam = dam * calc_hell_fire_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_MIND_BLAST: