[Refactor] #39963 Separated effect_monster_curse_*() from switch_effects_monster()

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 15caba0..d61e72c 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -181,6 +181,7 @@
     <ClCompile Include="..\..\src\effect\effect-monster-oldies.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-psi.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-resist-hurt.c" />\r
+    <ClCompile Include="..\..\src\effect\effect-monster-spirit.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-switcher.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-util.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster.c" />\r
@@ -360,6 +361,7 @@
     <ClInclude Include="..\..\src\effect\effect-monster-oldies.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-psi.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-resist-hurt.h" />\r
+    <ClInclude Include="..\..\src\effect\effect-monster-spirit.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-switcher.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-util.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index d2925d9..889bbd2 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -739,6 +739,9 @@
     <ClCompile Include="..\..\src\effect\effect-monster-evil.c">
       <Filter>effect</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\effect\effect-monster-spirit.c">
+      <Filter>effect</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1490,6 +1493,9 @@
     <ClInclude Include="..\..\src\effect\effect-monster-evil.h">
       <Filter>effect</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\effect\effect-monster-spirit.h">
+      <Filter>effect</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 5f35dc2..b6a363a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -178,6 +178,7 @@ hengband_SOURCES = \
        effect/effect-monster-charm.c effect/effect-monster-charm.h \
        effect/effect-monster-lite-dark.c effect/effect-monster-lite-dark.h \
        effect/effect-monster-evil.c effect/effect-monster-evil.h \
+       effect/effect-monster-spirit.c effect/effect-monster-spirit.h \
        effect/effect-monster-switcher.c effect/effect-monster-switcher.h \
        effect/effect-player-util.h \
        effect/effect-player-switcher.c effect/effect-player-switcher.h \

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
new file mode 100644 (file)
index 0000000..a2949d9
--- /dev/null
+++ b/src/effect/effect-monster-spirit.c
@@ -0,0 +1,152 @@
+#include "angband.h"
+#include "effect/effect-monster-util.h"
+#include "effect/effect-monster-spirit.h"
+#include "monster-spell.h"
+#include "monster-status.h"
+
+gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+       bool has_mana = ((em_ptr->r_ptr->flags4 & ~(RF4_NOMAGIC_MASK))) != 0;
+       has_mana |= ((em_ptr->r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK))) != 0;
+       has_mana |= ((em_ptr->r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK))) != 0;
+       if (!has_mana)
+       {
+               if (em_ptr->see_s_msg)
+                       msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name);
+
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->who <= 0)
+       {
+               msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), em_ptr->m_name);
+               (void)hp_player(caster_ptr, em_ptr->dam);
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->m_caster_ptr->hp >= em_ptr->m_caster_ptr->maxhp)
+       {
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       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);
+       }
+
+       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;
+}

diff --git a/src/effect/effect-monster-spirit.h b/src/effect/effect-monster-spirit.h
new file mode 100644 (file)
index 0000000..a141c38
--- /dev/null
+++ b/src/effect/effect-monster-spirit.h
@@ -0,0 +1,5 @@
+#pragma once
+
+gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_mind_blast(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_brain_smash(player_type *caster_ptr, effect_monster_type *em_ptr);

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 88efeb7..febf52e 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -9,7 +9,6 @@
 #include "effect/effect-monster-switcher.h"
 #include "player-damage.h"
 #include "avatar.h"
-#include "monster-spell.h"
 #include "quest.h"
 #include "monster-status.h"
 #include "effect/spells-effect-util.h"
@@ -25,6 +24,7 @@
 #include "effect/effect-monster-charm.h"
 #include "effect/effect-monster-lite-dark.h"
 #include "effect/effect-monster-evil.h"
+#include "effect/effect-monster-spirit.h"
 
 gf_switch_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
@@ -144,149 +144,62 @@ gf_switch_result effect_monster_kill_wall(player_type *caster_ptr, effect_monste
 }
 
 
-gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
+gf_switch_result effect_monster_curse_1(effect_monster_type *em_ptr)
 {
        if (em_ptr->seen) em_ptr->obvious = TRUE;
-       bool has_mana = ((em_ptr->r_ptr->flags4 & ~(RF4_NOMAGIC_MASK))) != 0;
-       has_mana |= ((em_ptr->r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK))) != 0;
-       has_mana |= ((em_ptr->r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK))) != 0;
-       if (!has_mana)
-       {
-               if (em_ptr->see_s_msg)
-                       msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name);
-
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->who <= 0)
-       {
-               msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), em_ptr->m_name);
-               (void)hp_player(caster_ptr, em_ptr->dam);
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->m_caster_ptr->hp >= em_ptr->m_caster_ptr->maxhp)
+       if (!em_ptr->who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), em_ptr->m_name);
+       if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35))
        {
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
                em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
        }
 
-       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;
+       return GF_SWITCH_CONTINUE;
+}
 
-       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);
+gf_switch_result effect_monster_curse_2(effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+       if (!em_ptr->who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), em_ptr->m_name);
 
-       if (em_ptr->see_s_msg)
+       if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35))
        {
-               monster_desc(caster_ptr, em_ptr->killer, em_ptr->m_caster_ptr, 0);
-               msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), em_ptr->killer);
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->dam = 0;
        }
 
-       em_ptr->dam = 0;
        return GF_SWITCH_CONTINUE;
 }
 
 
-gf_switch_result effect_monster_mind_blast(player_type *caster_ptr, effect_monster_type *em_ptr)
+gf_switch_result effect_monster_curse_3(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->who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた！", "You point at %s, incanting terribly!"), 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 (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35))
        {
-               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)
+gf_switch_result effect_monster_curse_4(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->who)
+               msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。",
+                       "You point at %s, screaming the word, 'DIE!'."), 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 ((randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35)) && ((em_ptr->who <= 0) || (em_ptr->m_caster_ptr->r_idx != MON_KENSHIROU)))
        {
-               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;
 }
@@ -444,57 +357,13 @@ gf_switch_result switch_effects_monster(player_type *caster_ptr, effect_monster_
        case GF_BRAIN_SMASH:
                return effect_monster_brain_smash(caster_ptr, em_ptr);
        case GF_CAUSE_1:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (!em_ptr->who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), em_ptr->m_name);
-               if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35))
-               {
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-                       em_ptr->dam = 0;
-               }
-
-               break;
-       }
+               return effect_monster_curse_1(em_ptr);
        case GF_CAUSE_2:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (!em_ptr->who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), em_ptr->m_name);
-
-               if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35))
-               {
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-                       em_ptr->dam = 0;
-               }
-
-               break;
-       }
+               return effect_monster_curse_2(em_ptr);
        case GF_CAUSE_3:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (!em_ptr->who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた！", "You point at %s, incanting terribly!"), em_ptr->m_name);
-
-               if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35))
-               {
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-                       em_ptr->dam = 0;
-               }
-
-               break;
-       }
+               return effect_monster_curse_3(em_ptr);
        case GF_CAUSE_4:
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (!em_ptr->who)
-                       msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。",
-                               "You point at %s, screaming the word, 'DIE!'."), em_ptr->m_name);
-
-               if ((randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35)) && ((em_ptr->who <= 0) || (em_ptr->m_caster_ptr->r_idx != MON_KENSHIROU)))
-               {
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-                       em_ptr->dam = 0;
-               }
-               break;
-       }
+               return effect_monster_curse_4(em_ptr);
        case GF_HAND_DOOM:
        {
                if (em_ptr->seen) em_ptr->obvious = TRUE;