From 2be26c8f6562d7884c801b61bd6fbcf836c53db1 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Fri, 5 Jun 2020 20:58:33 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#40414=20spells-shuffle.c/h=20?=
 =?utf8?q?=E3=82=92spells2.c/h=20=E3=81=8B=E3=82=89=E5=88=86=E9=9B=A2?=
 =?utf8?q?=E3=81=97=E3=80=81c=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB400?=
 =?utf8?q?=E5=80=8B=E9=81=94=E6=88=90=20/=20Separated=20spells-shuffle.c/h?=
 =?utf8?q?=20from=20spells2.c/h=20and=20achieved=20making=20400=20*.c=20fi?=
 =?utf8?q?le?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Hengband/Hengband/Hengband.vcxproj         |   2 +
 Hengband/Hengband/Hengband.vcxproj.filters |   6 +
 src/Makefile.am                            |   1 +
 src/realm/realm-trump.c                    |   1 +
 src/spell-kind/spells-shuffle.c            | 215 +++++++++++++++++++++++++++
 src/spell-kind/spells-shuffle.h            |   5 +
 src/spell/spells2.c                        | 229 -----------------------------
 src/spell/spells2.h                        |   1 -
 8 files changed, 230 insertions(+), 230 deletions(-)
 create mode 100644 src/spell-kind/spells-shuffle.c
 create mode 100644 src/spell-kind/spells-shuffle.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 197c3287d..2d4b7cfb6 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -359,6 +359,7 @@
     <ClCompile Include="..\..\src\spell-kind\spells-beam.c" />
     <ClCompile Include="..\..\src\spell-kind\spells-chaos.c" />
     <ClCompile Include="..\..\src\spell-kind\spells-charm.c" />
+    <ClCompile Include="..\..\src\spell-kind\spells-shuffle.c" />
     <ClCompile Include="..\..\src\spell\spells-describer.c" />
     <ClCompile Include="..\..\src\spell-kind\spells-detection.c" />
     <ClCompile Include="..\..\src\spell-kind\spells-genocide.c" />
@@ -585,6 +586,7 @@
     <ClInclude Include="..\..\src\spell-kind\spells-beam.h" />
     <ClInclude Include="..\..\src\spell-kind\spells-chaos.h" />
     <ClInclude Include="..\..\src\spell-kind\spells-charm.h" />
+    <ClInclude Include="..\..\src\spell-kind\spells-shuffle.h" />
     <ClInclude Include="..\..\src\spell\spells-describer.h" />
     <ClInclude Include="..\..\src\spell-kind\spells-genocide.h" />
     <ClInclude Include="..\..\src\spell\spells-hex.h" />
diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 79c7b33b5..a8ccf2793 100644
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1172,6 +1172,9 @@
     <ClCompile Include="..\..\src\mind\racial-warrior.c">
       <Filter>mind</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\spell-kind\spells-shuffle.c">
+      <Filter>spell-kind</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -2500,6 +2503,9 @@
     <ClInclude Include="..\..\src\mind\racial-warrior.h">
       <Filter>mind</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spell-kind\spells-shuffle.h">
+      <Filter>spell-kind</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
diff --git a/src/Makefile.am b/src/Makefile.am
index 45e80bd10..367f927de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -412,6 +412,7 @@ hengband_SOURCES = \
 	spell-kind/spells-lite.c spell-kind/spells-lite.h \
 	spell-kind/spells-neighbor.c spell-kind/spells-neighbor.h \
 	spell-kind/spells-pet.c spell-kind/spells-pet.h \
+	spell-kind/spells-shuffle.c spell-kind/spells-shuffle.h \
 	spell-kind/spells-sight.c spell-kind/spells-sight.h \
 	spell-kind/spells-specific-bolt.c spell-kind/spells-specific-bolt.h \
 	spell-kind/spells-teleport.c spell-kind/spells-teleport.h \
diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index efd497794..6506786c9 100644
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -11,6 +11,7 @@
 #include "spell-kind/spells-sight.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
