From 2be058db9539aa9be6b00dbccf2e89769087647e Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:10:17 +0200
Subject: [PATCH 01/12] three files

---
 data/json/items/armor/cardboard.json   | 11 +++--------
 data/json/items/armor/exotic.json      |  2 --
 data/json/items/armor/eyewear.json     |  1 -
 data/mods/TEST_DATA/legacy_to_hit.json |  5 -----
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/data/json/items/armor/cardboard.json b/data/json/items/armor/cardboard.json
index 3c43769a7cf6a..0a9a2710f62a4 100644
--- a/data/json/items/armor/cardboard.json
+++ b/data/json/items/armor/cardboard.json
@@ -22,8 +22,7 @@
     "material_thickness": 5,
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "WATER_DISSOLVE", "VARSIZE", "HARD", "PSYSHIELD_PARTIAL", "FRAGILE" ],
-    "melee_damage": { "bash": 0 }
+    "flags": [ "WATER_DISSOLVE", "VARSIZE", "HARD", "PSYSHIELD_PARTIAL", "FRAGILE" ]
   },
   {
     "id": "armor_cardboard",
@@ -36,7 +35,6 @@
     "volume": "17500 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -5,
     "material": [ "cardboard", "paper" ],
     "symbol": "[",
     "color": "brown_yellow",
@@ -72,8 +70,7 @@
         "coverage": 100,
         "encumbrance": 23
       }
