[Refactor] #40514 装備による射撃命中力処理を移動． / Moved hit power calculation processing by equipment.

diff --git a/src/object/object-kind.c b/src/object/object-kind.c
index fcf8c1a..fb09067 100644 (file)
--- a/src/object/object-kind.c
+++ b/src/object/object-kind.c
@@ -260,11 +260,9 @@ void calc_equipment_status(player_type* creature_ptr) {
                 }
             } else {
                 if (o_ptr->curse_flags & TRC_HEAVY_CURSE) {
-                    creature_ptr->to_h_b -= 15;
                     if (object_is_fully_known(o_ptr))
                         creature_ptr->dis_to_h_b -= 15;
                 } else {
-                    creature_ptr->to_h_b -= 5;
                     if (object_is_fully_known(o_ptr))
                         creature_ptr->dis_to_h_b -= 5;
                 }

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 300d2d7..3826b9c 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -795,9 +795,9 @@ void calc_bonuses(player_type *creature_ptr)
     creature_ptr->dis_to_d[1] += ((int)(adj_str_td[creature_ptr->stat_ind[A_STR]]) - 128);
     creature_ptr->dis_to_h[0] += ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128);
     creature_ptr->dis_to_h[1] += ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128);
-    creature_ptr->dis_to_h_b += ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128);
     creature_ptr->dis_to_h[0] += ((int)(adj_str_th[creature_ptr->stat_ind[A_STR]]) - 128);
     creature_ptr->dis_to_h[1] += ((int)(adj_str_th[creature_ptr->stat_ind[A_STR]]) - 128);
+    creature_ptr->dis_to_h_b += ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128);
     creature_ptr->dis_to_h_b += ((int)(adj_str_th[creature_ptr->stat_ind[A_STR]]) - 128);
 
     hold = adj_str_hold[creature_ptr->stat_ind[A_STR]];
@@ -3540,6 +3540,33 @@ static void calc_to_hit_bow(player_type *creature_ptr)
 {
        creature_ptr->to_h_b = 0;
 
+    for (int i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+        object_type *o_ptr;
+        BIT_FLAGS flgs[TR_FLAG_SIZE];
+        o_ptr = &creature_ptr->inventory_list[i];
+        if (!o_ptr->k_idx)
+            continue;
+        object_flags(o_ptr, flgs);
+
+        if (o_ptr->curse_flags & TRC_LOW_MELEE) {
+            int slot = i - INVEN_RARM;
+            if (slot >= 2) {
+                if (o_ptr->curse_flags & TRC_HEAVY_CURSE) {
+                    creature_ptr->to_h_b -= 15;
+                } else {
+                    creature_ptr->to_h_b -= 5;
+                }
+            }
+        }
+
+        int bonus_to_h = o_ptr->to_h;
+        if (creature_ptr->pclass == CLASS_NINJA) {
+            if (o_ptr->to_h > 0)
+                bonus_to_h = (o_ptr->to_h + 1) / 2;
+        }
+        creature_ptr->to_h_b += (s16b)bonus_to_h;
+       }
+
        if (creature_ptr->stun > 50) {
         creature_ptr->to_h_b -= 20;
     } else if (creature_ptr->stun) {