[Refactor] #40561 Separated artifact-bias-table.c/h from artifact.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index a6e92d5..0c52168 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -630,6 +630,7 @@
     <ClCompile Include="..\..\src\spell\technic-info-table.c" />\r
     <ClCompile Include="..\..\src\combat\aura-counterattack.c" />\r
     <ClCompile Include="..\..\src\window\main-window-equipments.c" />\r
+    <ClCompile Include="..\..\src\wizard\artifact-bias-table.c" />\r
     <ClCompile Include="..\..\src\wizard\spoiler-table.c" />\r
     <ClCompile Include="..\..\src\wizard\tval-descriptions-table.c" />\r
     <ClCompile Include="..\..\src\savedata\quest-loader.c" />\r
@@ -1232,6 +1233,7 @@
     <ClInclude Include="..\..\src\view\object-describer.h" />\r
     <ClInclude Include="..\..\src\view\status-bars-table.h" />\r
     <ClInclude Include="..\..\src\window\main-window-equipments.h" />\r
+    <ClInclude Include="..\..\src\wizard\artifact-bias-table.h" />\r
     <ClInclude Include="..\..\src\wizard\spoiler-table.h" />\r
     <ClInclude Include="..\..\src\wizard\wizard-messages.h" />\r
     <ClInclude Include="..\..\src\wizard\wizard-spells.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index e6750bf..924075d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1724,6 +1724,9 @@
     <ClCompile Include="..\..\src\object-enchant\artifact.c">
       <Filter>object-enchant</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\wizard\artifact-bias-table.c">
+      <Filter>wizard</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -3766,6 +3769,9 @@
     <ClInclude Include="..\..\src\object-enchant\artifact.h">
       <Filter>object-enchant</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\wizard\artifact-bias-table.h">
+      <Filter>wizard</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a36327..e976a8b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -712,6 +712,7 @@ hengband_SOURCES = \
        window/main-window-util.c window/main-window-util.h \
        window/main-window-equipment.c window/main-window-equipment.h \
        \
+       wizard/artifact-bias-table.c wizard/artifact-bias-table.h \
        wizard/spoiler-table.c wizard/spoiler-table.h \
        wizard/tval-descriptions-table.c wizard/tval-descriptions-table.h \
        wizard/wizard-messages.c wizard/wizard-messages.h \

diff --git a/src/object-enchant/artifact.c b/src/object-enchant/artifact.c
index cfeaf74..9f24b5e 100644 (file)
--- a/src/object-enchant/artifact.c
+++ b/src/object-enchant/artifact.c
@@ -55,6 +55,7 @@
 #include "util/bit-flags-calculator.h"
 #include "util/quarks.h"
 #include "view/display-messages.h"
+#include "wizard/artifact-bias-table.h"
 #include "wizard/wizard-messages.h"
 #include "world/world.h"
 
@@ -74,32 +75,6 @@ static bool has_extreme_damage_rate(player_type *player_ptr, object_type *o_ptr)
 static bool weakening_artifact(player_type *player_ptr, object_type *o_ptr);
 
 /*!
- * @brief ランダムアーティファクトのバイアス名称テーブル
- */
-const concptr artifact_bias_name[MAX_BIAS] = {
-    _("なし", "None"),
-    _("電撃", "Elec"),
-    _("毒", "Poison"),
-    _("火炎", "Fire"),
-    _("冷気", "Cold"),
-    _("酸", "Acid"),
-    _("腕力", "STR"),
-    _("知力", "INT"),
-    _("賢さ", "WIS"),
-    _("器用さ", "DEX"),
-    _("耐久", "CON"),
-    _("魅力", "CHA"),
-    _("混沌", "Chaos"),
-    _("プリースト", "Pristly"),
-    _("死霊", "Necromantic"),
-    _("法", "Law"),
-    _("盗賊", "Rogue"),
-    _("メイジ", "Mage"),
-    _("戦士", "Warrior"),
-    _("レンジャー", "Ranger"),
-};
-
-/*!
  * @brief ランダムアーティファクト生成中、対象のオブジェクトを呪いのアーティファクトにする経過処理。/ generation process of cursed artifact.
  * @details pval、AC、命中、ダメージが正の場合、符号反転の上1d4だけ悪化させ、重い呪い、呪いフラグを必ず付加。
  * 祝福を無効。確率に応じて、永遠の呪い、太古の怨念、経験値吸収、弱い呪いの継続的付加、強い呪いの継続的付加、HP吸収の呪い、

diff --git a/src/wizard/artifact-bias-table.c b/src/wizard/artifact-bias-table.c
new file mode 100644 (file)
index 0000000..a059a79
--- /dev/null
+++ b/src/wizard/artifact-bias-table.c
@@ -0,0 +1,27 @@
+#include "wizard/artifact-bias-table.h"
+
+/*!
+ * @brief ランダムアーティファクトのバイアス名称テーブル
+ */
+const concptr artifact_bias_name[MAX_BIAS] = {
+    _("なし", "None"),
+    _("電撃", "Elec"),
+    _("毒", "Poison"),
+    _("火炎", "Fire"),
+    _("冷気", "Cold"),
+    _("酸", "Acid"),
+    _("腕力", "STR"),
+    _("知力", "INT"),
+    _("賢さ", "WIS"),
+    _("器用さ", "DEX"),
+    _("耐久", "CON"),
+    _("魅力", "CHA"),
+    _("混沌", "Chaos"),
+    _("プリースト", "Pristly"),
+    _("死霊", "Necromantic"),
+    _("法", "Law"),
+    _("盗賊", "Rogue"),
+    _("メイジ", "Mage"),
+    _("戦士", "Warrior"),
+    _("レンジャー", "Ranger"),
+};

diff --git a/src/wizard/artifact-bias-table.h b/src/wizard/artifact-bias-table.h
new file mode 100644 (file)
index 0000000..0fb1d03
--- /dev/null
+++ b/src/wizard/artifact-bias-table.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "artifact/random-art-bias-types.h"
+#include "system/angband.h"
+
+extern const concptr artifact_bias_name[MAX_BIAS];