-    ],
-    "melee_damage": { "bash": 0 }
+    ]
   },
   {
     "id": "armor_cardboard_cuirass",
@@ -86,7 +83,6 @@
     "volume": "6 L",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -5,
     "material": [ "cardboard", "paper" ],
     "symbol": "[",
     "color": "brown_yellow",
@@ -94,8 +90,7 @@
     "warmth": 15,
     "material_thickness": 6,
     "flags": [ "WATER_DISSOLVE", "FRAGILE_MELEE", "VARSIZE", "OUTER", "HARD" ],
-    "armor": [ { "encumbrance": 12, "coverage": 90, "covers": [ "torso" ] } ],
-    "melee_damage": { "bash": 0 }
+    "armor": [ { "encumbrance": 12, "coverage": 90, "covers": [ "torso" ] } ]
   },
   {
     "id": "cardboard_crown",
diff --git a/data/json/items/armor/exotic.json b/data/json/items/armor/exotic.json
index 56b715ea6e089..ea4787219b392 100644
--- a/data/json/items/armor/exotic.json
+++ b/data/json/items/armor/exotic.json
@@ -237,7 +237,6 @@
     "volume": "250 ml",
     "price": "10 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "plastic", "steel" ],
     "symbol": ",",
     "color": "red",
@@ -365,7 +364,6 @@
     "volume": "1 L",
     "price": "49 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -3,
     "material": [ "monolith" ],
     "symbol": "[",
     "color": "dark_gray",
diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json
index 1666e0b04a776..d5dbfb148b54e 100644
--- a/data/json/items/armor/eyewear.json
+++ b/data/json/items/armor/eyewear.json
@@ -233,7 +233,6 @@
     "volume": "250 ml",
     "price": "14 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -3,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_safety",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index 2bd4cf3877f01..6160eca3afc30 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -35,8 +35,6 @@
       "arisaka_monopod",
       "armchair",
       "armor_aztec",
-      "armor_cardboard",
-      "armor_cardboard_cuirass",
       "armor_cuirass",
       "armor_larmor_chest",
       "armor_lc_chestplate",
@@ -48,7 +46,6 @@
       "armor_lorica",
       "armor_riot_leg",
       "armor_riot_torso",
-      "armor_star_samurai_mask",
       "armor_thessalonian",
       "art_crystal",
       "art_disc",
@@ -262,7 +259,6 @@
       "extinguisher",
       "face_veil",
       "fake_dynamite_50lbs",
-      "feeding_kit",
       "felinesuit",
       "feral_human_thrown_rock",
       "fiber_mat",
@@ -306,7 +302,6 @@
       "glowstick",
       "glowstick_dead",
       "glowstick_lit",
-      "goggles_welding",
       "gold_watch",
       "golf_ball",
       "grass_blanket",

From 85276af054fe1eb9e96c14bcec378aac32f5513b Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:12:16 +0200
Subject: [PATCH 02/12] ``armor\head_attachments.json``

---
 data/json/items/armor/head_attachments.json | 10 ++--------
 data/mods/TEST_DATA/legacy_to_hit.json      |  6 ------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/data/json/items/armor/head_attachments.json b/data/json/items/armor/head_attachments.json
index bc5db320d6062..97174b56aa52c 100644
--- a/data/json/items/armor/head_attachments.json
+++ b/data/json/items/armor/head_attachments.json
@@ -219,7 +219,6 @@
     "material": [ "plastic", "steel", "glass" ],
     "symbol": "[",
     "color": "dark_gray",
-    "to_hit": -3,
     "charges_per_use": 1,
     "ammo": "battery",
     "use_action": {
@@ -278,7 +277,6 @@
     "material": [ "plastic", "steel", "glass" ],
     "symbol": "[",
     "color": "dark_gray",
-    "to_hit": -3,
     "charges_per_use": 1,
     "ammo": "battery",
     "use_action": {
@@ -345,7 +343,6 @@
     "material": [ "plastic", "steel", "glass" ],
     "symbol": "[",
     "color": "dark_gray",
-    "to_hit": -3,
     "charges_per_use": 1,
     "ammo": "battery",
     "use_action": {
@@ -482,11 +479,10 @@
     "category": "armor",
     "name": { "str": "mild steel chainmail partial aventail" },
     "description": "A wide chainmail ring designed to attach to a cap helmet, hanging down to extend protection to the face and neck.",
-    "weight": "1000 g",
+    "weight": "1 kg",
     "volume": "300 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "lc_steel_chain" ],
     "symbol": "[",
     "warmth": 3,
@@ -627,7 +623,6 @@
     "volume": "450 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "13 USD",
-    "to_hit": -1,
     "material": [ "lc_steel_chain" ],
     "symbol": "[",
     "warmth": 3,
@@ -763,11 +758,10 @@
     "category": "armor",
     "name": { "str": "mild steel armored face mask" },
     "description": "A metal face mask designed to attach to a cap helmet to protect the lower half.  This is a crude, dull facsimile of the original masterpieces made of mild steel.",
-    "weight": "2000 g",
+    "weight": "2 kg",
     "volume": "300 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "13 USD",
-    "to_hit": -1,
     "material": [ "lc_steel" ],
     "symbol": "[",
     "warmth": 3,
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index 6160eca3afc30..33591ae631fde 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -15,7 +15,6 @@
       "UPS_off",
       "acidbomb",
       "adjustable_stock",
-      "advanced_gpnvg",
       "airsoft_helmet",
       "ak308",
       "ak47",
@@ -254,7 +253,6 @@
       "engineering_engine_kit",
       "engineering_makerspace_kit",
       "engineering_robotics_kit",
-      "enhanced_nvg",
       "extension_cable",
       "extinguisher",
       "face_veil",
@@ -379,11 +377,8 @@
       "large_tent_kit",
       "laser_rifle",
       "lawn_dart",
-      "lc_chainmail_aventail",
-      "lc_chainmail_face",
       "lc_chainmail_hood",
       "lc_mirror_armor",
-      "lc_steel_facemask",
       "leather_funnel",
       "leather_pouch",
       "leather_tarp",
@@ -456,7 +451,6 @@
       "military_explosive_half_barrel_bomb",
       "military_explosive_half_barrel_bomb_act",
       "military_explosive_pipebomb",
-      "military_nvg",
       "minidraco556",
       "mininuke",
       "minireactor",

From dd33fadedf5a362b42edbe8224bdef68e9914639 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:20:39 +0200
Subject: [PATCH 03/12] ``armor\helmets.json``

---
 data/json/items/armor/helmets.json     | 60 +++++++++++++-------------
 data/mods/TEST_DATA/legacy_to_hit.json | 14 ------
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
index 1a58cb9e817d1..57f7ad2b2a445 100644
--- a/data/json/items/armor/helmets.json
+++ b/data/json/items/armor/helmets.json
@@ -116,7 +116,6 @@
     "volume": "1 L",
     "price": "40 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "plastic_pad", "leather" ],
     "symbol": "[",
     "looks_like": "balclava",
@@ -168,7 +167,7 @@
     "longest_side": "28 cm",
     "price": "150 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "hat_hard",
@@ -255,7 +254,7 @@
         "transparent": true
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_army_outdated",
@@ -270,7 +269,7 @@
     "price": "200 USD",
     "//": "assuming this is an antique and not a cheap replica",
     "price_postapoc": "12 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "hc_steel", "plastic", "leather" ],
     "repairs_with": [ "hc_steel" ],
     "symbol": "[",
@@ -349,7 +348,7 @@
     "volume": "2250 ml",
     "price": "250 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "helmet_motor",
@@ -377,7 +376,7 @@
         "inherits_flags": false
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "tac_helmet",
@@ -389,7 +388,7 @@
     "volume": "1850 ml",
     "price": "200 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "tac_fullhelmet",
@@ -476,7 +475,7 @@
         "transparent": true
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "firehelmet",
@@ -489,7 +488,7 @@
     "longest_side": "30 cm",
     "price": "240 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "nomex" ],
     "symbol": "[",
     "looks_like": "cowboy_hat",
@@ -517,7 +516,7 @@
         "specifically_covers": [ "head_ear_l", "head_ear_r", "head_nape" ]
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_ball",
@@ -529,7 +528,6 @@
     "volume": "1750 ml",
     "price": "31 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
     "material": [ "plastic", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "hat_hard",
@@ -560,8 +558,7 @@
         "covers": [ "head" ],
         "specifically_covers": [ "head_ear_l", "head_ear_r" ]
       }
-    ],
-    "melee_damage": { "bash": 2 }
+    ]
   },
   {
     "id": "helmet_aztec",
@@ -577,7 +574,7 @@
     "price": "150 USD",
     "price_postapoc": "12 USD 50 cent",
     "material": [ "wood", "cotton" ],
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 6 },
     "techniques": [ "WBLOCK_1" ],
     "warmth": 15,
@@ -620,7 +617,8 @@
         "specifically_covers": [ "mouth_cheeks" ],
         "coverage": 20
       }
-    ]
+    ],
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_barbute",
@@ -669,7 +667,8 @@
     "material_thickness": 4,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "STURDY" ],
-    "melee_damage": { "bash": 3 }
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "xl_helmet_barbute",
@@ -1220,7 +1219,6 @@
     "volume": "250 ml",
     "price": "10 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "balclava",
@@ -1228,8 +1226,7 @@
     "warmth": 30,
     "material_thickness": 0.5,
     "flags": [ "VARSIZE", "SKINTIGHT" ],
