[Refactor] #40482 Separated blood-curse.c/h from spells3.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 99df112..08c14b1 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -237,6 +237,7 @@
     <ClCompile Include="..\..\src\object-hook\hook-armor.c" />\r
     <ClCompile Include="..\..\src\object-potion\quaff-execution.c" />\r
     <ClCompile Include="..\..\src\specific-object\death-crimson.c" />\r
+    <ClCompile Include="..\..\src\spell-kind\blood-curse.c" />\r
     <ClCompile Include="..\..\src\spell-kind\spells-equipment.c" />\r
     <ClCompile Include="..\..\src\spell-kind\spells-fetcher.c" />\r
     <ClCompile Include="..\..\src\spell-kind\spells-polymorph.c" />\r
@@ -692,6 +693,7 @@
     <ClInclude Include="..\..\src\object-hook\hook-weapon.h" />\r
     <ClInclude Include="..\..\src\object-potion\quaff-execution.h" />\r
     <ClInclude Include="..\..\src\specific-object\death-crimson.h" />\r
+    <ClInclude Include="..\..\src\spell-kind\blood-curse.h" />\r
     <ClInclude Include="..\..\src\spell-kind\spells-equipment.h" />\r
     <ClInclude Include="..\..\src\spell-kind\spells-fetcher.h" />\r
     <ClInclude Include="..\..\src\spell-kind\spells-polymorph.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 80c2734..48e9b93 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1592,6 +1592,9 @@
     <ClCompile Include="..\..\src\specific-object\death-crimson.c">
       <Filter>specific-object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\blood-curse.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3481,6 +3484,9 @@
     <ClInclude Include="..\..\src\specific-object\death-crimson.h">
       <Filter>specific-object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\blood-curse.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 7a99be0..3ef729b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -541,6 +541,7 @@ hengband_SOURCES = \
        spell/spell-types.h spell/spells-util.h \
        spell/technic-info-table.c spell/technic-info-table.h \
        \
+       spell-kind/blood-curse.c spell-kind/blood-curse.h \
        spell-kind/earthquake.c spell-kind/earthquake.h \
        spell-kind/spells-beam.c spell-kind/spells-beam.h \
        spell-kind/spells-charm.c spell-kind/spells-charm.h \

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index f638ac5..79a6013 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -32,10 +32,10 @@
 #include "object/object-kind-hook.h"
 #include "player/avatar.h"
 #include "player/player-move.h"
+#include "spell-kind/blood-curse.h"
 #include "spell-kind/spells-polymorph.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spell-types.h"
-#include "spell/spells3.h"
 #include "spells-effect-util.h"
 #include "sv-definition/sv-other-types.h"
 #include "system/object-type-definition.h"

