[Refactor] #40514 effect_player_*() 関数を全て effect-player-resist-hurt.c/h へ移動． / Move...

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index ad56c0b..ae13dee 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -11,6 +11,7 @@
 #include "monster-race/race-indice-types.h"
 #include "mutation/mutation-investor-remover.h"
 #include "object/object-broken.h"
+#include "object-enchant/object-curse.h"
 #include "player/player-damage.h"
 #include "player/player-race-types.h"
 #include "player/player-race.h"
@@ -519,3 +520,73 @@ void effect_player_death_ray(player_type *target_ptr, effect_player_type *ep_ptr
     ep_ptr->dam = ep_ptr->dam * calc_deathray_damage_rate(target_ptr, CALC_RAND) / 100;
     ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
 }
+
+void effect_player_mana(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+    if (target_ptr->blind)
+        msg_print(_("魔法のオーラで攻撃された！", "You are hit by an aura of magic!"));
+
+    ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
+}
+
+void effect_player_psy_spear(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+    if (target_ptr->blind)
+        msg_print(_("エネルギーの塊で攻撃された！", "You are hit by an energy!"));
+
+    ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_FORCE, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
+}
+
+void effect_player_meteor(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+    if (target_ptr->blind)
+        msg_print(_("何かが空からあなたの頭上に落ちてきた！", "Something falls from the sky on you!"));
+
+    ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
+    if (!target_ptr->resist_shard || one_in_(13)) {
+        if (!is_immune_fire(target_ptr))
+            inventory_damage(target_ptr, set_fire_destroy, 2);
+        inventory_damage(target_ptr, set_cold_destroy, 2);
+    }
+}
+
+void effect_player_icee(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+    if (target_ptr->blind)
+        msg_print(_("何か鋭く冷たいもので攻撃された！", "You are hit by something sharp and cold!"));
+
+    ep_ptr->get_damage = cold_dam(target_ptr, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell, FALSE);
+    if (check_multishadow(target_ptr))
+        return;
+
+    if (!target_ptr->resist_shard) {
+        (void)set_cut(target_ptr, target_ptr->cut + damroll(5, 8));
+    }
+
+    if (!target_ptr->resist_sound) {
+        (void)set_stun(target_ptr, target_ptr->stun + randint1(15));
+    }
+
+    if ((!(target_ptr->resist_cold || is_oppose_cold(target_ptr))) || one_in_(12)) {
+        if (!is_immune_cold(target_ptr))
+            inventory_damage(target_ptr, set_cold_destroy, 3);
+    }
+}
+
+void effect_player_hand_doom(player_type *target_ptr, effect_player_type *ep_ptr)
+{
+    if ((randint0(100 + ep_ptr->rlev / 2) < target_ptr->skill_sav) && !check_multishadow(target_ptr)) {
+        msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+        learn_spell(target_ptr, ep_ptr->monspell);
+    } else {
+        if (!check_multishadow(target_ptr)) {
+            msg_print(_("あなたは命が薄まっていくように感じた！", "You feel your life fade away!"));
+            curse_equipment(target_ptr, 40, 20);
+        }
+
+        ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->m_name, ep_ptr->monspell);
+
+        if (target_ptr->chp < 1)
+            target_ptr->chp = 1;
+    }
+}

diff --git a/src/effect/effect-player-resist-hurt.h b/src/effect/effect-player-resist-hurt.h
index 6e0d1de..900a760 100644 (file)
--- a/src/effect/effect-player-resist-hurt.h
+++ b/src/effect/effect-player-resist-hurt.h
@@ -28,3 +28,8 @@ void effect_player_time(player_type *target_ptr, effect_player_type *ep_ptr);
 void effect_player_gravity(player_type *target_ptr, effect_player_type *ep_ptr);
 void effect_player_disintegration(player_type *target_ptr, effect_player_type *ep_ptr);
 void effect_player_death_ray(player_type *target_ptr, effect_player_type *ep_ptr);
+void effect_player_mana(player_type *target_ptr, effect_player_type *ep_ptr);
+void effect_player_psy_spear(player_type *target_ptr, effect_player_type *ep_ptr);
+void effect_player_meteor(player_type *target_ptr, effect_player_type *ep_ptr);
+void effect_player_icee(player_type *target_ptr, effect_player_type *ep_ptr);
+void effect_player_hand_doom(player_type *target_ptr, effect_player_type *ep_ptr);

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index aa29b73..70cb121 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -7,7 +7,6 @@
 #include "effect/effect-player-spirit.h"
 #include "inventory/inventory-damage.h"
 #include "mind/mind-mirror-master.h"