+#include "spell-kind/spells-shuffle.h"
 #include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
diff --git a/src/spell-kind/spells-shuffle.c b/src/spell-kind/spells-shuffle.c
new file mode 100644
index 000000000..0bda4d3eb
--- /dev/null
+++ b/src/spell-kind/spells-shuffle.c
@@ -0,0 +1,215 @@
+#include "spell-kind/spells-shuffle.h"
+#include "floor/floor.h"
+#include "io/targeting.h"
+#include "mutation/mutation.h"
+#include "player/avatar.h"
+#include "player/player-effects.h"
+#include "spell-kind/spells-chaos.h"
+#include "spell-kind/spells-charm.h"
+#include "spell-kind/spells-floor.h"
+#include "spell-kind/spells-lite.h"
+#include "spell-kind/spells-neighbor.h"
+#include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
+#include "spell/spells-status.h"
+#include "spell/spells-summon.h"
+#include "spell/spells2.h"
+
+/*!
+ * @brief トランプ領域の「シャッフル」の効果をランダムに決めて処理する。
+ * @param caster_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ */
+void cast_shuffle(player_type *caster_ptr)
+{
+    PLAYER_LEVEL plev = caster_ptr->lev;
+    DIRECTION dir;
+    int die;
+    int vir = virtue_number(caster_ptr, V_CHANCE);
+    int i;
+
+    if ((caster_ptr->pclass == CLASS_ROGUE) || (caster_ptr->pclass == CLASS_HIGH_MAGE) || (caster_ptr->pclass == CLASS_SORCERER))
+        die = (randint1(110)) + plev / 5;
+    else
+        die = randint1(120);
+
+    if (vir) {
+        if (caster_ptr->virtues[vir - 1] > 0) {
+            while (randint1(400) < caster_ptr->virtues[vir - 1])
+                die++;
+        } else {
+            while (randint1(400) < (0 - caster_ptr->virtues[vir - 1]))
+                die--;
+        }
+    }
+
+    msg_print(_("あなたはカードを切って一枚引いた...", "You shuffle the deck and draw a card..."));
+
+    if (die < 30) {
+        chg_virtue(caster_ptr, V_CHANCE, 1);
+    }
+
+    floor_type *floor_ptr = caster_ptr->current_floor_ptr;
+    if (die < 7) {
+        msg_print(_("なんてこった！《死》だ！", "Oh no! It's Death!"));
+
+        for (i = 0; i < randint1(3); i++) {
+            activate_hi_summon(caster_ptr, caster_ptr->y, caster_ptr->x, FALSE);
+        }
+
+        return;
+    }
+
+    if (die < 14) {
+        msg_print(_("なんてこった！《悪魔》だ！", "Oh no! It's the Devil!"));
+        summon_specific(caster_ptr, 0, caster_ptr->y, caster_ptr->x, floor_ptr->dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
+        return;
+    }
+
+    if (die < 18) {
+        int count = 0;
+        msg_print(_("なんてこった！《吊られた男》だ！", "Oh no! It's the Hanged Man."));
+        activate_ty_curse(caster_ptr, FALSE, &count);
+        return;
+    }
+
+    if (die < 22) {
+        msg_print(_("《不調和の剣》だ。", "It's the swords of discord."));
+        aggravate_monsters(caster_ptr, 0);
+        return;
+    }
+
+    if (die < 26) {
+        msg_print(_("《愚者》だ。", "It's the Fool."));
+        do_dec_stat(caster_ptr, A_INT);
+        do_dec_stat(caster_ptr, A_WIS);
+        return;
+    }
+
+    if (die < 30) {
+        msg_print(_("奇妙なモンスターの絵だ。", "It's the picture of a strange monster."));
+        trump_summoning(
+            caster_ptr, 1, FALSE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), (32 + randint1(6)), PM_ALLOW_GROUP | PM_ALLOW_UNIQUE);
+        return;
+    }
+
+    if (die < 33) {
+        msg_print(_("《月》だ。", "It's the Moon."));
+        unlite_area(caster_ptr, 10, 3);
+        return;
+    }
+
+    if (die < 38) {
+        msg_print(_("《運命の輪》だ。", "It's the Wheel of Fortune."));
+        wild_magic(caster_ptr, randint0(32));
+        return;
+    }
+
+    if (die < 40) {
+        msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
+        teleport_player(caster_ptr, 10, TELEPORT_PASSIVE);
+        return;
+    }
+
+    if (die < 42) {
+        msg_print(_("《正義》だ。", "It's Justice."));
+        set_blessed(caster_ptr, caster_ptr->lev, FALSE);
+        return;
+    }
+
+    if (die < 47) {
+        msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
+        teleport_player(caster_ptr, 100, TELEPORT_PASSIVE);
+        return;
+    }
+
+    if (die < 52) {
+        msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
+        teleport_player(caster_ptr, 200, TELEPORT_PASSIVE);
+        return;
+    }
+
+    if (die < 60) {
+        msg_print(_("《塔》だ。", "It's the Tower."));
+        wall_breaker(caster_ptr);
+        return;
+    }
+
+    if (die < 72) {
+        msg_print(_("《節制》だ。", "It's Temperance."));
+        sleep_monsters_touch(caster_ptr);
+        return;
+    }
+
+    if (die < 80) {
+        msg_print(_("《塔》だ。", "It's the Tower."));
+        earthquake(caster_ptr, caster_ptr->y, caster_ptr->x, 5, 0);
+        return;
+    }
+
+    if (die < 82) {
+        msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
+        trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_MOLD, 0L);
+        return;
+    }
+
+    if (die < 84) {
+        msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
+        trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_BAT, 0L);
+        return;
+    }
+
+    if (die < 86) {
+        msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
+        trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_VORTEX, 0L);
+        return;
+    }
+
+    if (die < 88) {
+        msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
+        trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_COIN_MIMIC, 0L);
+        return;
+    }
+
+    if (die < 96) {
+        msg_print(_("《恋人》だ。", "It's the Lovers."));
+
+        if (get_aim_dir(caster_ptr, &dir)) {
+            charm_monster(caster_ptr, dir, MIN(caster_ptr->lev, 20));
+        }
+
+        return;
+    }
+
+    if (die < 101) {
+        msg_print(_("《隠者》だ。", "It's the Hermit."));
+        wall_stone(caster_ptr);
+        return;
+    }
+
+    if (die < 111) {
+        msg_print(_("《審判》だ。", "It's the Judgement."));
+        roll_hitdice(caster_ptr, 0L);
+        lose_all_mutations(caster_ptr);
+        return;
+    }
+
+    if (die < 120) {
+        msg_print(_("《太陽》だ。", "It's the Sun."));
+        chg_virtue(caster_ptr, V_KNOWLEDGE, 1);
+        chg_virtue(caster_ptr, V_ENLIGHTEN, 1);
+        wiz_lite(caster_ptr, FALSE);
+        return;
+    }
+
+    msg_print(_("《世界》だ。", "It's the World."));
+    if (caster_ptr->exp >= PY_MAX_EXP) {
+        return;
+    }
+
+    s32b ee = (caster_ptr->exp / 25) + 1;
+    if (ee > 5000)
+        ee = 5000;
+    msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
+    gain_exp(caster_ptr, ee);
+}
diff --git a/src/spell-kind/spells-shuffle.h b/src/spell-kind/spells-shuffle.h
new file mode 100644
index 000000000..9e7b73787
--- /dev/null
+++ b/src/spell-kind/spells-shuffle.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "system/angband.h"
+
+void cast_shuffle(player_type *caster_ptr);
diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 73bb3a0bc..42fb5e1c8 100644
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -189,235 +189,6 @@ bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad)
 }
 
 
