[Refactor] #37353 adj_str_blow と adj_dex_blow を melee.h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 3dba6d9..5821d87 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -61,8 +61,6 @@ extern const byte adj_str_th[];
 extern const byte adj_str_wgt[];
 extern const byte adj_str_hold[];
 extern const byte adj_str_dig[];
-extern const byte adj_str_blow[];
-extern const byte adj_dex_blow[];
 extern const byte adj_dex_safe[];
 extern const byte adj_con_fix[];
 extern const byte adj_con_mhp[];

diff --git a/src/melee.h b/src/melee.h
index 17171b3..89448d6 100644 (file)
--- a/src/melee.h
+++ b/src/melee.h
@@ -38,6 +38,8 @@ extern const concptr silly_attacks[MAX_SILLY_ATTACK];
 extern const concptr silly_attacks2[MAX_SILLY_ATTACK];
 #endif
 
+extern const byte adj_str_blow[];
+extern const byte adj_dex_blow[];
 extern const byte blows_table[12][12];
 
 /* For Monk martial arts */

diff --git a/src/melee1.c b/src/melee1.c
index 57ac7f6..cf102c8 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -324,6 +324,99 @@ const int monk_ave_damage[PY_MAX_LEVEL + 1][3] =
   {4486, 5636, 1702},
 };
 
+/*!
+ * 腕力による攻撃回数算定値テーブル
+ * Stat Table (STR) -- help index into the "blow" table
+ */
+const byte adj_str_blow[] =
+{
+       3       /* 3 */,
+       4       /* 4 */,
+       5       /* 5 */,
+       6       /* 6 */,
+       7       /* 7 */,
+       8       /* 8 */,
+       9       /* 9 */,
+       10      /* 10 */,
+       11      /* 11 */,
+       12      /* 12 */,
+       13      /* 13 */,
+       14      /* 14 */,
+       15      /* 15 */,
+       16      /* 16 */,
+       17      /* 17 */,
+       20 /* 18/00-18/09 */,
+       30 /* 18/10-18/19 */,
+       40 /* 18/20-18/29 */,
+       50 /* 18/30-18/39 */,
+       60 /* 18/40-18/49 */,
+       70 /* 18/50-18/59 */,
+       80 /* 18/60-18/69 */,
+       90 /* 18/70-18/79 */,
+       100 /* 18/80-18/89 */,
+       110 /* 18/90-18/99 */,
+       120 /* 18/100-18/109 */,
+       130 /* 18/110-18/119 */,
+       140 /* 18/120-18/129 */,
+       150 /* 18/130-18/139 */,
+       160 /* 18/140-18/149 */,
+       170 /* 18/150-18/159 */,
+       180 /* 18/160-18/169 */,
+       190 /* 18/170-18/179 */,
+       200 /* 18/180-18/189 */,
+       210 /* 18/190-18/199 */,
+       220 /* 18/200-18/209 */,
+       230 /* 18/210-18/219 */,
+       240 /* 18/220+ */
+};
+
+
+/*!
+ * 器用さによる攻撃回数インデックステーブル
+ * Stat Table (DEX) -- index into the "blow" table
+ */
+const byte adj_dex_blow[] =
+{
+       0       /* 3 */,
+       0       /* 4 */,
+       0       /* 5 */,
+       0       /* 6 */,
+       0       /* 7 */,
+       0       /* 8 */,
+       0       /* 9 */,
+       1       /* 10 */,
+       1       /* 11 */,
+       1       /* 12 */,
+       1       /* 13 */,
+       1       /* 14 */,
+       2       /* 15 */,
+       2       /* 16 */,
+       2       /* 17 */,
+       2       /* 18/00-18/09 */,
+       3       /* 18/10-18/19 */,
+       3       /* 18/20-18/29 */,
+       3       /* 18/30-18/39 */,
+       4       /* 18/40-18/49 */,
+       4       /* 18/50-18/59 */,
+       5       /* 18/60-18/69 */,
+       5       /* 18/70-18/79 */,
+       6       /* 18/80-18/89 */,
+       6       /* 18/90-18/99 */,
+       7       /* 18/100-18/109 */,
+       7       /* 18/110-18/119 */,
+       8       /* 18/120-18/129 */,
+       8       /* 18/130-18/139 */,
+       9      /* 18/140-18/149 */,
+       9      /* 18/150-18/159 */,
+       10      /* 18/160-18/169 */,
+       10      /* 18/170-18/179 */,
+       11      /* 18/180-18/189 */,
+       11      /* 18/190-18/199 */,
+       12      /* 18/200-18/209 */,
+       12      /* 18/210-18/219 */,
+       13      /* 18/220+ */
+};
+
 
 /*!
  * @brief

diff --git a/src/tables.c b/src/tables.c
index e83f76c..a3f97ae 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -851,101 +851,6 @@ const byte adj_str_dig[] =
        100     /* 18/220+ */
 };
 