-    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ]
   },
   {
     "id": "helmet_motor",
@@ -1242,7 +1239,7 @@
     "longest_side": "33 cm",
     "price": "325 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "hard_plastic_transp", "epoxy", "plastic_pad" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -1319,7 +1316,7 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "WATERPROOF", "STURDY", "PADDED", "SUN_GLASSES" ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_motor_raised",
@@ -1334,7 +1331,7 @@
     "longest_side": "33 cm",
     "price": "325 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "epoxy" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -1389,7 +1386,7 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "WATERPROOF", "STURDY", "PADDED" ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_riding",
@@ -1710,6 +1707,7 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "STURDY" ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 3 }
   },
   {
@@ -1765,7 +1763,8 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "STURDY" ],
-    "melee_damage": { "bash": 1 }
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "xl_helmet_kettle",
@@ -1785,7 +1784,7 @@
     "volume": "2750 ml",
     "price": "350 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "budget_steel", "cotton" ],
     "symbol": "[",
     "looks_like": "helmet_plate",
@@ -1804,7 +1803,7 @@
         "encumbrance_modifiers": [ "IMBALANCED" ]
       }
     ],
-    "melee_damage": { "bash": 1 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "xl_helmet_scrap",
@@ -1865,6 +1864,7 @@
         "encumbrance": 10
       }
     ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 3 }
   },
   {
@@ -1907,6 +1907,7 @@
         "encumbrance_modifiers": [ "RESTRICTS_NECK", "WELL_SUPPORTED" ]
       }
     ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 3 }
   },
   {
@@ -1944,6 +1945,7 @@
         "specifically_covers": [ "head_crown", "head_forehead" ]
       }
     ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 2 }
   },
   {
@@ -1956,7 +1958,7 @@
     "volume": "1750 ml",
     "price": "240 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -3,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "point", "balance": "clumsy" },
     "material": [ "leather", "iron" ],
     "symbol": "[",
     "looks_like": "helmet_plate",
@@ -2917,7 +2919,6 @@
     "volume": "1850 ml",
     "price": "60 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "plastic", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "helmet_army",
@@ -3010,8 +3011,7 @@
         "flag_restriction": [ "HELMET_HEAD_ATTACHMENT" ],
         "transparent": true
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "lc_helmet_turban",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index 33591ae631fde..30f3b70ae0401 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -15,7 +15,6 @@
       "UPS_off",
       "acidbomb",
       "adjustable_stock",
-      "airsoft_helmet",
       "ak308",
       "ak47",
       "ak556",
@@ -266,7 +265,6 @@
       "firecracker_act",
       "firecracker_pack",
       "firecracker_pack_act",
-      "firehelmet",
       "firework_cannon",
       "flashbang",
       "flint_steel",
@@ -321,15 +319,6 @@
       "hard_plate",
       "hd_tow_cable",
       "hdframe",
-      "headgear",
-      "helmet_army",
-      "helmet_army_outdated",
-      "helmet_aztec",
-      "helmet_ball",
-      "helmet_liner",
-      "helmet_motor",
-      "helmet_motor_raised",
-      "helmet_scrap",
       "henry_big_boy",
       "hk417_13",
       "hk_g3",
@@ -495,7 +484,6 @@
       "pedal_grindstone",
       "peephole",
       "ph_meter",
-      "pickelhaube",
       "pike_pole",
       "pipe_shotgun",
       "pipebomb",
@@ -630,8 +618,6 @@
       "swimming_kickboard",
       "tac338",
       "tac50",
-      "tac_fullhelmet",
-      "tac_helmet",
       "talking_doll",
       "tavor_12",
       "tearer",

From effe336687562b7a6198ed34f504b9675c9d3b4d Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:31:15 +0200
Subject: [PATCH 04/12] group commit

---
 data/json/items/armor/hoods.json          | 3 ---
 data/json/items/armor/integrated.json     | 2 --
 data/json/items/armor/pets_dog_armor.json | 4 +---
 data/mods/TEST_DATA/legacy_to_hit.json    | 6 ------
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/data/json/items/armor/hoods.json b/data/json/items/armor/hoods.json
index 7b05f9c92ca62..6474dd17e3de2 100644
--- a/data/json/items/armor/hoods.json
+++ b/data/json/items/armor/hoods.json
@@ -31,7 +31,6 @@
     "volume": "500 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "25 USD",
-    "to_hit": -1,
     "material": [ "budget_steel_chain" ],
     "symbol": "[",
     "looks_like": "balclava",
@@ -59,7 +58,6 @@
     "volume": "500 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "25 USD",
-    "to_hit": -1,
     "material": [ "lc_steel_chain" ],
     "symbol": "[",
     "looks_like": "balclava",
@@ -212,7 +210,6 @@
     "volume": "500 ml",
     "price": "50 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -5,
     "material": [ "nomex" ],
     "symbol": "[",
     "looks_like": "hood_rain",
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index ca5e7439011ad..bd818b487d0bd 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -1000,7 +1000,6 @@
     "symbol": ",",
     "color": "brown",
     "warmth": 5,
-    "to_hit": 1,
     "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 4 ], [ "PRY", 1 ] ],
     "environmental_protection": 1,
     "techniques": [ "RAPID" ],
@@ -1168,7 +1167,6 @@
     "symbol": ",",
     "color": "brown",
     "warmth": 10,
-    "to_hit": 1,
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -4 ], [ "PRY", 1 ], [ "HAMMER", 1 ] ],
     "environmental_protection": 3,
     "techniques": [ "BRUTAL", "WBLOCK_2" ],
diff --git a/data/json/items/armor/pets_dog_armor.json b/data/json/items/armor/pets_dog_armor.json
index 2895bfd196754..c8af6ac9fff6a 100644
--- a/data/json/items/armor/pets_dog_armor.json
+++ b/data/json/items/armor/pets_dog_armor.json
@@ -12,7 +12,6 @@
     "material": [ "kevlar_layered" ],
     "weight": "2150 g",
     "volume": "4500 ml",
