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

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 6856aad..15caba0 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -176,6 +176,7 @@
     <ClCompile Include="..\..\src\effect\effect-item.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-charm.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
     <ClCompile Include="..\..\src\effect\effect-monster-oldies.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-psi.c" />\r
@@ -354,6 +355,7 @@
     <ClInclude Include="..\..\src\effect\effect-item.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-charm.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
     <ClInclude Include="..\..\src\effect\effect-monster-oldies.h" />\r
     <ClInclude Include="..\..\src\effect\effect-monster-psi.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 8edcba2..d2925d9 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -736,6 +736,9 @@
     <ClCompile Include="..\..\src\effect\effect-monster-lite-dark.c">
       <Filter>effect</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\effect\effect-monster-evil.c">
+      <Filter>effect</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1484,6 +1487,9 @@
     <ClInclude Include="..\..\src\effect\effect-monster-lite-dark.h">
       <Filter>effect</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\effect\effect-monster-evil.h">
+      <Filter>effect</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6158332..5f35dc2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -177,6 +177,7 @@ hengband_SOURCES = \
        effect/effect-monster-oldies.c effect/effect-monster-oldies.h \
        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-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-evil.c b/src/effect/effect-monster-evil.c
new file mode 100644 (file)
index 0000000..87e89d3
--- /dev/null
+++ b/src/effect/effect-monster-evil.c
@@ -0,0 +1,263 @@
+#include "angband.h"
+#include "effect/effect-monster-util.h"
+#include "effect/effect-monster-evil.h"
+#include "monsterrace-hook.h"
+
+static bool effect_monster_away_resist(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flagsr & RFR_RES_TELE) == 0) return FALSE;
+
+       if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->flagsr & RFR_RES_ALL))
+       {
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE;
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               return TRUE;
+       }
+
+       if (em_ptr->r_ptr->level > randint1(100))
+       {
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE;
+               em_ptr->note = _("には耐性がある！", " resists!");
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+
+gf_switch_result effect_monster_away_undead(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr);
+       if (!resists_tele)
+       {
+               if (em_ptr->seen) em_ptr->obvious = TRUE;
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                       em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD);
+
+               em_ptr->do_dist = em_ptr->dam;
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_away_evil(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr);
+       if (!resists_tele)
+       {
+               if (em_ptr->seen) em_ptr->obvious = TRUE;
+               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+                       em_ptr->r_ptr->r_flags3 |= (RF3_EVIL);
+
+               em_ptr->do_dist = em_ptr->dam;
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_away_all(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr);
+       if (!resists_tele)
+       {
+               if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+               em_ptr->do_dist = em_ptr->dam;
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_turn_undead(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD);
+
+       em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1;
+       if (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)
+       {
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->obvious = FALSE;
+               em_ptr->do_fear = 0;
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_turn_evil(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL);
+
+       em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1;
+       if (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)
+       {
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->obvious = FALSE;
+               em_ptr->do_fear = 0;
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_turn_all(effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1;
+       if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) ||
+               (em_ptr->r_ptr->flags3 & (RF3_NO_FEAR)) ||
+               (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10))
+       {
+               em_ptr->note = _("には効果がなかった。", " is unaffected.");
+               em_ptr->obvious = FALSE;
+               em_ptr->do_fear = 0;
+       }
+
+       em_ptr->dam = 0;
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_disp_undead(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
+               em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD);
+
+       em_ptr->note = _("は身震いした。", " shudders.");
+       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_disp_evil(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL);
+
+       em_ptr->note = _("は身震いした。", " shudders.");
+       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_disp_good(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_GOOD)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_GOOD);
+
+       em_ptr->note = _("は身震いした。", " shudders.");
+       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_disp_living(effect_monster_type *em_ptr)
+{
+       if (!monster_living(em_ptr->m_ptr->r_idx))
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       em_ptr->note = _("は身震いした。", " shudders.");
+       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_disp_demon(player_type *caster_ptr, effect_monster_type *em_ptr)
+{
+       if ((em_ptr->r_ptr->flags3 & (RF3_DEMON)) == 0)
+       {
+               em_ptr->skipped = TRUE;
+               em_ptr->dam = 0;
+               return GF_SWITCH_CONTINUE;
+       }
+
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_DEMON);
+
+       em_ptr->note = _("は身震いした。", " shudders.");
+       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
+       return GF_SWITCH_CONTINUE;
+}
+
+
+gf_switch_result effect_monster_disp_all(effect_monster_type *em_ptr)
+{
+       if (em_ptr->seen) em_ptr->obvious = TRUE;
+
+       em_ptr->note = _("は身震いした。", " shudders.");
+       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
+       return GF_SWITCH_CONTINUE;
+}

diff --git a/src/effect/effect-monster-evil.h b/src/effect/effect-monster-evil.h
new file mode 100644 (file)
index 0000000..e991a6e
--- /dev/null
+++ b/src/effect/effect-monster-evil.h
@@ -0,0 +1,14 @@
+#pragma once
+
+gf_switch_result effect_monster_away_undead(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_away_evil(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_away_all(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_turn_undead(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_turn_evil(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_turn_all(effect_monster_type *em_ptr);
+gf_switch_result effect_monster_disp_undead(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_disp_evil(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_disp_good(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_disp_living(effect_monster_type *em_ptr);
+gf_switch_result effect_monster_disp_demon(player_type *caster_ptr, effect_monster_type *em_ptr);
+gf_switch_result effect_monster_disp_all(effect_monster_type *em_ptr);

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index b039cb0..fbacfab 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -24,6 +24,7 @@
 #include "effect/effect-monster-oldies.h"
 #include "effect/effect-monster-charm.h"
 #include "effect/effect-monster-lite-dark.h"
+#include "effect/effect-monster-evil.h"
 
 gf_switch_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
@@ -143,265 +144,6 @@ gf_switch_result effect_monster_kill_wall(player_type *caster_ptr, effect_monste
 }
 
 
-static bool effect_monster_away_resist(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flagsr & RFR_RES_TELE) == 0) return FALSE;
-
-       if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->flagsr & RFR_RES_ALL))
-       {
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE;
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               return TRUE;
-       }
-       
-       if (em_ptr->r_ptr->level > randint1(100))
-       {
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE;
-               em_ptr->note = _("には耐性がある！", " resists!");
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-
-gf_switch_result effect_monster_away_undead(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr);
-       if (!resists_tele)
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-                       em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD);
-
-               em_ptr->do_dist = em_ptr->dam;
-       }
-
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_away_evil(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr);
-       if (!resists_tele)
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-               if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-                       em_ptr->r_ptr->r_flags3 |= (RF3_EVIL);
-
-               em_ptr->do_dist = em_ptr->dam;
-       }
-
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_away_all(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr);
-       if (!resists_tele)
-       {
-               if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-               em_ptr->do_dist = em_ptr->dam;
-       }
-
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_turn_undead(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD);
-
-       em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1;
-       if (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)
-       {
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               em_ptr->obvious = FALSE;
-               em_ptr->do_fear = 0;
-       }
-
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_turn_evil(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL);
-
-       em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1;
-       if (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)
-       {
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               em_ptr->obvious = FALSE;
-               em_ptr->do_fear = 0;
-       }
-
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_turn_all(effect_monster_type *em_ptr)
-{
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1;
-       if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) ||
-               (em_ptr->r_ptr->flags3 & (RF3_NO_FEAR)) ||
-               (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10))
-       {
-               em_ptr->note = _("には効果がなかった。", " is unaffected.");
-               em_ptr->obvious = FALSE;
-               em_ptr->do_fear = 0;
-       }
-
-       em_ptr->dam = 0;
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_disp_undead(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr))
-               em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD);
-
-       em_ptr->note = _("は身震いした。", " shudders.");
-       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_disp_evil(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL);
-
-       em_ptr->note = _("は身震いした。", " shudders.");
-       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_disp_good(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_GOOD)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_GOOD);
-
-       em_ptr->note = _("は身震いした。", " shudders.");
-       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_disp_living(effect_monster_type *em_ptr)
-{
-       if (!monster_living(em_ptr->m_ptr->r_idx))
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       em_ptr->note = _("は身震いした。", " shudders.");
-       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_disp_demon(player_type *caster_ptr, effect_monster_type *em_ptr)
-{
-       if ((em_ptr->r_ptr->flags3 & (RF3_DEMON)) == 0)
-       {
-               em_ptr->skipped = TRUE;
-               em_ptr->dam = 0;
-               return GF_SWITCH_CONTINUE;
-       }
-
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_DEMON);
-
-       em_ptr->note = _("は身震いした。", " shudders.");
-       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
-       return GF_SWITCH_CONTINUE;
-}
-
-
-gf_switch_result effect_monster_disp_all(effect_monster_type *em_ptr)
-{
-       if (em_ptr->seen) em_ptr->obvious = TRUE;
-
-       em_ptr->note = _("は身震いした。", " shudders.");
-       em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!");
-}
-
-
 gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
 {
        if (em_ptr->seen) em_ptr->obvious = TRUE;