[Refactor] #37353 martial_arts と関連配列を melee.h/melee1.c へ移動。

diff --git a/src/externs.h b/src/externs.h
index 5fb569d..f6d60ae 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -88,8 +88,7 @@ extern const concptr color_names[16];
 extern const concptr stat_names[6];
 extern const concptr stat_names_reduced[6];
 extern const concptr window_flag_desc[32];
-extern const martial_arts ma_blows[MAX_MA];
-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];

diff --git a/src/files.c b/src/files.c
index 51a369b..61e37bf 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -49,6 +49,7 @@
 #include "player-skill.h"
 #include "floor.h"
 #include "dungeon.h"
+#include "melee.h"
 
 
 /*

diff --git a/src/melee.h b/src/melee.h
index 8edee05..304548a 100644 (file)
--- a/src/melee.h
+++ b/src/melee.h
@@ -38,6 +38,9 @@ extern const concptr silly_attacks[MAX_SILLY_ATTACK];
 extern const concptr silly_attacks2[MAX_SILLY_ATTACK];
 #endif
 
+extern const martial_arts ma_blows[MAX_MA];
+extern const int monk_ave_damage[PY_MAX_LEVEL + 1][3];
+
 extern bool test_hit_norm(HIT_RELIABILITY chance, ARMOUR_CLASS ac, bool visible);
 extern PERCENTAGE hit_chance(HIT_RELIABILITY chance, ARMOUR_CLASS ac);
 extern HIT_POINT tot_dam_aux(object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown);

diff --git a/src/melee1.c b/src/melee1.c
index aec92c2..fc62913 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -177,6 +177,110 @@ const concptr silly_attacks[MAX_SILLY_ATTACK] =
 #endif
 
 
+
+/*!
+ * @brief マーシャルアーツ打撃テーブル
+ */
+const martial_arts ma_blows[MAX_MA] =
+{
+#ifdef JP
+       { "%sを殴った。",                          1, 0, 1, 5, 0 },
+       { "%sを蹴った。",                           2, 0, 1, 7, 0 },
+       { "%sに正拳突きをくらわした。",                         3, 0, 1, 9, 0 },
+       { "%sに膝蹴りをくらわした。",             5, 5, 2, 4, MA_KNEE },
+       { "%sに肘打ちをくらわした。",            7, 5, 1, 12, 0 },
+       { "%sに体当りした。",                           9, 10, 2, 6, 0 },
+       { "%sを蹴った。",                           11, 10, 3, 6, MA_SLOW },
+       { "%sにアッパーをくらわした。",                       13, 12, 5, 5, 6 },
+       { "%sに二段蹴りをくらわした。",                    16, 15, 5, 6, 8 },
+       { "%sに猫爪撃をくらわした。",          20, 20, 5, 8, 0 },
+       { "%sに跳空脚をくらわした。",           24, 25, 6, 8, 10 },
+       { "%sに鷲爪襲をくらわした。",       28, 25, 7, 9, 0 },
+       { "%sに回し蹴りをくらわした。",         32, 30, 8, 10, 10 },
+       { "%sに鉄拳撃をくらわした。",          35, 35, 8, 11, 10 },
+       { "%sに飛空脚をくらわした。",         39, 35, 8, 12, 12 },
+       { "%sに昇龍拳をくらわした。",         43, 35, 9, 12, 16 },
+       { "%sに石破天驚拳をくらわした。",       48, 40, 10, 13, 18 },
+#else
+       { "You punch %s.",                          1, 0, 1, 4, 0 },
+       { "You kick %s.",                           2, 0, 1, 6, 0 },
+       { "You strike %s.",                         3, 0, 1, 7, 0 },
+       { "You hit %s with your knee.",             5, 5, 2, 3, MA_KNEE },
+       { "You hit %s with your elbow.",            7, 5, 1, 8, 0 },
+       { "You butt %s.",                           9, 10, 2, 5, 0 },
+       { "You kick %s.",                           11, 10, 3, 4, MA_SLOW },
+       { "You uppercut %s.",                       13, 12, 4, 4, 6 },
+       { "You double-kick %s.",                    16, 15, 5, 4, 8 },
+       { "You hit %s with a Cat's Claw.",          20, 20, 5, 5, 0 },
+       { "You hit %s with a jump kick.",           25, 25, 5, 6, 10 },
+       { "You hit %s with an Eagle's Claw.",       29, 25, 6, 6, 0 },
+       { "You hit %s with a circle kick.",         33, 30, 6, 8, 10 },
+       { "You hit %s with an Iron Fist.",          37, 35, 8, 8, 10 },
+       { "You hit %s with a flying kick.",         41, 35, 8, 10, 12 },
+       { "You hit %s with a Dragon Fist.",         45, 35, 10, 10, 16 },
+       { "You hit %s with a Crushing Blow.",       48, 35, 10, 12, 18 },
+#endif
+
+};
+
+/*!
+ * @brief 修行僧のターンダメージ算出テーブル
+ */
+const int monk_ave_damage[PY_MAX_LEVEL + 1][3] =
+{
+  {0, 0, 0},
+  {249, 249, 249},
+  {324, 324, 324},
+  {382, 438, 382},
+  {382, 439, 382},
+  {390, 446, 390},
+  {394, 473, 394},
+  {425, 528, 425},
+  {430, 535, 430},
+  {505, 560, 435},
+  {517, 575, 444},
+  {566, 655, 474},
+  {585, 713, 486},
+  {653, 843, 527},
+  {678, 890, 544},
+  {703, 973, 558},
+  {765, 1096, 596},
+  {914, 1146, 614},
+  {943, 1240, 629},
+  {971, 1276, 643},
+  {1018, 1350, 667},
+  {1063, 1464, 688},
+  {1099, 1515, 705},
+  {1128, 1559, 721},
+  {1153, 1640, 735},
+  {1336, 1720, 757},
+  {1387, 1789, 778},
+  {1430, 1893, 794},
+  {1610, 2199, 863},
+  {1666, 2280, 885},
+  {1713, 2401, 908},
+  {1755, 2465, 925},
+  {1909, 2730, 984},
+  {2156, 2891, 1009},
+  {2218, 2970, 1031},
+  {2319, 3107, 1063},
+  {2404, 3290, 1098},
+  {2477, 3389, 1125},
+  {2544, 3483, 1150},
+  {2771, 3899, 1228},
+  {2844, 3982, 1259},
+  {3129, 4064, 1287},
+  {3200, 4190, 1313},
+  {3554, 4674, 1432},
+  {3614, 4738, 1463},
+  {3679, 4853, 1485},
+  {3741, 4905, 1512},
+  {3785, 4943, 1538},
+  {4141, 5532, 1652},
+  {4442, 5581, 1679},
+  {4486, 5636, 1702},
+};
+
  /*!
  * @brief プレイヤーからモンスターへの打撃命中判定 /
  * Determine if the player "hits" a monster (normal combat).

diff --git a/src/tables.c b/src/tables.c
index d25f95e..df25175 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -3648,110 +3648,6 @@ const concptr window_flag_desc[32] =
 };
 
 
-
-/*!
- * @brief マーシャルアーツ打撃テーブル
- */
-const martial_arts ma_blows[MAX_MA] =
-{
-#ifdef JP
-       { "%sを殴った。",                          1, 0, 1, 5, 0 },
-       { "%sを蹴った。",                           2, 0, 1, 7, 0 },
-       { "%sに正拳突きをくらわした。",                         3, 0, 1, 9, 0 },
-       { "%sに膝蹴りをくらわした。",             5, 5, 2, 4, MA_KNEE },
-       { "%sに肘打ちをくらわした。",            7, 5, 1, 12, 0 },
-       { "%sに体当りした。",                           9, 10, 2, 6, 0 },
-       { "%sを蹴った。",                           11, 10, 3, 6, MA_SLOW },
-       { "%sにアッパーをくらわした。",                       13, 12, 5, 5, 6 },
-       { "%sに二段蹴りをくらわした。",                    16, 15, 5, 6, 8 },
-       { "%sに猫爪撃をくらわした。",          20, 20, 5, 8, 0 },
-       { "%sに跳空脚をくらわした。",           24, 25, 6, 8, 10 },
-       { "%sに鷲爪襲をくらわした。",       28, 25, 7, 9, 0 },
-       { "%sに回し蹴りをくらわした。",         32, 30, 8, 10, 10 },
-       { "%sに鉄拳撃をくらわした。",          35, 35, 8, 11, 10 },
-       { "%sに飛空脚をくらわした。",         39, 35, 8, 12, 12 },
-       { "%sに昇龍拳をくらわした。",         43, 35, 9, 12, 16 },
-       { "%sに石破天驚拳をくらわした。",       48, 40, 10, 13, 18 },
-#else
-       { "You punch %s.",                          1, 0, 1, 4, 0 },
-       { "You kick %s.",                           2, 0, 1, 6, 0 },
-       { "You strike %s.",                         3, 0, 1, 7, 0 },
-       { "You hit %s with your knee.",             5, 5, 2, 3, MA_KNEE },
-       { "You hit %s with your elbow.",            7, 5, 1, 8, 0 },
-       { "You butt %s.",                           9, 10, 2, 5, 0 },
-       { "You kick %s.",                           11, 10, 3, 4, MA_SLOW },
-       { "You uppercut %s.",                       13, 12, 4, 4, 6 },
-       { "You double-kick %s.",                    16, 15, 5, 4, 8 },
-       { "You hit %s with a Cat's Claw.",          20, 20, 5, 5, 0 },
-       { "You hit %s with a jump kick.",           25, 25, 5, 6, 10 },
-       { "You hit %s with an Eagle's Claw.",       29, 25, 6, 6, 0 },
-       { "You hit %s with a circle kick.",         33, 30, 6, 8, 10 },
-       { "You hit %s with an Iron Fist.",          37, 35, 8, 8, 10 },
-       { "You hit %s with a flying kick.",         41, 35, 8, 10, 12 },
-       { "You hit %s with a Dragon Fist.",         45, 35, 10, 10, 16 },
-       { "You hit %s with a Crushing Blow.",       48, 35, 10, 12, 18 },
-#endif
-
-};
-
-/*!
- * @brief 修行僧のターンダメージ算出テーブル
- */
-const int monk_ave_damage[PY_MAX_LEVEL+1][3] =
-{
-  {0, 0, 0},
-  {249, 249, 249},
-  {324, 324, 324},
-  {382, 438, 382},
-  {382, 439, 382},
-  {390, 446, 390},
-  {394, 473, 394},
-  {425, 528, 425},
-  {430, 535, 430},
-  {505, 560, 435},
-  {517, 575, 444},
-  {566, 655, 474},
-  {585, 713, 486},
-  {653, 843, 527},
-  {678, 890, 544},
-  {703, 973, 558},
-  {765, 1096, 596},
-  {914, 1146, 614},
-  {943, 1240, 629},
-  {971, 1276, 643},
-  {1018, 1350, 667},
-  {1063, 1464, 688},
-  {1099, 1515, 705},
-  {1128, 1559, 721},
-  {1153, 1640, 735},
-  {1336, 1720, 757},
-  {1387, 1789, 778},
-  {1430, 1893, 794},
-  {1610, 2199, 863},
-  {1666, 2280, 885},
-  {1713, 2401, 908},
-  {1755, 2465, 925},
-  {1909, 2730, 984},
-  {2156, 2891, 1009},
-  {2218, 2970, 1031},
-  {2319, 3107, 1063},
-  {2404, 3290, 1098},
-  {2477, 3389, 1125},
-  {2544, 3483, 1150},
-  {2771, 3899, 1228},
-  {2844, 3982, 1259},
-  {3129, 4064, 1287},
-  {3200, 4190, 1313},
-  {3554, 4674, 1432},
-  {3614, 4738, 1463},
-  {3679, 4853, 1485},
-  {3741, 4905, 1512},
-  {3785, 4943, 1538},
-  {4141, 5532, 1652},
-  {4442, 5581, 1679},
-  {4486, 5636, 1702},
-};
-
 /*!
  * @brief アイテムの価値記述テーブル /
  * Table of game-generated inscriptions (indexed by the defines in defines.h). -- RG