-    "to_hit": -1,
     "flags": [ "IS_PET_ARMOR" ],
     "material_thickness": 2.0,
     "max_pet_vol": "60 L",
@@ -47,8 +46,7 @@
         "max_item_length": "20 cm",
         "moves": 200
       }
-    ],
-    "melee_damage": { "bash": 5 }
+    ]
   },
   {
     "type": "PET_ARMOR",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index 30f3b70ae0401..c3a1a1d53de17 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -169,7 +169,6 @@
       "carpet_legguards",
       "case_violin",
       "catalytic_cracking_reactor",
-      "chainmail_junk_hood",
       "chainsaw_off",
       "chainsaw_on",
       "chair_folding",
@@ -338,9 +337,7 @@
       "indoor_volleyball",
       "inflatable_airbag",
       "inflatable_section",
-      "integrated_chitin3_claws",
       "integrated_electrokit",
-      "integrated_giant_pincer",
       "integrated_multimeter",
       "integrated_welder",
       "inter_bayonet",
@@ -352,7 +349,6 @@
       "jumpsuit_xl",
       "kantele",
       "kevlar",
-      "kevlar_harness",
       "kevlar_shears",
       "knee_pads",
       "kord",
@@ -366,7 +362,6 @@
       "large_tent_kit",
       "laser_rifle",
       "lawn_dart",
-      "lc_chainmail_hood",
       "lc_mirror_armor",
       "leather_funnel",
       "leather_pouch",
@@ -463,7 +458,6 @@
       "nitrogen_generator",
       "nitrogen_tank",
       "noise_emitter",
-      "nomex_hood",
       "number4_mki",
       "ny_hook",
       "office_letter_opener",

From d1518748d589edbec9e6d2fe1e413d8de168107b Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:02:00 +0200
Subject: [PATCH 05/12] ``armor\jewelry.json``

---
 data/json/items/armor/jewelry.json     | 6 ------
 data/mods/TEST_DATA/legacy_to_hit.json | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
index 5324969638fdb..49cfd85a40adb 100644
--- a/data/json/items/armor/jewelry.json
+++ b/data/json/items/armor/jewelry.json
@@ -285,7 +285,6 @@
     "volume": "90 ml",
     "price": "120 USD",
     "price_postapoc": "7 USD",
-    "to_hit": -1,
     "material": [ "steel" ],
     "symbol": "[",
     "looks_like": "gold_watch",
@@ -1044,7 +1043,6 @@
     "volume": "90 ml",
     "price": "500 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
     "material": [ { "type": "steel", "portion": 9 }, { "type": "gold" } ],
     "symbol": "[",
     "color": "yellow",
@@ -1075,7 +1073,6 @@
     "volume": "90 ml",
     "price": "180 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -1,
     "material": [ { "type": "steel", "portion": 9 }, { "type": "silver" } ],
     "symbol": "[",
     "color": "light_gray",
@@ -1130,7 +1127,6 @@
     "volume": "100 ml",
     "price": "22 kUSD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
     "material": [ "gold", "silver" ],
     "symbol": "[",
     "color": "yellow",
@@ -1608,7 +1604,6 @@
     "//": "far more expensive than gold watches, around $100,000 for most platinum watches ",
     "price": "100 kUSD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "platinum" ],
     "symbol": "[",
     "color": "white",
@@ -1939,7 +1934,6 @@
     "volume": "100 ml",
     "price": "50 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -1,
     "material": [ "plastic", "steel" ],
     "ascii_picture": "wristwatch",
     "symbol": "[",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index c3a1a1d53de17..9a11e83e7474d 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -229,7 +229,6 @@
       "dinosuit",
       "directional_antenna",
       "diveknife",
-      "diving_watch",
       "down_blanket",
       "dragonsuit",
       "draw_plate",
@@ -297,7 +296,6 @@
       "glowstick",
       "glowstick_dead",
       "glowstick_lit",
-      "gold_watch",
       "golf_ball",
       "grass_blanket",
       "grass_sheet",
@@ -487,7 +485,6 @@
       "plasma_rifle",
       "plastic_boat_hull",
       "platinum_grille",
-      "platinum_watch",
       "plunger_futuristic",
       "plunger_toilet",
       "pockknife",
@@ -560,7 +557,6 @@
       "seat",
       "seat_bench",
       "sextant",
-      "sf_watch",
       "shark_suit",
       "shark_suit_faraday",
       "sharksuit",
@@ -577,7 +573,6 @@
       "shuttlecock",
       "sig_assault_rifle",
       "sig_p230",
-      "silver_watch",
       "sks",
       "sleeping_bag",
       "sm_extinguisher",
@@ -747,7 +742,6 @@
       "wood_plate",
       "wood_sheet",
       "wool_suit",
-      "wristwatch",
       "xd_10",
       "xedra_antenna",
       "xedra_gun",

From 11aad9df55d892e464f157a56d411ed50e6c0e2a Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:34:49 +0200
Subject: [PATCH 06/12] ``armor\legs_armor.json``

---
 data/json/items/armor/legs_armor.json  | 39 ++++++--------------------
 data/mods/TEST_DATA/legacy_to_hit.json | 14 ---------
 2 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index cfbdda5ce1fe1..def48d11a755c 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -9,7 +9,7 @@
     "volume": "1500 ml",
     "price": "5 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "wood" ],
     "symbol": "[",
     "looks_like": "leg_splint",
@@ -28,7 +28,7 @@
         "specifically_covers": [ "leg_lower_r", "leg_lower_l" ]
       }
     ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "carpet_legguards",
