[Refactor] #39963 Separated effecr-monster-curse.c/h from effect-monster-switcher.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index d61e72c..bca8457 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -175,6 +175,7 @@
     <ClCompile Include="..\..\src\effect\effect-feature.c" />\r
     <ClCompile Include="..\..\src\effect\effect-item.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-charm.c" />\r
+    <ClCompile Include="..\..\src\effect\effect-monster-curse.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-domination.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-evil.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-lite-dark.c" />\r
@@ -355,6 +356,7 @@
     <ClInclude Include="..\..\src\effect\effect-feature.h" />\r
     <ClInclude Include="..\..\src\effect\effect-item.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-charm.h" />\r
+    <ClInclude Include="..\..\src\effect\effect-monster-curse.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-domination.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-evil.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-lite-dark.h" />\r

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

diff --git a/src/effect/effect-monster-curse.c b/src/effect/effect-monster-curse.c
new file mode 100644 (file)
index 0000000..890cacd
--- /dev/null
+++ b/src/effect/effect-monster-curse.c
@@ -0,0 +1,63 @@
+#include "angband.h"
+#include "effect/effect-monster-util.h"
+#include "effect/effect-monster-curse.h"
+
+gf_switch_result effect_monster_curse_1(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."), 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;
+}
+
+
+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 (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;
+}
+
+
+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 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;
+       }
+
+       return GF_SWITCH_CONTINUE;
+}
+
+
+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 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;
+       }
+
+       return GF_SWITCH_CONTINUE;
+}

diff --git a/src/effect/effect-monster-curse.h b/src/effect/effect-monster-curse.h
new file mode 100644 (file)
index 0000000..5062cb5
--- /dev/null
+++ b/src/effect/effect-monster-curse.h
@@ -0,0 +1,6 @@
+#pragma once
+
+gf_switch_result effect_monster_curse_1(effect_monster_type *em_ptr);
+gf_switch_result effect_monster_curse_2(effect_monster_type *em_ptr);
+gf_switch_result effect_monster_curse_3(effect_monster_type *em_ptr);
+gf_switch_result effect_monster_curse_4(effect_monster_type *em_ptr);

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 19711a6..5539882 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -25,6 +25,7 @@
 #include "effect/effect-monster-lite-dark.h"
 #include "effect/effect-monster-evil.h"
 #include "effect/effect-monster-spirit.h"
+#include "effect/effect-monster-curse.h"
 
 gf_switch_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
@@ -144,67 +145,6 @@ gf_switch_result effect_monster_kill_wall(player_type *caster_ptr, effect_monste
 }
 
 
-gf_switch_result effect_monster_curse_1(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."), 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;
-}
-
-
-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 (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;
-}
-
-
-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 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;
-       }
-
-       return GF_SWITCH_CONTINUE;
-}
-
-
-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 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;
-       }
-
-       return GF_SWITCH_CONTINUE;
-}
-
-
 gf_switch_result effect_monster_hand_doom(effect_monster_type *em_ptr)
 {
        if (em_ptr->seen) em_ptr->obvious = TRUE;