[Refactor] #39963 Separated spiritual magic functions from switch_effects_monster()

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 6bb2916..b039cb0 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -402,6 +402,147 @@ gf_switch_result effect_monster_disp_all(effect_monster_type *em_ptr)
 }
 
 
+gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+       if ((em_ptr->r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (em_ptr->r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK)) || (em_ptr->r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK)))
+       {
+               if (em_ptr->who > 0)
+               {
+                       if (em_ptr->m_caster_ptr->hp < em_ptr->m_caster_ptr->maxhp)
+                       {
+                               em_ptr->m_caster_ptr->hp += em_ptr->dam;
+                               if (em_ptr->m_caster_ptr->hp > em_ptr->m_caster_ptr->maxhp)
+                                       em_ptr->m_caster_ptr->hp = em_ptr->m_caster_ptr->maxhp;
+
+                               if (caster_ptr->health_who == em_ptr->who)
+                                       caster_ptr->redraw |= (PR_HEALTH);
+
+                               if (caster_ptr->riding == em_ptr->who)
+                                       caster_ptr->redraw |= (PR_UHEALTH);
+
+                               if (em_ptr->see_s_msg)
+                               {
+                                       monster_desc(caster_ptr, em_ptr->killer, em_ptr->m_caster_ptr, 0);
+                                       msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), em_ptr->killer);
+                               }
+                       }
+               }
+               else
+               {
+                       msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), em_ptr->m_name);
+                       (void)hp_player(caster_ptr, em_ptr->dam);
+               }
+       }
+       else
+       {
+               if (em_ptr->see_s_msg)
+                       msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name);
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_mind_blast(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+       if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
+
+       if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) ||
+               (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
+               (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10))
+       {
+               if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF))
+               {
+                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
+               }
+
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->dam = 0;
+       }
+       else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND)
+       {
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+               em_ptr->note = _("には完全な耐性がある！", " is immune.");
+               em_ptr->dam = 0;
+       }
+       else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND)
+       {
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
+               em_ptr->note = _("には耐性がある。", " resists.");
+               em_ptr->dam /= 3;
+       }
+       else
+       {
+               em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+               em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+
+               if (em_ptr->who > 0) em_ptr->do_conf = randint0(4) + 4;
+               else em_ptr->do_conf = randint0(8) + 8;
+       }
+
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_brain_smash(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+       if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
+
+       if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) ||
+               (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
+               (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10))
+       {
+               if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF))
+               {
+                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                               em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
+               }
+
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->dam = 0;
+       }
+       else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND)
+       {
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                       em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
+
+               em_ptr->note = _("には完全な耐性がある！", " is immune.");
+               em_ptr->dam = 0;
+       }
+       else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND)
+       {
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                       em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
+
+               em_ptr->note = _("には耐性がある！", " resists!");
+               em_ptr->dam /= 3;
+       }
+       else
+       {
+               em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
+               em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
+               if (em_ptr->who > 0)
+               {
+                       em_ptr->do_conf = randint0(4) + 4;
+                       em_ptr->do_stun = randint0(4) + 4;
+               }
+               else
+               {
+                       em_ptr->do_conf = randint0(8) + 8;
+                       em_ptr->do_stun = randint0(8) + 8;
+               }
+
+               (void)set_monster_slow(caster_ptr, em_ptr->g_ptr->m_idx, MON_SLOW(em_ptr->m_ptr) + 10);
+       }
+
+       return GF_SWITCH_CONTINUE;
+}
+
+
 /*!
  * @brief 魔法の効果によって様々なメッセーを出力したり与えるダメージの増減を行ったりする
  * @param em_ptr モンスター効果構造体への参照ポインタ
@@ -548,128 +689,11 @@ gf_switch_result switch_effects_monster(player_type *caster_ptr, effect_monster_
        case GF_DISP_ALL:
                return effect_monster_disp_all(em_ptr);
        case GF_DRAIN_MANA:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if ((em_ptr->r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) || (em_ptr->r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK)) || (em_ptr->r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK)))
-               {
-                       if (em_ptr->who > 0)
-                       {
-                               if (em_ptr->m_caster_ptr->hp < em_ptr->m_caster_ptr->maxhp)
-                               {
-                                       em_ptr->m_caster_ptr->hp += em_ptr->dam;
-                                       if (em_ptr->m_caster_ptr->hp > em_ptr->m_caster_ptr->maxhp) em_ptr->m_caster_ptr->hp = em_ptr->m_caster_ptr->maxhp;
-                                       if (caster_ptr->health_who == em_ptr->who) caster_ptr->redraw |= (PR_HEALTH);
-                                       if (caster_ptr->riding == em_ptr->who) caster_ptr->redraw |= (PR_UHEALTH);
-
-                                       if (em_ptr->see_s_msg)
-                                       {
-                                               monster_desc(caster_ptr, em_ptr->killer, em_ptr->m_caster_ptr, 0);
-                                               msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), em_ptr->killer);
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), em_ptr->m_name);
-                               (void)hp_player(caster_ptr, em_ptr->dam);
-                       }
-               }
-               else
-               {
-                       if (em_ptr->see_s_msg) msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name);
-               }
-
-               em_ptr->dam = 0;
-               break;
-       }
+               return effect_monster_drain_mana(caster_ptr, em_ptr);
        case GF_MIND_BLAST:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
-
-               if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) ||
-                       (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
-                       (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10))
-               {
-                       if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF))
-                       {
-                               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
-                       }
-
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-                       em_ptr->dam = 0;
-               }
-               else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND)
-               {
-                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-                       em_ptr->note = _("には完全な耐性がある！", " is immune.");
-                       em_ptr->dam = 0;
-               }
-               else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND)
-               {
-                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-                       em_ptr->note = _("には耐性がある。", " resists.");
-                       em_ptr->dam /= 3;
-               }
-               else
-               {
-                       em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-                       em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
-
-                       if (em_ptr->who > 0) em_ptr->do_conf = randint0(4) + 4;
-                       else em_ptr->do_conf = randint0(8) + 8;
-               }
-
-               break;
-       }
+               return effect_monster_mind_blast(caster_ptr, em_ptr);
        case GF_BRAIN_SMASH:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name);
-
-               if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) ||
-                       (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
-                       (em_ptr->r_ptr->level > randint1((em_ptr->caster_lev - 10) < 1 ? 1 : (em_ptr->caster_lev - 10)) + 10))
-               {
-                       if (em_ptr->r_ptr->flags3 & (RF3_NO_CONF))
-                       {
-                               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
-                       }
-
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-                       em_ptr->dam = 0;
-               }
-               else if (em_ptr->r_ptr->flags2 & RF2_EMPTY_MIND)
-               {
-                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_EMPTY_MIND);
-                       em_ptr->note = _("には完全な耐性がある！", " is immune.");
-                       em_ptr->dam = 0;
-               }
-               else if (em_ptr->r_ptr->flags2 & RF2_WEIRD_MIND)
-               {
-                       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags2 |= (RF2_WEIRD_MIND);
-                       em_ptr->note = _("には耐性がある！", " resists!");
-                       em_ptr->dam /= 3;
-               }
-               else
-               {
-                       em_ptr->note = _("は精神攻撃を食らった。", " is blasted by psionic energy.");
-                       em_ptr->note_dies = _("の精神は崩壊し、肉体は抜け殻となった。", " collapses, a mindless husk.");
-                       if (em_ptr->who > 0)
-                       {
-                               em_ptr->do_conf = randint0(4) + 4;
-                               em_ptr->do_stun = randint0(4) + 4;
-                       }
-                       else
-                       {
-                               em_ptr->do_conf = randint0(8) + 8;
-                               em_ptr->do_stun = randint0(8) + 8;
-                       }
-                       (void)set_monster_slow(caster_ptr, em_ptr->g_ptr->m_idx, MON_SLOW(em_ptr->m_ptr) + 10);
-               }
-
-               break;
-       }
+               return effect_monster_brain_smash(caster_ptr, em_ptr);
        case GF_CAUSE_1:
        {
                if (em_ptr->seen) em_ptr->obvious = TRUE;