-
-/*!
- * 腕力による攻撃回数算定値テーブル
- * Stat Table (STR) -- help index into the "blow" table
- */
-const byte adj_str_blow[] =
-{
-       3       /* 3 */,
-       4       /* 4 */,
-       5       /* 5 */,
-       6       /* 6 */,
-       7       /* 7 */,
-       8       /* 8 */,
-       9       /* 9 */,
-       10      /* 10 */,
-       11      /* 11 */,
-       12      /* 12 */,
-       13      /* 13 */,
-       14      /* 14 */,
-       15      /* 15 */,
-       16      /* 16 */,
-       17      /* 17 */,
-       20 /* 18/00-18/09 */,
-       30 /* 18/10-18/19 */,
-       40 /* 18/20-18/29 */,
-       50 /* 18/30-18/39 */,
-       60 /* 18/40-18/49 */,
-       70 /* 18/50-18/59 */,
-       80 /* 18/60-18/69 */,
-       90 /* 18/70-18/79 */,
-       100 /* 18/80-18/89 */,
-       110 /* 18/90-18/99 */,
-       120 /* 18/100-18/109 */,
-       130 /* 18/110-18/119 */,
-       140 /* 18/120-18/129 */,
-       150 /* 18/130-18/139 */,
-       160 /* 18/140-18/149 */,
-       170 /* 18/150-18/159 */,
-       180 /* 18/160-18/169 */,
-       190 /* 18/170-18/179 */,
-       200 /* 18/180-18/189 */,
-       210 /* 18/190-18/199 */,
-       220 /* 18/200-18/209 */,
-       230 /* 18/210-18/219 */,
-       240 /* 18/220+ */
-};
-
-
-/*!
- * 器用さによる攻撃回数インデックステーブル
- * Stat Table (DEX) -- index into the "blow" table
- */
-const byte adj_dex_blow[] =
-{
-       0       /* 3 */,
-       0       /* 4 */,
-       0       /* 5 */,
-       0       /* 6 */,
-       0       /* 7 */,
-       0       /* 8 */,
-       0       /* 9 */,
-       1       /* 10 */,
-       1       /* 11 */,
-       1       /* 12 */,
-       1       /* 13 */,
-       1       /* 14 */,
-       2       /* 15 */,
-       2       /* 16 */,
-       2       /* 17 */,
-       2       /* 18/00-18/09 */,
-       3       /* 18/10-18/19 */,
-       3       /* 18/20-18/29 */,
-       3       /* 18/30-18/39 */,
-       4       /* 18/40-18/49 */,
-       4       /* 18/50-18/59 */,
-       5       /* 18/60-18/69 */,
-       5       /* 18/70-18/79 */,
-       6       /* 18/80-18/89 */,
-       6       /* 18/90-18/99 */,
-       7       /* 18/100-18/109 */,
-       7       /* 18/110-18/119 */,
-       8       /* 18/120-18/129 */,
-       8       /* 18/130-18/139 */,
-       9      /* 18/140-18/149 */,
-       9      /* 18/150-18/159 */,
-       10      /* 18/160-18/169 */,
-       10      /* 18/170-18/179 */,
-       11      /* 18/180-18/189 */,
-       11      /* 18/190-18/199 */,
-       12      /* 18/200-18/209 */,
-       12      /* 18/210-18/219 */,
-       13      /* 18/220+ */
-};
-
-
 /*!
  * 器用さによる盗難防止＆体当たり成功判定修正テーブル
  * Stat Table (DEX) -- chance of avoiding "theft" and "falling"