[Refactor] #37353 player-skill.c/h を追加。

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 3a70416..cc01e03 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -171,6 +171,7 @@
     <ClCompile Include="..\..\src\patron.c" />\r
     <ClCompile Include="..\..\src\player-damage.c" />\r
     <ClCompile Include="..\..\src\player-effects.c" />\r
+    <ClCompile Include="..\..\src\player-skill.c" />\r
     <ClCompile Include="..\..\src\player-status.c" />\r
     <ClCompile Include="..\..\src\quest.c" />\r
     <ClCompile Include="..\..\src\realm-craft.c" />\r
@@ -324,6 +325,7 @@
     <ClInclude Include="..\..\src\player-damage.h" />\r
     <ClInclude Include="..\..\src\player-effects.h" />\r
     <ClInclude Include="..\..\src\player-move.h" />\r
+    <ClInclude Include="..\..\src\player-skill.h" />\r
     <ClInclude Include="..\..\src\player-status.h" />\r
     <ClInclude Include="..\..\src\quest.h" />\r
     <ClInclude Include="..\..\src\readdib.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index fe277e5..c02aa38 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -312,6 +312,9 @@
     <ClCompile Include="..\..\src\mind.c">
       <Filter>spells</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\player-skill.c">
+      <Filter>player</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h" />
@@ -590,6 +593,9 @@
     <ClInclude Include="..\..\src\object.h">
       <Filter>object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player-skill.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 9044b48..1074507 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ hengband_SOURCES = \
        projection.h projection.c\
        \
        player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \
-       player-effects.c player-effects.h \
+       player-effects.c player-effects.h player-skill.c player-skill.h \
        \
        quest.h quest.c\
        \

diff --git a/src/birth.c b/src/birth.c
index 49c4786..688222c 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -30,6 +30,7 @@
 #include "dungeon-file.h"
 #include "files.h"
 #include "birth.h"
+#include "player-skill.h"
 
 /*!
  * オートローラーの内容を描画する間隔 / 

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index eeb7583..f3b9cec 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -8,6 +8,7 @@
 #include "player-move.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-skill.h"
 #include "object-hook.h"
 #include "monster.h"
 #include "monster-status.h"

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 571afc1..87de891 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -29,6 +29,7 @@
 #include "avatar.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-skill.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
 #include "view-mainwindow.h"

diff --git a/src/cmd4.c b/src/cmd4.c
index ee8b75a..3b59554 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -48,6 +48,7 @@
 #include "world.h"
 #include "player-effects.h"
 #include "player-status.h"
+#include "player-skill.h"
 #include "sort.h"
 #include "mutation.h"
 #include "quest.h"

diff --git a/src/defines.h b/src/defines.h
index 0c6da81..d336f85 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2662,41 +2662,8 @@ extern int PlayerUID;
 #define PARSE_ERROR_UNDEFINED_TERRAIN_TAG   10
 #define PARSE_ERROR_MAX                     11
 
-#define GINOU_SUDE      0
-#define GINOU_NITOURYU  1
-#define GINOU_RIDING    2
-#define GINOU_SHIELD    3
-#define GINOU_TEMPMAX   4
 #define GINOU_MAX      10
 
-/* Proficiency level */
-#define EXP_LEVEL_UNSKILLED 0
-#define EXP_LEVEL_BEGINNER  1
-#define EXP_LEVEL_SKILLED   2
-#define EXP_LEVEL_EXPERT    3
-#define EXP_LEVEL_MASTER    4
-
-/* Proficiency of weapons and misc. skills (except riding) */
-#define WEAPON_EXP_UNSKILLED     0
-#define WEAPON_EXP_BEGINNER   4000
-#define WEAPON_EXP_SKILLED    6000
-#define WEAPON_EXP_EXPERT     7000
-#define WEAPON_EXP_MASTER     8000
-
-/* Proficiency of riding */
-#define RIDING_EXP_UNSKILLED     0
-#define RIDING_EXP_BEGINNER    500
-#define RIDING_EXP_SKILLED    2000
-#define RIDING_EXP_EXPERT     5000
-#define RIDING_EXP_MASTER     8000
-
-/* Proficiency of spells */
-#define SPELL_EXP_UNSKILLED      0
-#define SPELL_EXP_BEGINNER     900
-#define SPELL_EXP_SKILLED     1200
-#define SPELL_EXP_EXPERT      1400
-#define SPELL_EXP_MASTER      1600
-
 #define NO_TOWN 6
 #define SECRET_TOWN 5
 

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 8c0565c..0525e49 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -8,6 +8,7 @@
 #include "quest.h"
 #include "monster.h"
 #include "files.h"
