[Refactor] #40399 Separated sv-weapon-types.h from object.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 08d01ec..6bf0135 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -511,6 +511,7 @@
     <ClInclude Include="..\..\src\object\sv-bow-types.h" />\r
     <ClInclude Include="..\..\src\object\sv-digging-types.h" />\r
     <ClInclude Include="..\..\src\object\sv-other-types.h" />\r
+    <ClInclude Include="..\..\src\object\sv-weapon-types.h" />\r
     <ClInclude Include="..\..\src\object\tr-types.h" />\r
     <ClInclude Include="..\..\src\object\trc-types.h" />\r
     <ClInclude Include="..\..\src\object\tval-types.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index c9f758b..05d6e97 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2179,6 +2179,9 @@
     <ClInclude Include="..\..\src\object\sv-digging-types.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object\sv-weapon-types.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 75aa164..c1e4549 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -209,6 +209,7 @@ hengband_SOURCES = \
        object/object-mark-types.h object/object-util.h \
        object/item-apply-magic.h \
        object/sv-bow-types.h object/sv-digging-types.h object/sv-other-types.h \
+       object/sv-weapon-types.h \
        object/item-feeling.h object/item-use-flags.h \
        \
        inventory/simple-appraiser.c inventory/simple-appraiser.h \

diff --git a/src/birth/birth-stat.c b/src/birth/birth-stat.c
index 53e63e1..fb3d685 100644 (file)
Binary files a/src/birth/birth-stat.c and b/src/birth/birth-stat.c differ

diff --git a/src/birth/initial-equipments-table.c b/src/birth/initial-equipments-table.c
index bdae224..b270184 100644 (file)
--- a/src/birth/initial-equipments-table.c
+++ b/src/birth/initial-equipments-table.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "birth/initial-equipments-table.h"
 #include "object/sv-bow-types.h"
