OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision596cd9d130fdde67663ba938c1533b5683c18121 (tree)
Time2019-04-24 22:39:53
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -171,6 +171,7 @@
171171 <ClCompile Include="..\..\src\patron.c" />
172172 <ClCompile Include="..\..\src\player-damage.c" />
173173 <ClCompile Include="..\..\src\player-effects.c" />
174+ <ClCompile Include="..\..\src\player-skill.c" />
174175 <ClCompile Include="..\..\src\player-status.c" />
175176 <ClCompile Include="..\..\src\quest.c" />
176177 <ClCompile Include="..\..\src\realm-craft.c" />
@@ -324,6 +325,7 @@
324325 <ClInclude Include="..\..\src\player-damage.h" />
325326 <ClInclude Include="..\..\src\player-effects.h" />
326327 <ClInclude Include="..\..\src\player-move.h" />
328+ <ClInclude Include="..\..\src\player-skill.h" />
327329 <ClInclude Include="..\..\src\player-status.h" />
328330 <ClInclude Include="..\..\src\quest.h" />
329331 <ClInclude Include="..\..\src\readdib.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -312,6 +312,9 @@
312312 <ClCompile Include="..\..\src\mind.c">
313313 <Filter>spells</Filter>
314314 </ClCompile>
315+ <ClCompile Include="..\..\src\player-skill.c">
316+ <Filter>player</Filter>
317+ </ClCompile>
315318 </ItemGroup>
316319 <ItemGroup>
317320 <ClInclude Include="..\..\src\angband.h" />
@@ -590,6 +593,9 @@
590593 <ClInclude Include="..\..\src\object.h">
591594 <Filter>object</Filter>
592595 </ClInclude>
596+ <ClInclude Include="..\..\src\player-skill.h">
597+ <Filter>player</Filter>
598+ </ClInclude>
593599 </ItemGroup>
594600 <ItemGroup>
595601 <ResourceCompile Include="..\..\src\angband.rc" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ hengband_SOURCES = \
5454 projection.h projection.c\
5555 \
5656 player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \
57- player-effects.c player-effects.h \
57+ player-effects.c player-effects.h player-skill.c player-skill.h \
5858 \
5959 quest.h quest.c\
6060 \
--- a/src/birth.c
+++ b/src/birth.c
@@ -30,6 +30,7 @@
3030 #include "dungeon-file.h"
3131 #include "files.h"
3232 #include "birth.h"
33+#include "player-skill.h"
3334
3435 /*!
3536 * オートローラーの内容を描画する間隔 /
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -8,6 +8,7 @@
88 #include "player-move.h"
99 #include "player-status.h"
1010 #include "player-effects.h"
11+#include "player-skill.h"
1112 #include "object-hook.h"
1213 #include "monster.h"
1314 #include "monster-status.h"
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -29,6 +29,7 @@
2929 #include "avatar.h"
3030 #include "player-status.h"
3131 #include "player-effects.h"
32+#include "player-skill.h"
3233 #include "object-hook.h"
3334 #include "cmd-basic.h"
3435 #include "view-mainwindow.h"
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -48,6 +48,7 @@
4848 #include "world.h"
4949 #include "player-effects.h"
5050 #include "player-status.h"
51+#include "player-skill.h"
5152 #include "sort.h"
5253 #include "mutation.h"
5354 #include "quest.h"
--- a/src/defines.h
+++ b/src/defines.h
@@ -2662,41 +2662,8 @@ extern int PlayerUID;
26622662 #define PARSE_ERROR_UNDEFINED_TERRAIN_TAG 10
26632663 #define PARSE_ERROR_MAX 11
26642664
2665-#define GINOU_SUDE 0
2666-#define GINOU_NITOURYU 1
2667-#define GINOU_RIDING 2
2668-#define GINOU_SHIELD 3
2669-#define GINOU_TEMPMAX 4
26702665 #define GINOU_MAX 10
26712666
2672-/* Proficiency level */
2673-#define EXP_LEVEL_UNSKILLED 0
2674-#define EXP_LEVEL_BEGINNER 1
2675-#define EXP_LEVEL_SKILLED 2
2676-#define EXP_LEVEL_EXPERT 3
2677-#define EXP_LEVEL_MASTER 4
2678-
2679-/* Proficiency of weapons and misc. skills (except riding) */
2680-#define WEAPON_EXP_UNSKILLED 0
2681-#define WEAPON_EXP_BEGINNER 4000
2682-#define WEAPON_EXP_SKILLED 6000
2683-#define WEAPON_EXP_EXPERT 7000
2684-#define WEAPON_EXP_MASTER 8000
2685-
2686-/* Proficiency of riding */
2687-#define RIDING_EXP_UNSKILLED 0
2688-#define RIDING_EXP_BEGINNER 500
2689-#define RIDING_EXP_SKILLED 2000
2690-#define RIDING_EXP_EXPERT 5000
2691-#define RIDING_EXP_MASTER 8000
2692-
2693-/* Proficiency of spells */
2694-#define SPELL_EXP_UNSKILLED 0
2695-#define SPELL_EXP_BEGINNER 900
2696-#define SPELL_EXP_SKILLED 1200
2697-#define SPELL_EXP_EXPERT 1400
2698-#define SPELL_EXP_MASTER 1600
2699-
27002667 #define NO_TOWN 6
27012668 #define SECRET_TOWN 5
27022669
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -8,6 +8,7 @@
88 #include "quest.h"
99 #include "monster.h"
1010 #include "files.h"
11+#include "player-skill.h"
1112
1213 dungeon_grid letter[255];
1314
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -59,6 +59,7 @@
5959 #include "monsterrace-hook.h"
6060 #include "floor-save.h"
6161 #include "feature.h"
62+#include "player-skill.h"
6263
6364 #include "view-mainwindow.h"
6465 #include "dungeon-file.h"
--- a/src/externs.h
+++ b/src/externs.h
@@ -93,7 +93,7 @@ extern const int monk_ave_damage[PY_MAX_LEVEL+1][3];
9393 extern const concptr game_inscriptions[];
9494 extern const kamae kamae_shurui[MAX_KAMAE];
9595 extern const kamae kata_shurui[MAX_KATA];
96-extern const concptr exp_level_str[5];
96+
9797
9898 extern const concptr ident_info[];
9999 extern const mbe_info_type mbe_info[];
--- a/src/files.c
+++ b/src/files.c
@@ -46,6 +46,7 @@
4646 #include "dungeon-file.h"
4747 #include "init.h"
4848 #include "monster-spell.h"
49+#include "player-skill.h"
4950
5051
5152 /*
--- a/src/load.c
+++ b/src/load.c
@@ -65,6 +65,7 @@
6565 #include "cmd-pet.h"
6666 #include "dungeon-file.h"
6767 #include "files.h"
68+#include "player-skill.h"
6869
6970
7071 /*
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -16,14 +16,12 @@
1616
1717 #include "artifact.h"
1818 #include "cmd-pet.h"
19-#include "player-damage.h"
2019 #include "monsterrace-hook.h"
2120 #include "melee.h"
2221 #include "monster.h"
2322 #include "monster-status.h"
2423 #include "monster-spell.h"
2524 #include "avatar.h"
26-#include "player-status.h"
2725 #include "realm-hex.h"
2826 #include "object-flavor.h"
2927 #include "object-hook.h"
@@ -33,6 +31,9 @@
3331 #include "spells.h"
3432 #include "files.h"
3533 #include "player-effects.h"
34+#include "player-skill.h"
35+#include "player-damage.h"
36+#include "player-status.h"
3637 #include "view-mainwindow.h"
3738
3839
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -5,6 +5,7 @@
55 #include "object-hook.h"
66 #include "monster.h"
77 #include "artifact.h"
8+#include "player-skill.h"
89
910 /*!
1011 * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/
--- /dev/null
+++ b/src/player-skill.c
@@ -0,0 +1,12 @@
1+#include "angband.h"
2+#include "player-skill.h"
3+
4+/*!
5+ * @brief 技能値到達表記テーブル
6+ */
7+const concptr exp_level_str[5] =
8+#ifdef JP
9+{ "[初心者]", "[入門者]", "[熟練者]", "[エキスパート]", "[達人]" };
10+#else
11+{"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
12+#endif
--- /dev/null
+++ b/src/player-skill.h
@@ -0,0 +1,38 @@
1+#pragma once
2+
3+extern const concptr exp_level_str[5];
4+
5+#define GINOU_SUDE 0
6+#define GINOU_NITOURYU 1
7+#define GINOU_RIDING 2
8+#define GINOU_SHIELD 3
9+#define GINOU_TEMPMAX 4
10+
11+
12+/* Proficiency level */
13+#define EXP_LEVEL_UNSKILLED 0
14+#define EXP_LEVEL_BEGINNER 1
15+#define EXP_LEVEL_SKILLED 2
16+#define EXP_LEVEL_EXPERT 3
17+#define EXP_LEVEL_MASTER 4
18+
19+/* Proficiency of weapons and misc. skills (except riding) */
20+#define WEAPON_EXP_UNSKILLED 0
21+#define WEAPON_EXP_BEGINNER 4000
22+#define WEAPON_EXP_SKILLED 6000
23+#define WEAPON_EXP_EXPERT 7000
24+#define WEAPON_EXP_MASTER 8000
25+
26+/* Proficiency of riding */
27+#define RIDING_EXP_UNSKILLED 0
28+#define RIDING_EXP_BEGINNER 500
29+#define RIDING_EXP_SKILLED 2000
30+#define RIDING_EXP_EXPERT 5000
31+#define RIDING_EXP_MASTER 8000
32+
33+/* Proficiency of spells */
34+#define SPELL_EXP_UNSKILLED 0
35+#define SPELL_EXP_BEGINNER 900
36+#define SPELL_EXP_SKILLED 1200
37+#define SPELL_EXP_EXPERT 1400
38+#define SPELL_EXP_MASTER 1600
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -3,6 +3,8 @@
33
44 #include "player-move.h"
55 #include "player-status.h"
6+#include "player-effects.h"
7+#include "player-skill.h"
68 #include "floor.h"
79 #include "floor-events.h"
810 #include "feature.h"
@@ -19,7 +21,6 @@
1921 #include "realm-hex.h"
2022 #include "cmd-pet.h"
2123 #include "cmd-spell.h"
22-#include "player-effects.h"
2324
2425 /*!
2526 * @var horror_desc
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -28,6 +28,7 @@
2828 #include "spells.h"
2929 #include "player-status.h"
3030 #include "player-effects.h"
31+#include "player-skill.h"
3132 #include "realm-hex.h"
3233 #include "grid.h"
3334
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -7,6 +7,7 @@
77 #include "artifact.h"
88 #include "avatar.h"
99 #include "player-status.h"
10+#include "player-skill.h"
1011 #include "object-hook.h"
1112 #include "floor.h"
1213 #include "grid.h"
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -36,6 +36,7 @@
3636 #include "player-move.h"
3737 #include "player-status.h"
3838 #include "player-effects.h"
39+#include "player-skill.h"
3940
4041 #include "floor-events.h"
4142 #include "feature.h"
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -37,6 +37,7 @@
3737 #include "floor-save.h"
3838 #include "files.h"
3939 #include "player-effects.h"
40+#include "player-skill.h"
4041 #include "view-mainwindow.h"
4142 #include "mind.h"
4243 #include "wild.h"
--- a/src/tables.c
+++ b/src/tables.c
@@ -3819,16 +3819,6 @@ const kamae kata_shurui[MAX_KATA] =
38193819 #endif
38203820 };
38213821
3822-/*!
3823- * @brief 技能値到達表記テーブル
3824- */
3825-const concptr exp_level_str[5]=
3826-#ifdef JP
3827-{"[初心者]", "[入門者]", "[熟練者]", "[エキスパート]", "[達人]"};
3828-#else
3829-{"[Unskilled]", "[Beginner]", "[Skilled]", "[Expert]", "[Master]"};
3830-#endif
3831-
38323822
38333823 /*!
38343824 * @brief シンボル解説テーブル /
--- a/src/types.h
+++ b/src/types.h
@@ -47,6 +47,7 @@
4747
4848 #include "h-type.h"
4949 #include "defines.h"
50+//#include "player-skill.h"
5051
5152 /*!
5253 * @struct feature_state
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -20,6 +20,7 @@
2020 #include "artifact.h"
2121 #include "player-status.h"
2222 #include "player-effects.h"
23+#include "player-skill.h"
2324
2425 #include "spells.h"
2526 #include "spells-object.h"
Show on old repository browser