@@ -41,7 +41,6 @@
     "volume": "3 L",
     "price": "20 cent",
     "price_postapoc": "10 cent",
-    "to_hit": 1,
     "material": [ "plastic", "carpet_pilling" ],
     "symbol": "[",
     "looks_like": "leg_warmers",
@@ -76,7 +75,6 @@
     "volume": "2 L",
     "price": "20 cent",
     "price_postapoc": "10 cent",
-    "to_hit": 1,
     "material": [ "plastic", "carpet_pilling" ],
     "symbol": "[",
     "looks_like": "leg_warmers",
@@ -110,7 +108,6 @@
     "volume": "5000 ml",
     "price": "250 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": 1,
     "material": [ "chitin" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -187,7 +184,6 @@
     "volume": "5 L",
     "price": "815 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
     "material": [ "nomex", "kevlar", "lycra" ],
     "symbol": "[",
     "looks_like": "pants_cargo",
@@ -240,7 +236,6 @@
     "longest_side": "11 cm",
     "price": "75 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -1,
     "material": [ "steel" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -655,7 +650,6 @@
     "volume": "1500 ml",
     "price": "75 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -1,
     "material": [ "fancy_bronze", "leather" ],
     "symbol": "[",
     "looks_like": "chainmail_legs",
@@ -684,7 +678,6 @@
     "volume": "1250 ml",
     "price": "210 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "pants_leather",
@@ -758,7 +751,6 @@
     "volume": "1500 ml",
     "price": "25 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 1,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -787,7 +779,6 @@
     "volume": "5500 ml",
     "price": "400 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": 1,
     "material": [ "bronze", "leather" ],
     "symbol": "[",
     "looks_like": "legguard_lightplate",
@@ -833,7 +824,6 @@
     "volume": "3 L",
     "price": "34 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "plastic", "neoprene" ],
     "symbol": "[",
     "looks_like": "leg_warmers",
@@ -864,7 +854,6 @@
     "volume": "6 L",
     "price": "200 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -1,
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -910,7 +899,6 @@
     "volume": "5500 ml",
     "price": "400 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 1,
     "material": [ "iron", "leather" ],
     "symbol": "[",
     "looks_like": "legguard_lightplate",
@@ -957,7 +945,6 @@
     "volume": "2500 ml",
     "price": "400 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "symbol": "[",
     "looks_like": "legguard_lightplate",
@@ -998,7 +985,6 @@
     "volume": "1200 ml",
     "price": "200 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "symbol": "[",
     "looks_like": "legguard_lightplate",
@@ -1039,7 +1025,6 @@
     "volume": "2 L",
     "price": "5 USD",
     "price_postapoc": "4 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "symbol": "m",
     "color": "light_gray",
@@ -1077,7 +1062,6 @@
     "volume": "1 L",
     "price": "5 USD",
     "price_postapoc": "4 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "repairs_with": [ "steel" ],
     "symbol": "m",
@@ -1132,7 +1116,6 @@
     "volume": "500 ml",
     "price": "2 USD 30 cent",
     "price_postapoc": "50 cent",
-    "to_hit": 1,
     "material": [ "paper" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -1159,10 +1142,9 @@
     "name": { "str": "pair of improvised tire leg guards", "str_pl": "pairs of improvised tire leg guards" },
     "description": "Leg guards made of thick chunks of tire held together with duct tape.",
     "weight": "2400 g",
-    "volume": "2000 ml",
+    "volume": "2 L",
     "price": "23 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "rubber" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -1192,7 +1174,7 @@
     "volume": "5 L",
     "price": "200 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "budget_steel", "cotton" ],
     "symbol": "[",
     "looks_like": "legguard_metal",
@@ -1210,7 +1192,7 @@
         "encumbrance": 15
       }
     ],
-    "melee_damage": { "bash": 1, "cut": 1 }
+    "melee_damage": { "bash": 3, "cut": 1 }
   },
   {
     "id": "xl_legguard_scrap",
@@ -1238,7 +1220,6 @@
     "volume": "5 L",
     "price": "200 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "rubber" ],
     "symbol": "[",
     "looks_like": "legguard_metal",
@@ -1526,7 +1507,7 @@
     "volume": "2916 ml",
     "price": "600 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "lc_steel", "lc_steel_chain" ],
     "symbol": "[",
     "looks_like": "legguard_lightplate",
@@ -1633,7 +1614,7 @@
     "volume": "2916 ml",
     "price": "600 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "lc_steel", "lc_steel_chain" ],
     "symbol": "[",
     "looks_like": "armor_larmor",
@@ -1740,7 +1721,7 @@
     "volume": "2916 ml",
     "price": "600 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "lc_steel", "lc_steel_chain" ],
     "symbol": "[",
     "looks_like": "armor_larmor",
@@ -1847,7 +1828,6 @@
     "volume": "2500 ml",
     "price_postapoc": "12 USD",
     "looks_like": "technician_pants_gray",
-    "to_hit": 1,
     "material": [ "canvas", "leather" ],
     "symbol": "[",
     "color": "light_gray",
@@ -1902,7 +1882,6 @@
     "volume": "2500 ml",
     "price_postapoc": "12 USD",
     "looks_like": "technician_pants_gray",
-    "to_hit": 1,
     "material": [ "canvas", "cotton" ],
     "symbol": "[",
     "color": "light_gray",
@@ -1956,7 +1935,6 @@
     "volume": "2500 ml",
     "price": "100 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -3,
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "legguard_hard",
@@ -1994,7 +1972,6 @@
     "volume": "2 L",
     "price": "40 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "legguard_bronze",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index 9a11e83e7474d..bc15e9f0f11d3 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -5,7 +5,6 @@
     "legacy_to_hit": [
       "1895sbl",
       "2_shot_special",
-      "2byshin_guard",
       "EMPbomb",
       "EMPbomb_act",
       "LAW",
@@ -365,19 +364,6 @@
       "leather_pouch",
       "leather_tarp",
       "leggings_thessalonian",
-      "legguard_bronze",
-      "legguard_chitin",
-      "legguard_hard",
-      "legguard_larmor",
-      "legguard_lightplate",
-      "legguard_metal",
-      "legguard_metal_sheets",
-      "legguard_metal_sheets_greaves",
-      "legguard_metal_sheets_hip",
-      "legguard_metal_sheets_knees",
-      "legguard_paper",
-      "legguard_scrap",
-      "legguard_tire",
       "light_detector",
       "light_emergency_red",
       "livestock_scale",

From 3c9d95a78b0f8dd6a815f6d0afe9af87a099eaae Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:37:19 +0200
Subject: [PATCH 07/12] ``armor\masks.json``

---
 data/json/items/armor/masks.json       | 10 ----------
 data/mods/TEST_DATA/legacy_to_hit.json |  8 --------
 2 files changed, 18 deletions(-)

diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json
index 981625e6e4be6..ec779902402b0 100644
--- a/data/json/items/armor/masks.json
+++ b/data/json/items/armor/masks.json
@@ -71,7 +71,6 @@
     "volume": "1 L",
     "price": "40 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -3,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "balclava",
@@ -154,7 +153,6 @@
     "volume": "750 ml",
     "price": "200 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -3,
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_bal",
@@ -174,7 +172,6 @@
     "volume": "100 ml",
     "price": "8 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "scarf",
@@ -279,7 +276,6 @@
     "volume": "750 ml",
     "price": "40 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "mask_hockey",
@@ -301,7 +297,6 @@
     "volume": "750 ml",
     "price": "40 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -3,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_safety",
@@ -321,7 +316,6 @@
     "volume": "500 ml",
     "price": "8 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "scarf",
@@ -342,7 +336,6 @@
     "volume": "750 ml",
     "price": "40 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "mask_hockey",
@@ -414,7 +407,6 @@
     "volume": "150 ml",
     "price": "8 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "scarf",
@@ -434,7 +426,6 @@
     "volume": "100 ml",
     "price": "8 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "scarf",
@@ -584,7 +575,6 @@
     "volume": "780 ml",
     "price": "50 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "brown",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index bc15e9f0f11d3..d26d2c519fbb3 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -88,7 +88,6 @@
       "boat_board",
       "bolas",
       "bond_410",
-      "bondage_mask",
       "bondage_suit",
       "bone_fossil",
       "bone_plaster",
@@ -392,13 +391,6 @@
       "manual_tire_changer",
       "mark19",
       "marlin_9a",
-      "mask_bal",
-      "mask_dust",
-      "mask_guy_fawkes",
-      "mask_hockey",
-      "mask_plague",
-      "mask_rioter",
-      "mask_skull",
       "masonrysaw_off",
       "masonrysaw_on",
       "mbag",

From 38980e1b81340ef848fef03e213c7f51f5c660ab Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:43:51 +0200
Subject: [PATCH 08/12] ``armor\storage.json``

---
 data/json/items/armor/storage.json     | 47 +++++++++-----------------
 data/mods/TEST_DATA/legacy_to_hit.json |  9 -----
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
index 112a81f6cca7b..896fbec9a473f 100644
--- a/data/json/items/armor/storage.json
+++ b/data/json/items/armor/storage.json
@@ -608,8 +608,7 @@
       }
     ],
     "material_thickness": 2,
-    "flags": [ "OVERSIZE", "RESTRICT_HANDS", "NO_SALVAGE" ],
-    "melee_damage": { "bash": 1 }
+    "flags": [ "OVERSIZE", "RESTRICT_HANDS", "NO_SALVAGE" ]
   },
   {
     "id": "bigback",
@@ -714,6 +713,7 @@
     "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "5 L", "max_contains_weight": "15 kg", "moves": 300 } ],
     "material_thickness": 1,
     "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ],
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "neutral" },
     "melee_damage": { "bash": 4 }
   },
   {
@@ -721,8 +721,8 @@
     "type": "ARMOR",
     "name": { "str": "box backpack" },
     "description": "A makeshift backpack comprised of a wooden box and a pair of ropes.",
-    "weight": "8000 g",
-    "to_hit": -5,
+    "weight": "8 kg",
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "color": "brown",
     "symbol": "]",
     "looks_like": "jerrypack",
@@ -772,7 +772,7 @@
     "price": "35 USD",
     "flags": [ "BELTED", "OVERSIZE", "NO_REPAIR" ],
     "armor": [ { "encumbrance": 20, "coverage": 80, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ],
-    "melee_damage": { "bash": 16, "cut": 4 }
+    "melee_damage": { "bash": 10 }
   },
   {
     "id": "briefcase",
@@ -802,6 +802,7 @@
     "material_thickness": 2,
     "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ],
     "armor": [ { "encumbrance": 30, "coverage": 10, "covers": [ "arm_l", "arm_r", "hand_l", "hand_r" ] } ],
+    "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 5 }
   },
   {
@@ -813,7 +814,7 @@
     "volume": "10500 ml",
     "price": "240 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -4,
+    "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel", "leather" ],
     "symbol": "&",
     "looks_like": "briefcase",
@@ -832,7 +833,7 @@
     "material_thickness": 5,
     "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ],
     "armor": [ { "encumbrance": 30, "coverage": 10, "covers": [ "arm_l", "arm_r", "hand_l", "hand_r" ] } ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 5 }
   },
   {
     "id": "daypack",
@@ -1165,8 +1166,7 @@
     ],
     "material_thickness": 0.5,
     "flags": [ "BELTED", "WATER_FRIENDLY", "PALS_MEDIUM" ],