-#include "object-enchant/object-curse.h"
 #include "object/object-broken.h"
 #include "player/mimic-info-table.h"
 #include "player/player-damage.h"
@@ -19,76 +18,6 @@
 #include "view/display-messages.h"
 #include "world/world.h"
 
-void effect_player_mana(player_type *target_ptr, effect_player_type *ep_ptr)
-{
-    if (target_ptr->blind)
-        msg_print(_("\96\82\96@\82Ì\83I\81[\83\89\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by an aura of magic!"));
-
-    ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-}
-
-void effect_player_psy_spear(player_type *target_ptr, effect_player_type *ep_ptr)
-{
-    if (target_ptr->blind)
-        msg_print(_("\83G\83l\83\8b\83M\81[\82Ì\89ò\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by an energy!"));
-
-    ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_FORCE, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-}
-
-void effect_player_meteor(player_type *target_ptr, effect_player_type *ep_ptr)
-{
-    if (target_ptr->blind)
-        msg_print(_("\89½\82©\82ª\8bó\82©\82ç\82 \82È\82½\82Ì\93ª\8fã\82É\97\8e\82¿\82Ä\82«\82½\81I", "Something falls from the sky on you!"));
-
-    ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-    if (!target_ptr->resist_shard || one_in_(13)) {
-        if (!is_immune_fire(target_ptr))
-            inventory_damage(target_ptr, set_fire_destroy, 2);
-        inventory_damage(target_ptr, set_cold_destroy, 2);
-    }
-}
-
-void effect_player_icee(player_type *target_ptr, effect_player_type *ep_ptr)
-{
-    if (target_ptr->blind)
-        msg_print(_("\89½\82©\89s\82­\97â\82½\82¢\82à\82Ì\82Å\8dU\8c\82\82³\82ê\82½\81I", "You are hit by something sharp and cold!"));
-
-    ep_ptr->get_damage = cold_dam(target_ptr, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell, FALSE);
-    if (check_multishadow(target_ptr))
-        return;
-
-    if (!target_ptr->resist_shard) {
-        (void)set_cut(target_ptr, target_ptr->cut + damroll(5, 8));
-    }
-
-    if (!target_ptr->resist_sound) {
-        (void)set_stun(target_ptr, target_ptr->stun + randint1(15));
-    }
-
-    if ((!(target_ptr->resist_cold || is_oppose_cold(target_ptr))) || one_in_(12)) {
-        if (!is_immune_cold(target_ptr))
-            inventory_damage(target_ptr, set_cold_destroy, 3);
-    }
-}
-
-void effect_player_hand_doom(player_type *target_ptr, effect_player_type *ep_ptr)
-{
-    if ((randint0(100 + ep_ptr->rlev / 2) < target_ptr->skill_sav) && !check_multishadow(target_ptr)) {
-        msg_print(_("\82µ\82©\82µ\8cø\97Í\82ð\92µ\82Ë\95Ô\82µ\82½\81I", "You resist the effects!"));
-        learn_spell(target_ptr, ep_ptr->monspell);
-    } else {
-        if (!check_multishadow(target_ptr)) {
-            msg_print(_("\82 \82È\82½\82Í\96½\82ª\94\96\82Ü\82Á\82Ä\82¢\82­\82æ\82¤\82É\8a´\82¶\82½\81I", "You feel your life fade away!"));
-            curse_equipment(target_ptr, 40, 20);
-        }
-
-        ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->m_name, ep_ptr->monspell);
-
-        if (target_ptr->chp < 1)
-            target_ptr->chp = 1;
-    }
-}
-
 /*!
  * @brief
  * \96\82\96@\82Ì\8cø\89Ê\82É\82æ\82Á\82Ä\97l\81X\82È\83\81\83b\83Z\81[\82ð\8fo\97Í\82µ\82½\82è\97^\82¦\82é\83_\83\81\81[\83W\82Ì\91\9d\8c¸\82ð\8ds\82Á\82½\82è\82·\82é