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

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 100febb..05c2be8 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -174,6 +174,7 @@
     <ClCompile Include="..\..\src\cmd\dump-util.c" />\r
     <ClCompile Include="..\..\src\effect\effect-feature.c" />\r
     <ClCompile Include="..\..\src\effect\effect-item.c" />\r
+    <ClCompile Include="..\..\src\effect\effect-monster-domination.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-switcher.c" />\r
@@ -348,6 +349,7 @@
     <ClInclude Include="..\..\src\cmd\dump-util.h" />\r
     <ClInclude Include="..\..\src\effect\effect-feature.h" />\r
     <ClInclude Include="..\..\src\effect\effect-item.h" />\r
+    <ClInclude Include="..\..\src\effect\effect-monster-domination.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-switcher.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index dc59fa1..296c574 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -724,6 +724,9 @@
     <ClCompile Include="..\..\src\effect\effect-monster-psi.c">
       <Filter>effect</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\effect\effect-monster-domination.c">
+      <Filter>effect</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1460,6 +1463,9 @@
     <ClInclude Include="..\..\src\effect\effect-monster-psi.h">
       <Filter>effect</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\effect\effect-monster-domination.h">
+      <Filter>effect</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index b4a21fc..326915a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,6 +173,7 @@ hengband_SOURCES = \
        effect/effect-monster-util.c effect/effect-monster-util.h \
        effect/effect-monster-resist-hurt.c effect/effect-monster-resist-hurt.h \
        effect/effect-monster-psi.c effect/effect-monster-psi.h \