+#include "object/sv-weapon-types.h"
 
 /*!
  * プレイヤーの職業毎の初期装備テーブル。/\n

diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index 2a57ac1..9c191f3 100644 (file)
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -8,6 +8,7 @@
 #include "object/object-kind.h"
 #include "object/sv-bow-types.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 #include "autopick/autopick.h"
 #include "player/player-races-table.h"
 

diff --git a/src/combat/attack-accuracy.c b/src/combat/attack-accuracy.c
index ff7df88..6f0ba62 100644 (file)
--- a/src/combat/attack-accuracy.c
+++ b/src/combat/attack-accuracy.c
@@ -2,6 +2,7 @@
 #include "combat/attack-accuracy.h"
 #include "main/sound-definitions-table.h"
 #include "object/death-scythe.h"
+#include "object/sv-weapon-types.h"
 
 /*!
  * @brief プレイヤーからモンスターへの打撃命中判定 /

diff --git a/src/combat/attack-criticality.c b/src/combat/attack-criticality.c
index 6a77b96..e9a8142 100644 (file)
--- a/src/combat/attack-criticality.c
+++ b/src/combat/attack-criticality.c
@@ -1,5 +1,6 @@
 #include "combat/combat-options-type.h"
 #include "combat/attack-criticality.h"
+#include "object/sv-weapon-types.h"
 
 /*!
 * @brief プレイヤーからモンスターへの打撃クリティカル判定 /

diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c
index bbda76b..224b575 100644 (file)
--- a/src/combat/player-attack.c
+++ b/src/combat/player-attack.c
@@ -22,6 +22,7 @@
 #include "object/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
+#include "object/sv-weapon-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-skill.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 7cda01a..b8b39db 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -33,6 +33,7 @@
 #include "store/store-util.h"
 #include "store/store.h"
 #include "object/object-flavor.h"
+#include "object/sv-weapon-types.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-personalities-table.h"

diff --git a/src/market/articles-on-sale.c b/src/market/articles-on-sale.c
index f88bcc5..56945a2 100644 (file)
--- a/src/market/articles-on-sale.c
+++ b/src/market/articles-on-sale.c
@@ -4,6 +4,7 @@
 #include "object/sv-bow-types.h"
 #include "object/sv-digging-types.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 
 /*!
  * 店舗で販売するオブジェクトを定義する / Hack -- Objects sold in the stores -- by tval/sval pair.

diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index e2f0d8a..81a770e 100644 (file)
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -13,6 +13,7 @@
 #include "object/tr-types.h"
 #include "object/item-use-flags.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 
 /*!
  * @brief 修復材料のオブジェクトから修復対象に特性を移植する。

diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index 45cde92..9edd8df 100644 (file)
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -13,6 +13,7 @@
 #include "core/stuff-handler.h"
 #include "object/tr-types.h"
 #include "object/item-use-flags.h"
+#include "object/sv-weapon-types.h"
 
 /*!
  * @brief 攻撃時スレイによるダメージ期待値修正計算 / critical happens at i / 10000

diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index b5a016c..b1d87f5 100644 (file)
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -46,6 +46,7 @@
 #include "combat/monster-attack-types.h"
 #include "combat/monster-attack-effect.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 
  /*
   * Pronoun arrays, by gender.

diff --git a/src/object/artifact.c b/src/object/artifact.c
index 06cedb7..4df1e73 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -27,6 +27,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"
+#include "object/sv-weapon-types.h"
 #include "spell/spells-object.h"
 #include "io/files-util.h"
 #include "grid/grid.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 9115a4a..c6be39f 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -6,6 +6,7 @@
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "monster/monster.h"
 #include "player/player-class.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 7d6bef7..8e708a3 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -26,6 +26,7 @@
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 #include "player/player-move.h"
 #include "player/player-class.h"
 #include "inventory/player-inventory.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 1dba909..a926646 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -36,6 +36,7 @@
 #include "object/special-object-flags.h"
 #include "object/sv-bow-types.h"
 #include "object/sv-other-types.h"
+#include "object/sv-weapon-types.h"
 #include "object/item-feeling.h"
 #include "grid/feature.h"
 #include "player/player-status.h"

diff --git a/src/object/sv-weapon-types.h b/src/object/sv-weapon-types.h
new file mode 100644 (file)
index 0000000..aab6131
--- /dev/null
+++ b/src/object/sv-weapon-types.h
@@ -0,0 +1,91 @@
+#pragma once
+
+/* The "sval" values for TV_HAFTED */
+typedef enum sv_hafted_type {
+       SV_CLUB = 1, /* 1d4  */
+    SV_WHIP = 2, /* 1d6  */
+    SV_QUARTERSTAFF = 3, /* 1d9  */
+    SV_NUNCHAKU = 4, /* 2d3  */
+    SV_MACE = 5, /* 2d4  */
+    SV_BALL_AND_CHAIN = 6, /* 2d4  */
+    SV_JO_STAFF = 7, /* 1d7  */
+    SV_WAR_HAMMER = 8, /* 3d3  */
+    SV_THREE_PIECE_ROD = 11, /* 3d3  */
+    SV_MORNING_STAR = 12, /* 2d6  */
+    SV_FLAIL = 13, /* 2d6  */
+    SV_BO_STAFF = 14, /* 1d11 */
+    SV_LEAD_FILLED_MACE = 15, /* 3d4  */
+    SV_TETSUBO = 16, /* 2d7  */
+    SV_TWO_HANDED_FLAIL = 18, /* 3d6  */
+    SV_GREAT_HAMMER = 19, /* 4d6  */
+    SV_MACE_OF_DISRUPTION = 20, /* 5d8  */
+    SV_WIZSTAFF = 21, /* 1d2  */
+    SV_GROND = 50, /* 3d9  */
+    SV_NAMAKE_HAMMER = 63, /* 1d77 */
+} sv_hafted_type;
+
+/* The "sval" values for TV_POLEARM */
+typedef enum sv_polearm_type {
+    SV_HATCHET = 1, /* 1d5 */
+    SV_SPEAR = 2, /* 1d6 */
+    SV_SICKLE = 3, /* 2d3 */
+    SV_AWL_PIKE = 4, /* 1d8 */
+    SV_TRIDENT = 5, /* 1d9 */
+    SV_FAUCHARD = 6, /* 1d10 */
+    SV_BROAD_SPEAR = 7, /* 1d9 */
+    SV_PIKE = 8, /* 2d5 */
+    SV_NAGINATA = 9, /* 2d6 */
+    SV_BEAKED_AXE = 10, /* 2d6 */
+    SV_BROAD_AXE = 11, /* 2d6 */
+    SV_LUCERNE_HAMMER = 12, /* 2d5  */
+    SV_GLAIVE = 13, /* 2d6 */
+    SV_LAJATANG = 14, /* 2d7 */
+    SV_HALBERD = 15, /* 3d4 */
+    SV_GUISARME = 16, /* 2d5 */
+    SV_SCYTHE = 17, /* 5d3 */
+    SV_LANCE = 20, /* 2d8 */
+    SV_BATTLE_AXE = 22, /* 2d8 */
+    SV_GREAT_AXE = 25, /* 4d4 */
+    SV_TRIFURCATE_SPEAR = 26, /* 2d9 */
+    SV_LOCHABER_AXE = 28, /* 3d8 */
+    SV_HEAVY_LANCE = 29, /* 4d8 */
+    SV_SCYTHE_OF_SLICING = 30, /* 8d4 */
+    SV_TSURIZAO = 40, /* 1d1 */
+    SV_DEATH_SCYTHE = 50, /* 10d10 */
+} sv_polearm_type;
+
+/* The "sval" codes for TV_SWORD */
+typedef enum sv_sword_type {
+    SV_BROKEN_DAGGER = 1, /* 1d1 */
+    SV_BROKEN_SWORD = 2, /* 1d2 */
+    SV_DAGGER = 4, /* 1d4 */
+    SV_MAIN_GAUCHE = 5, /* 1d5 */
+    SV_TANTO = 6, /* 1d5 */
+    SV_RAPIER = 7, /* 1d6 */
+    SV_SMALL_SWORD = 8, /* 1d6 */
+    SV_BASILLARD = 9, /* 1d8 */
+    SV_SHORT_SWORD = 10, /* 1d7 */
+    SV_SABRE = 11, /* 1d7 */
+    SV_CUTLASS = 12, /* 1d7 */
+    SV_WAKIZASHI = 13, /* 2d4 */
+    SV_KHOPESH = 14, /* 2d4 */
+    SV_TULWAR = 15, /* 2d4 */
+    SV_BROAD_SWORD = 16, /* 2d5 */
+    SV_LONG_SWORD = 17, /* 2d5 */
+    SV_SCIMITAR = 18, /* 2d5 */
+    SV_NINJATO = 19, /* 1d9 */
+    SV_KATANA = 20, /* 3d4 */
+    SV_BASTARD_SWORD = 21, /* 3d4 */
+    SV_GREAT_SCIMITAR = 22, /* 4d5 */
+    SV_CLAYMORE = 23, /* 2d8 */
+    SV_ESPADON = 24, /* 2d9 */
+    SV_TWO_HANDED_SWORD = 25, /* 3d6 */
+    SV_FLAMBERGE = 26, /* 3d7 */
+    SV_NO_DACHI = 27, /* 5d4 */
+    SV_EXECUTIONERS_SWORD = 28, /* 4d5 */
+    SV_ZWEIHANDER = 29, /* 4d6 */
+    SV_BLADE_OF_CHAOS = 30, /* 6d5 */
+    SV_DIAMOND_EDGE = 31, /* 7d5 */
+    SV_POISON_NEEDLE = 32, /* 1d1 */
+    SV_HAYABUSA = 33, /* 1d6 */
+} sv_sword_type;

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index a719efb..58c4f78 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -35,6 +35,7 @@
 #include "object/object-ego.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"