-    "armor": [ { "encumbrance": 1, "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance": 1, "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ]
   },
   {
     "id": "fanny",
@@ -1201,8 +1201,7 @@
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_lower" ]
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "golf_bag",
@@ -1343,7 +1342,6 @@
     "volume": "10500 ml",
     "price": "14 USD 50 cent",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "looks_like": "backpack",
@@ -1371,7 +1369,6 @@
     "volume": "500 ml",
     "price": "10 USD",
     "price_postapoc": "1 USD 50 cent",
-    "to_hit": 1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "holster",
@@ -1395,8 +1392,7 @@
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_waist" ]
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "legrig",
@@ -1842,7 +1838,6 @@
     "volume": "2625 ml",
     "price": "79 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "purse",
@@ -1868,7 +1863,6 @@
         "specifically_covers": [ "torso_hanging_back" ]
       }
     ],
-    "melee_damage": { "bash": 1 },
     "use_action": {
       "type": "transform",
       "msg": "You slide the bag to your side.",
@@ -2285,8 +2279,7 @@
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_hanging_front" ]
       }
-    ],
-    "melee_damage": { "bash": 2 }
+    ]
   },
   {
     "id": "ragpouch",
@@ -2297,7 +2290,6 @@
     "volume": "500 ml",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 1,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "light_gray",
@@ -2320,8 +2312,7 @@
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_waist" ]
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "rucksack",
@@ -2454,7 +2445,6 @@
     "volume": "1500 ml",
     "price": "240 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "canvas", "plastic" ],
     "symbol": "[",
     "looks_like": "backpack",
@@ -2480,8 +2470,7 @@
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_hanging_back" ]
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "slingpack",
@@ -2518,8 +2507,7 @@
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_hanging_back" ]
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "straw_basket",
@@ -2530,7 +2518,6 @@
     "volume": "10500 ml",
     "price": "2 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "paper" ],
     "symbol": "[",
     "looks_like": "plastic_shopping_bag",
@@ -2616,7 +2603,6 @@
     "volume": "1 L",
     "price": "0 cent",
     "price_postapoc": "50 cent",
-    "to_hit": -5,
     "material": [ "canvas" ],
     "symbol": "[",
     "looks_like": "duffelbag",
@@ -3214,8 +3200,7 @@
     "warmth": 2,
     "material_thickness": 1,
     "flags": [ "BELTED", "WATER_FRIENDLY" ],
-    "armor": [ { "encumbrance": [ 3, 5 ], "coverage": 60, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_front" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance": [ 3, 5 ], "coverage": 60, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_front" ] } ]
   },
   {
     "id": "bookstrap",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index d26d2c519fbb3..082a1b2a22663 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -131,7 +131,6 @@
       "bot_turret_speaker",
       "bot_yrax_trifacet",
       "boxcutter",
-      "boxpack",
       "bren2_556",
       "bren2_762",
       "brogyaga",
@@ -165,7 +164,6 @@
       "cargo_rack",
       "carpet_greaves",
       "carpet_legguards",
-      "case_violin",
       "catalytic_cracking_reactor",
       "chainsaw_off",
       "chainsaw_on",
@@ -340,7 +338,6 @@
       "it_battery_mount",
       "iwi_tavor_x95_300blk",
       "jacket_leather_mod",
-      "jerrypack",
       "jumpsuit",
       "jumpsuit_xl",
       "kantele",
@@ -360,7 +357,6 @@
       "lawn_dart",
       "lc_mirror_armor",
       "leather_funnel",
-      "leather_pouch",
       "leather_tarp",
       "leggings_thessalonian",
       "light_detector",
@@ -393,7 +389,6 @@
       "marlin_9a",
       "masonrysaw_off",
       "masonrysaw_on",
-      "mbag",
       "mdrx",
       "melting_point",
       "mess_tray",
@@ -482,7 +477,6 @@
       "rack_test_tube_micro",
       "radio",
       "raft_board",
-      "ragpouch",
       "rebar_plate",
       "recharge_station",
       "recoil_stock",
@@ -515,7 +509,6 @@
       "ruger_m77",
       "ruger_mini",
       "rugerlcp",
-      "runner_bag",
       "saiga_12",
       "saiga_410",
       "sail",
@@ -573,14 +566,12 @@
       "stone_chopper",
       "stopcock",
       "storage_line",
-      "straw_basket",
       "subsuit_xl",
       "suppressor",
       "surv_rocket_launcher",
       "survivor_adhoc_leather_pants",
       "survivor_hairtrimmer",
       "survivor_shavingkit",
-      "swag_bag",
       "swage",
       "swimming_kickboard",
       "tac338",

From ddbfafff940d3de6e22729f404e7eeca6c3f78fd Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:58:45 +0200
Subject: [PATCH 09/12] Update helmets.json

---
 data/json/items/armor/helmets.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
index 57f7ad2b2a445..553c00efabb26 100644
--- a/data/json/items/armor/helmets.json
+++ b/data/json/items/armor/helmets.json
@@ -575,7 +575,7 @@
     "price_postapoc": "12 USD 50 cent",
     "material": [ "wood", "cotton" ],
     "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
-    "melee_damage": { "bash": 6 },
+    "melee_damage": { "bash": 1 },
     "techniques": [ "WBLOCK_1" ],
     "warmth": 15,
     "flags": [ "VARSIZE", "STURDY", "PADDED", "WATERPROOF", "NO_REPAIR" ],
@@ -617,8 +617,7 @@
         "specifically_covers": [ "mouth_cheeks" ],
         "coverage": 20
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "helmet_barbute",

From e1524366cc12700a8635477e29f034e95af4ca10 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:33:44 +0200
Subject: [PATCH 10/12] Update legacy_to_hit.json

---
 data/mods/TEST_DATA/legacy_to_hit.json | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
index 082a1b2a22663..77ccf258454ce 100644
--- a/data/mods/TEST_DATA/legacy_to_hit.json
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -36,12 +36,8 @@
       "armor_larmor_chest",
       "armor_lc_chestplate",
       "armor_lc_heavy_chestplate",
-      "armor_lc_heavy_leg_guard",
-      "armor_lc_leg_guard",
       "armor_lc_light_chestplate",
-      "armor_lc_light_leg_guard",
       "armor_lorica",
-      "armor_riot_leg",
       "armor_riot_torso",
       "armor_thessalonian",
       "art_crystal",
@@ -146,7 +142,6 @@
       "browning_blr",
       "brush",
       "brush_toilet",
-      "bunker_pants",
       "burette",
       "butane_tank",
       "c4",
@@ -159,18 +154,14 @@
       "canister_goo",
       "cannon_3in_ordnance",
       "cannonball_4lb",
-      "canvas_pants_padded",
       "carbonfiber_boat_hull",
       "cargo_rack",
-      "carpet_greaves",
-      "carpet_legguards",
       "catalytic_cracking_reactor",
       "chainsaw_off",
       "chainsaw_on",
       "chair_folding",
       "chair_plywood",
       "chair_wood",
-      "chaps_leather",
       "cheek_pad",
       "chemical_thrower",
       "chemistry_set",
@@ -248,7 +239,6 @@
       "engineering_robotics_kit",
       "extension_cable",
       "extinguisher",
-      "face_veil",
       "fake_dynamite_50lbs",
       "felinesuit",
       "feral_human_thrown_rock",
@@ -327,7 +317,6 @@
       "hydrogen_tank",
       "hygrometer",
       "hygroscope",
-      "improvised_legguard_tire",
       "indoor_volleyball",
       "inflatable_airbag",
       "inflatable_section",
@@ -343,7 +332,6 @@
       "kantele",
       "kevlar",
       "kevlar_shears",
-      "knee_pads",
       "kord",
       "kp32",
       "ksg",
@@ -358,7 +346,6 @@
       "lc_mirror_armor",
       "leather_funnel",
       "leather_tarp",
-      "leggings_thessalonian",
       "light_detector",
       "light_emergency_red",
       "livestock_scale",
@@ -512,7 +499,6 @@
       "saiga_12",
       "saiga_410",
       "sail",
-      "santa_beard",
       "sapra",
       "savage112",
       "savage_111f",
@@ -569,7 +555,6 @@
       "subsuit_xl",
       "suppressor",
       "surv_rocket_launcher",
-      "survivor_adhoc_leather_pants",
       "survivor_hairtrimmer",
       "survivor_shavingkit",
       "swage",

From 9d4cbc0d23bc1a2de1b13f29f0005b146a3205b0 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sun, 20 Oct 2024 14:16:07 +0200
Subject: [PATCH 11/12] Update integrated.json

---
 data/json/items/armor/integrated.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index bd818b487d0bd..e0efd9b1febd8 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -1000,6 +1000,7 @@
     "symbol": ",",
     "color": "brown",
     "warmth": 5,
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "line", "balance": "neutral" },
     "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 4 ], [ "PRY", 1 ] ],
     "environmental_protection": 1,
     "techniques": [ "RAPID" ],
@@ -1167,6 +1168,8 @@
     "symbol": ",",
     "color": "brown",
     "warmth": 10,
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "any", "balance": "uneven" },
+    "//": "Assuming that it'd be shorter than 90cm but still long enough to slightly upset balance. Also given it does more bash than cut, I went with any striking surface as opposed to line. Not sure why it falls under shivs",
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -4 ], [ "PRY", 1 ], [ "HAMMER", 1 ] ],
     "environmental_protection": 3,
     "techniques": [ "BRUTAL", "WBLOCK_2" ],

From e1552680356fc9c66513208fa4eb8f14ad532a71 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Sun, 20 Oct 2024 21:21:43 +0200
Subject: [PATCH 12/12] Update integrated_dps.json

---
 data/mods/TEST_DATA/expected_dps_data/integrated_dps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/TEST_DATA/expected_dps_data/integrated_dps.json b/data/mods/TEST_DATA/expected_dps_data/integrated_dps.json
index 37d9fb4a3edd7..8d31355851d22 100644
--- a/data/mods/TEST_DATA/expected_dps_data/integrated_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/integrated_dps.json
@@ -4,9 +4,9 @@
     "//": "Integrated weapons, bionics, etc",
     "expected_dps": {
       "integrated_fangs": 6.66,
-      "integrated_chitin3_claws": 8.42,
+      "integrated_chitin3_claws": 5.75,
       "bio_scalpel": 6.18,
-      "integrated_giant_pincer": 11.31,
+      "integrated_giant_pincer": 9.78,
       "integrated_vampire_fangs": 10.69
     }
   }