+       effect/effect-monster-domination.c effect/effect-monster-domination.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-domination.c b/src/effect/effect-monster-domination.c
new file mode 100644 (file)
index 0000000..3b374b6
--- /dev/null
+++ b/src/effect/effect-monster-domination.c
@@ -0,0 +1,101 @@
+#include "angband.h"
+#include "effect/effect-monster-util.h"
+#include "effect/effect-monster-domination.h"
+#include "player-effects.h"
+#include "spells-diceroll.h"
+
+static void effect_monster_domination_corrupted_addition(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       switch (randint1(4))
+       {
+       case 1:
+               set_stun(caster_ptr, caster_ptr->stun + em_ptr->dam / 2);
+               break;
+       case 2:
+               set_confused(caster_ptr, caster_ptr->confused + em_ptr->dam / 2);
+               break;
+       default:
+       {
+               if (em_ptr->r_ptr->flags3 & RF3_NO_FEAR)
+                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               else
+                       set_afraid(caster_ptr, caster_ptr->afraid + em_ptr->dam);
+       }
+       }
+}
+
+
+// Powerful demons & undead can turn a mindcrafter's attacks back on them.
+static void effect_monster_domination_corrupted(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       bool is_corrupted = ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) != 0) &&
+               (em_ptr->r_ptr->level > caster_ptr->lev / 2) &&
+               (one_in_(2));
+       if (!is_corrupted)
+       {
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->obvious = FALSE;
+               return;
+       }
+
+       em_ptr->note = NULL;
+       msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！",
+               (em_ptr->seen ? "%^s's corrupted mind backlashes your attack!" :
+                       "%^ss corrupted mind backlashes your attack!")), em_ptr->m_name);
+       if (randint0(100 + em_ptr->r_ptr->level / 2) < caster_ptr->skill_sav)
+       {
+               msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
+               return;
+       }
+
+       effect_monster_domination_corrupted_addition(caster_ptr, em_ptr);
+}
+
+
+static void effect_monster_domination_addition(effect_monster_type *em_ptr)
+{
+       switch (randint1(4))
+       {
+       case 1:
+               em_ptr->do_stun = em_ptr->dam / 2;
+               break;
+       case 2:
+               em_ptr->do_conf = em_ptr->dam / 2;
+               break;
+       default:
+               em_ptr->do_fear = em_ptr->dam;
+       }
+}
+
+
+gf_switch_result effect_monster_domination(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if (!is_hostile(em_ptr->m_ptr)) return GF_SWITCH_CONTINUE;
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) ||
+               (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
+               (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10))
+       {
+               if (((em_ptr->r_ptr->flags3 & RF3_NO_CONF) != 0) && is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                       em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
+
+               em_ptr->do_conf = 0;
+               effect_monster_domination_corrupted(caster_ptr, em_ptr);
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (!common_saving_throw_charm(caster_ptr, em_ptr->dam, em_ptr->m_ptr))
+       {
+               em_ptr->note = _("があなたに隷属した。", " is in your thrall!");
+               set_pet(caster_ptr, em_ptr->m_ptr);
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       effect_monster_domination_addition(em_ptr);
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}

diff --git a/src/effect/effect-monster-domination.h b/src/effect/effect-monster-domination.h
new file mode 100644 (file)
index 0000000..c79aa4b
--- /dev/null
+++ b/src/effect/effect-monster-domination.h
@@ -0,0 +1,3 @@
+#pragma once
+
+gf_switch_result effect_monster_domination(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 596c7e5..668ddc4 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -21,6 +21,7 @@
 #include "spell/spells-type.h"
 #include "effect/effect-monster-resist-hurt.h"
 #include "effect/effect-monster-psi.h"
+#include "effect/effect-monster-domination.h"
 
 gf_switch_result effect_monster_telekinesis(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
@@ -43,103 +44,6 @@ gf_switch_result effect_monster_telekinesis(player_type *caster_ptr, effect_mons
 }
 
 
-static void effect_monster_domination_corrupted_addition(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       switch (randint1(4))
-       {
-       case 1:
-               set_stun(caster_ptr, caster_ptr->stun + em_ptr->dam / 2);
-               break;
-       case 2:
-               set_confused(caster_ptr, caster_ptr->confused + em_ptr->dam / 2);
-               break;
-       default:
-       {
-               if (em_ptr->r_ptr->flags3 & RF3_NO_FEAR)
-                       em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               else
-                       set_afraid(caster_ptr, caster_ptr->afraid + em_ptr->dam);
-       }
-       }
-}
-
-
-// Powerful demons & undead can turn a mindcrafter's attacks back on them.
-static void effect_monster_domination_corrupted(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       bool is_corrupted = ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) != 0) &&
-               (em_ptr->r_ptr->level > caster_ptr->lev / 2) &&
-               (one_in_(2));
-       if (!is_corrupted)
-       {
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               em_ptr->obvious = FALSE;
-               return;
-       }
-
-       em_ptr->note = NULL;
-       msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！",
-               (em_ptr->seen ? "%^s's corrupted mind backlashes your attack!" :
-                       "%^ss corrupted mind backlashes your attack!")), em_ptr->m_name);
-       if (randint0(100 + em_ptr->r_ptr->level / 2) < caster_ptr->skill_sav)
-       {
-               msg_print(_("しかし効力を跳ね返した！", "You resist the effects!"));
-               return;
-       }
-
-       effect_monster_domination_corrupted_addition(caster_ptr, em_ptr);
-}
-
-
-static void effect_monster_domination_addition(effect_monster_type *em_ptr)
-{
-       switch (randint1(4))
-       {
-       case 1:
-               em_ptr->do_stun = em_ptr->dam / 2;
-               break;
-       case 2:
-               em_ptr->do_conf = em_ptr->dam / 2;
-               break;
-       default:
-               em_ptr->do_fear = em_ptr->dam;
-       }
-}
-
-
-gf_switch_result effect_monster_domination(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if (!is_hostile(em_ptr->m_ptr)) return GF_SWITCH_CONTINUE;
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) ||
-               (em_ptr->r_ptr->flags3 & RF3_NO_CONF) ||
-               (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10))
-       {
-               if (((em_ptr->r_ptr->flags3 & RF3_NO_CONF) != 0) && is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-                       em_ptr->r_ptr->r_flags3 |= (RF3_NO_CONF);
-
-               em_ptr->do_conf = 0;
-               effect_monster_domination_corrupted(caster_ptr, em_ptr);                
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (!common_saving_throw_charm(caster_ptr, em_ptr->dam, em_ptr->m_ptr))
-       {
-               em_ptr->note = _("があなたに隷属した。", " is in your thrall!");
-               set_pet(caster_ptr, em_ptr->m_ptr);
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       effect_monster_domination_addition(em_ptr);
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
 gf_switch_result effect_monster_icee_bolt(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
        if (em_ptr->seen) em_ptr->obvious = TRUE;