-/*!
-* @brief トランプ領域の「シャッフル」の効果をランダムに決めて処理する。
-* @param caster_ptr プレーヤーへの参照ポインタ
-* @return なし
-*/
-void cast_shuffle(player_type *caster_ptr)
-{
-	PLAYER_LEVEL plev = caster_ptr->lev;
-	DIRECTION dir;
-	int die;
-	int vir = virtue_number(caster_ptr, V_CHANCE);
-	int i;
-
-	if ((caster_ptr->pclass == CLASS_ROGUE) ||
-		(caster_ptr->pclass == CLASS_HIGH_MAGE) ||
-		(caster_ptr->pclass == CLASS_SORCERER))
-		die = (randint1(110)) + plev / 5;
-	else
-		die = randint1(120);
-
-	if (vir)
-	{
-		if (caster_ptr->virtues[vir - 1] > 0)
-		{
-			while (randint1(400) < caster_ptr->virtues[vir - 1]) die++;
-		}
-		else
-		{
-			while (randint1(400) < (0 - caster_ptr->virtues[vir - 1])) die--;
-		}
-	}
-
-	msg_print(_("あなたはカードを切って一枚引いた...", "You shuffle the deck and draw a card..."));
-
-	if (die < 30)
-	{
-		chg_virtue(caster_ptr, V_CHANCE, 1);
-	}
-
-	floor_type *floor_ptr = caster_ptr->current_floor_ptr;
-	if (die < 7)
-	{
-		msg_print(_("なんてこった！《死》だ！", "Oh no! It's Death!"));
-
-		for (i = 0; i < randint1(3); i++)
-		{
-			activate_hi_summon(caster_ptr, caster_ptr->y, caster_ptr->x, FALSE);
-		}
-
-		return;
-	}
-
-	if (die < 14)
-	{
-		msg_print(_("なんてこった！《悪魔》だ！", "Oh no! It's the Devil!"));
-		summon_specific(caster_ptr, 0, caster_ptr->y, caster_ptr->x, floor_ptr->dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
-		return;
-	}
-
-	if (die < 18)
-	{
-		int count = 0;
-		msg_print(_("なんてこった！《吊られた男》だ！", "Oh no! It's the Hanged Man."));
-		activate_ty_curse(caster_ptr, FALSE, &count);
-		return;
-	}
-
-	if (die < 22)
-	{
-		msg_print(_("《不調和の剣》だ。", "It's the swords of discord."));
-		aggravate_monsters(caster_ptr, 0);
-		return;
-	}
-
-	if (die < 26)
-	{
-		msg_print(_("《愚者》だ。", "It's the Fool."));
-		do_dec_stat(caster_ptr, A_INT);
-		do_dec_stat(caster_ptr, A_WIS);
-		return;
-	}
-
-	if (die < 30)
-	{
-		msg_print(_("奇妙なモンスターの絵だ。", "It's the picture of a strange monster."));
-		trump_summoning(caster_ptr, 1, FALSE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), (32 + randint1(6)), PM_ALLOW_GROUP | PM_ALLOW_UNIQUE);
-		return;
-	}
-
-	if (die < 33)
-	{
-		msg_print(_("《月》だ。", "It's the Moon."));
-		unlite_area(caster_ptr, 10, 3);
-		return;
-	}
-
-	if (die < 38)
-	{
-		msg_print(_("《運命の輪》だ。", "It's the Wheel of Fortune."));
-		wild_magic(caster_ptr, randint0(32));
-		return;
-	}
-
-	if (die < 40)
-	{
-		msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
-		teleport_player(caster_ptr, 10, TELEPORT_PASSIVE);
-		return;
-	}
-
-	if (die < 42)
-	{
-		msg_print(_("《正義》だ。", "It's Justice."));
-		set_blessed(caster_ptr, caster_ptr->lev, FALSE);
-		return;
-	}
-
-	if (die < 47)
-	{
-		msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
-		teleport_player(caster_ptr, 100, TELEPORT_PASSIVE);
-		return;
-	}
-
-	if (die < 52)
-	{
-		msg_print(_("テレポート・カードだ。", "It's a teleport trump card."));
-		teleport_player(caster_ptr, 200, TELEPORT_PASSIVE);
-		return;
-	}
-
-	if (die < 60)
-	{
-		msg_print(_("《塔》だ。", "It's the Tower."));
-		wall_breaker(caster_ptr);
-		return;
-	}
-
-	if (die < 72)
-	{
-		msg_print(_("《節制》だ。", "It's Temperance."));
-		sleep_monsters_touch(caster_ptr);
-		return;
-	}
-
-	if (die < 80)
-	{
-		msg_print(_("《塔》だ。", "It's the Tower."));
-		earthquake(caster_ptr, caster_ptr->y, caster_ptr->x, 5, 0);
-		return;
-	}
-
-	if (die < 82)
-	{
-		msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
-		trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_MOLD, 0L);
-		return;
-	}
-
-	if (die < 84)
-	{
-		msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
-		trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_BAT, 0L);
-		return;
-	}
-
-	if (die < 86)
-	{
-		msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
-		trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_VORTEX, 0L);
-		return;
-	}
-
-	if (die < 88)
-	{
-		msg_print(_("友好的なモンスターの絵だ。", "It's the picture of a friendly monster."));
-		trump_summoning(caster_ptr, 1, TRUE, caster_ptr->y, caster_ptr->x, (floor_ptr->dun_level * 3 / 2), SUMMON_COIN_MIMIC, 0L);
-		return;
-	}
-
-	if (die < 96)
-	{
-		msg_print(_("《恋人》だ。", "It's the Lovers."));
-
-		if (get_aim_dir(caster_ptr, &dir))
-		{
-			charm_monster(caster_ptr, dir, MIN(caster_ptr->lev, 20));
-		}
-
-		return;
-	}
-
-	if (die < 101)
-	{
-		msg_print(_("《隠者》だ。", "It's the Hermit."));
-		wall_stone(caster_ptr);
-		return;
-	}
-
-	if (die < 111)
-	{
-		msg_print(_("《審判》だ。", "It's the Judgement."));
-		roll_hitdice(caster_ptr, 0L);
-		lose_all_mutations(caster_ptr);
-		return;
-	}
-
-	if (die < 120)
-	{
-		msg_print(_("《太陽》だ。", "It's the Sun."));
-		chg_virtue(caster_ptr, V_KNOWLEDGE, 1);
-		chg_virtue(caster_ptr, V_ENLIGHTEN, 1);
-		wiz_lite(caster_ptr, FALSE);
-		return;
-	}
-
-	msg_print(_("《世界》だ。", "It's the World."));
-	if (caster_ptr->exp >= PY_MAX_EXP)
-	{
-		return;
-	}
-
-	s32b ee = (caster_ptr->exp / 25) + 1;
-	if (ee > 5000) ee = 5000;
-	msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
-	gain_exp(caster_ptr, ee);
-}
-
-
 bool vampirism(player_type *caster_ptr)
 {
 	if (d_info[caster_ptr->dungeon_idx].flags1 & DF1_NO_MELEE)
diff --git a/src/spell/spells2.h b/src/spell/spells2.h
index 150975026..42450c61c 100644
--- a/src/spell/spells2.h
+++ b/src/spell/spells2.h
@@ -7,7 +7,6 @@ void wild_magic(player_type* caster_ptr, int spell);
 void cast_meteor(player_type* caster_ptr, HIT_POINT dam, POSITION rad);
 bool cast_wrath_of_the_god(player_type* caster_ptr, HIT_POINT dam, POSITION rad);
 void cast_wonder(player_type* caster_ptr, DIRECTION dir);
-void cast_shuffle(player_type* caster_ptr);
 bool vampirism(player_type* caster_ptr);
 bool android_inside_weapon(player_type* creature_ptr);
 bool create_ration(player_type* crature_ptr);
-- 
2.11.0