diff --git a/src/spell-kind/blood-curse.c b/src/spell-kind/blood-curse.c
new file mode 100644 (file)
index 0000000..6ef78a9
--- /dev/null
+++ b/src/spell-kind/blood-curse.c
@@ -0,0 +1,134 @@
+#include "spell-kind/blood-curse.h"
+#include "effect/effect-characteristics.h"
+#include "floor/floor.h"
+#include "grid/grid.h"
+#include "monster-floor/monster-summon.h"
+#include "monster-floor/place-monster-types.h"
+#include "spell-kind/earthquake.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
+#include "spell/process-effect.h"
+#include "spell/spell-types.h"
+#include "spell/spells-summon.h"
+#include "status/base-status.h"
+#include "status/experience.h"
+#include "system/monster-type-definition.h"
+#include "view/display-messages.h"
+
+void blood_curse_to_enemy(player_type *caster_ptr, MONSTER_IDX m_idx)
+{
+    monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx];
+    grid_type *g_ptr = &caster_ptr->current_floor_ptr->grid_array[m_ptr->fy][m_ptr->fx];
+    BIT_FLAGS curse_flg = (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP);
+    int count = 0;
+    bool is_first_loop = TRUE;
+    while (is_first_loop || one_in_(5)) {
+        is_first_loop = FALSE;
+        switch (randint1(28)) {
+        case 1:
+        case 2:
+            if (!count) {
+                msg_print(_("地面が揺れた...", "The ground trembles..."));
+                earthquake(caster_ptr, m_ptr->fy, m_ptr->fx, 4 + randint0(4), 0);
+                if (!one_in_(6))
+                    break;
+            }
+            /* Fall through */
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+            if (!count) {
+                int extra_dam = damroll(10, 10);
+                msg_print(_("純粋な魔力の次元への扉が開いた！", "A portal opens to a plane of raw mana!"));
+                project(caster_ptr, 0, 8, m_ptr->fy, m_ptr->fx, extra_dam, GF_MANA, curse_flg, -1);
+                if (!one_in_(6))
+                    break;
+            }
+            /* Fall through */
+        case 7:
+        case 8:
+            if (!count) {
+                msg_print(_("空間が歪んだ！", "Space warps about you!"));
+                if (m_ptr->r_idx)
+                    teleport_away(caster_ptr, g_ptr->m_idx, damroll(10, 10), TELEPORT_PASSIVE);
+                if (one_in_(13))
+                    count += activate_hi_summon(caster_ptr, m_ptr->fy, m_ptr->fx, TRUE);
+                if (!one_in_(6))
+                    break;
+            }
+            /* Fall through */
+        case 9:
+        case 10:
+        case 11:
+            msg_print(_("エネルギーのうねりを感じた！", "You feel a surge of energy!"));
+            project(caster_ptr, 0, 7, m_ptr->fy, m_ptr->fx, 50, GF_DISINTEGRATE, curse_flg, -1);
+            if (!one_in_(6))
+                break;
+            /* Fall through */
+        case 12:
+        case 13:
+        case 14:
+        case 15:
+        case 16:
+            aggravate_monsters(caster_ptr, 0);
+            if (!one_in_(6))
+                break;
+            /* Fall through */
+        case 17:
+        case 18:
+            count += activate_hi_summon(caster_ptr, m_ptr->fy, m_ptr->fx, TRUE);
+            if (!one_in_(6))
+                break;
+            /* Fall through */
+        case 19:
+        case 20:
+        case 21:
+        case 22: {
+            bool pet = !one_in_(3);
+            BIT_FLAGS mode = PM_ALLOW_GROUP;
+
+            if (pet)
+                mode |= PM_FORCE_PET;
+            else
+                mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
+
+            count += summon_specific(caster_ptr, (pet ? -1 : 0), caster_ptr->y, caster_ptr->x,
+                (pet ? caster_ptr->lev * 2 / 3 + randint1(caster_ptr->lev / 2) : caster_ptr->current_floor_ptr->dun_level), 0, mode);
+            if (!one_in_(6))
+                break;
+        }
+            /* Fall through */
+        case 23:
+        case 24:
+        case 25:
+            if (caster_ptr->hold_exp && (randint0(100) < 75))
+                break;
+
+            msg_print(_("経験値が体から吸い取られた気がする！", "You feel your experience draining away..."));
+            if (caster_ptr->hold_exp)
+                lose_exp(caster_ptr, caster_ptr->exp / 160);
+            else
+                lose_exp(caster_ptr, caster_ptr->exp / 16);
+            if (!one_in_(6))
+                break;
+            /* Fall through */
+        case 26:
+        case 27:
+        case 28: {
+            if (one_in_(13)) {
+                for (int i = 0; i < A_MAX; i++) {
+                    bool is_first_dec_stat = TRUE;
+                    while (is_first_dec_stat || one_in_(2)) {
+                        (void)do_dec_stat(caster_ptr, i);
+                    }
+                }
+            } else {
+                (void)do_dec_stat(caster_ptr, randint0(6));
+            }
+
+            break;
+        }
+        }
+    }
+}

diff --git a/src/spell-kind/blood-curse.h b/src/spell-kind/blood-curse.h
new file mode 100644 (file)
index 0000000..31daeca
--- /dev/null
+++ b/src/spell-kind/blood-curse.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "system/angband.h"
+
+void blood_curse_to_enemy(player_type *caster_ptr, MONSTER_IDX m_idx);

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index f9e8d46..6c60ea1 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -536,126 +536,6 @@ bool shock_power(player_type *caster_ptr)
     return TRUE;
 }
 