+#include "object/sv-weapon-types.h"
 #include "floor/wild.h"
 #include "spell/spells-floor.h"
 #include "player/player-status.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 31162b0..76778c2 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -26,6 +26,7 @@
 #include "object/object-hook.h"
 #include "object/object-ego.h"
 #include "object/special-object-flags.h"
+#include "object/sv-weapon-types.h"
 #include "monster/monster.h"
 #include "monster/monster-status.h"
 #include "monster/monster-race-hook.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 0bc373a..ca0c780 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -16,6 +16,7 @@
 #include "object/object-flavor.h"
 #include "object/object-ego.h"
 #include "object/special-object-flags.h"
+#include "object/sv-weapon-types.h"
 #include "player/player-damage.h"
 #include "player/player-status.h"
 #include "player/avatar.h"

diff --git a/src/store/store-util.c b/src/store/store-util.c
index c3d6aac..ead5676 100644 (file)
--- a/src/store/store-util.c
+++ b/src/store/store-util.c
@@ -6,6 +6,7 @@
 #include "object/object-kind.h"
 #include "object/tr-types.h"
 #include "object/special-object-flags.h"
+#include "object/sv-weapon-types.h"
 
 int cur_store_num = 0;
 store_type *st_ptr = NULL;

diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index 971a4d9..5836216 100644 (file)
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -13,6 +13,7 @@
 #include "combat/shoot.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
+#include "object/sv-weapon-types.h"
 #include "combat/attack-power-table.h"
 #include "object/tr-types.h"
 #include "object/special-object-flags.h"