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

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 992d205..286f76d 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -275,10 +275,10 @@ void effect_player_disenchant(player_type *target_ptr, effect_player_type *ep_pt
 {
     if (target_ptr->blind)
         msg_print(_("何かさえないもので攻撃された！", "You are hit by something static!"));
-    if (target_ptr->resist_disen) {
-        ep_ptr->dam *= 6;
-        ep_ptr->dam /= (randint1(4) + 7);
-    } else if (!check_multishadow(target_ptr)) {
+
+    ep_ptr->dam = ep_ptr->dam * calc_disenchant_damage_rate(target_ptr, CALC_RAND) / 100;
+
+    if (!target_ptr->resist_disen && !check_multishadow(target_ptr)) {
         (void)apply_disenchant(target_ptr, 0);
     }
 

diff --git a/src/object/warning.c b/src/object/warning.c
index 315be1c..30a1200 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -168,8 +168,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I
         break;
 
     case GF_DISENCHANT:
-        if (target_ptr->resist_disen)
-            dam = dam * 3 / 4; /* Worst case of 6 / (d4 + 7) */
+        dam = dam * calc_disenchant_damage_rate(target_ptr, CALC_MAX) / 100;
         break;
 
     case GF_NEXUS:

diff --git a/src/player/player-status-resist.c b/src/player/player-status-resist.c
index 94fd8e0..57f8120 100644 (file)
--- a/src/player/player-status-resist.c
+++ b/src/player/player-status-resist.c
@@ -262,6 +262,18 @@ PERCENTAGE calc_chaos_damage_rate(player_type *creature_ptr, rate_calc_type_mode
     return per;
 }
 
+PERCENTAGE calc_disenchant_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode)
+{
+    PERCENTAGE per = 100;
+
+    if (creature_ptr->resist_disen) {
+        per *= 600;
+        per /= randrate(4, 7, mode);
+    }
+
+    return per;
+}
+
 PERCENTAGE calc_nether_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode)
 {
     PERCENTAGE per = 100;

diff --git a/src/player/player-status-resist.h b/src/player/player-status-resist.h
index 03267dc..15f49e6 100644 (file)
--- a/src/player/player-status-resist.h
+++ b/src/player/player-status-resist.h
@@ -21,5 +21,6 @@ PERCENTAGE calc_sound_damage_rate(player_type *creature_ptr, rate_calc_type_mode
 PERCENTAGE calc_conf_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode);
 PERCENTAGE calc_chaos_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode);
 PERCENTAGE calc_nether_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode);
+PERCENTAGE calc_disenchant_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode);
 PERCENTAGE calc_holy_fire_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode);
 PERCENTAGE calc_hell_fire_damage_rate(player_type *creature_ptr, rate_calc_type_mode mode);