-void blood_curse_to_enemy(player_type *caster_ptr, MONSTER_IDX m_idx)
-{
-    monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx];
-    grid_type *g_ptr = &caster_ptr->current_floor_ptr->grid_array[m_ptr->fy][m_ptr->fx];
-    BIT_FLAGS curse_flg = (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP);
-    int count = 0;
-    bool is_first_loop = TRUE;
-    while (is_first_loop || one_in_(5)) {
-        is_first_loop = FALSE;
-        switch (randint1(28)) {
-        case 1:
-        case 2:
-            if (!count) {
-                msg_print(_("地面が揺れた...", "The ground trembles..."));
-                earthquake(caster_ptr, m_ptr->fy, m_ptr->fx, 4 + randint0(4), 0);
-                if (!one_in_(6))
-                    break;
-            }
-            /* Fall through */
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-            if (!count) {
-                int extra_dam = damroll(10, 10);
-                msg_print(_("純粋な魔力の次元への扉が開いた！", "A portal opens to a plane of raw mana!"));
-
-                project(caster_ptr, 0, 8, m_ptr->fy, m_ptr->fx, extra_dam, GF_MANA, curse_flg, -1);
-                if (!one_in_(6))
-                    break;
-            }
-            /* Fall through */
-        case 7:
-        case 8:
-            if (!count) {
-                msg_print(_("空間が歪んだ！", "Space warps about you!"));
-
-                if (m_ptr->r_idx)
-                    teleport_away(caster_ptr, g_ptr->m_idx, damroll(10, 10), TELEPORT_PASSIVE);
-                if (one_in_(13))
-                    count += activate_hi_summon(caster_ptr, m_ptr->fy, m_ptr->fx, TRUE);
-                if (!one_in_(6))
-                    break;
-            }
-            /* Fall through */
-        case 9:
-        case 10:
-        case 11:
-            msg_print(_("エネルギーのうねりを感じた！", "You feel a surge of energy!"));
-            project(caster_ptr, 0, 7, m_ptr->fy, m_ptr->fx, 50, GF_DISINTEGRATE, curse_flg, -1);
-            if (!one_in_(6))
-                break;
-            /* Fall through */
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-            aggravate_monsters(caster_ptr, 0);
-            if (!one_in_(6))
-                break;
-            /* Fall through */
-        case 17:
-        case 18:
-            count += activate_hi_summon(caster_ptr, m_ptr->fy, m_ptr->fx, TRUE);
-            if (!one_in_(6))
-                break;
-            /* Fall through */
-        case 19:
-        case 20:
-        case 21:
-        case 22: {
-            bool pet = !one_in_(3);
-            BIT_FLAGS mode = PM_ALLOW_GROUP;
-
-            if (pet)
-                mode |= PM_FORCE_PET;
-            else
-                mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
-
-            count += summon_specific(caster_ptr, (pet ? -1 : 0), caster_ptr->y, caster_ptr->x,
-                (pet ? caster_ptr->lev * 2 / 3 + randint1(caster_ptr->lev / 2) : caster_ptr->current_floor_ptr->dun_level), 0, mode);
-            if (!one_in_(6))
-                break;
-        }
-            /* Fall through */
-        case 23:
-        case 24:
-        case 25:
-            if (caster_ptr->hold_exp && (randint0(100) < 75))
-                break;
-            msg_print(_("経験値が体から吸い取られた気がする！", "You feel your experience draining away..."));
-
-            if (caster_ptr->hold_exp)
-                lose_exp(caster_ptr, caster_ptr->exp / 160);
-            else
-                lose_exp(caster_ptr, caster_ptr->exp / 16);
-            if (!one_in_(6))
-                break;
-            /* Fall through */
-        case 26:
-        case 27:
-        case 28: {
-            if (one_in_(13)) {
-                for (int i = 0; i < A_MAX; i++) {
-                    bool is_first_dec_stat = TRUE;
-                    while (is_first_dec_stat || one_in_(2)) {
-                        (void)do_dec_stat(caster_ptr, i);
-                    }
-                }
-            } else {
-                (void)do_dec_stat(caster_ptr, randint0(6));
-            }
-
-            break;
-        }
-        }
-    }
-}
-
 /*!
  * @brief 町間のテレポートを行うメインルーチン
  * @param caster_ptr プレーヤーへの参照ポインタ

diff --git a/src/spell/spells3.h b/src/spell/spells3.h
index 1a8edbf..2c9a575 100644 (file)
--- a/src/spell/spells3.h
+++ b/src/spell/spells3.h
@@ -8,4 +8,3 @@ bool mundane_spell(player_type* ownner_ptr, bool only_equip);
 bool recharge(player_type* caster_ptr, int power);
 void massacre(player_type* caster_ptr);
 bool shock_power(player_type* caster_ptr);
-void blood_curse_to_enemy(player_type* caster_ptr, MONSTER_IDX m_idx);