+#include "player-skill.h"
 
 dungeon_grid letter[255];
 

diff --git a/src/dungeon.c b/src/dungeon.c
index 01cb003..f7414e3 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -59,6 +59,7 @@
 #include "monsterrace-hook.h"
 #include "floor-save.h"
 #include "feature.h"
+#include "player-skill.h"
 
 #include "view-mainwindow.h"
 #include "dungeon-file.h"

diff --git a/src/externs.h b/src/externs.h
index d8c9603..6e89576 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -93,7 +93,7 @@ extern const int monk_ave_damage[PY_MAX_LEVEL+1][3];
 extern const concptr game_inscriptions[];
 extern const kamae kamae_shurui[MAX_KAMAE];
 extern const kamae kata_shurui[MAX_KATA];
-extern const concptr exp_level_str[5];
+
 
 extern const concptr ident_info[];
 extern const mbe_info_type mbe_info[];

diff --git a/src/files.c b/src/files.c
index d1d7c35..2f4fc5c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -46,6 +46,7 @@
 #include "dungeon-file.h"
 #include "init.h"
 #include "monster-spell.h"
+#include "player-skill.h"
 
 
 /*

diff --git a/src/load.c b/src/load.c
index 9e89a5c..e3b8b7d 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -65,6 +65,7 @@
 #include "cmd-pet.h"
 #include "dungeon-file.h"
 #include "files.h"
+#include "player-skill.h"
 
 
 /*

diff --git a/src/melee1.c b/src/melee1.c
index 60befd1..f6df731 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -16,14 +16,12 @@
 
 #include "artifact.h"
 #include "cmd-pet.h"
-#include "player-damage.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
 #include "monster.h"
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "avatar.h"
-#include "player-status.h"
 #include "realm-hex.h"
 #include "object-flavor.h"
 #include "object-hook.h"
@@ -33,6 +31,9 @@
 #include "spells.h"
 #include "files.h"
 #include "player-effects.h"
+#include "player-skill.h"
+#include "player-damage.h"
+#include "player-status.h"
 #include "view-mainwindow.h"
 
 

diff --git a/src/object-hook.c b/src/object-hook.c
index 4aee8e8..009be9c 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -5,6 +5,7 @@
 #include "object-hook.h"
 #include "monster.h"
 #include "artifact.h"
+#include "player-skill.h"
 
 /*!
 * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/

diff --git a/src/player-skill.c b/src/player-skill.c
new file mode 100644 (file)
index 0000000..db6ddd8
--- /dev/null
+++ b/src/player-skill.c
@@ -0,0 +1,12 @@
+#include "angband.h"
+#include "player-skill.h"
+
+/*!
+ * @brief 技能値到達表記テーブル
+ */
+const concptr exp_level_str[5] =
+#ifdef JP
+{ "[初心者]", "[入門者]", "[熟練者]", "[エキスパート]", "[達人]" };
+#else
+{"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
+#endif

diff --git a/src/player-skill.h b/src/player-skill.h
new file mode 100644 (file)
index 0000000..1012a5d
--- /dev/null
+++ b/src/player-skill.h
@@ -0,0 +1,38 @@
+#pragma once
+
+extern const concptr exp_level_str[5];
+
+#define GINOU_SUDE      0
+#define GINOU_NITOURYU  1
+#define GINOU_RIDING    2
+#define GINOU_SHIELD    3
+#define GINOU_TEMPMAX   4
+
+
+/* Proficiency level */
+#define EXP_LEVEL_UNSKILLED 0
+#define EXP_LEVEL_BEGINNER  1
+#define EXP_LEVEL_SKILLED   2
+#define EXP_LEVEL_EXPERT    3
+#define EXP_LEVEL_MASTER    4
+
+/* Proficiency of weapons and misc. skills (except riding) */
+#define WEAPON_EXP_UNSKILLED     0
+#define WEAPON_EXP_BEGINNER   4000
+#define WEAPON_EXP_SKILLED    6000
+#define WEAPON_EXP_EXPERT     7000
+#define WEAPON_EXP_MASTER     8000
+
+/* Proficiency of riding */
+#define RIDING_EXP_UNSKILLED     0
+#define RIDING_EXP_BEGINNER    500
+#define RIDING_EXP_SKILLED    2000
+#define RIDING_EXP_EXPERT     5000
+#define RIDING_EXP_MASTER     8000
+
+/* Proficiency of spells */
+#define SPELL_EXP_UNSKILLED      0
+#define SPELL_EXP_BEGINNER     900
+#define SPELL_EXP_SKILLED     1200
+#define SPELL_EXP_EXPERT      1400
+#define SPELL_EXP_MASTER      1600

diff --git a/src/player-status.c b/src/player-status.c
index 50f115d..4a8c55e 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -3,6 +3,8 @@
 
 #include "player-move.h"
 #include "player-status.h"
+#include "player-effects.h"
+#include "player-skill.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "feature.h"
@@ -19,7 +21,6 @@
 #include "realm-hex.h"
 #include "cmd-pet.h"
 #include "cmd-spell.h"
-#include "player-effects.h"
 
 /*!
  * @var horror_desc

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 8ae9675..1d9d2b0 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -28,6 +28,7 @@
 #include "spells.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-skill.h"
 #include "realm-hex.h"
 #include "grid.h"
 

diff --git a/src/shoot.c b/src/shoot.c
index b74c4c2..8abb8c5 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -7,6 +7,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "player-skill.h"
 #include "object-hook.h"
 #include "floor.h"
 #include "grid.h"

diff --git a/src/spells2.c b/src/spells2.c
index ca5f5c2..6174ff9 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -36,6 +36,7 @@
 #include "player-move.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-skill.h"
 
 #include "floor-events.h"
 #include "feature.h"

diff --git a/src/spells3.c b/src/spells3.c
index 1985af1..d54c9fe 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -37,6 +37,7 @@
 #include "floor-save.h"
 #include "files.h"
 #include "player-effects.h"
+#include "player-skill.h"
 #include "view-mainwindow.h"
 #include "mind.h"
 #include "wild.h"

diff --git a/src/tables.c b/src/tables.c
index dab05cf..d25f95e 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -3819,16 +3819,6 @@ const kamae kata_shurui[MAX_KATA] =
 #endif
 };
 
-/*!
- * @brief 技能値到達表記テーブル
- */
-const concptr exp_level_str[5]=
-#ifdef JP
-{"[初心者]", "[入門者]", "[熟練者]", "[エキスパート]", "[達人]"};
-#else
-{"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
-#endif
-
 
 /*!
  * @brief シンボル解説テーブル /

diff --git a/src/types.h b/src/types.h
index fac24cf..e64912e 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -47,6 +47,7 @@
 
 #include "h-type.h"
 #include "defines.h"
+//#include "player-skill.h"
 
 /*!
  * @struct feature_state

diff --git a/src/wizard2.c b/src/wizard2.c
index 89a8b71..dbcb8a4 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -20,6 +20,7 @@
 #include "artifact.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-skill.h"
 
 #include "spells.h"
 #include "spells-object.h"