[Fix] 弓が重すぎて運搬中になると命中率が上がる #1133

calc_weapon_weight_limit は両手持ちの時に重量上限が2倍になる
処理があるため、近接武器を両手持ちしているとこのボーナスが
弓にも適用されてしまっているのが原因。
calc_bow_weight_limit を新設し弓はそちらを使用するようにする。

ついでにこれらの関数の戻り値を重量の型に合わせて WEIGHT
にする。

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index 1f673ba..86821bd 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -237,8 +237,7 @@ static void delayed_visual_update(player_type *player_ptr)
  */
 static bool is_heavy_shoot(player_type *creature_ptr, object_type *o_ptr)
 {
-    int hold = adj_str_hold[creature_ptr->stat_index[A_STR]];
-    return (hold < o_ptr->weight / 10);
+    return (calc_bow_weight_limit(creature_ptr) < o_ptr->weight / 10);
 }
 
 /*!
@@ -2378,7 +2377,7 @@ static s16b calc_to_hit_bow(player_type *creature_ptr, bool is_real_value)
     object_type *o_ptr = &creature_ptr->inventory_list[INVEN_BOW];
 
     if (is_heavy_shoot(creature_ptr, o_ptr)) {
-        pow += 2 * (calc_weapon_weight_limit(creature_ptr) - o_ptr->weight / 10);
+        pow += 2 * (calc_bow_weight_limit(creature_ptr) - o_ptr->weight / 10);
     }
 
     if (o_ptr->k_idx) {
@@ -3026,9 +3025,9 @@ bool is_echizen(player_type *creature_ptr)
     return (creature_ptr->pseikaku == PERSONALITY_COMBAT) || (creature_ptr->inventory_list[INVEN_BOW].name1 == ART_CRIMSON);
 }
 
-int calc_weapon_weight_limit(player_type *creature_ptr)
+WEIGHT calc_weapon_weight_limit(player_type *creature_ptr)
 {
-    int weight = adj_str_hold[creature_ptr->stat_index[A_STR]];
+    WEIGHT weight = adj_str_hold[creature_ptr->stat_index[A_STR]];
 
     if (has_two_handed_weapons(creature_ptr))
         weight *= 2;
@@ -3036,6 +3035,13 @@ int calc_weapon_weight_limit(player_type *creature_ptr)
     return weight;
 }
 
+WEIGHT calc_bow_weight_limit(player_type *creature_ptr)
+{
+    WEIGHT weight = adj_str_hold[creature_ptr->stat_index[A_STR]];
+
+    return weight;
+}
+
 static player_hand main_attack_hand(player_type *creature_ptr)
 {
     switch (player_melee_type(creature_ptr)) {

diff --git a/src/player/player-status.h b/src/player/player-status.h
index d834fe8..3ded9ce 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -13,7 +13,8 @@ int weapon_exp_level(int weapon_exp);
 int riding_exp_level(int riding_exp);
 int spell_exp_level(int spell_exp);
 
-int calc_weapon_weight_limit(player_type *creature_ptr);
+WEIGHT calc_weapon_weight_limit(player_type *creature_ptr);
+WEIGHT calc_bow_weight_limit(player_type *creature_ptr);
 WEIGHT calc_inventory_weight(player_type *creature_ptr);
 
 s16b calc_num_fire(player_type *creature_ptr, object_type *o_ptr);