diff --git a/data/json/artifact/artifact_item_types.json b/data/json/artifact/artifact_item_types.json
index 0e7308872b810..cebd785df5aad 100644
--- a/data/json/artifact/artifact_item_types.json
+++ b/data/json/artifact/artifact_item_types.json
@@ -35,8 +35,7 @@
     "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "35 ml",
-    "weight": "50 g",
-    "to_hit": -2
+    "weight": "50 g"
   },
   {
     "id": "art_lamp",
@@ -47,8 +46,7 @@
     "material": [ "anomaly" ],
     "symbol": "[",
     "volume": "1 L",
-    "weight": "80 g",
-    "to_hit": -2
+    "weight": "80 g"
   },
   {
     "id": "art_snake",
@@ -86,8 +84,7 @@
     "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "76 ml",
-    "weight": "125 g",
-    "to_hit": -2
+    "weight": "125 g"
   },
   {
     "id": "art_napkin",
@@ -111,7 +108,6 @@
     "symbol": "O",
     "volume": "1 L",
     "weight": "800 g",
-    "to_hit": -2,
     "melee_damage": { "cut": 3 }
   },
   {
@@ -214,8 +210,7 @@
     "material": [ "anomaly" ],
     "symbol": "C",
     "volume": "35 ml",
-    "weight": "50 g",
-    "to_hit": -2
+    "weight": "50 g"
   },
   {
     "id": "art_robe",
@@ -342,6 +337,7 @@
     "volume": "500 ml",
     "longest_side": "25 cm",
     "price": "30 USD",
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" },
     "material": [ "wood", "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -349,7 +345,6 @@
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 11 ] ],
     "weapon_category": [ "KNIVES" ],
     "flags": [ "SHEATH_KNIFE", "TRADER_AVOID" ],
-    "to_hit": -2,
     "melee_damage": { "bash": 2, "stab": 13 }
   },
   {
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 4601d1d602f60..35051655bb24d 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -538,7 +538,6 @@
     "range": 12,
     "dispersion": 14,
     "loudness": 0,
-    "to_hit": -2,
     "recovery_chance": 99,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "cut": 9 }
@@ -1524,7 +1523,6 @@
     "//": "300g / 8.8g/ml = ~34.1ml. Add 10% to take an uneven chunk into account = 37.5ml rounded upwards to 38ml.",
     "price": "1 USD 69 cent",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "bronze" ],
     "symbol": ",",
     "color": "yellow",
diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index 7c6990bb77d89..1a7e5b9efd7d4 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -182,7 +182,6 @@
     "weight": "400 g",
     "volume": "1500 ml",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -1708,7 +1707,6 @@
     "weight": "500 g",
     "volume": "500 ml",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
     "looks_like": "armguard_soft",
diff --git a/data/json/items/armor/bespoke_armor/custom_gloves.json b/data/json/items/armor/bespoke_armor/custom_gloves.json
index 24c2b63b9e580..e2c31e6160859 100644
--- a/data/json/items/armor/bespoke_armor/custom_gloves.json
+++ b/data/json/items/armor/bespoke_armor/custom_gloves.json
@@ -9,7 +9,6 @@
     "volume": "750 ml",
     "price": "180 USD",
     "price_postapoc": "20 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "looks_like": "gloves_survivor",
@@ -47,7 +46,6 @@
     "volume": "700 ml",
     "price": "160 USD",
     "price_postapoc": "20 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
     "color": "green",
@@ -97,7 +95,6 @@
     "volume": "700 ml",
     "price": "160 USD",
     "price_postapoc": "20 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "color": "brown",
@@ -146,7 +143,6 @@
     "volume": "750 ml",
     "price": "180 USD",
     "price_postapoc": "20 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
@@ -183,7 +179,6 @@
     "volume": "1250 ml",
     "price": "180 USD",
     "price_postapoc": "25 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "fur" ],
     "symbol": "[",
     "looks_like": "gloves_winter",
diff --git a/data/json/items/armor/bespoke_armor/cuttingroom.json b/data/json/items/armor/bespoke_armor/cuttingroom.json
index 88b6f834aa0a5..498966c64ff8f 100644
--- a/data/json/items/armor/bespoke_armor/cuttingroom.json
+++ b/data/json/items/armor/bespoke_armor/cuttingroom.json
@@ -114,7 +114,6 @@
     "volume": "1 L",
     "price": "180 USD",
     "price_postapoc": "30 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "steel" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
@@ -186,7 +185,6 @@
     "volume": "1 L",
     "price": "180 USD",
     "price_postapoc": "25 USD",
-    "to_hit": 2,
     "material": [ "kevlar_layered", "nomex" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
diff --git a/data/json/items/armor/bespoke_armor/utility.json b/data/json/items/armor/bespoke_armor/utility.json
index 06e8a2b2973f6..959a95636e41b 100644
--- a/data/json/items/armor/bespoke_armor/utility.json
+++ b/data/json/items/armor/bespoke_armor/utility.json
@@ -96,7 +96,6 @@
     "volume": "250 ml",
     "price": "75 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "hard_plastic_transp", "leather_treated" ],
     "symbol": "[",
     "looks_like": "glasses_bal",
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
index 7c960910aada5..fafc60172f1b8 100644
--- a/data/json/items/armor/boots.json
+++ b/data/json/items/armor/boots.json
@@ -8,7 +8,6 @@
     "volume": "250 ml",
     "price": "30 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "flip_flops",
@@ -159,7 +158,6 @@
     "volume": "3500 ml",
     "price": "130 USD",
     "price_postapoc": "15 USD",
-    "to_hit": 2,
     "symbol": "[",
     "looks_like": "boots_steel",
     "color": "dark_gray",
@@ -668,7 +666,6 @@
     "volume": "3250 ml",
     "price": "500 USD",
     "price_postapoc": "60 USD",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "boots_steel",
     "color": "light_gray",
@@ -733,7 +730,6 @@
     "volume": "3500 ml",
     "price": "80 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 2,
     "symbol": "[",
     "looks_like": "boots",
     "color": "dark_gray",
@@ -841,7 +837,6 @@
     "volume": "750 ml",
     "price": "4 USD",
     "price_postapoc": "2 USD",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "lc_sabaton",
     "material": [ "lc_steel" ],
@@ -1197,7 +1192,6 @@
     "volume": "1250 ml",
     "price": "40 USD",
     "price_postapoc": "1 USD 50 cent",
-    "to_hit": -2,
     "material": [ "wood" ],
     "symbol": "[",
     "looks_like": "leathersandals",
@@ -1375,7 +1369,6 @@
     "volume": "250 ml",
     "price": "5 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "sneakers",
     "color": "blue",
@@ -1406,7 +1399,6 @@
     "volume": "250 ml",
     "price": "105 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "rubber", "leather" ],
     "symbol": "[",
     "looks_like": "flip_flops",
@@ -1530,7 +1522,6 @@
     "volume": "1 L",
     "price": "65 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "clogs",
     "color": "yellow",
@@ -1566,7 +1557,6 @@
     "volume": "750 ml",
     "price": "40 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "dress_shoes",
@@ -1763,7 +1753,6 @@
     "volume": "250 ml",
     "price": "40 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "flip_flops",
     "color": "brown",
@@ -1803,7 +1792,6 @@
     "volume": "750 ml",
     "price": "15 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "sneakers",
     "color": "dark_gray",
@@ -1931,7 +1919,6 @@
     "volume": "3750 ml",
     "price": "85 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "looks_like": "rollerskates",
@@ -1980,7 +1967,6 @@
     "volume": "3 L",
     "price": "85 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "leather", "steel" ],
     "symbol": "[",
     "looks_like": "roller_blades",
@@ -2163,7 +2149,6 @@
     "volume": "250 ml",
     "price": "6 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "socks_wool",
@@ -2251,7 +2236,6 @@
     "volume": "500 ml",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "leathersandals",
     "color": "light_gray",
@@ -3296,7 +3280,6 @@
     "volume": "750 ml",
     "price": "400 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "boots_steel",
     "material": [ "lc_steel" ],
diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json
index 64368dfecdac0..a6a9f04db585e 100644
--- a/data/json/items/armor/cloaks.json
+++ b/data/json/items/armor/cloaks.json
@@ -1614,7 +1614,6 @@
     "volume": "6 L",
     "price": "500 USD",
     "price_postapoc": "3 USD",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "]",
     "looks_like": "cloak",
diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
index b4c965620238d..6429c3d8fe849 100644
--- a/data/json/items/armor/coats.json
+++ b/data/json/items/armor/coats.json
@@ -261,7 +261,6 @@
     "volume": "2250 ml",
     "price": "25 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "coat_winter",
@@ -387,7 +386,6 @@
     "volume": "6750 ml",
     "price": "140 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "coat_rain",
diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json
index 39ff74ccf7a47..1666e0b04a776 100644
--- a/data/json/items/armor/eyewear.json
+++ b/data/json/items/armor/eyewear.json
@@ -8,7 +8,6 @@
     "volume": "18 ml",
     "price": "25 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ { "type": "cardboard", "portion": 90 }, { "type": "plastic", "portion": 9 }, { "type": "aluminum", "portion": 1 } ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -46,7 +45,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -65,7 +63,6 @@
     "volume": "250 ml",
     "price": "50 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -85,7 +82,6 @@
     "volume": "250 ml",
     "price": "75 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "hard_plastic_transp", "nylon" ],
     "symbol": "[",
     "looks_like": "glasses_safety",
@@ -105,7 +101,6 @@
     "volume": "250 ml",
     "price": "79 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -125,7 +120,6 @@
     "volume": "250 ml",
     "price": "79 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -145,7 +139,6 @@
     "volume": "5 ml",
     "price": "40 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -165,7 +158,6 @@
     "volume": "250 ml",
     "price": "20 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -185,7 +177,6 @@
     "volume": "250 ml",
     "price": "10 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -223,7 +214,6 @@
     "volume": "500 ml",
     "price": "45 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -264,7 +254,6 @@
     "volume": "250 ml",
     "price": "45 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "bone" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -283,7 +272,6 @@
     "volume": "250 ml",
     "price": "50 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -302,7 +290,6 @@
     "volume": "250 ml",
     "price": "79 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -321,7 +308,6 @@
     "volume": "250 ml",
     "price": "79 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -341,7 +327,6 @@
     "volume": "250 ml",
     "price": "20 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -360,7 +345,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_bifocal",
@@ -380,7 +364,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -400,7 +383,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_reading",
@@ -420,7 +402,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "75 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -439,7 +420,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -459,7 +439,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "sunglasses",
@@ -478,7 +457,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "75 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_bifocal",
@@ -497,7 +475,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -517,7 +494,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_reading",
@@ -536,7 +512,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "75 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_bifocal",
@@ -555,7 +530,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "8 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -575,7 +549,6 @@
     "volume": "250 ml",
     "price": "275 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_reading",
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
index 0364302ad7877..c0ce8d0a3429d 100644
--- a/data/json/items/armor/gloves.json
+++ b/data/json/items/armor/gloves.json
@@ -208,7 +208,6 @@
     "volume": "1 L",
     "price": "82 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 2,
     "material": [ "leather", "nomex" ],
     "symbol": "[",
     "looks_like": "gloves_leather",
@@ -229,7 +228,6 @@
     "volume": "1750 ml",
     "price": "380 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "chitin" ],
     "symbol": "[",
     "looks_like": "gauntlets_larmor",
@@ -323,7 +321,6 @@
     "volume": "250 ml",
     "price": "64 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "white",
@@ -342,7 +339,6 @@
     "volume": "250 ml",
     "price": "64 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "color": "white",
@@ -362,7 +358,6 @@
     "volume": "750 ml",
     "price": "34 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "gloves_leather",
@@ -437,7 +432,6 @@
     "volume": "250 ml",
     "price": "14 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "gloves_light",
@@ -469,7 +463,6 @@
     "volume": "500 ml",
     "price": "90 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 2,
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "gloves_fingerless",
@@ -521,7 +514,6 @@
     "volume": "1250 ml",
     "price": "4 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "lc_mitten_gaunt",
     "material": [ "lc_steel" ],
@@ -664,7 +656,6 @@
     "volume": "250 ml",
     "price": "45 USD",
     "price_postapoc": "1 USD 50 cent",
-    "to_hit": 2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "gloves_light",
@@ -861,7 +852,6 @@
     "volume": "1500 ml",
     "price": "400 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "iron", "leather" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
@@ -934,7 +924,6 @@
     "volume": "250 ml",
     "price": "13 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 2,
     "material": [ "rubber" ],
     "symbol": "[",
     "looks_like": "gloves_light",
@@ -955,7 +944,6 @@
     "volume": "500 ml",
     "price": "52 USD",
     "price_postapoc": "15 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
@@ -1075,7 +1063,6 @@
     "volume": "250 ml",
     "price": "45 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "leather", "cotton" ],
     "symbol": "[",
     "looks_like": "gloves_leather",
@@ -1096,7 +1083,6 @@
     "volume": "250 ml",
     "price": "90 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "kevlar" ],
     "symbol": "[",
     "looks_like": "gloves_work",
@@ -1116,7 +1102,6 @@
     "volume": "250 ml",
     "price": "5 USD",
     "price_postapoc": "10 cent",
-    "to_hit": 2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "gloves_light",
@@ -1135,7 +1120,6 @@
     "volume": "500 ml",
     "price": "7 USD",
     "price_postapoc": "10 cent",
-    "to_hit": 2,
     "material": [ "fur" ],
     "symbol": "[",
     "looks_like": "gloves_wraps",
@@ -1154,7 +1138,6 @@
     "volume": "500 ml",
     "price": "5 USD 25 cent",
     "price_postapoc": "10 cent",
-    "to_hit": 2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "gloves_wraps",
@@ -1173,7 +1156,6 @@
     "volume": "250 ml",
     "price": "5 USD",
     "price_postapoc": "10 cent",
-    "to_hit": 2,
     "material": [ "wool" ],
     "symbol": "[",
     "looks_like": "gloves_wraps",
@@ -1402,7 +1384,6 @@
     "volume": "250 ml",
     "price": "40 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "gloves_light",
@@ -1455,7 +1436,6 @@
     "volume": "750 ml",
     "price": "400 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "fire_gauntlets",
     "material": [ "lc_steel", "lc_steel_chain" ],
@@ -1575,7 +1555,6 @@
     "volume": "1250 ml",
     "price": "400 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "symbol": "[",
     "looks_like": "fire_gauntlets",
     "material": [ "lc_steel", "lc_steel_chain" ],
@@ -1695,7 +1674,6 @@
     "volume": "300 ml",
     "price": "40 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 2,
     "material": [ "leather", "thermo_resin" ],
     "symbol": "[",
     "looks_like": "gloves_tactical",
diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
index fd880cf8a1232..d1b5856a19f71 100644
--- a/data/json/items/armor/helmets.json
+++ b/data/json/items/armor/helmets.json
@@ -760,7 +760,6 @@
     "volume": "2500 ml",
     "price": "380 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "chitin" ],
     "symbol": "[",
     "looks_like": "helmet_larmor",
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
index c77ccbeabe1da..ca5e7439011ad 100644
--- a/data/json/items/armor/integrated.json
+++ b/data/json/items/armor/integrated.json
@@ -1541,7 +1541,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "plastic", "lvl4ballisticglass" ],
     "symbol": "[",
     "color": "dark_gray",
diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
index 1c77edc9f90a4..f41d4e78beac4 100644
--- a/data/json/items/armor/legs_clothes.json
+++ b/data/json/items/armor/legs_clothes.json
@@ -431,7 +431,6 @@
     "volume": "1300 ml",
     "price": "50 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 2,
     "material": [ "denim" ],
     "symbol": "[",
     "looks_like": "jeans",
@@ -2005,7 +2004,6 @@
     "volume": "700 ml",
     "price": "30 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 2,
     "material": [ "denim" ],
     "symbol": "[",
     "looks_like": "skirt",
diff --git a/data/json/items/armor/misc.json b/data/json/items/armor/misc.json
index 1dc8ef0798a6f..92a42004e894c 100644
--- a/data/json/items/armor/misc.json
+++ b/data/json/items/armor/misc.json
@@ -275,7 +275,6 @@
     "volume": "250 ml",
     "price": "64 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "light_gray",
@@ -294,7 +293,6 @@
     "volume": "250 ml",
     "price": "64 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "light_gray",
@@ -313,7 +311,6 @@
     "volume": "250 ml",
     "price": "64 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "[",
     "color": "light_gray",
diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json
index 043efda99db88..2c99f03665ada 100644
--- a/data/json/items/armor/scarfs.json
+++ b/data/json/items/armor/scarfs.json
@@ -8,7 +8,6 @@
     "volume": "2 L",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "wool" ],
     "symbol": "[",
     "looks_like": "scarf",
diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
index 98a2d05ee10c1..71fb1242caf87 100644
--- a/data/json/items/armor/storage.json
+++ b/data/json/items/armor/storage.json
@@ -589,7 +589,6 @@
     "volume": "52500 ml",
     "price": "75 cent",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": ")",
     "looks_like": "plastic_shopping_bag",
@@ -703,7 +702,6 @@
     "volume": "3 L",
     "price": "80 cent",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "cotton", "wood" ],
     "symbol": "[",
     "looks_like": "plastic_shopping_bag",
@@ -786,7 +784,6 @@
     "longest_side": "46 cm",
     "price": "240 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "plastic_shopping_bag",
@@ -1151,7 +1148,6 @@
     "volume": "525 ml",
     "price": "45 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 2,
     "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "holster",
@@ -1181,7 +1177,6 @@
     "volume": "1050 ml",
     "price": "35 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "nylon", "plastic" ],
     "symbol": "[",
     "looks_like": "holster",
@@ -1810,7 +1805,6 @@
     "volume": "5 L",
     "price": "1 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "ragpouch",
@@ -2247,7 +2241,6 @@
     "volume": "30 ml",
     "price": "1 cent",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
     "color": "white",
@@ -2269,7 +2262,6 @@
     "volume": "1 L",
     "price": "75 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "ragpouch",
diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json
index 95db2deceab36..201035f37bf7e 100644
--- a/data/json/items/armor/swimming.json
+++ b/data/json/items/armor/swimming.json
@@ -376,7 +376,6 @@
     "volume": "2 L",
     "price": "52 USD 50 cent",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ { "type": "nylon", "portion": 8 }, { "type": "lycra", "portion": 2 } ],
     "symbol": "[",
     "looks_like": "longshirt",
@@ -981,7 +980,6 @@
     "volume": "2500 ml",
     "price": "75 USD",
     "price_postapoc": "3 USD 50 cent",
-    "to_hit": -2,
     "material": [ "neoprene", "nylon" ],
     "symbol": "[",
     "looks_like": "jacket_light",
@@ -1146,7 +1144,6 @@
     "volume": "4 L",
     "price": "65 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "neoprene", "nylon" ],
     "symbol": "[",
     "looks_like": "longshirt",
@@ -1604,7 +1601,6 @@
     "volume": "3 L",
     "price": "80 USD",
     "price_postapoc": "4 USD 50 cent",
-    "to_hit": -2,
     "material": [ "neoprene" ],
     "symbol": "[",
     "looks_like": "wetsuit_spring",
@@ -1757,7 +1753,6 @@
     "volume": "250 ml",
     "price": "11 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "rubber" ],
     "symbol": "[",
     "looks_like": "goggles_welding",
@@ -1871,7 +1866,6 @@
     "volume": "1500 ml",
     "price": "400 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic", "rubber", "thermo_resin" ],
     "symbol": "[",
     "looks_like": "mask_h20survivor",
@@ -1914,7 +1908,6 @@
     "volume": "1500 ml",
     "price": "400 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic", "rubber", "thermo_resin" ],
     "symbol": "[",
     "looks_like": "mask_h20survivor",
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 4e2b360da4f92..292c031616e1e 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -406,7 +406,6 @@
     "volume": "4 L",
     "price": "5 USD",
     "price_postapoc": "4 USD",
-    "to_hit": -2,
     "material": [ "lc_steel" ],
     "symbol": "H",
     "looks_like": "cuirass_lightplate",
@@ -470,7 +469,6 @@
     "volume": "2 L",
     "price": "5 USD",
     "price_postapoc": "4 USD",
-    "to_hit": -2,
     "material": [ "lc_steel" ],
     "repairs_with": [ "steel" ],
     "symbol": "H",
@@ -762,7 +760,6 @@
     "weight": "1000 g",
     "volume": "3500 ml",
     "price_postapoc": "2 USD",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "sweatshirt",
@@ -803,7 +800,6 @@
     "weight": "600 g",
     "volume": "2000 ml",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "tank_top",
@@ -835,7 +831,6 @@
     "volume": "7 L",
     "price": "600 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "plastic", "neoprene" ],
     "symbol": "H",
     "looks_like": "cuirass_lightplate",
@@ -1904,7 +1899,6 @@
     "weight": "2000 g",
     "volume": "2500 ml",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
     "looks_like": "sweatshirt",
@@ -1951,7 +1945,6 @@
     "weight": "1500 g",
     "volume": "2000 ml",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "cotton", "leather" ],
     "symbol": "[",
     "looks_like": "sleeveless_tunic",
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
index 828d6f28393fb..3e9c92a617971 100644
--- a/data/json/items/chemicals_and_resources.json
+++ b/data/json/items/chemicals_and_resources.json
@@ -214,7 +214,6 @@
     "material": [ "stone" ],
     "weight": "2700 g",
     "volume": "1 L",
-    "to_hit": -2,
     "melee_damage": { "bash": 2 }
   },
   {
@@ -1200,8 +1199,7 @@
     "price_postapoc": "0 cent",
     "material": [ "wood" ],
     "weight": "500 g",
-    "volume": "500 ml",
-    "to_hit": -2
+    "volume": "500 ml"
   },
   {
     "type": "GENERIC",
@@ -1215,8 +1213,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "212 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1230,8 +1227,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "212 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1245,8 +1241,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "180 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1260,8 +1255,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "212 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1275,8 +1269,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "200 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1290,8 +1283,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "212 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1305,8 +1297,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "240 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1320,8 +1311,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "240 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -1335,8 +1325,7 @@
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "weight": "240 g",
-    "volume": "250 ml",
-    "to_hit": -2
+    "volume": "250 ml"
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
index 61a5f6b2aa2d1..9a2cb2519c64c 100644
--- a/data/json/items/containers/containers.json
+++ b/data/json/items/containers/containers.json
@@ -333,7 +333,6 @@
     "volume": "40 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "10000 ml", "max_contains_weight": "15 kg", "moves": 200 } ],
     "material": [ "paper" ],
     "symbol": ")",
@@ -661,7 +660,7 @@
     ],
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic" ],
     "symbol": ")",
     "color": "white",
@@ -2038,7 +2037,6 @@
     "volume": "44250 ml",
     "price": "100 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "clay" ],
     "symbol": ")",
     "color": "brown",
@@ -2388,7 +2386,6 @@
     "longest_side": "33 cm",
     "price": "12 USD 50 cent",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": ")",
     "color": "green",
@@ -3552,7 +3549,6 @@
     "volume": "5 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "paper" ],
     "symbol": ",",
     "color": "light_gray",
@@ -3957,7 +3953,6 @@
     "volume": "2900 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "flags": [ "COLLAPSE_CONTENTS" ],
     "pocket_data": [
@@ -3987,7 +3982,6 @@
     "volume": "1250 ml",
     "price": "0 cent",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "cotton", "neoprene" ],
     "flags": [ "COLLAPSE_CONTENTS", "PALS_MEDIUM" ],
     "pocket_data": [
@@ -4798,7 +4792,6 @@
     "volume": "221 ml",
     "price": "1 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "t",
     "color": "light_cyan",
@@ -4826,7 +4819,6 @@
     "volume": "95 ml",
     "price": "50 cent",
     "price_postapoc": "5 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "t",
     "color": "light_cyan",
diff --git a/data/json/items/corpses/dead_yrax.json b/data/json/items/corpses/dead_yrax.json
index 4c10f4a8bba87..e036a52e70785 100644
--- a/data/json/items/corpses/dead_yrax.json
+++ b/data/json/items/corpses/dead_yrax.json
@@ -27,7 +27,7 @@
     "material": [ "steel", "yrax_quartz" ],
     "volume": "119 L",
     "weight": "221 kg",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
     "melee_damage": { "bash": 20, "cut": 15 }
   },
diff --git a/data/json/items/fake.json b/data/json/items/fake.json
index 62a00d675d021..8263df0d7fe94 100644
--- a/data/json/items/fake.json
+++ b/data/json/items/fake.json
@@ -91,10 +91,10 @@
     "type": "TOOL",
     "name": { "str_sp": "autonomous surgical scalpels" },
     "description": "A system of surgical-grade scalpels.  They allow you to make precise cuts on corpses.",
-    "to_hit": 2,
     "techniques": [ "PRECISE" ],
     "extend": { "flags": [ "TRADER_AVOID", "BIONIC_WEAPON", "UNBREAKABLE_MELEE", "SPEAR" ] },
     "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 5 ], [ "BUTCHER", 14 ] ],
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "neutral" },
     "melee_damage": { "stab": 8 }
   },
   {
diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json
index 3717fcd571810..10ef90a92713e 100644
--- a/data/json/items/fluff.json
+++ b/data/json/items/fluff.json
@@ -1727,7 +1727,6 @@
     "longest_side": "30 cm",
     "price": "1 kUSD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "variants": [
       {
         "id": "statue_person",
@@ -1777,7 +1776,6 @@
     "longest_side": "30 cm",
     "price": "800 USD",
     "price_postapoc": "25 cent",
-    "to_hit": -2,
     "variants": [
       {
         "id": "statue_person",
diff --git a/data/json/items/furniture/seating.json b/data/json/items/furniture/seating.json
index fa8ae595dda30..6a93f4a437fb6 100644
--- a/data/json/items/furniture/seating.json
+++ b/data/json/items/furniture/seating.json
@@ -44,8 +44,7 @@
     "longest_side": "45 cm",
     "volume": "17 L",
     "weight": "3 kg",
-    "material": [ "wood" ],
-    "to_hit": -2
+    "material": [ "wood" ]
   },
   {
     "type": "GENERIC",
@@ -60,8 +59,7 @@
     "longest_side": "50 cm",
     "volume": "20 L",
     "weight": "11 kg",
-    "material": [ "wood" ],
-    "to_hit": -2
+    "material": [ "wood" ]
   },
   {
     "type": "GENERIC",
@@ -75,8 +73,7 @@
     "longest_side": "80 cm",
     "volume": "30 L",
     "weight": "7500 g",
-    "material": [ { "type": "steel", "portion": 975 }, { "type": "leather", "portion": 25 } ],
-    "to_hit": -2
+    "material": [ { "type": "steel", "portion": 975 }, { "type": "leather", "portion": 25 } ]
   },
   {
     "type": "GENERIC",
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index 8c6124263ccd5..0424cadcaa9c5 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -282,7 +282,6 @@
     "material": [ "dry_plant" ],
     "weight": "20 g",
     "volume": "250 ml",
-    "to_hit": -2,
     "flags": [ "TRADER_AVOID", "TINDER" ]
   },
   {
@@ -324,7 +323,6 @@
     "material": [ "plastic" ],
     "weight": "8 g",
     "volume": "10 ml",
-    "to_hit": -2,
     "flags": [ "UNRECOVERABLE" ]
   },
   {
@@ -341,7 +339,6 @@
     "material": [ "plastic" ],
     "weight": "52 g",
     "volume": "250 ml",
-    "to_hit": -2,
     "flags": [ "UNRECOVERABLE" ]
   },
   {
@@ -357,7 +354,6 @@
     "material": [ "bone" ],
     "weight": "45 g",
     "volume": "150 ml",
-    "to_hit": -2,
     "flags": [ "UNRECOVERABLE", "NO_SALVAGE" ]
   },
   {
@@ -382,7 +378,6 @@
     "material": [ "steel" ],
     "techniques": [ "WRAP" ],
     "volume": "1 L",
-    "to_hit": -2,
     "price": "80 USD",
     "qualities": [ [ "ROPE", 2 ] ],
     "price_postapoc": "50 cent",
@@ -404,7 +399,6 @@
     "milling": { "into": "meal_chitin_piece", "recipe": "meal_chitin_piece_mill_1_4" },
     "weight": "89 g",
     "volume": "250 ml",
-    "to_hit": -2,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -937,7 +931,6 @@
     "material": [ "steel" ],
     "weight": "1000 g",
     "volume": "1500 ml",
-    "to_hit": -2,
     "qualities": [ [ "BUTCHER", -38 ] ],
     "melee_damage": { "bash": 6, "cut": 8 }
   },
@@ -1026,8 +1019,7 @@
     "price_postapoc": "10 cent",
     "material": [ "steel" ],
     "weight": "151 g",
-    "volume": "100 ml",
-    "to_hit": -2
+    "volume": "100 ml"
   },
   {
     "type": "GENERIC",
@@ -1041,8 +1033,7 @@
     "price_postapoc": "10 cent",
     "material": [ "steel" ],
     "weight": "1 g",
-    "volume": "3 ml",
-    "to_hit": -2
+    "volume": "3 ml"
   },
   {
     "type": "GENERIC",
@@ -1056,8 +1047,7 @@
     "price_postapoc": "1 USD",
     "material": [ "lc_steel" ],
     "weight": "151 g",
-    "volume": "100 ml",
-    "to_hit": -2
+    "volume": "100 ml"
   },
   {
     "type": "GENERIC",
@@ -1099,8 +1089,7 @@
     "material": [ "steel" ],
     "weight": "302 g",
     "volume": "500 ml",
-    "flags": [ "HURT_WHEN_WIELDED" ],
-    "to_hit": -2
+    "flags": [ "HURT_WHEN_WIELDED" ]
   },
   {
     "type": "GENERIC",
@@ -1475,7 +1464,6 @@
     "longest_side": "48 cm",
     "price": "2 kUSD 500 USD",
     "category": "other",
-    "to_hit": -2,
     "description": "A special forces Russian rifle chambered in 5.45 that someone has taken a plasma cutter to, cutting it in three places to comply with import restrictions.  This thing would have been hard to source, and thankfully its unique complex recoil balance system remains intact, unlike the receiver and barrel.  The telltale rainbow patterns of torch cuts mar the otherwise beautiful receiver.  A well-equipped gunsmith with time and materials could probably build a new one out of this…",
     "variant_type": "gun",
     "variants": [
@@ -2139,8 +2127,7 @@
     "price_postapoc": "10 cent",
     "material": [ "copper" ],
     "weight": "68 g",
-    "volume": "250 ml",
-    "to_hit": 2
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -2394,7 +2381,6 @@
     "material": [ "wood" ],
     "weight": "220 g",
     "volume": "500 ml",
-    "to_hit": -2,
     "flags": [ "TRADER_AVOID", "FIREWOOD" ]
   },
   {
@@ -2408,7 +2394,6 @@
     "//": "Commercial pinecones average 300g. We're assuming wild ones weigh less than this.",
     "weight": "200 g",
     "volume": "250 ml",
-    "to_hit": -2,
     "flags": [ "TRADER_AVOID", "FIREWOOD" ]
   },
   {
@@ -2538,7 +2523,6 @@
     "name": { "str": "sunflower" },
     "description": "The top of a sunflower, with yellow petals and some seeds that have yet to be eaten by animals.",
     "weight": "450 g",
-    "to_hit": -2,
     "color": "yellow",
     "symbol": ",",
     "material": [ "veggy" ],
@@ -2643,7 +2627,6 @@
     "material": [ "clay", "stone" ],
     "weight": "969 g",
     "volume": "500 ml",
-    "to_hit": -2,
     "qualities": [ [ "HAMMER", 1 ] ],
     "melee_damage": { "bash": 8 }
   },
@@ -2717,7 +2700,6 @@
     "flags": [ "NONCONDUCTIVE" ],
     "weight": "1500 g",
     "volume": "2250 ml",
-    "to_hit": -2,
     "price": "20 USD",
     "price_postapoc": "10 cent",
     "qualities": [ [ "HAMMER", 1 ] ],
@@ -2969,7 +2951,6 @@
     "flags": [ "TRADER_AVOID", "INEDIBLE", "CATTLE", "TINDER", "RABBIT" ],
     "weight": "34 g",
     "volume": "250 ml",
-    "to_hit": -2,
     "vitamins": [ [ "veggy_allergen", 1 ] ]
   },
   {
@@ -3754,7 +3735,6 @@
     "material": [ "clay", "stone" ],
     "weight": "969 g",
     "volume": "500 ml",
-    "to_hit": -2,
     "qualities": [ [ "HAMMER", 1 ] ],
     "melee_damage": { "bash": 8 }
   },
@@ -4132,7 +4112,6 @@
     "material": [ "wood" ],
     "weight": "50 kg",
     "volume": "80 L",
-    "to_hit": -2,
     "melee_damage": { "bash": 12 }
   },
   {
@@ -4148,7 +4127,6 @@
     "material": [ "steel", "wood" ],
     "weight": "55 kg",
     "volume": "80 L",
-    "to_hit": -2,
     "melee_damage": { "bash": 14 }
   },
   {
@@ -4183,7 +4161,6 @@
     "weight": "5 kg",
     "volume": "22 L",
     "longest_side": "36 cm",
-    "to_hit": -2,
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
diff --git a/data/json/items/generic/bathroom_house.json b/data/json/items/generic/bathroom_house.json
index 6f2025aaa558e..baf14f6fdcdb2 100644
--- a/data/json/items/generic/bathroom_house.json
+++ b/data/json/items/generic/bathroom_house.json
@@ -271,7 +271,6 @@
     "volume": "250 ml",
     "weight": "227 g",
     "material": [ "paper" ],
-    "to_hit": -2,
     "snippet_category": [
       {
         "id": "tpaper1",
diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
index 28d196e4c6c48..2743e8c8c7d5b 100644
--- a/data/json/items/generic/dining_kitchen.json
+++ b/data/json/items/generic/dining_kitchen.json
@@ -41,7 +41,6 @@
     "weight": "28 g",
     "volume": "25 ml",
     "material": [ "plastic" ],
-    "to_hit": -2,
     "melee_damage": { "bash": 1, "cut": 1 }
   },
   {
@@ -1054,7 +1053,6 @@
     "weight": "750 g",
     "volume": "3500 ml",
     "longest_side": "23 cm",
-    "to_hit": -2,
     "pocket_data": [
       {
         "max_contains_volume": "2 L",
@@ -1157,7 +1155,6 @@
     "longest_side": "35 cm",
     "price": "100 USD",
     "price_postapoc": "3 USD",
-    "to_hit": -2,
     "material": [ "clay" ],
     "symbol": ")",
     "color": "brown",
@@ -1216,7 +1213,6 @@
     "weight": "660 g",
     "volume": "3 L",
     "longest_side": "35 cm",
-    "to_hit": -2,
     "pocket_data": [
       {
         "max_contains_volume": "1 L",
@@ -1242,7 +1238,6 @@
     "weight": "628 g",
     "volume": "3 L",
     "longest_side": "35 cm",
-    "to_hit": -2,
     "pocket_data": [
       {
         "max_contains_volume": "1 L",
diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json
index 9bbaadcd9f5ad..ae11e1f27fdbe 100644
--- a/data/json/items/generic/toys_and_sports.json
+++ b/data/json/items/generic/toys_and_sports.json
@@ -140,7 +140,6 @@
     "weight": "7257 g",
     "volume": "5277 ml",
     "longest_side": "216 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 18 }
   },
   {
@@ -159,14 +158,13 @@
     "weight": "150 g",
     "volume": "250 ml",
     "longest_side": "75 mm",
-    "damage": { "damage_type": "bash", "amount": 6 },
     "range": 12,
     "dispersion": 12,
     "loudness": 0,
     "to_hit": 3,
     "recovery_chance": 99,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
-    "melee_damage": { "bash": 6 }
+    "thrown_damage": [ { "damage_type": "bash", "amount": 6 } ]
   },
   {
     "type": "GENERIC",
@@ -259,8 +257,7 @@
     "weight": "280 g",
     "volume": "1 L",
     "longest_side": "27 cm",
-    "to_hit": -1,
-    "melee_damage": { "bash": 4 }
+    "thrown_damage": [ { "damage_type": "bash", "amount": 4 } ]
   },
   {
     "type": "GENERIC",
@@ -276,8 +273,7 @@
     "weight": "170 g",
     "volume": "250 ml",
     "longest_side": "76 mm",
-    "to_hit": 2,
-    "melee_damage": { "bash": 7 }
+    "thrown_damage": [ { "damage_type": "bash", "amount": 7 } ]
   },
   {
     "type": "GENERIC",
@@ -293,7 +289,6 @@
     "weight": "81500 g",
     "volume": "62500 ml",
     "longest_side": "180 cm",
-    "to_hit": -2,
     "melee_damage": { "bash": 18 },
     "use_action": [ { "type": "deploy_furn", "furn_type": "f_mannequin" } ]
   },
@@ -311,7 +306,6 @@
     "weight": "81500 g",
     "volume": "62500 ml",
     "longest_side": "180 cm",
-    "to_hit": -2,
     "ammo": [ "battery" ],
     "flags": [ "WATER_BREAK", "SINGLE_USE", "ELECTRONIC" ],
     "pocket_data": [
diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json
index 76c5cb397255b..e4dbbb9e0046d 100644
--- a/data/json/items/gun/10mm.json
+++ b/data/json/items/gun/10mm.json
@@ -22,7 +22,6 @@
     "//": "165mm + 32mm max OAL for 10mm. Revolvers just built different.",
     "price": "740 USD",
     "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -63,7 +62,6 @@
     "barrel_length": "96 mm",
     "price": "605 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -103,7 +101,6 @@
     "barrel_length": "117 mm",
     "price": "592 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -189,7 +186,6 @@
     "barrel_length": "127 mm",
     "price": "1 kUSD 50 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "light_gray",
@@ -223,7 +219,6 @@
     "barrel_length": "114 mm",
     "price": "649 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "color": "dark_gray",
     "ammo": "10mm",
@@ -350,7 +345,6 @@
     "barrel_length": "127 mm",
     "price": "2 kUSD 699 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json
index ed90384df5b8f..ef56e3036c787 100644
--- a/data/json/items/gun/20x66mm.json
+++ b/data/json/items/gun/20x66mm.json
@@ -114,7 +114,6 @@
     "longest_side": "165 mm",
     "price": "3 kUSD 300 USD",
     "price_postapoc": "100 USD",
-    "to_hit": -2,
     "material": [ "superalloy", "ceramic" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index 30c95f61b7145..b5204b86f1ee8 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -224,7 +224,6 @@
     "barrel_length": "99 mm",
     "price": "360 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "aluminum", "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -302,7 +301,6 @@
     "volume": "525 ml",
     "price": "495 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "longest_side": "273 mm",
     "barrel_length": "140 mm",
     "material": [ "steel", "plastic", "aluminum" ],
@@ -357,7 +355,6 @@
     "volume": "392 ml",
     "price": "679 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "longest_side": "266 mm",
     "barrel_length": "140 mm",
     "material": [ "steel", "plastic", "aluminum" ],
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index c9ffe10c84386..a76b173c22517 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -39,7 +39,6 @@
     "barrel_length": "191 mm",
     "price": "914 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -862,7 +861,6 @@
     "barrel_length": "439 mm",
     "price": "1 kUSD",
     "price_postapoc": "55 USD",
-    "to_hit": -2,
     "material": [ "steel", "aluminum", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json
index 94104bec6ad98..6d547f757247f 100644
--- a/data/json/items/gun/300.json
+++ b/data/json/items/gun/300.json
@@ -114,7 +114,6 @@
     "barrel_length": "660 mm",
     "price": "2 kUSD 539 USD",
     "price_postapoc": "55 USD",
-    "to_hit": -2,
     "material": [ "steel", "aluminum", "plastic" ],
     "symbol": "-",
     "color": "black",
diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
index b8c645d439281..4c59d80b07270 100644
--- a/data/json/items/gun/308.json
+++ b/data/json/items/gun/308.json
@@ -516,7 +516,6 @@
     "barrel_length": "470 mm",
     "price": "1 kUSD 800 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "steel", "aluminum", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json
index 546221f93d1fa..2b2768f4be64d 100644
--- a/data/json/items/gun/357sig.json
+++ b/data/json/items/gun/357sig.json
@@ -55,7 +55,6 @@
     "barrel_length": "99 mm",
     "price": "690 USD",
     "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "357sig" ],
diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index 1ab71e881ff19..3b4baefb1087a 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -46,7 +46,6 @@
     "//": "101.6mm + 39.4mm max OAL for 38spl. Revolvers just built different.",
     "price": "424 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "color": "dark_gray",
     "ammo": [ "38" ],
@@ -118,7 +117,6 @@
     "//": "47mm + 39.4mm max OAL for 38spl. Revolvers just built different.",
     "price": "545 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel", "aluminum", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
index d34607314d8f4..dae00a0e68d99 100644
--- a/data/json/items/gun/380.json
+++ b/data/json/items/gun/380.json
@@ -96,7 +96,6 @@
     "barrel_length": "89 mm",
     "price": "75 USD",
     "price_postapoc": "17 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel", "zinc" ],
     "color": "dark_gray",
     "ammo": [ "380" ],
@@ -124,7 +123,6 @@
     "longest_side": "71 mm",
     "price": "640 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json
index 5c78d531c60e2..f388cfee5df35 100644
--- a/data/json/items/gun/38super.json
+++ b/data/json/items/gun/38super.json
@@ -12,7 +12,6 @@
     "barrel_length": "127 mm",
     "price": "784 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 683636ce30a00..edbc565c9f810 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -11,7 +11,6 @@
     "longest_side": "250 mm",
     "price": "650 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -37,7 +36,6 @@
     "barrel_length": "125 mm",
     "price": "690 USD",
     "price_postapoc": "17 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -77,7 +75,6 @@
     "barrel_length": "102 mm",
     "price": "650 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -103,7 +100,6 @@
     "barrel_length": "99 mm",
     "price": "750 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -182,7 +178,6 @@
     "barrel_length": "119 mm",
     "price": "540 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "40" ],
@@ -237,7 +232,6 @@
     "barrel_length": "110 mm",
     "price": "75 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel", "zinc" ],
     "color": "dark_gray",
     "ammo": [ "40" ],
diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json
index a39e7dd1d1636..e0a69afd90709 100644
--- a/data/json/items/gun/44.json
+++ b/data/json/items/gun/44.json
@@ -26,7 +26,6 @@
         "description": "Needing little introduction, the Desert Eagle's impact on popular culture is almost as massive as the pistol itself.  The newest Mark XIX model introduced a more modern optics rail.  It was sold in multiple hard-hitting magnum calibers and can swap between them using conversion kits and the appropriate magazine.  For maximum style points (or tackiness, depending on taste), this one is plated in what appears to be 24-karat gold."
       }
     ],
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
index e05b84d6cfb45..c99699822ebe4 100644
--- a/data/json/items/gun/45.json
+++ b/data/json/items/gun/45.json
@@ -25,7 +25,6 @@
     "barrel_length": "165 mm",
     "price": "3 kUSD 100 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -76,7 +75,6 @@
     "//": "Numbers for weight, volume, and length calculations are based upon weapon without caliber conversion. The difference will be made up for with integrated stats from the installable caliber conversion.",
     "price": "2 kUSD 900 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -133,7 +131,6 @@
     "barrel_length": "127 mm",
     "price": "784 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
@@ -168,7 +165,6 @@
     "barrel_length": "146 mm",
     "price": "1 kUSD 800 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -300,7 +296,6 @@
     "barrel_length": "267 mm",
     "price": "4 kUSD 500 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
@@ -418,7 +413,6 @@
     "barrel_length": "114 mm",
     "price": "75 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel", "zinc" ],
     "color": "dark_gray",
     "ammo": [ "45" ],
@@ -452,7 +446,6 @@
     "barrel_length": "117 mm",
     "price": "602 USD",
     "price_postapoc": "26 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -487,7 +480,6 @@
     "barrel_length": "203 mm",
     "price": "23 kUSD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json
index efb4f42e5604c..e5317dad24aa8 100644
--- a/data/json/items/gun/454.json
+++ b/data/json/items/gun/454.json
@@ -13,7 +13,6 @@
     "//": "212.725 + 45mm max OAL for 454. Revolvers just built different.",
     "price": "641 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json
index 1c8c9dc379b02..aa93cb4cf67c1 100644
--- a/data/json/items/gun/4570.json
+++ b/data/json/items/gun/4570.json
@@ -51,7 +51,6 @@
     "//2": "190.5 + 64.8mm max OAL for 45-70. Revolvers just built different.",
     "price": "1 kUSD 50 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "color": "dark_gray",
     "symbol": "(",
diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json
index 3953dd305236f..c52b3567f1c95 100644
--- a/data/json/items/gun/45colt.json
+++ b/data/json/items/gun/45colt.json
@@ -83,7 +83,6 @@
     "//": "76.2 + 63.5 for barrel length and chamber length, revolvers just built different",
     "price": "564 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "ammo": [ "410shot", "45colt" ],
     "dispersion": 280,
     "clip_size": 5,
diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json
index 2090db0d0e9f5..a3afad84566a4 100644
--- a/data/json/items/gun/46.json
+++ b/data/json/items/gun/46.json
@@ -12,7 +12,6 @@
     "barrel_length": "180 mm",
     "price": "1 kUSD 750 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json
index 268f3e70f24ab..d05d3d1b41533 100644
--- a/data/json/items/gun/500.json
+++ b/data/json/items/gun/500.json
@@ -18,7 +18,6 @@
     "volume": "1307 ml",
     "price": "900 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "longest_side": "407 mm",
     "barrel_length": "147 mm",
     "//": "88.9mm + 58mm max OAL for 500mag. Revolvers just built different.",
diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json
index 252644a5d72e0..561dedf2306c9 100644
--- a/data/json/items/gun/57.json
+++ b/data/json/items/gun/57.json
@@ -21,7 +21,6 @@
     "barrel_length": "122 mm",
     "price": "1 kUSD 249 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
@@ -69,7 +68,6 @@
     "barrel_length": "264 mm",
     "price": "3 kUSD 500 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
@@ -115,7 +113,6 @@
     "barrel_length": "244 mm",
     "price": "995 USD",
     "price_postapoc": "27 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
@@ -164,7 +161,6 @@
     "barrel_length": "125 mm",
     "price": "799 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
index 37fdce1c2f49a..0c47b3e6f3e8c 100644
--- a/data/json/items/gun/762x25.json
+++ b/data/json/items/gun/762x25.json
@@ -21,7 +21,6 @@
     "barrel_length": "116 mm",
     "price": "1 kUSD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "ammo": [ "762x25" ],
     "dispersion": 225,
diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
index b5de953c3caeb..227637968d1bb 100644
--- a/data/json/items/gun/8x40mm.json
+++ b/data/json/items/gun/8x40mm.json
@@ -21,7 +21,6 @@
     "barrel_length": "203 mm",
     "price": "2 kUSD 300 USD",
     "price_postapoc": "60 USD",
-    "to_hit": -2,
     "material": [ "steel", "carbonfiber" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -110,7 +109,6 @@
     "barrel_length": "254 mm",
     "price": "19 kUSD",
     "price_postapoc": "100 USD",
-    "to_hit": -2,
     "material": [ "steel", "carbonfiber" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 57d578eaac0d4..0d2b422842cef 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -21,7 +21,6 @@
     "barrel_length": "152 mm",
     "price": "2 kUSD 400 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -126,7 +125,6 @@
     "barrel_length": "102 mm",
     "price": "690 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -161,7 +159,6 @@
     "barrel_length": "225 mm",
     "price": "2 kUSD 800 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -341,7 +338,6 @@
     "barrel_length": "100 mm",
     "price": "1 kUSD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": "steel",
     "symbol": "(",
     "color": "dark_gray",
@@ -385,7 +381,6 @@
     "barrel_length": "140 mm",
     "price": "1 kUSD 300 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": "steel",
     "symbol": "(",
     "color": "dark_gray",
@@ -591,7 +586,6 @@
       }
     ],
     "ascii_picture": "beretta_m9",
-    "to_hit": -2,
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -624,7 +618,6 @@
     "barrel_length": "102 mm",
     "price": "650 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -734,7 +727,6 @@
     "barrel_length": "127 mm",
     "price": "1 kUSD 250 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -777,7 +769,6 @@
     "barrel_length": "108 mm",
     "price": "680 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -812,7 +803,6 @@
     "barrel_length": "260 mm",
     "price": "2 kUSD 80 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -866,7 +856,6 @@
     "barrel_length": "114 mm",
     "price": "690 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -938,7 +927,6 @@
     "barrel_length": "99 mm",
     "price": "950 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -969,7 +957,6 @@
     "barrel_length": "120 mm",
     "price": "690 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1046,7 +1033,6 @@
     "barrel_length": "99 mm",
     "price": "500 USD",
     "price_postapoc": "37 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1074,7 +1060,6 @@
     "barrel_length": "119 mm",
     "price": "320 USD",
     "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1101,7 +1086,6 @@
     "barrel_length": "125 mm",
     "price": "390 USD",
     "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1156,7 +1140,6 @@
     "barrel_length": "89 mm",
     "price": "75 USD",
     "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel", "zinc" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1185,7 +1168,6 @@
     "barrel_length": "120 mm",
     "price": "100 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1216,7 +1198,6 @@
     "barrel_length": "90 mm",
     "price": "125 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -1294,7 +1275,6 @@
     "barrel_length": "175 mm",
     "price": "5 kUSD",
     "price_postapoc": "60 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "range": 1,
     "color": "dark_gray",
diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json
index 4d1978da4d04d..26737b63a8cb7 100644
--- a/data/json/items/gun/9x18.json
+++ b/data/json/items/gun/9x18.json
@@ -21,7 +21,6 @@
     "barrel_length": "94 mm",
     "price": "250 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "color": "dark_gray",
     "ammo": [ "9x18" ],
diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json
index f3e7af3bb46dc..33adc4a3afff2 100644
--- a/data/json/items/gun/bio.json
+++ b/data/json/items/gun/bio.json
@@ -7,7 +7,6 @@
     "description": "Bionic one-shot retracting shotgun integrated with your arm.",
     "volume": "103 ml",
     "price": "0 cent",
-    "to_hit": -2,
     "material": [ "superalloy", "plastic" ],
     "symbol": "(",
     "color": "magenta",
diff --git a/data/json/items/gun/flammable.json b/data/json/items/gun/flammable.json
index ad00d8ee1da74..89a7c22b1b0ac 100644
--- a/data/json/items/gun/flammable.json
+++ b/data/json/items/gun/flammable.json
@@ -12,7 +12,6 @@
     "longest_side": "584 mm",
     "price": "800 USD",
     "price_postapoc": "60 USD",
-    "to_hit": -2,
     "range": 6,
     "dispersion": 300,
     "durability": 8,
diff --git a/data/json/items/gun/nail.json b/data/json/items/gun/nail.json
index ec448260f0457..e77476258961e 100644
--- a/data/json/items/gun/nail.json
+++ b/data/json/items/gun/nail.json
@@ -11,7 +11,6 @@
     "longest_side": "45 cm",
     "price": "130 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "yellow",
@@ -40,7 +39,6 @@
     "longest_side": "80 cm",
     "price": "750 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "copper", "steel" ],
     "ammo": [ "nail" ],
     "skill": "rifle",
diff --git a/data/json/items/gun/robofac_gun.json b/data/json/items/gun/robofac_gun.json
index 5f03f5b6361bb..7070619169d1b 100644
--- a/data/json/items/gun/robofac_gun.json
+++ b/data/json/items/gun/robofac_gun.json
@@ -329,7 +329,6 @@
     "color": "blue",
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "burst", 3 ] ],
     "ammo": [ "40x46mm" ],
-    "to_hit": -2,
     "extend": { "flags": [ "NO_TURRET" ] },
     "dispersion": 120,
     "durability": 9,
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 1dd79526c2fc4..326b5599e2c6c 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -13,7 +13,6 @@
     "barrel_length": "203 mm",
     "price": "1 kUSD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
@@ -49,7 +48,6 @@
     "barrel_length": "762 mm",
     "price": "1 kUSD 800 USD",
     "price_postapoc": "17 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "dispersion": 855,
     "durability": 8,
@@ -987,7 +985,6 @@
     "barrel_length": "197 mm",
     "price": "1 kUSD 890 USD",
     "price_postapoc": "45 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "dispersion": 395,
     "durability": 7,
diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json
index 9ce1d00eff25e..e7711d7c63b1a 100644
--- a/data/json/items/gun/ups.json
+++ b/data/json/items/gun/ups.json
@@ -85,7 +85,6 @@
     "price": "95 kUSD",
     "price_postapoc": "80 USD",
     "longest_side": "1228 mm",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "blue",
@@ -194,7 +193,6 @@
     "//": "copy-from'd Glock 17, since this looks_like it",
     "price": "7 kUSD 200 USD",
     "price_postapoc": "55 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "magenta",
diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json
index beaf1137e5c98..5d8be21481a83 100644
--- a/data/json/items/items_holiday.json
+++ b/data/json/items/items_holiday.json
@@ -8,7 +8,6 @@
     "volume": "3964 ml",
     "price": "1 USD",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "0",
     "color": "yellow",
@@ -34,7 +33,6 @@
     "volume": "3964 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "0",
     "looks_like": "pumpkin",
@@ -101,7 +99,6 @@
     "volume": "4 L",
     "price": "1 USD",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "wood" ],
     "symbol": "0",
     "color": "green",
diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
index ec95eb59ef336..68018d3208130 100644
--- a/data/json/items/magazine/223.json
+++ b/data/json/items/magazine/223.json
@@ -299,7 +299,6 @@
     "longest_side": "175 mm",
     "price": "90 USD",
     "price_postapoc": "3 USD 60 cent",
-    "to_hit": -2,
     "material": [ "aluminum", "steel" ],
     "symbol": "#",
     "color": "light_gray",
@@ -354,7 +353,6 @@
     "longest_side": "188 mm",
     "price": "92 USD 50 cent",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "#",
     "color": "light_gray",
@@ -383,7 +381,6 @@
     "longest_side": "197 mm",
     "price": "95 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "#",
     "color": "light_gray",
diff --git a/data/json/items/ranged/energy.json b/data/json/items/ranged/energy.json
index 698d3d00ff54e..aaf3be0acf222 100644
--- a/data/json/items/ranged/energy.json
+++ b/data/json/items/ranged/energy.json
@@ -18,7 +18,6 @@
     "weight": "10500 g",
     "volume": "4L",
     "price_postapoc": "100 USD",
-    "to_hit": -2,
     "range": 25,
     "ranged_damage": { "damage_type": "stab", "amount": 22, "armor_penetration": 60 },
     "dispersion": 90,
diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json
index 551a7a055f408..74a39192c34fb 100644
--- a/data/json/items/ranged/slings.json
+++ b/data/json/items/ranged/slings.json
@@ -17,7 +17,6 @@
     "weight": "96 g",
     "volume": "80 ml",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": 4 },
     "range": 8,
     "dispersion": 150,
@@ -43,7 +42,6 @@
     "weight": "254 g",
     "volume": "250 ml",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": 3 },
     "range": 5,
     "dispersion": 75,
@@ -111,7 +109,6 @@
     "weight": "322 g",
     "volume": "500 ml",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": 4 },
     "range": 8,
     "dispersion": 45,
diff --git a/data/json/items/ranged/spearguns.json b/data/json/items/ranged/spearguns.json
index 0f43215e2ea41..8ba0b4e56a743 100644
--- a/data/json/items/ranged/spearguns.json
+++ b/data/json/items/ranged/spearguns.json
@@ -88,7 +88,6 @@
     "//2": "1340g for a gun + 790g for pump",
     "volume": "3982 ml",
     "longest_side": "70 cm",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "stab", "amount": 12 },
     "range": 2,
     "dispersion": 105,
@@ -119,7 +118,6 @@
     "weight": "3060 g",
     "volume": "2 L",
     "longest_side": "90 cm",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "stab", "amount": 10 },
     "range": 4,
     "dispersion": 120,
@@ -150,7 +148,6 @@
     "weight": "850 g",
     "volume": "3777 ml",
     "longest_side": "118 cm",
-    "to_hit": -2,
     "dispersion": 120,
     "durability": 8,
     "clip_size": 1,
@@ -178,7 +175,6 @@
     "weight": "840 g",
     "volume": "3983 ml",
     "longest_side": "90 cm",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "stab", "amount": 6 },
     "range": 4,
     "dispersion": 90,
diff --git a/data/json/items/ranged/throwing.json b/data/json/items/ranged/throwing.json
index 73e07b6ef2fd3..1f826ac49d207 100644
--- a/data/json/items/ranged/throwing.json
+++ b/data/json/items/ranged/throwing.json
@@ -61,7 +61,6 @@
     "material": [ "cotton", "stone" ],
     "symbol": "H",
     "color": "white",
-    "to_hit": -2,
     "ammo_type": "thrown",
     "flags": [ "NOGIB", "TANGLE", "PRIMITIVE_RANGED_WEAPON" ]
   },
@@ -126,6 +125,7 @@
     "category": "weapons",
     "price": "52 USD",
     "price_postapoc": "5 USD",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "neutral" },
     "name": { "str": "throwing knife", "str_pl": "throwing knives" },
     "symbol": ";",
     "color": "light_gray",
@@ -133,7 +133,6 @@
     "material": [ "steel" ],
     "volume": "100 ml",
     "weight": "460 g",
-    "to_hit": -2,
     "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ],
     "weapon_category": [ "KNIVES" ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ],
diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json
index 3831dc51026eb..45f3138c5d0aa 100644
--- a/data/json/items/resources/glass.json
+++ b/data/json/items/resources/glass.json
@@ -78,7 +78,6 @@
     "weight": "11475 g",
     "volume": "5300 ml",
     "longest_side": "305 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 4 }
   },
   {
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index 973ea664fcd2a..98b7e8fe072a5 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -46,7 +46,6 @@
     "description": "A large and slightly misshapen metal spike, could do some damage mounted on a vehicle.",
     "category": "spare_parts",
     "weight": "550 g",
-    "to_hit": -2,
     "color": "light_gray",
     "symbol": ";",
     "material": [ "steel" ],
@@ -54,6 +53,7 @@
     "flags": [ "ALLOWS_BODY_BLOCK" ],
     "qualities": [ [ "BUTCHER", -42 ] ],
     "price_postapoc": "10 cent",
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "point", "balance": "neutral" },
     "melee_damage": { "bash": 2, "stab": 6 },
     "weapon_category": [ "SHIVS" ]
   },
@@ -175,7 +175,6 @@
     "//2": "appears to be about 20% cheaper than bronze",
     "price": "1 USD 40 cent",
     "price_postapoc": "80 cent",
-    "to_hit": -2,
     "material": [ "brass" ],
     "symbol": ",",
     "color": "yellow",
@@ -269,7 +268,6 @@
     "//1": "250ml × 8.0 = 2kg -> 500g/unit @ stack 4; but mishapen so weight is only 50% of this",
     "price": "10 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "stack_size": 4,
     "material": [ "steel" ],
     "symbol": ",",
@@ -369,7 +367,6 @@
     "material": [ "copper" ],
     "volume": "30 ml",
     "weight": "250 g",
-    "to_hit": -2,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -385,8 +382,7 @@
     "material": [ "tin" ],
     "//": "Density of 7.265g/cm³ => 50g/7.265g/cm³ ~ 7ml",
     "volume": "8 ml",
-    "weight": "50 g",
-    "to_hit": -2
+    "weight": "50 g"
   },
   {
     "type": "AMMO",
@@ -1165,7 +1161,6 @@
     "material": [ "aluminum" ],
     "volume": "20 ml",
     "weight": "50 g",
-    "to_hit": -2,
     "melee_damage": { "bash": 1 }
   },
   {
diff --git a/data/json/items/resources/stone.json b/data/json/items/resources/stone.json
index 64e7d3803452a..b62501e4261fe 100644
--- a/data/json/items/resources/stone.json
+++ b/data/json/items/resources/stone.json
@@ -41,7 +41,6 @@
     "weight": "15768 g",
     "volume": "6 L",
     "longest_side": "30 cm",
-    "to_hit": -2,
     "qualities": [ [ "ANVIL", 1 ] ],
     "melee_damage": { "bash": 28 }
   },
diff --git a/data/json/items/resources/wood.json b/data/json/items/resources/wood.json
index 556b01648d375..18c2a45f3430e 100644
--- a/data/json/items/resources/wood.json
+++ b/data/json/items/resources/wood.json
@@ -214,7 +214,6 @@
     "weight": "48861 g",
     "volume": "82743 ml",
     "longest_side": "244 cm",
-    "to_hit": -2,
     "color": "brown",
     "symbol": "/",
     "material": [ "wood" ],
@@ -291,7 +290,6 @@
     "material": [ "wood" ],
     "volume": "328 ml",
     "longest_side": "13 cm",
-    "to_hit": -2,
     "price": "10 USD",
     "price_postapoc": "10 cent",
     "flags": [ "FIREWOOD" ],
@@ -348,7 +346,6 @@
     "weight": "15000 g",
     "volume": "25000 ml",
     "longest_side": "120 cm",
-    "to_hit": -2,
     "color": "brown",
     "symbol": "§",
     "material": [ "wood" ],
diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
index 83f6cf54b2def..de2375957ab88 100644
--- a/data/json/items/tool/cooking.json
+++ b/data/json/items/tool/cooking.json
@@ -11,7 +11,6 @@
     "longest_side": "20 cm",
     "price": "1 kUSD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum", "lead", "steel" ],
     "qualities": [ [ "BOIL", 1 ] ],
     "ammo": [ "battery" ],
@@ -46,7 +45,6 @@
     "volume": "100 L",
     "price": "200 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "wood" ],
     "symbol": "T",
     "color": "red",
@@ -62,7 +60,6 @@
     "volume": "5 L",
     "price": "525 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -78,7 +75,6 @@
     "longest_side": "30 cm",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "/",
     "color": "yellow",
@@ -212,7 +208,6 @@
     "longest_side": "60 cm",
     "price": "100 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -331,7 +326,6 @@
     "volume": "13 L",
     "price": "60 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "blue",
@@ -707,7 +701,6 @@
     "longest_side": "20 cm",
     "price": "120 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "green",
@@ -725,7 +718,6 @@
     "looks_like": "oil_press_manual",
     "price": "120 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "wood" ],
     "symbol": ";",
     "color": "green",
@@ -743,7 +735,6 @@
     "volume": "1 L",
     "price": "20 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "iron" ],
     "symbol": ")",
     "color": "dark_gray",
@@ -983,7 +974,6 @@
     "longest_side": "17 cm",
     "price": "10 USD",
     "price_postapoc": "10 cent",
-    "to_hit": 2,
     "material": [ "steel" ],
     "symbol": ")",
     "color": "dark_gray",
diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json
index ef345057a33a4..4b02cbfe36a8d 100644
--- a/data/json/items/tool/electronics.json
+++ b/data/json/items/tool/electronics.json
@@ -926,7 +926,7 @@
     "longest_side": "30 cm",
     "price": "0 cent",
     "price_postapoc": "90 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "aluminum", "steel" ],
     "symbol": ";",
     "color": "yellow",
diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json
index 519ef024cd3c9..c0ef8517ce456 100644
--- a/data/json/items/tool/explosives.json
+++ b/data/json/items/tool/explosives.json
@@ -791,7 +791,6 @@
     "volume": "250 ml",
     "price": "1 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "green",
@@ -816,7 +815,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "green",
@@ -957,7 +955,6 @@
     "weight": "8760 g",
     "volume": "3900 ml",
     "price": "200 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "red",
@@ -1212,7 +1209,6 @@
     "weight": "6500 g",
     "volume": "3900 ml",
     "price": "100 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "red",
@@ -1237,7 +1233,6 @@
     "weight": "6500 g",
     "volume": "3900 ml",
     "price": "0 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "light_red",
diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json
index 4596382f79a18..73d711e189c31 100644
--- a/data/json/items/tool/firefighting.json
+++ b/data/json/items/tool/firefighting.json
@@ -60,6 +60,7 @@
     "price": "200 USD",
     "longest_side": "90 cm",
     "price_postapoc": "15 USD",
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "line", "balance": "uneven" },
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "light_gray",
@@ -94,6 +95,7 @@
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "qualities": [ [ "PRY", 4 ], [ "HAMMER", 2 ], [ "DIG", 1 ], [ "PRYING_NAIL", 1 ] ],
     "use_action": [ "CROWBAR" ],
diff --git a/data/json/items/tool/fishing.json b/data/json/items/tool/fishing.json
index c890d66f47846..5f14057f14aaa 100644
--- a/data/json/items/tool/fishing.json
+++ b/data/json/items/tool/fishing.json
@@ -8,7 +8,6 @@
     "volume": "2 L",
     "price": "5 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "green",
@@ -27,7 +26,6 @@
     "longest_side": "50 cm",
     "price": "5 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "dry_plant" ],
     "symbol": ";",
     "color": "brown",
diff --git a/data/json/items/tool/handloading.json b/data/json/items/tool/handloading.json
index fcd00048da94c..b5974a91fd0df 100644
--- a/data/json/items/tool/handloading.json
+++ b/data/json/items/tool/handloading.json
@@ -9,7 +9,6 @@
     "longest_side": "30 cm",
     "price": "100 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -25,7 +24,6 @@
     "longest_side": "30 cm",
     "price": "6 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "wood", "plastic", "brass" ],
     "symbol": ";",
     "color": "dark_gray",
diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json
index 9e08fea06a402..c88f989bc50fe 100644
--- a/data/json/items/tool/landscaping.json
+++ b/data/json/items/tool/landscaping.json
@@ -211,7 +211,6 @@
     "longest_side": "150 cm",
     "price": "20 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 2,
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "brown",
@@ -231,7 +230,6 @@
     "longest_side": "150 cm",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "plastic", "wood" ],
     "symbol": "/",
     "color": "brown",
@@ -249,7 +247,7 @@
     "longest_side": "35 cm",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "clumsy" },
     "material": [ "stone", "wood" ],
     "symbol": "/",
     "color": "light_gray",
@@ -269,7 +267,7 @@
     "longest_side": "50 cm",
     "price": "38 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "uneven" },
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "light_gray",
@@ -289,7 +287,7 @@
     "longest_side": "50 cm",
     "price": "18 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "uneven" },
     "material": [ "bronze", "wood" ],
     "symbol": "L",
     "color": "yellow",
@@ -309,6 +307,7 @@
     "longest_side": "150 cm",
     "price": "55 USD",
     "price_postapoc": "2 USD 50 cent",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
     "material": [ "wood", "steel" ],
     "symbol": "/",
     "color": "brown",
@@ -329,6 +328,7 @@
     "longest_side": "150 cm",
     "price": "55 USD",
     "price_postapoc": "2 USD 50 cent",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "uneven" },
     "material": [ "wood", "bronze" ],
     "symbol": "/",
     "color": "yellow",
diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json
index 9900cb95a74bf..d9996b6b8228f 100644
--- a/data/json/items/tool/lighting.json
+++ b/data/json/items/tool/lighting.json
@@ -9,7 +9,6 @@
     "volume": "1 L",
     "price": "1 kUSD 750 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "light_green",
@@ -27,7 +26,6 @@
     "volume": "1 L",
     "price": "1 kUSD 750 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "light_green",
@@ -51,7 +49,6 @@
     "volume": "250 ml",
     "price": "1 kUSD 250 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "light_green",
@@ -74,7 +71,6 @@
     "volume": "250 ml",
     "price": "1 kUSD 250 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "light_green",
@@ -99,7 +95,6 @@
     "longest_side": "102 mm",
     "price": "1 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "paraffin_wax" ],
     "symbol": ",",
     "color": "white",
@@ -143,7 +138,6 @@
     "volume": "1 L",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "green",
@@ -474,7 +468,6 @@
     "volume": "750 ml",
     "price": "30 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "glass", "steel" ],
     "symbol": ";",
     "color": "yellow",
@@ -678,7 +671,6 @@
     "volume": "50 ml",
     "price": "5 USD",
     "price_postapoc": "25 cent",
-    "to_hit": 2,
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
     "melee_damage": { "bash": 1 }
@@ -737,7 +729,6 @@
     "volume": "1 L",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "glass", "iron" ],
     "symbol": ";",
     "color": "yellow",
@@ -1041,7 +1032,6 @@
     "volume": "750 ml",
     "price": "30 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 2,
     "material": [ "glass", "steel" ],
     "symbol": ";",
     "color": "yellow",
diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
index 61556d2d6379f..b4f12eba441e7 100644
--- a/data/json/items/tool/metalworking.json
+++ b/data/json/items/tool/metalworking.json
@@ -91,7 +91,6 @@
     "volume": "8 L",
     "price": "200 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -111,7 +110,6 @@
     "volume": "7500 ml",
     "price": "160 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -156,7 +154,6 @@
     "volume": "2 L",
     "price": "1 kUSD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "material": [ "ceramic" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -183,7 +180,6 @@
     "volume": "2500 ml",
     "price": "600 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "clay" ],
     "symbol": ";",
     "color": "brown",
@@ -210,7 +206,6 @@
     "volume": "6 L",
     "price": "400 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -229,7 +224,6 @@
     "volume": "10 L",
     "price": "1 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "brown"
@@ -244,7 +238,6 @@
     "volume": "10 L",
     "price": "1 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": ";",
     "color": "brown",
@@ -268,7 +261,6 @@
     "volume": "10 L",
     "price": "1 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": ";",
     "color": "brown",
@@ -527,7 +519,6 @@
     "longest_side": "40 cm",
     "price": "8 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "sand", "clay", "wood" ],
     "symbol": ";",
     "color": "brown",
@@ -543,7 +534,6 @@
     "volume": "3 L",
     "price": "4 USD",
     "price_postapoc": "15 cent",
-    "to_hit": -2,
     "material": [ "stone" ],
     "color": "dark_gray",
     "symbol": ";",
diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json
index 24ffd1b8cfe1b..f5069d7d7470c 100644
--- a/data/json/items/tool/misc.json
+++ b/data/json/items/tool/misc.json
@@ -180,6 +180,7 @@
     "color": "dark_gray",
     "qualities": [ [ "CUT", 1 ], [ "DIG", 3 ], [ "BUTCHER", -8 ], [ "COOK", 1 ] ],
     "flags": [ "DURABLE_MELEE", "NEEDS_UNFOLD", "BELT_CLIP" ],
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" },
     "melee_damage": { "bash": 10, "cut": 8 }
   },
   {
@@ -246,7 +247,6 @@
     "volume": "2500 ml",
     "copy-from": "rope_30",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "cotton", "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -549,7 +549,6 @@
     "volume": "3750 ml",
     "price": "80 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -709,7 +708,6 @@
     "longest_side": "9 cm",
     "price": "10 USD",
     "price_postapoc": "1 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "red",
@@ -782,7 +780,6 @@
     "longest_side": "25 cm",
     "price": "120 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "dark_gray",
diff --git a/data/json/items/tool/musical_instruments.json b/data/json/items/tool/musical_instruments.json
index 447f7ab25163f..ed3236acf0bf4 100644
--- a/data/json/items/tool/musical_instruments.json
+++ b/data/json/items/tool/musical_instruments.json
@@ -507,7 +507,6 @@
     "category": "tools",
     "weight": "2500 g",
     "color": "green",
-    "to_hit": -2,
     "use_action": [ { "type": "play_instrument" } ],
     "tick_action": {
       "type": "musical_instrument",
diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json
index babceb425c330..4cd5e8aca4eb6 100644
--- a/data/json/items/tool/radio_tools.json
+++ b/data/json/items/tool/radio_tools.json
@@ -87,7 +87,6 @@
     "volume": "250 ml",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
diff --git a/data/json/items/tool/tailoring.json b/data/json/items/tool/tailoring.json
index 3b16f56f392fd..f98250c36f05e 100644
--- a/data/json/items/tool/tailoring.json
+++ b/data/json/items/tool/tailoring.json
@@ -271,7 +271,6 @@
     "volume": "1 L",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "flesh", "leather" ],
     "symbol": ",",
     "color": "brown",
@@ -296,7 +295,6 @@
     "volume": "1 L",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fur", "flesh" ],
     "symbol": ",",
     "color": "brown",
@@ -373,7 +371,6 @@
     "volume": "500 ml",
     "price": "10 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "red",
diff --git a/data/json/items/tool/toiletries.json b/data/json/items/tool/toiletries.json
index e1ca435318df2..a0976ae89a1c7 100644
--- a/data/json/items/tool/toiletries.json
+++ b/data/json/items/tool/toiletries.json
@@ -11,7 +11,6 @@
     "longest_side": "30 cm",
     "price": "5 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "use_action": { "type": "weigh_self", "max_weight": "150 kg" },
     "flags": [ "ALLOWS_REMOTE_USE" ],
@@ -120,7 +119,6 @@
     "longest_side": "630 mm",
     "price": "15 USD",
     "price_postapoc": "15 cent",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "/",
     "color": "light_gray",
diff --git a/data/json/items/tool/traps.json b/data/json/items/tool/traps.json
index c75b6f7eec835..051d10fca5b48 100644
--- a/data/json/items/tool/traps.json
+++ b/data/json/items/tool/traps.json
@@ -9,7 +9,6 @@
     "volume": "1500 ml",
     "price": "60 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -204,7 +203,6 @@
     "volume": "1750 ml",
     "price": "60 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": ";",
     "color": "green",
@@ -254,7 +252,6 @@
     "volume": "1750 ml",
     "price": "250 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json
index 85a4cfad72936..392218a672c12 100644
--- a/data/json/items/tool/woodworking.json
+++ b/data/json/items/tool/woodworking.json
@@ -29,7 +29,6 @@
     "longest_side": "88 cm",
     "price": "30 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "red",
@@ -364,7 +363,6 @@
     "longest_side": "28 cm",
     "price": "200 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "yellow",
@@ -575,7 +573,7 @@
     "longest_side": "56 cm",
     "price": "0 cent",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "uneven" },
     "material": [ "stone", "wood" ],
     "symbol": ";",
     "color": "brown",
@@ -593,7 +591,7 @@
     "longest_side": "56 cm",
     "price": "0 cent",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "uneven" },
     "material": [ "wood", "stone" ],
     "symbol": "/",
     "color": "light_gray",
@@ -612,7 +610,6 @@
     "longest_side": "46 cm",
     "price": "30 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": ";",
     "color": "brown",
@@ -630,7 +627,6 @@
     "volume": "250 ml",
     "longest_side": "20 cm",
     "price": "2 USD",
-    "to_hit": 2,
     "material": [ "stone" ],
     "symbol": ";",
     "color": "light_gray",
diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
index 862d76d9ce8b7..fff3947f9d2e4 100644
--- a/data/json/items/tool/workshop.json
+++ b/data/json/items/tool/workshop.json
@@ -9,7 +9,6 @@
     "longest_side": "122 cm",
     "price": "1 USD",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "soil", "wood" ],
     "symbol": "#",
     "color": "brown",
@@ -216,7 +215,6 @@
     "volume": "300 ml",
     "price": "5 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -289,7 +287,6 @@
     "longest_side": "22 cm",
     "price": "20 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "yellow",
@@ -318,7 +315,6 @@
     "longest_side": "22 cm",
     "price": "20 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "yellow",
@@ -342,7 +338,6 @@
     "longest_side": "22 cm",
     "price": "200 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "yellow",
@@ -551,7 +546,6 @@
     "longest_side": "25 cm",
     "price": "180 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "qualities": [ [ "JACK", 16 ] ],
     "melee_damage": { "bash": 8 }
   },
@@ -568,7 +562,6 @@
     "longest_side": "18 cm",
     "price": "8 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "qualities": [ [ "JACK", 3 ] ],
     "melee_damage": { "bash": 4 }
   },
@@ -585,7 +578,6 @@
     "longest_side": "14 cm",
     "price": "50 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -2,
     "qualities": [ [ "JACK", 4 ] ],
     "melee_damage": { "bash": 4 }
   },
@@ -639,7 +631,6 @@
     "longest_side": "36 cm",
     "price": "50 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "steel", "aluminum" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -720,7 +711,6 @@
     "longest_side": "13 cm",
     "price": "3 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -887,7 +877,7 @@
     "longest_side": "91 cm",
     "price": "160 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "point", "balance": "uneven" },
     "material": [ "wood", "steel" ],
     "symbol": "/",
     "color": "dark_gray",
@@ -907,7 +897,7 @@
     "longest_side": "91 cm",
     "price": "160 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "point", "balance": "uneven" },
     "material": [ "wood", "bronze" ],
     "symbol": "/",
     "color": "yellow",
@@ -927,7 +917,6 @@
     "longest_side": "13 cm",
     "price": "3 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_gray",
@@ -997,7 +986,6 @@
     "volume": "3500 ml",
     "price": "350 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -1316,7 +1304,6 @@
     "longest_side": "42 cm",
     "price": "17 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "red",
@@ -1335,7 +1322,6 @@
     "longest_side": "66 cm",
     "price": "140 USD 99 cent",
     "price_postapoc": "4 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "red",
@@ -1402,7 +1388,6 @@
     "volume": "3500 ml",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "light_red",
diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
index 6f4bc05cab29d..cbef318e65054 100644
--- a/data/json/items/tool_armor.json
+++ b/data/json/items/tool_armor.json
@@ -3324,7 +3324,6 @@
     "volume": "15 L",
     "price": "5 kUSD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "glass", "steel" ],
     "symbol": "[",
     "color": "blue",
diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json
index b9287d5a945cf..4c10d4e239ca6 100644
--- a/data/json/items/vehicle/battery.json
+++ b/data/json/items/vehicle/battery.json
@@ -73,7 +73,6 @@
     "name": { "str": "tool battery mount" },
     "description": "An empty mount that can connect conventional batteries used in most handheld tools to a vehicular power grid.  It has a power converter, a charging controller chip, connecting wires, and a harness for securing a battery.",
     "weight": "400 g",
-    "to_hit": -2,
     "color": "light_gray",
     "symbol": ":",
     "material": [ "plastic", "steel", "copper" ],
@@ -139,7 +138,6 @@
     "volume": "25 L",
     "price": "2 kUSD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": ":",
     "color": "light_cyan",
diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json
index 18dc1b86f946f..0bb60ff22d16a 100644
--- a/data/json/items/vehicle/controls.json
+++ b/data/json/items/vehicle/controls.json
@@ -71,7 +71,6 @@
     "volume": "1200 ml",
     "price": "300 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "leather" ],
     "symbol": "W",
     "color": "light_gray",
@@ -84,7 +83,6 @@
     "name": { "str": "dashboard" },
     "description": "A vehicle instrument panel with various gauges and switches.  Useful for crafting.",
     "weight": "2821 g",
-    "to_hit": -2,
     "color": "cyan",
     "symbol": "$",
     "material": [ "plastic", "steel" ],
diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json
index 1a3b373a9cedd..1a046ccdb5b75 100644
--- a/data/json/items/vehicle/lights.json
+++ b/data/json/items/vehicle/lights.json
@@ -43,7 +43,6 @@
     "name": { "str": "reinforced headlight" },
     "description": "A vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.",
     "weight": "1200 g",
-    "to_hit": -2,
     "color": "light_cyan",
     "symbol": ",",
     "material": [ "steel", "plastic" ],
diff --git a/data/json/items/vehicle/manual.json b/data/json/items/vehicle/manual.json
index 76bb4c10b7dfc..d66c305bb20f3 100644
--- a/data/json/items/vehicle/manual.json
+++ b/data/json/items/vehicle/manual.json
@@ -12,16 +12,13 @@
     "volume": "500 ml",
     "category": "veh_parts",
     "price": "90 USD",
-    "price_postapoc": "1 USD",
-    "melee_damage": { "bash": 10 }
+    "price_postapoc": "1 USD"
   },
   {
     "type": "GENERIC",
     "id": "foot_crank",
     "copy-from": "hand_rims",
     "name": { "str": "foot crank" },
-    "description": "A pedal and gear assembly from a bicycle.",
-    "to_hit": -2,
-    "melee_damage": { "bash": 8, "cut": 2 }
+    "description": "A pedal and gear assembly from a bicycle."
   }
 ]
diff --git a/data/json/items/vehicle/noise.json b/data/json/items/vehicle/noise.json
index 73d37d75cc7b9..665044fa6bd39 100644
--- a/data/json/items/vehicle/noise.json
+++ b/data/json/items/vehicle/noise.json
@@ -40,7 +40,6 @@
     "name": { "str": "stereo system" },
     "description": "A stereo system with speakers.  It is capable of being hooked up to a vehicle.",
     "weight": "800 g",
-    "to_hit": -2,
     "color": "red",
     "symbol": "&",
     "material": [ "steel" ],
@@ -56,7 +55,6 @@
     "name": { "str_sp": "chime loudspeakers" },
     "description": "A stereo system with loudspeakers and a built-in set of simple melodies that it will play.  Commonly used by ice cream trucks to draw the attention of children in the days when children wanted ice cream more than brains.",
     "weight": "2600 g",
-    "to_hit": -2,
     "color": "blue",
     "symbol": "&",
     "material": [ "steel" ],
diff --git a/data/json/items/vehicle/plating.json b/data/json/items/vehicle/plating.json
index 7d001b6f299ef..53ae09bf1446c 100644
--- a/data/json/items/vehicle/plating.json
+++ b/data/json/items/vehicle/plating.json
@@ -7,7 +7,6 @@
     "//": "Roughly in the 70 cm × 70 cm × 1.5 mm to 1 m × 1 m × 0.75 mm range. Has to be folded / rolled up when in inventory, so 75% density compared to solid block.",
     "weight": "6 kg",
     "longest_side": "100 cm",
-    "to_hit": -2,
     "color": "light_cyan",
     "symbol": "]",
     "material": [ "lc_steel" ],
@@ -77,7 +76,6 @@
     "name": { "str": "superalloy sheet" },
     "description": "A sheet of sturdy superalloy; incredibly hard, yet incredibly malleable.",
     "weight": "900 g",
-    "to_hit": -2,
     "color": "light_cyan",
     "symbol": ",",
     "material": [ "superalloy" ],
diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json
index a9d85af5d2af0..e1a996a6c8ade 100644
--- a/data/json/items/vehicle/utilities.json
+++ b/data/json/items/vehicle/utilities.json
@@ -123,7 +123,6 @@
     "name": { "str": "washing machine" },
     "description": "A very small washing machine designed for use in vehicles.",
     "weight": "15000 g",
-    "to_hit": -8,
     "color": "light_blue",
     "symbol": "{",
     "material": [ "steel" ],
@@ -139,7 +138,6 @@
     "name": { "str": "programmable autopilot" },
     "description": "A computer system hooked up to the steering and engine of a vehicle to allow it to follow simple paths.",
     "weight": "11246 g",
-    "to_hit": -2,
     "color": "light_blue",
     "symbol": "A",
     "material": [ "steel" ],
diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
index 95ff4401395ea..80fca61f10c18 100644
--- a/data/json/items/vehicle/wheel.json
+++ b/data/json/items/vehicle/wheel.json
@@ -40,7 +40,6 @@
     "longest_side": "204 mm",
     "price": "30 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -57,7 +56,6 @@
     "longest_side": "254 mm",
     "price": "50 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -74,7 +72,6 @@
     "longest_side": "200 mm",
     "price": "2 USD",
     "price_postapoc": "20 cent",
-    "to_hit": -2,
     "material": [ "steel", "aluminum" ],
     "symbol": "]",
     "color": "dark_gray",
@@ -139,7 +136,6 @@
     "description": "A large, spoked rim for a bicycle tire.",
     "weight": "750 g",
     "volume": "11 L",
-    "to_hit": -2,
     "longest_side": "686 mm",
     "price": "50 USD",
     "price_postapoc": "5 USD",
@@ -624,7 +620,6 @@
     "longest_side": "1524 mm",
     "price": "500 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "m",
     "color": "light_gray",
@@ -662,7 +657,6 @@
     "longest_side": "77 mm",
     "price": "14 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "]",
     "color": "dark_gray",
@@ -700,7 +694,6 @@
     "longest_side": "178 mm",
     "price": "70 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "]",
     "color": "dark_gray",
diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 3b5690d4340d9..c2d18892f28b3 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -217,7 +217,6 @@
     "longest_side": "249 mm",
     "price": "650 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": -4 },
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
diff --git a/data/json/obsoletion_and_migration_0.I/gun.json b/data/json/obsoletion_and_migration_0.I/gun.json
index de78cfc4b8c0f..b45759a7d64af 100644
--- a/data/json/obsoletion_and_migration_0.I/gun.json
+++ b/data/json/obsoletion_and_migration_0.I/gun.json
@@ -20,7 +20,6 @@
     "barrel_length": "269 mm",
     "price": "2 kUSD 800 USD",
     "price_postapoc": "22 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
@@ -245,7 +244,6 @@
     "barrel_length": "470 mm",
     "price": "1 kUSD 630 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "symbol": "(",
     "color": "light_gray",
@@ -451,7 +449,6 @@
     "barrel_length": "125 mm",
     "price": "4 kUSD 799 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -2,
     "material": [ "steel" ],
     "color": "light_gray",
     "ammo": [ "38super" ],
diff --git a/data/mods/Aftershock/items/armor.json b/data/mods/Aftershock/items/armor.json
index cc305073b1b47..33a132622296b 100644
--- a/data/mods/Aftershock/items/armor.json
+++ b/data/mods/Aftershock/items/armor.json
@@ -206,7 +206,6 @@
     "weight": "7500 g",
     "volume": "15 L",
     "price": "15 kUSD",
-    "to_hit": -2,
     "material": [ "glass", "steel" ],
     "symbol": "[",
     "color": "blue",
@@ -310,7 +309,6 @@
     "weight": "1 kg",
     "volume": "750 ml",
     "price": "52 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
@@ -329,7 +327,6 @@
     "weight": "320 g",
     "volume": "750 ml",
     "price": "52 USD",
-    "to_hit": 2,
     "material": [ "kevlar", "leather" ],
     "symbol": "[",
     "looks_like": "fire_gauntlets",
diff --git a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json
index 7f05381cdd479..a2ac3d8867386 100644
--- a/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json
+++ b/data/mods/Aftershock/items/armor/exosuit/exosuit_modules.json
@@ -253,7 +253,6 @@
     "weight": "500 g",
     "volume": "250 ml",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "lvl4ballisticglass", "qt_steel" ],
     "symbol": "(",
     "color": "yellow",
@@ -432,7 +431,6 @@
     "weight": "500 g",
     "volume": "250 ml",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "plastic", "qt_steel" ],
     "symbol": "(",
     "color": "yellow",
@@ -475,7 +473,6 @@
     "weight": "8750 g",
     "volume": "10 L",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "vacuum_carbide", "qt_steel" ],
     "symbol": "(",
     "color": "light_gray",
@@ -502,7 +499,6 @@
     "weight": "5 kg",
     "volume": "2500 ml",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "vacuum_carbide", "qt_steel" ],
     "symbol": "(",
     "color": "light_gray",
@@ -526,7 +522,6 @@
     "weight": "5 kg",
     "volume": "2500 ml",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "vacuum_carbide", "qt_steel" ],
     "symbol": "(",
     "color": "light_gray",
@@ -554,7 +549,6 @@
     "weight": "5 kg",
     "volume": "2500 ml",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "vacuum_carbide", "qt_steel" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/mods/Aftershock/items/containers.json b/data/mods/Aftershock/items/containers.json
index 49b15c95932c7..67be9e020107f 100644
--- a/data/mods/Aftershock/items/containers.json
+++ b/data/mods/Aftershock/items/containers.json
@@ -7,7 +7,6 @@
     "weight": "1022 g",
     "volume": "22 L",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "symbol": ",",
     "color": "red",
     "pocket_data": [ { "max_contains_volume": "20 L", "max_contains_weight": "40 kg", "max_item_length": "133 cm", "rigid": true } ]
@@ -20,7 +19,6 @@
     "weight": "2710 g",
     "volume": "30 L",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "symbol": "0",
     "color": "light_red",
     "pocket_data": [ { "max_contains_volume": "28 L", "max_contains_weight": "40 kg", "max_item_length": "170 cm", "rigid": true } ]
diff --git a/data/mods/Aftershock/items/gun/10mm.json b/data/mods/Aftershock/items/gun/10mm.json
index 8f473063fe320..ad668040d074f 100644
--- a/data/mods/Aftershock/items/gun/10mm.json
+++ b/data/mods/Aftershock/items/gun/10mm.json
@@ -24,7 +24,6 @@
     "volume": "480 ml",
     "longest_side": "205 mm",
     "price": "450 USD",
-    "to_hit": -2,
     "material": [ "plastic", "superalloy" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -61,7 +60,6 @@
     "volume": "480 ml",
     "longest_side": "205 mm",
     "price": "1750 USD",
-    "to_hit": -2,
     "material": [ "steel", "superalloy" ],
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "DOUBLE", "2rd burst", 2 ] ],
     "symbol": "(",
@@ -96,7 +94,6 @@
     "volume": "480 ml",
     "longest_side": "205 mm",
     "price": "750 kUSD",
-    "to_hit": -2,
     "material": [ "plastic", "superalloy" ],
     "built_in_mods": [ "afs_smart_scope" ],
     "skill": "smartgun",
diff --git a/data/mods/Aftershock/items/gun/5x50.json b/data/mods/Aftershock/items/gun/5x50.json
index a5ceb6484a8c4..4cf9a4b43c890 100644
--- a/data/mods/Aftershock/items/gun/5x50.json
+++ b/data/mods/Aftershock/items/gun/5x50.json
@@ -26,7 +26,6 @@
     "longest_side": "690 mm",
     "price": "23 kUSD 200 USD",
     "price_postapoc": "80 USD",
-    "to_hit": -2,
     "material": [ "superalloy", "ceramic" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -68,7 +67,6 @@
     "longest_side": "255 mm",
     "price": "12 kUSD",
     "price_postapoc": "80 USD",
-    "to_hit": -2,
     "material": [ "superalloy", "ceramic" ],
     "symbol": "(",
     "color": "dark_gray",
diff --git a/data/mods/Aftershock/items/gun/7.50mm.json b/data/mods/Aftershock/items/gun/7.50mm.json
index c3ff62001e175..07831e999c819 100644
--- a/data/mods/Aftershock/items/gun/7.50mm.json
+++ b/data/mods/Aftershock/items/gun/7.50mm.json
@@ -156,7 +156,6 @@
     "barrel_length": "264 mm",
     "price": "3 kUSD 500 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -2,
     "material": [ "superalloy", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/mods/Aftershock/items/gun/foam.json b/data/mods/Aftershock/items/gun/foam.json
index 08f6fc3e35fc7..f57c723d969d6 100644
--- a/data/mods/Aftershock/items/gun/foam.json
+++ b/data/mods/Aftershock/items/gun/foam.json
@@ -10,7 +10,6 @@
     "volume": "750 ml",
     "price": "130 USD",
     "price_postapoc": "50 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "yellow",
diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json
index 3c19ed8985007..617ebda19ba9d 100644
--- a/data/mods/Aftershock/items/gun/laser.json
+++ b/data/mods/Aftershock/items/gun/laser.json
@@ -6,7 +6,6 @@
     "name": { "str": "wrist-stunner" },
     "description": "A severed robotic hand from a Wraitheon Sentinel.  The powerful electro-laser stun gun embed on its wrist is still functional, and can be used when connected to an UPS.",
     "price": "7 kUSD 200 USD",
-    "to_hit": -2,
     "material": [ "superalloy", "plastic" ],
     "color": "cyan",
     "range": 10,
diff --git a/data/mods/Aftershock/items/gun/needle.json b/data/mods/Aftershock/items/gun/needle.json
index dc9c485a5df22..5d4940e5c48ee 100644
--- a/data/mods/Aftershock/items/gun/needle.json
+++ b/data/mods/Aftershock/items/gun/needle.json
@@ -10,7 +10,6 @@
     "volume": "1250 ml",
     "longest_side": "690 mm",
     "price": 232000,
-    "to_hit": -2,
     "melee_damage": { "bash": 12 },
     "material": [ "steel", "ceramic" ],
     "symbol": "(",
@@ -50,7 +49,6 @@
     "volume": "620 ml",
     "longest_side": "255 mm",
     "price": 1200000,
-    "to_hit": -2,
     "melee_damage": { "bash": 8 },
     "material": [ "ceramic" ],
     "symbol": "(",
diff --git a/data/mods/Aftershock/items/gun/plasma.json b/data/mods/Aftershock/items/gun/plasma.json
index 58ba7ad5cfe19..c57858fd65b89 100644
--- a/data/mods/Aftershock/items/gun/plasma.json
+++ b/data/mods/Aftershock/items/gun/plasma.json
@@ -10,7 +10,6 @@
     "volume": "750 ml",
     "price": "750 USD",
     "price_postapoc": "750 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "yellow",
diff --git a/data/mods/Aftershock/items/gun/projectile.json b/data/mods/Aftershock/items/gun/projectile.json
index e30b6d1c19821..5a8f2485848eb 100644
--- a/data/mods/Aftershock/items/gun/projectile.json
+++ b/data/mods/Aftershock/items/gun/projectile.json
@@ -6,7 +6,6 @@
     "description": "Bionic one-shot subdermal 10mm pistol integrated with your head.",
     "volume": "80 ml",
     "price": "0 cent",
-    "to_hit": -2,
     "material": [ "superalloy", "plastic" ],
     "symbol": "(",
     "color": "magenta",
diff --git a/data/mods/Aftershock/items/gun/shot.json b/data/mods/Aftershock/items/gun/shot.json
index 9356854327e8d..98d4d2856935a 100644
--- a/data/mods/Aftershock/items/gun/shot.json
+++ b/data/mods/Aftershock/items/gun/shot.json
@@ -78,7 +78,6 @@
     "volume": "1450 ml",
     "longest_side": "475 mm",
     "min_strength": 14,
-    "to_hit": -2,
     "material": [ "qt_steel", "plastic", "carbide" ],
     "symbol": "r",
     "color": "light_gray",
diff --git a/data/mods/Aftershock/items/inactiverobot.json b/data/mods/Aftershock/items/inactiverobot.json
index 563365f9fd62c..e34d3ed3bee35 100644
--- a/data/mods/Aftershock/items/inactiverobot.json
+++ b/data/mods/Aftershock/items/inactiverobot.json
@@ -114,7 +114,6 @@
     "material": [ "steel", "plastic" ],
     "weight": "430000 g",
     "volume": "187500 ml",
-    "to_hit": -2,
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
     "melee_damage": { "bash": 10, "cut": 6 }
   },
@@ -130,7 +129,6 @@
     "material": [ "steel", "plastic" ],
     "volume": "12500 ml",
     "weight": "10500 g",
-    "to_hit": -2,
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
     "melee_damage": { "bash": 10, "cut": 6 }
   },
diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json
index ae84a7af5dc8a..46f9953123761 100644
--- a/data/mods/Aftershock/items/items.json
+++ b/data/mods/Aftershock/items/items.json
@@ -59,7 +59,6 @@
     "looks_like": "scrap",
     "weight": "450 g",
     "volume": "100 ml",
-    "to_hit": -2,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -126,7 +125,6 @@
     "symbol": "u",
     "color": "light_green",
     "use_action": { "type": "deploy_furn", "furn_type": "f_atomic_butter_churn" },
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "//": "I figured bionic preppers would have a sci-fi solution to some low tech problems.",
     "flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE" ],
@@ -140,7 +138,6 @@
     "weight": "6464 g",
     "volume": "11356 ml",
     "price": "200 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "qualities": [ [ "CONTAIN", 1 ], [ "CHURN", 2 ] ],
     "symbol": "H",
diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json
index c588b918f4c64..575b2ef46d8f9 100644
--- a/data/mods/Aftershock/items/tools.json
+++ b/data/mods/Aftershock/items/tools.json
@@ -48,7 +48,6 @@
     "volume": "850 ml",
     "longest_side": "20 cm",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "yellow",
@@ -75,7 +74,6 @@
     "volume": "650 ml",
     "price": "6 kUSD",
     "longest_side": "20 cm",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "yellow",
@@ -279,7 +277,6 @@
     "longest_side": "20 cm",
     "price": "1 kUSD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "plastic", "aluminum" ],
     "qualities": [ [ "BOIL", 1 ] ],
     "symbol": ",",
@@ -349,7 +346,6 @@
     "type": "TOOL",
     "name": { "str": "murdersaw (on)", "str_pl": "murdersaws (on)" },
     "description": "This fearsome weapon is currently whirring loudly and shaking with the force of its own power.  Use it to turn it off.",
-    "to_hit": 2,
     "turns_per_charge": 5,
     "revert_to": "afs_murdersaw",
     "use_action": { "target": "afs_murdersaw", "msg": "Your murdersaw falls quiet.", "menu_text": "Turn off", "type": "transform" },
@@ -584,7 +580,6 @@
     "symbol": "u",
     "color": "light_green",
     "use_action": { "type": "deploy_furn", "furn_type": "f_nano_forge" },
-    "to_hit": -2,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "battery": 5000 } } ],
     "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "1 h", "regenerate_ammo": true } },
     "material": [ "superalloy" ],
@@ -599,7 +594,6 @@
     "weight": "6464 g",
     "volume": "11356 ml",
     "price": "200 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "qualities": [ [ "NANO_FORGE", 1 ] ],
     "symbol": "H",
@@ -657,7 +651,6 @@
     "symbol": "u",
     "color": "light_green",
     "use_action": { "type": "deploy_furn", "furn_type": "f_diamond_press" },
-    "to_hit": -2,
     "material": [ "superalloy" ],
     "flags": [ "DURABLE_MELEE" ],
     "melee_damage": { "bash": 5 }
@@ -670,7 +663,6 @@
     "weight": "6464 g",
     "volume": "11356 ml",
     "price": "200 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "qualities": [ [ "DIAMONDPRESS", 1 ] ],
     "symbol": "H",
diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json
index 39ae95806878f..19a473897cd0e 100644
--- a/data/mods/Aftershock/items/weapons.json
+++ b/data/mods/Aftershock/items/weapons.json
@@ -58,7 +58,6 @@
     "color": "light_blue",
     "looks_like": "arming_sword",
     "turns_per_charge": 4,
-    "to_hit": 2,
     "flags": [ "DURABLE_MELEE" ],
     "techniques": [ "WBLOCK_2" ],
     "revert_to": "afs_energy_saber_off",
@@ -87,7 +86,6 @@
     "weight": "500 g",
     "volume": "2700 ml",
     "longest_side": "90 cm",
-    "to_hit": -2,
     "reload_noise_volume": 0,
     "loudness": 0,
     "ranged_damage": { "damage_type": "heat", "amount": 50, "armor_penetration": 15 },
@@ -123,7 +121,6 @@
     "symbol": "[",
     "looks_like": "gauntlets_chitin",
     "color": "light_gray",
-    "to_hit": -2,
     "flags": [ "NO_REPAIR", "NONCONDUCTIVE", "SLOW_WIELD", "DURABLE_MELEE", "LEAK_DAM" ],
     "techniques": [ "BRUTAL", "AFS_PRESSURE_CRUNCH" ],
     "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "hand_r" ] } ],
@@ -174,7 +171,6 @@
     "description": "A grenade launcher mounted onto your right-hand wrist.  Less powerful than a proper grenade launcher, but infinitely more portable, and quick to reload.",
     "volume": "2250 ml",
     "price": "0 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "looks_like": "bio_int_enhancer",
@@ -238,6 +234,7 @@
     "volume": "250 ml",
     "price": "40 USD",
     "material": [ "ceramic", "plastic" ],
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "good" },
     "symbol": "/",
     "color": "dark_gray",
     "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 5 ] ],
@@ -259,6 +256,7 @@
     "color": "white",
     "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 5 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_KNIFE", "NPC_THROWN", "ALLOWS_BODY_BLOCK", "NO_SALVAGE" ],
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "good" },
     "weapon_category": [ "KNIVES" ],
     "thrown_damage": [ { "damage_type": "afs_toxin_pierce", "amount": 14 } ],
     "melee_damage": { "afs_toxin_pierce": 21 }
@@ -281,6 +279,7 @@
     "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
     "price": "75 USD",
     "price_postapoc": "12 USD",
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" },
     "melee_damage": { "bash": 5, "stab": 28 },
     "weapon_category": [ "POLEARMS", "SPEARS" ]
   },
@@ -356,7 +355,6 @@
     "weight": "1360 g",
     "volume": "2 L",
     "longest_side": "90 cm",
-    "to_hit": 2,
     "category": "weapons",
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
     "melee_damage": { "bash": 10, "cut": 50 },
diff --git a/data/mods/Backrooms/items.json b/data/mods/Backrooms/items.json
index 310308331e5fe..5782e7c9a33db 100644
--- a/data/mods/Backrooms/items.json
+++ b/data/mods/Backrooms/items.json
@@ -10,7 +10,6 @@
     "volume": "20000 ml",
     "price": "0 cent",
     "price_postapoc": "10 cent",
-    "to_hit": 1,
     "material": [ "plastic" ],
     "symbol": ")",
     "color": "light_cyan",
diff --git a/data/mods/BlazeIndustries/items/gun/grenade.json b/data/mods/BlazeIndustries/items/gun/grenade.json
index 02e4a18b6c031..2f62e35b084b8 100644
--- a/data/mods/BlazeIndustries/items/gun/grenade.json
+++ b/data/mods/BlazeIndustries/items/gun/grenade.json
@@ -30,7 +30,6 @@
     "weight": "400 g",
     "volume": "250 ml",
     "price": "0 cent",
-    "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "cyan",
diff --git a/data/mods/BlazeIndustries/items/items.json b/data/mods/BlazeIndustries/items/items.json
index a032e28376395..acf6891fc074c 100644
--- a/data/mods/BlazeIndustries/items/items.json
+++ b/data/mods/BlazeIndustries/items/items.json
@@ -12,7 +12,6 @@
     "looks_like": "scrap",
     "weight": "450 g",
     "volume": "100 ml",
-    "to_hit": -2,
     "melee_damage": { "bash": 1 }
   },
   {
diff --git a/data/mods/BlazeIndustries/items/vehicle/blaze_gun.json b/data/mods/BlazeIndustries/items/vehicle/blaze_gun.json
index a687375d0a27f..130a5c94c6578 100644
--- a/data/mods/BlazeIndustries/items/vehicle/blaze_gun.json
+++ b/data/mods/BlazeIndustries/items/vehicle/blaze_gun.json
@@ -10,7 +10,6 @@
     "volume": "2500 ml",
     "price": "230 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -1,
     "material": [ "iron", "wood" ],
     "symbol": "(",
     "color": "brown",
@@ -50,7 +49,6 @@
     "longest_side": "103 cm",
     "price": "380 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -1,
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "brown",
diff --git a/data/mods/BlazeIndustries/items/vehicle/blaze_other.json b/data/mods/BlazeIndustries/items/vehicle/blaze_other.json
index 1e91b1bd8d62d..ec09bacb7bb0f 100644
--- a/data/mods/BlazeIndustries/items/vehicle/blaze_other.json
+++ b/data/mods/BlazeIndustries/items/vehicle/blaze_other.json
@@ -5,7 +5,6 @@
     "name": { "str": "vehicle shelving" },
     "description": "Several heavy frames retrofitted to be installed together which are outfitted with tie-downs and attachment points gallore for carrying an extended amount of cargo.",
     "weight": "350000 g",
-    "to_hit": -4,
     "color": "cyan",
     "symbol": "]",
     "material": [ "steel", "plastic" ],
@@ -28,7 +27,6 @@
     "price": "400 USD",
     "price_postapoc": "100 USD",
     "material": [ "steel" ],
-    "to_hit": -4,
     "flags": [ "DURABLE_MELEE" ],
     "looks_like": "minifridge",
     "melee_damage": { "bash": 8 }
diff --git a/data/mods/BlazeIndustries/items/vehicle/blaze_solar.json b/data/mods/BlazeIndustries/items/vehicle/blaze_solar.json
index b6473c41f18b5..6e30942d18438 100644
--- a/data/mods/BlazeIndustries/items/vehicle/blaze_solar.json
+++ b/data/mods/BlazeIndustries/items/vehicle/blaze_solar.json
@@ -9,7 +9,6 @@
     "volume": "10000 ml",
     "price": "1 kUSD 200 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -4,
     "flags": [ "NO_REPAIR" ],
     "material": [ "glass" ],
     "symbol": "]",
diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json
index ab937ddadb497..a01e059e83814 100644
--- a/data/mods/CrazyCataclysm/crazy_items.json
+++ b/data/mods/CrazyCataclysm/crazy_items.json
@@ -8,7 +8,6 @@
     "weight": "180 g",
     "volume": "250 ml",
     "price": "400 USD",
-    "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "green",
@@ -30,7 +29,6 @@
     "weight": "180 g",
     "volume": "250 ml",
     "price": "0 cent",
-    "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "green",
@@ -68,7 +66,6 @@
     "weight": "2950 g",
     "volume": "3 L",
     "price": "16 kUSD",
-    "to_hit": -1,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "cyan",
@@ -94,7 +91,6 @@
     "weight": "709 g",
     "volume": "539 ml",
     "price": "75 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel", "zinc" ],
     "color": "dark_gray",
     "ammo": [ "9mm" ],
@@ -244,7 +240,7 @@
     "name": { "str": "burnt out Louisville Slaughterer" },
     "description": "A sturdy wood bat, wrapped in flame-resistant Nomex fabric.  Makes a good melee weapon but better be disassembled to recycle the baseball bat and some Nomex patches.",
     "weight": "1343 g",
-    "to_hit": 3,
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "any", "balance": "good" },
     "color": "brown",
     "symbol": "/",
     "material": [ "wood" ],
@@ -263,7 +259,7 @@
     "weight": "1485 g",
     "volume": "2 L",
     "price": "160 USD",
-    "to_hit": 3,
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "any", "balance": "good" },
     "material": [ "wood", "nomex" ],
     "symbol": "/",
     "color": "brown",
@@ -291,7 +287,7 @@
     "weight": "1485 g",
     "volume": "2 L",
     "price": "160 USD",
-    "to_hit": 3,
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "any", "balance": "good" },
     "material": [ "wood", "nomex" ],
     "symbol": "/",
     "color": "red",
@@ -419,7 +415,6 @@
     "range": 10,
     "dispersion": 14,
     "loudness": 0,
-    "to_hit": -1,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80" ],
     "qualities": [ [ "HAMMER", 1 ] ],
     "melee_damage": { "bash": 7 }
diff --git a/data/mods/Defense_Mode/items.json b/data/mods/Defense_Mode/items.json
index a7b3f184cdfb1..6effa627117ed 100644
--- a/data/mods/Defense_Mode/items.json
+++ b/data/mods/Defense_Mode/items.json
@@ -8,7 +8,6 @@
     "price_postapoc": "0 cent",
     "weight": "1 g",
     "volume": "1 ml",
-    "to_hit": -3,
     "color": "white",
     "symbol": "$",
     "material": [ "paper" ]
diff --git a/data/mods/DinoMod/items/containers.json b/data/mods/DinoMod/items/containers.json
index e99a590187588..131d473ab4128 100644
--- a/data/mods/DinoMod/items/containers.json
+++ b/data/mods/DinoMod/items/containers.json
@@ -9,7 +9,6 @@
     "volume": "1 L",
     "price": "90 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "gutskin" ],
     "symbol": ")",
     "color": "brown",
diff --git a/data/mods/DinoMod/items/laser_items.json b/data/mods/DinoMod/items/laser_items.json
index 5ad7a975e02d0..e262c20e840e2 100644
--- a/data/mods/DinoMod/items/laser_items.json
+++ b/data/mods/DinoMod/items/laser_items.json
@@ -10,7 +10,6 @@
     "flags": [ "NEVER_JAMS", "NON_FOULING", "NEEDS_NO_LUBE", "UNRECOVERABLE", "TRADER_AVOID", "WATERPROOF_GUN", "NO_SALVAGE" ],
     "skill": "rifle",
     "weight": "540 g",
-    "to_hit": 1,
     "reload_noise_volume": 3,
     "loudness": 6,
     "ranged_damage": { "damage_type": "bullet", "amount": 24, "armor_penetration": 6 },
diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json
index afa560c913601..0e89afe203386 100644
--- a/data/mods/Generic_Guns/firearms/pistol_magnum.json
+++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json
@@ -12,7 +12,6 @@
     "barrel_length": "152 mm",
     "price": "875 USD",
     "price_postapoc": "27 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
diff --git a/data/mods/Magiclysm/Spells/attunements/Crusader.json b/data/mods/Magiclysm/Spells/attunements/Crusader.json
index e72093e6f64ad..ead105de991f1 100644
--- a/data/mods/Magiclysm/Spells/attunements/Crusader.json
+++ b/data/mods/Magiclysm/Spells/attunements/Crusader.json
@@ -121,6 +121,7 @@
     "weapon_category": [ "LONG_SWORDS", "GREAT_SWORDS" ],
     "techniques": [ "RSTRIKE", "WBLOCK_2", "BRUTAL", "RAPID" ],
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "SHEATH_SWORD" ],
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "weight": "1067 g",
     "volume": "2750 ml",
     "longest_side": "120cm",
@@ -147,6 +148,7 @@
     "looks_like": "kris",
     "description": "A short blade made of glowing, radiant fire.  It explodes with radiance when striking enemies.",
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "SHEATH_KNIFE" ],
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "line", "balance": "good" },
     "weight": "328 g",
     "volume": "750 ml",
     "longest_side": "50 cm",
@@ -191,6 +193,7 @@
     "longest_side": "180 cm",
     "material": "concentrated_mana",
     "techniques": [ "RSTRIKE", "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "weapon_category": [ "GREAT_SWORDS" ],
     "relic_data": {
       "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "ITEM_DAMAGE_PURE", "add": 15 } ] } ]
@@ -231,6 +234,7 @@
     "material": "concentrated_mana",
     "techniques": [ "RSTRIKE", "WBLOCK_1", "IMPALE" ],
     "weapon_category": [ "POLEARMS", "SPEARS" ],
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
     "relic_data": {
       "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "ITEM_DAMAGE_PURE", "add": 11 } ] } ]
     },
@@ -254,6 +258,7 @@
     "looks_like": "mace",
     "description": "A short and hefty mace glowing with radiant fire.  It explodes with radiance when striking enemies.",
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "MAGIC_FOCUS", "TRADER_AVOID", "BELT_CLIP" ],
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "any", "balance": "neutral" },
     "weight": "882 g",
     "volume": "1250 ml",
     "longest_side": "80 cm",
diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json
index ec1e6395a6a2a..50f90badf24c0 100644
--- a/data/mods/Magiclysm/items/alchemy_items.json
+++ b/data/mods/Magiclysm/items/alchemy_items.json
@@ -26,7 +26,6 @@
     "material": [ "stone" ],
     "weight": "250 g",
     "volume": "150 ml",
-    "to_hit": -2,
     "qualities": [ [ "BUTCHER", -50 ] ],
     "//": "Potion recipes that require a full owlbear egg could also instead require larger amounts of stone shell.  Since 1 egg gives 3 shells, you could perhaps have 1 egg be equivalent to 5 or more shells when making potions.",
     "melee_damage": { "bash": 5, "cut": 3 }
@@ -226,7 +225,6 @@
     "weight": "89 g",
     "volume": "250 ml",
     "flags": [ "TRADER_AVOID" ],
-    "to_hit": -2,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -259,7 +257,6 @@
     "name": "demon spider fang",
     "description": "A fang from a demon spider.  It seems to still drip with poison; you might be able to use this in some alchemical recipe?",
     "weight": "270 g",
-    "to_hit": -2,
     "color": "green",
     "symbol": ",",
     "material": [ "flesh" ],
@@ -267,6 +264,7 @@
     "weapon_category": [ "SHIVS" ],
     "flags": [ "SPEAR", "SHEATH_KNIFE" ],
     "price": "15 USD",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "point", "balance": "good" },
     "melee_damage": { "stab": 8 }
   },
   {
diff --git a/data/mods/Magiclysm/items/black_dragon_items.json b/data/mods/Magiclysm/items/black_dragon_items.json
index b74acd2f7b5ba..1eba7248ad794 100644
--- a/data/mods/Magiclysm/items/black_dragon_items.json
+++ b/data/mods/Magiclysm/items/black_dragon_items.json
@@ -50,7 +50,6 @@
     "weight": "2500 g",
     "volume": "4 L",
     "price": "0 cent",
-    "to_hit": -2,
     "material": [ "flesh", "black_dragon_hide" ],
     "symbol": ",",
     "color": "black_white",
@@ -98,7 +97,6 @@
     "weight": "945 g",
     "volume": "3250 ml",
     "price": "750 USD",
-    "to_hit": -2,
     "material": [ "black_dragon_hide", "black_dragon_scales" ],
     "symbol": "[",
     "color": "black_white",
@@ -118,7 +116,6 @@
     "weight": "655 g",
     "volume": "3250 ml",
     "price": "500 USD",
-    "to_hit": -2,
     "material": [ "black_dragon_hide" ],
     "symbol": "[",
     "color": "black_white",
@@ -238,7 +235,6 @@
     "weight": "380 g",
     "volume": "1 L",
     "price": "1 kUSD 800 USD",
-    "to_hit": 2,
     "material": [ "black_dragon_hide", "black_dragon_scales" ],
     "symbol": "[",
     "color": "black_white",
@@ -257,7 +253,6 @@
     "weight": "230 g",
     "volume": "750 ml",
     "price": "1 kUSD 800 USD",
-    "to_hit": 2,
     "material": [ "black_dragon_hide" ],
     "symbol": "[",
     "color": "black_white",
diff --git a/data/mods/Magiclysm/items/caster_level_boosters.json b/data/mods/Magiclysm/items/caster_level_boosters.json
index bce00126a5a5f..00d7bd9aa1c5e 100644
--- a/data/mods/Magiclysm/items/caster_level_boosters.json
+++ b/data/mods/Magiclysm/items/caster_level_boosters.json
@@ -115,7 +115,6 @@
     "volume": "250 ml",
     "price": "1 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "material": [ "beeswax" ],
     "symbol": ",",
     "color": "white",
@@ -214,7 +213,6 @@
     "material": [ "clay", "stone" ],
     "weight": "969 g",
     "volume": "500 ml",
-    "to_hit": -2,
     "use_action": {
       "type": "consume_drug",
       "activation_message": "You feel a surge of power as the clay tablet crumbles between your fingers.",
diff --git a/data/mods/Magiclysm/items/enchanted_gunmods.json b/data/mods/Magiclysm/items/enchanted_gunmods.json
index 62a3414bcb08f..abdad98747b9f 100644
--- a/data/mods/Magiclysm/items/enchanted_gunmods.json
+++ b/data/mods/Magiclysm/items/enchanted_gunmods.json
@@ -8,7 +8,6 @@
     "weight": "804 g",
     "volume": "375 ml",
     "price": "770 USD",
-    "to_hit": 2,
     "material": [ "steel" ],
     "symbol": ":",
     "color": "white",
diff --git a/data/mods/Magiclysm/items/enchanted_melee.json b/data/mods/Magiclysm/items/enchanted_melee.json
index 7d8f3b38d3daf..72d5ff95d2c29 100644
--- a/data/mods/Magiclysm/items/enchanted_melee.json
+++ b/data/mods/Magiclysm/items/enchanted_melee.json
@@ -684,7 +684,6 @@
     "volume": "1250 ml",
     "longest_side": "130 cm",
     "price": "39 USD",
-    "to_hit": 2,
     "material": [ "wood", "bone" ],
     "symbol": "/",
     "color": "light_gray",
@@ -737,6 +736,7 @@
     "color": "light_gray",
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "qualities": [ [ "PRY", 3 ], [ "HAMMER", 3 ], [ "HAMMER_FINE", 1 ], [ "WRENCH", 2 ], [ "WRENCH_FINE", 2 ], [ "PRYING_NAIL", 1 ] ],
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
     "use_action": [ "CROWBAR" ],
     "flags": [ "DURABLE_MELEE", "BELT_CLIP", "TRADER_AVOID", "MAGIC_FOCUS" ],
     "weapon_category": [ "HOOKING_WEAPONRY" ],
@@ -758,6 +758,7 @@
     "color": "light_gray",
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "qualities": [ [ "PRY", 3 ], [ "HAMMER", 3 ], [ "HAMMER_FINE", 1 ], [ "WRENCH", 2 ], [ "WRENCH_FINE", 2 ], [ "PRYING_NAIL", 1 ] ],
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
     "flags": [ "DURABLE_MELEE", "BELT_CLIP", "TRADER_AVOID", "MAGIC_FOCUS", "WATCH", "ALARMCLOCK", "NO_RELOAD", "NO_UNLOAD" ],
     "weapon_category": [ "HOOKING_WEAPONRY" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "rigid": true, "ammo_restriction": { "crystallized_mana": 3 } } ],
@@ -923,6 +924,7 @@
     "color": "light_gray",
     "techniques": [ "WBLOCK_1", "RAPID" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 11 ] ],
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "line", "balance": "good" },
     "weapon_category": [ "KNIVES" ],
     "flags": [ "SHEATH_KNIFE", "MAGIC_FOCUS", "TRADER_AVOID" ],
     "melee_damage": { "bash": 2, "stab": 13 }
@@ -943,6 +945,7 @@
     "techniques": [ "WBLOCK_1", "RAPID" ],
     "weapon_category": [ "KNIVES" ],
     "qualities": [ [ "CUT", 1 ], [ "SAW_W", 1 ], [ "SAW_M", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 19 ] ],
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "line", "balance": "good" },
     "relic_data": {
       "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "PAIN", "multiply": -0.3 } ] } ]
     },
@@ -956,7 +959,6 @@
     "name": { "str": "springstaff(baton)", "str_pl": "springstaves(baton)" },
     "description": "This versatile weapon uses Technomancy-enhanced springs to keep the staff tips retracted while in baton configuration.  Activate to extend.",
     "weight": "1800 g",
-    "to_hit": 2,
     "color": "dark_gray",
     "symbol": "/",
     "material": [ "steel", "plastic" ],
diff --git a/data/mods/Magiclysm/items/enchanted_misc.json b/data/mods/Magiclysm/items/enchanted_misc.json
index c3b3d8988a594..58c3219aadda3 100644
--- a/data/mods/Magiclysm/items/enchanted_misc.json
+++ b/data/mods/Magiclysm/items/enchanted_misc.json
@@ -193,7 +193,6 @@
     "volume": "100 ml",
     "price": "1 kUSD",
     "price_postapoc": "1150 USD",
-    "to_hit": -2,
     "material": [ "glass" ],
     "symbol": ";",
     "color": "red",
diff --git a/data/mods/Magiclysm/items/enchanted_ranged.json b/data/mods/Magiclysm/items/enchanted_ranged.json
index 3da6bc9b026b0..4319075a3dcbc 100644
--- a/data/mods/Magiclysm/items/enchanted_ranged.json
+++ b/data/mods/Magiclysm/items/enchanted_ranged.json
@@ -108,7 +108,6 @@
     "volume": "1750 ml",
     "longest_side": "90 cm",
     "price": "80 USD",
-    "to_hit": 2,
     "material": [ "steel" ],
     "symbol": "/",
     "color": "dark_gray",
diff --git a/data/mods/Magiclysm/items/enchanted_unarmed.json b/data/mods/Magiclysm/items/enchanted_unarmed.json
index 451f563df72d9..ceb037f1766d1 100644
--- a/data/mods/Magiclysm/items/enchanted_unarmed.json
+++ b/data/mods/Magiclysm/items/enchanted_unarmed.json
@@ -28,7 +28,6 @@
     "material": [ "steel", "leather" ],
     "volume": "500 ml",
     "weight": "970 g",
-    "to_hit": 2,
     "price_postapoc": "1 kUSD 240 USD",
     "qualities": [ [ "HAMMER", 1 ] ],
     "flags": [ "ONLY_ONE", "DURABLE_MELEE", "NONCONDUCTIVE", "FLAMING" ],
diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
index a8f2f030e81d1..6bb8a2278dd36 100644
--- a/data/mods/Magiclysm/items/ethereal_items.json
+++ b/data/mods/Magiclysm/items/ethereal_items.json
@@ -8,7 +8,6 @@
     "volume": "250 ml",
     "longest_side": "20 cm",
     "price": "1 cent",
-    "to_hit": 2,
     "material": [ "concentrated_mana" ],
     "symbol": "[",
     "color": "light_gray",
@@ -68,7 +67,6 @@
     "material": [ "magical_material" ],
     "volume": "250 ml",
     "price": "1 cent",
-    "to_hit": -2,
     "symbol": ",",
     "color": "light_green",
     "flags": [ "LIGHT_300", "AURA", "SEMITANGIBLE", "UNBREAKABLE", "ALLOWS_NATURAL_ATTACKS" ],
@@ -121,7 +119,6 @@
     "volume": "250 ml",
     "longest_side": "15 cm",
     "price": "1 cent",
-    "to_hit": -2,
     "material": [ "concentrated_mana" ],
     "symbol": "[",
     "color": "brown",
@@ -141,7 +138,6 @@
     "description": "A crackling magical warhammer full of lightning to smite your foes with, and of course, to smash things to bits!",
     "weight": "1337 g",
     "longest_side": "70 cm",
-    "to_hit": 2,
     "color": "brown",
     "symbol": "/",
     "looks_like": "warhammer",
@@ -324,7 +320,6 @@
     "weight": "2175 g",
     "volume": "2500 ml",
     "longest_side": "183 cm",
-    "to_hit": 2,
     "melee_damage": { "bash": 16, "stab": 36 }
   },
   {
@@ -678,7 +673,6 @@
     "weight": "900 g",
     "volume": "1250 ml",
     "longest_side": "100 cm",
-    "to_hit": 2,
     "relic_data": {
       "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "ITEM_DAMAGE_HEAT", "add": 28 } ] } ]
     },
@@ -872,6 +866,7 @@
     "symbol": "[",
     "color": "light_gray",
     "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 12 ] ],
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "every", "balance": "good" },
     "weapon_category": [ "CLAWS" ],
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "NO_UNWIELD", "MAGIC_FOCUS", "TRADER_AVOID", "NO_REPAIR", "NO_SALVAGE" ],
     "techniques": [ "WBLOCK_2", "RAPID" ],
diff --git a/data/mods/Magiclysm/items/metals.json b/data/mods/Magiclysm/items/metals.json
index d0532cbc2118f..bf8b94781e1a5 100644
--- a/data/mods/Magiclysm/items/metals.json
+++ b/data/mods/Magiclysm/items/metals.json
@@ -27,7 +27,6 @@
     "weight": "250 g",
     "volume": "250 ml",
     "price": "10 USD",
-    "to_hit": -2,
     "stack_size": 4,
     "//": "Density 7.60g/cm³ ~ 1.9kg/250ml @ 250g/unit ~ stack 8 but mishapen so only 50% of this",
     "material": [ "orichalcum_metal" ],
diff --git a/data/mods/Magiclysm/items/tools.json b/data/mods/Magiclysm/items/tools.json
index c5155c28d67fb..0b44cd7f6f61a 100644
--- a/data/mods/Magiclysm/items/tools.json
+++ b/data/mods/Magiclysm/items/tools.json
@@ -46,7 +46,6 @@
     "weight": "10 kg",
     "volume": "8 L",
     "price": "2 kUSD",
-    "to_hit": -2,
     "material": [ "demon_chitin" ],
     "symbol": ";",
     "color": "red",
diff --git a/data/mods/Magiclysm/items/weapons.json b/data/mods/Magiclysm/items/weapons.json
index b04632b6760b2..78fa510593adc 100644
--- a/data/mods/Magiclysm/items/weapons.json
+++ b/data/mods/Magiclysm/items/weapons.json
@@ -21,7 +21,6 @@
     "copy-from": "spear_forked",
     "description": "A wooden melee weapon with a hand-forged steel forked spearhead attached to the end.  It can be used for stabbing opponents either in close-range or as a thrown weapon, and in the right hands can also readily disarm opponents.",
     "weight": "1650 g",
-    "to_hit": 2,
     "techniques": [ "WBLOCK_2", "DEF_DISARM", "IMPALE" ],
     "volume": "3 L",
     "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "DURABLE_MELEE", "SHEATH_SPEAR" ],
diff --git a/data/mods/Megafauna/items/tool/shelters.json b/data/mods/Megafauna/items/tool/shelters.json
index 4e84b222acd39..a1c77440859f3 100644
--- a/data/mods/Megafauna/items/tool/shelters.json
+++ b/data/mods/Megafauna/items/tool/shelters.json
@@ -9,7 +9,6 @@
     "longest_side": "90 cm",
     "price": "65 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -3,
     "material": [ "bone", "leather" ],
     "symbol": ";",
     "color": "brown",
@@ -34,7 +33,6 @@
     "longest_side": "240 cm",
     "price": "125 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -3,
     "material": [ "bone", "leather" ],
     "symbol": ";",
     "color": "brown",
diff --git a/data/mods/MindOverMatter/items/teleporter_start_items.json b/data/mods/MindOverMatter/items/teleporter_start_items.json
index f166f31ca8916..0f6dd22bdc390 100644
--- a/data/mods/MindOverMatter/items/teleporter_start_items.json
+++ b/data/mods/MindOverMatter/items/teleporter_start_items.json
@@ -5,7 +5,6 @@
     "type": "GUN",
     "name": { "str": "Ch47 Fusion Pistol" },
     "description": "The standard-issue officer's sidearm for the Imperial Navy, guaranteed manufactured on Tlalticpactli itself by scions of the Huey Calpulli, the Ch47 replaced the earlier Ch41 and is widely renowned for its accuracy and ease of maintenance.  This particular Ch47 even bears an eagle and snake on the grip, indicating it was produced in a factory in Anáhuac.  Hopefully it'll make a good melee weapon as well.",
-    "to_hit": -2,
     "melee_damage": { "bash": 5 },
     "reload_noise_volume": 5,
     "weight": "800 g",
diff --git a/data/mods/MindOverMatter/items/tools/crafting_tools.json b/data/mods/MindOverMatter/items/tools/crafting_tools.json
index b58fe956f3e01..37429169414a5 100644
--- a/data/mods/MindOverMatter/items/tools/crafting_tools.json
+++ b/data/mods/MindOverMatter/items/tools/crafting_tools.json
@@ -9,7 +9,6 @@
     "longest_side": "15 cm",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -2,
     "melee_damage": { "bash": 2 },
     "material": [ "nether_crystal", "steel" ],
     "symbol": "[",
@@ -26,7 +25,6 @@
     "longest_side": "25 cm",
     "price": "30 USD",
     "price_postapoc": "40 cent",
-    "to_hit": -2,
     "melee_damage": { "bash": 5 },
     "material": [ "nether_crystal", "steel" ],
     "symbol": "[",
diff --git a/data/mods/MindOverMatter/items/tools/lighting.json b/data/mods/MindOverMatter/items/tools/lighting.json
index 1c0944ba0afb8..24ffecd91f32c 100644
--- a/data/mods/MindOverMatter/items/tools/lighting.json
+++ b/data/mods/MindOverMatter/items/tools/lighting.json
@@ -57,7 +57,6 @@
     "volume": "1 L",
     "price": "1 kUSD 750 USD",
     "price_postapoc": "40 USD",
-    "to_hit": -2,
     "melee_damage": { "bash": 8 },
     "material": [ "plastic", "aluminum", "nether_crystal" ],
     "symbol": ",",
diff --git a/data/mods/MindOverMatter/monsters/monster_special_attacks.json b/data/mods/MindOverMatter/monsters/monster_special_attacks.json
index df993fb4253ce..5a2568cc2719a 100644
--- a/data/mods/MindOverMatter/monsters/monster_special_attacks.json
+++ b/data/mods/MindOverMatter/monsters/monster_special_attacks.json
@@ -70,7 +70,6 @@
     "weight": "540 g",
     "volume": "210 ml",
     "longest_side": "75 mm",
-    "to_hit": 2,
     "loudness": 2,
     "range": 8,
     "dispersion": 15,
diff --git a/data/mods/No_Hope/items.json b/data/mods/No_Hope/items.json
index 2697b0b23b3ed..c5948094afc9b 100644
--- a/data/mods/No_Hope/items.json
+++ b/data/mods/No_Hope/items.json
@@ -138,7 +138,6 @@
     "material": [ "steel", "plastic" ],
     "weight": "430000 g",
     "volume": "187500 ml",
-    "to_hit": -2,
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
     "melee_damage": { "bash": 10, "cut": 6 }
   },
@@ -242,7 +241,6 @@
     "volume": "30 L",
     "price": "6 kUSD",
     "price_postapoc": "120 USD",
-    "to_hit": -3,
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "white",
diff --git a/data/mods/TEST_DATA/appliance.json b/data/mods/TEST_DATA/appliance.json
index b17f73a385465..2a86c52888af2 100644
--- a/data/mods/TEST_DATA/appliance.json
+++ b/data/mods/TEST_DATA/appliance.json
@@ -151,7 +151,6 @@
     "volume": "25 L",
     "price": "2 kUSD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": ":",
     "color": "light_cyan",
diff --git a/data/mods/TEST_DATA/expected_dps_data/axes_dps.json b/data/mods/TEST_DATA/expected_dps_data/axes_dps.json
index 4dcc4c645c400..801f989f72ccb 100644
--- a/data/mods/TEST_DATA/expected_dps_data/axes_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/axes_dps.json
@@ -11,7 +11,7 @@
       "primitive_adze": 10.0,
       "primitive_axe": 10.0,
       "makeshift_axe": 10.0,
-      "pickaxe": 10.5,
+      "pickaxe": 9.46,
       "iceaxe": 12.5,
       "throwing_axe": 14.4,
       "ax_sheets_welded": 15.8,
diff --git a/data/mods/TEST_DATA/expected_dps_data/clubs_dps.json b/data/mods/TEST_DATA/expected_dps_data/clubs_dps.json
index 69a1f7ce0378e..7e007ec7a861c 100644
--- a/data/mods/TEST_DATA/expected_dps_data/clubs_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/clubs_dps.json
@@ -10,9 +10,9 @@
       "bokken_fake": 7,
       "hammer": 7.0,
       "rebar": 7.0,
-      "primitive_shovel": 7.0,
+      "primitive_shovel": 5.47,
       "makeshift_cane": 7.1,
-      "heavy_flashlight": 7.5,
+      "heavy_flashlight": 5.84,
       "wrench": 8.0,
       "glass_macuahuitl": 8.2,
       "sword_wood": 8.5,
@@ -26,7 +26,7 @@
       "morningstar_fake": 10.74,
       "cudgel": 10.9,
       "claw_bar": 11.0,
-      "e_tool": 11.0,
+      "e_tool": 8.51,
       "tonfa_wood": 11.0,
       "shocktonfa_off": 11.1,
       "baton-extended": 11.35,
diff --git a/data/mods/TEST_DATA/expected_dps_data/fist_weapons_dps.json b/data/mods/TEST_DATA/expected_dps_data/fist_weapons_dps.json
index d71358a09f0b5..e49d185ffb8f8 100644
--- a/data/mods/TEST_DATA/expected_dps_data/fist_weapons_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/fist_weapons_dps.json
@@ -6,12 +6,12 @@
     "expected_dps": {
       "bio_claws_weapon": 16.5,
       "bagh_nakha": 14.0,
-      "integrated_talons": 13.8,
+      "integrated_talons": 10.9,
       "punch_dagger": 10.27,
       "knuckle_katar": 10.5,
-      "integrated_claws_st": 9.0,
-      "integrated_claws_rat": 8.1,
-      "integrated_claws": 7.5
+      "integrated_claws_st": 7.38,
+      "integrated_claws_rat": 6.74,
+      "integrated_claws": 6.32
     }
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/guns_dps.json b/data/mods/TEST_DATA/expected_dps_data/guns_dps.json
index 26b5220641283..7d5507eb0ad84 100644
--- a/data/mods/TEST_DATA/expected_dps_data/guns_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/guns_dps.json
@@ -32,7 +32,7 @@
       "1895sbl": 6.24,
       "rm103a_pistol": 6.48,
       "tokarev": 6.51,
-      "walther_ppq_45": 7.15,
+      "walther_ppq_45": 5.41,
       "taurus_spectrum": 6.59,
       "modular_deagle": 6.65,
       "raging_bull": 6.65,
@@ -43,12 +43,12 @@
       "m1911a1_38super": 7.19,
       "m1911": 7.19,
       "STI_DS_10": 7.19,
-      "walther_ppq_9mm": 7.26,
-      "walther_ppq_40": 7.26,
-      "sw629": 7.31,
+      "walther_ppq_9mm": 5.49,
+      "walther_ppq_40": 5.49,
+      "sw629": 5.51,
       "m1911_10": 7.4,
       "pressin": 9.67,
-      "winchester_1897": 10.33,
+      "winchester_1897": 7.92,
       "obrez": 10.98
     }
   }
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 565f7dc5fb345..37d9fb4a3edd7 100644
--- a/data/mods/TEST_DATA/expected_dps_data/integrated_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/integrated_dps.json
@@ -3,11 +3,11 @@
     "type": "test_data",
     "//": "Integrated weapons, bionics, etc",
     "expected_dps": {
-      "integrated_fangs": 8.38,
+      "integrated_fangs": 6.66,
       "integrated_chitin3_claws": 8.42,
-      "bio_scalpel": 10.09,
+      "bio_scalpel": 6.18,
       "integrated_giant_pincer": 11.31,
-      "integrated_vampire_fangs": 13.61
+      "integrated_vampire_fangs": 10.69
     }
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json
index 2b376ccbdb7f2..89d7f3c32dbd2 100644
--- a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json
@@ -23,14 +23,11 @@
       "2x4": 5.66,
       "tazer": 5.69,
       "violin": 5.71,
-      "etched_skull": 5.71,
       "fighter_sting": 5.72,
-      "foot_crank": 5.73,
       "fishing_rod_2pc_packed": 5.77,
       "flint": 5.78,
       "rock_flaking": 5.78,
       "nailboard": 5.83,
-      "two_way_radio": 5.89,
       "fishing_rod_tele": 5.93,
       "bone_plaster": 5.98,
       "bone_fossil": 5.98,
@@ -48,51 +45,48 @@
       "ch_steel_chunk": 6.59,
       "mc_steel_chunk": 6.59,
       "steel_chunk": 6.59,
-      "soldering_iron_portable": 6.61,
-      "soldering_iron": 6.61,
-      "reference_fabrication1": 6.74,
-      "torch_done": 6.75,
-      "pickles_ferment": 6.75,
+      "soldering_iron_portable": 5.18,
+      "soldering_iron": 5.18,
+      "reference_fabrication1": 5.09,
+      "torch_done": 5.1,
+      "pickles_ferment": 5.1,
       "fishing_rod_professional": 6.89,
-      "hand_rims": 6.91,
       "ukulele": 6.92,
-      "eggs_ferment": 6.94,
+      "eggs_ferment": 5.25,
       "umbrella": 7.11,
       "teleumbrella-extended": 7.11,
-      "vortex_stone": 7.12,
+      "vortex_stone": 5.38,
       "adjustable_stock": 7.12,
       "robofac_stock": 7.12,
-      "landough_calrisean": 7.26,
-      "flask_yeast": 7.26,
+      "landough_calrisean": 5.49,
+      "flask_yeast": 5.49,
       "fishing_rod_basic": 7.52,
       "torch": 7.54,
       "torch_lit": 7.54,
-      "pipe_quiver_large": 7.69,
+      "pipe_quiver_large": 5.83,
       "bipod_handguard": 7.69,
       "bipod_mod": 7.69,
       "bipod": 7.69,
       "bipod_handguard_deployed": 7.69,
-      "heavy_flashlight_on": 7.73,
+      "heavy_flashlight_on": 5.84,
       "wizard_cane": 7.86,
       "wizard_cane_on": 7.86,
       "modern_handguard": 7.94,
-      "barb_paralysis": 8.0,
-      "nitrogen_membrane_filter": 8.04,
+      "barb_paralysis": 6.12,
+      "nitrogen_membrane_filter": 6.11,
       "pipe": 8.09,
       "sculpture_clay": 8.11,
       "makeshift_crowbar": 8.26,
-      "hd_pipe": 8.28,
-      "pipe_quiver": 8.64,
+      "hd_pipe": 6.36,
+      "pipe_quiver": 6.51,
       "arisaka_monopod_deployed": 8.66,
       "arisaka_monopod": 8.66,
       "stick": 9.04,
       "pot_makeshift_copper": 9.61,
-      "bolt_ballista_steel": 9.63,
+      "bolt_ballista_steel": 7.64,
       "chain": 9.64,
       "cow_bell": 10.1,
-      "pastaextruder": 10.37,
-      "baseball": 10.39,
-      "puck": 10.51
+      "pastaextruder": 5.89
     }
   }
 ]
diff --git a/data/mods/TEST_DATA/expected_dps_data/knives_dps.json b/data/mods/TEST_DATA/expected_dps_data/knives_dps.json
index 32017557eafff..f4e0de849a6ad 100644
--- a/data/mods/TEST_DATA/expected_dps_data/knives_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/knives_dps.json
@@ -6,11 +6,10 @@
     "expected_dps": {
       "primitive_knife": 2.5,
       "kirpan_cheap": 2.809,
-      "spike": 4.0,
       "pockknife": 4.5,
       "knife_small": 5.86,
       "tanto_fake": 6.93,
-      "throwing_knife": 7.0,
+      "throwing_knife": 6.02,
       "bone_knife": 7.11,
       "karambit": 7.62,
       "inter_bayonet": 7.77,
diff --git a/data/mods/TEST_DATA/expected_dps_data/polearms_dps.json b/data/mods/TEST_DATA/expected_dps_data/polearms_dps.json
index 594a391c5d07a..77ad3b3db82f1 100644
--- a/data/mods/TEST_DATA/expected_dps_data/polearms_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/polearms_dps.json
@@ -18,10 +18,10 @@
       "makeshift_halberd": 20.5,
       "makeshift_glaive": 20.55,
       "homemade_polehammer": 21.35,
-      "bronze_brush_axe": 21.57,
+      "bronze_brush_axe": 18.42,
       "pike": 23.0,
       "makeshift_scythe_war": 24.5,
-      "brush_axe": 27.67,
+      "brush_axe": 23.73,
       "spear_dory": 28.0,
       "qiang": 30.68,
       "lucern_hammer": 31.5,
diff --git a/data/mods/TEST_DATA/expected_dps_data/spears_dps.json b/data/mods/TEST_DATA/expected_dps_data/spears_dps.json
index ba0f1683f61fd..b5979f838b790 100644
--- a/data/mods/TEST_DATA/expected_dps_data/spears_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/spears_dps.json
@@ -4,11 +4,10 @@
     "//": "typical value around 30",
     "expected_dps": {
       "javelin": 6.11,
-      "bronze_atlatl_spear": 6.23,
       "aztec_spear_glass": 6.78,
       "pointed_rebar": 7.23,
       "aztec_spear_scrap": 7.62,
-      "steel_atlatl_spear": 7.7,
+      "steel_atlatl_spear": 6.12,
       "aztec_spear_stone": 7.91,
       "lajatang": 8.46,
       "spear_rebar": 10.46,
diff --git a/data/mods/TEST_DATA/expected_dps_data/tools_dps.json b/data/mods/TEST_DATA/expected_dps_data/tools_dps.json
index 9aada0c8b6e1a..7c1a1a946f270 100644
--- a/data/mods/TEST_DATA/expected_dps_data/tools_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/tools_dps.json
@@ -9,23 +9,21 @@
       "honey_scraper": 5.58,
       "swage": 5.71,
       "hammer_bronze": 5.78,
-      "nail_puller_bronze": 5.89,
       "bronze_sickle": 6.13,
       "lug_wrench": 6.18,
       "metalworking_tongs_bronze": 6.18,
       "metalworking_tongs": 6.18,
       "makeshift_hammer": 6.18,
-      "rake": 6.3,
-      "sickle_stone": 6.38,
+      "sickle_stone": 5.33,
       "atlatl": 7.13,
-      "big_pliers": 7.26,
+      "big_pliers": 5.49,
       "hoe": 7.38,
       "kevlar_shears": 7.62,
       "drift": 8.5,
       "awl_steel": 8.53,
-      "wrench_large": 8.54,
-      "bronze_pickaxe": 8.84,
-      "shovel_snow": 9.18,
+      "wrench_large": 6.48,
+      "bronze_pickaxe": 7.77,
+      "shovel_snow": 5.49,
       "hotcut_bronze": 9.61,
       "hotcut": 9.61,
       "crutches": 13.49
diff --git a/data/mods/TEST_DATA/expected_dps_data/two_handed_axes_dps.json b/data/mods/TEST_DATA/expected_dps_data/two_handed_axes_dps.json
index 3eb4301dc8853..59a9fbf85f5f6 100644
--- a/data/mods/TEST_DATA/expected_dps_data/two_handed_axes_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/two_handed_axes_dps.json
@@ -6,7 +6,7 @@
       "battleaxe": 29.0,
       "battleaxe_fake": 12.0,
       "battleaxe_inferior": 19.25,
-      "fire_ax": 25.0,
+      "fire_ax": 21.2,
       "ax": 20.25,
       "copper_ax": 13.75,
       "e_combatsaw_on": 29,
diff --git a/data/mods/TEST_DATA/expected_dps_data/two_handed_clubs_hammers_dps.json b/data/mods/TEST_DATA/expected_dps_data/two_handed_clubs_hammers_dps.json
index 84596a98366e3..924eb4c30bcce 100644
--- a/data/mods/TEST_DATA/expected_dps_data/two_handed_clubs_hammers_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/two_handed_clubs_hammers_dps.json
@@ -10,7 +10,7 @@
       "mace_pipe_large": 14.41,
       "hammer_sledge_short": 15.0,
       "hammer_sledge_heavy": 15.52,
-      "halligan": 16.5,
+      "halligan": 14.7,
       "pulverizer": 18.11,
       "hammer_sledge": 20.0,
       "2h_club_kanabo_studded": 25.16,
diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
index 790d6364dc7da..a2476a02e3c80 100644
--- a/data/mods/TEST_DATA/items.json
+++ b/data/mods/TEST_DATA/items.json
@@ -81,7 +81,6 @@
     "range": 10,
     "dispersion": 14,
     "loudness": 0,
-    "to_hit": -2,
     "recovery_chance": 99,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "qualities": [ [ "HAMMER", 1 ] ],
@@ -123,7 +122,6 @@
     "volume": "3 L",
     "price": "85 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -2,
     "material": [ "leather", "steel" ],
     "symbol": "[",
     "looks_like": "roller_blades",
@@ -144,7 +142,6 @@
     "volume": "3750 ml",
     "price": "85 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "looks_like": "rollerskates",
@@ -736,7 +733,6 @@
     "description": "A thin sheet of metal.",
     "//": "Roughly in the 70cm×70cm×1.5mm to 1m×1m×0.75mm range. Has to be folded / rolled up when in inventory, so 75% density compared to solid block.",
     "weight": "6000 g",
-    "to_hit": -2,
     "color": "light_cyan",
     "symbol": "]",
     "material": [ "steel" ],
@@ -774,7 +770,7 @@
     "volume": "1250 ml",
     "longest_side": "76 cm",
     "price": "75 USD",
-    "to_hit": 2,
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "any", "balance": "uneven" },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -1033,7 +1029,6 @@
     "weight": "3000 g",
     "volume": "750 ml",
     "price": "50 USD",
-    "to_hit": -2,
     "qualities": [ [ "JACK", 4 ] ],
     "melee_damage": { "bash": 4 }
   },
@@ -1443,7 +1438,6 @@
     "volume": "250 ml",
     "price": "50 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -2,
     "material": [ "glass", "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_eye",
@@ -2062,7 +2056,6 @@
     "weight": "1700 g",
     "volume": "15750 ml",
     "price": "240 USD",
-    "to_hit": -2,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "plastic_shopping_bag",
@@ -2252,7 +2245,6 @@
     "volume": "500 ml",
     "price": "690 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -2285,7 +2277,6 @@
     "barrel_length": "150 mm",
     "price": "690 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -3588,7 +3579,6 @@
     "volume": "500 ml",
     "price": "690 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "symbol": "(",
     "color": "dark_gray",
@@ -3619,7 +3609,6 @@
     "weight": "500 g",
     "volume": "250 ml",
     "price": "10 kUSD",
-    "to_hit": -2,
     "material": [ "lvl4ballisticglass", "qt_steel" ],
     "symbol": "(",
     "color": "yellow",
@@ -5073,7 +5062,7 @@
     "longest_side": "132 mm",
     "price": "50 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "glass" ],
     "symbol": "*",
     "color": "yellow",
diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
new file mode 100644
index 0000000000000..8c3b8bbb4a170
--- /dev/null
+++ b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -0,0 +1,1785 @@
+[
+  {
+    "type": "test_data",
+    "//": "Vanilla and TEST_DATA",
+    "legacy_to_hit": [
+      "1895sbl",
+      "2_shot_special",
+      "2byarm_guard",
+      "2byshin_guard",
+      "2lcanteen",
+      "30gal_drum",
+      "30gal_drum_aluminum",
+      "30gal_firebarrel",
+      "55gal_drum",
+      "55gal_drum_aluminum",
+      "55gal_firebarrel",
+      "EMPbomb",
+      "EMPbomb_act",
+      "FMCNote",
+      "FlatCoin",
+      "LAW",
+      "M24",
+      "RAM",
+      "RobofacCoin",
+      "UPS_OFF",
+      "UPS_ON",
+      "UPS_off",
+      "acetylene_cooker",
+      "acetylene_machine",
+      "acidbomb",
+      "acr_300blk",
+      "active_backup_generator",
+      "adjustable_stock",
+      "adobe_pallet_done",
+      "advanced_ecig",
+      "advanced_gpnvg",
+      "air_launcher",
+      "airhorn",
+      "airsoft_helmet",
+      "ak308",
+      "ak47",
+      "ak556",
+      "ak74_semi",
+      "aketon_canvas",
+      "aketon_canvas_vest",
+      "aketon_gloves_canvas",
+      "aketon_gloves_nylon",
+      "aketon_gloves_wool",
+      "aketon_hood_canvas",
+      "aketon_hood_nylon",
+      "aketon_hood_wool",
+      "aketon_nylon",
+      "aketon_nylon_vest",
+      "aketon_pants_canvas",
+      "aketon_pants_nylon",
+      "aketon_pants_wool",
+      "aketon_wool",
+      "aketon_wool_vest",
+      "aksemi",
+      "alarmclock",
+      "alder_bark",
+      "alien_fern",
+      "alloy_plate",
+      "aluminum_boat_hull",
+      "aluminum_stepladder",
+      "american_flag",
+      "ammo_pouch",
+      "ammonia_machine_pipework",
+      "ammonia_machine_reactor",
+      "amplifier",
+      "analytical_set_basic",
+      "anesthetic_kit",
+      "angle_grinder",
+      "anvil",
+      "anvil_bronze",
+      "anvil_crude",
+      "anvil_heavy",
+      "apron_leather",
+      "ar10",
+      "archery_target_box",
+      "arisaka_monopod",
+      "armchair",
+      "armguard_bronze",
+      "armguard_chitin",
+      "armguard_hard",
+      "armguard_larmor",
+      "armguard_lc_brigandine",
+      "armguard_lightplate",
+      "armguard_metal",
+      "armguard_metal_sheets_bracer",
+      "armguard_metal_sheets_elbows",
+      "armguard_metal_sheets_shoulders",
+      "armguard_paper",
+      "armguard_scrap",
+      "armguard_soft",
+      "armguard_tire",
+      "armor_aztec",
+      "armor_blarmor",
+      "armor_cardboard",
+      "armor_cardboard_cuirass",
+      "armor_chitin",
+      "armor_cuirass",
+      "armor_farmor",
+      "armor_faux_farmor",
+      "armor_junk_lightplate",
+      "armor_junk_plate",
+      "armor_larmor",
+      "armor_larmor_chest",
+      "armor_lc_armguard",
+      "armor_lc_brigandine",
+      "armor_lc_brigandine_shoulders",
+      "armor_lc_chestplate",
+      "armor_lc_coat_brigandine",
+      "armor_lc_coat_brigandine_shoulders",
+      "armor_lc_heavy_chestplate",
+      "armor_lc_heavy_leg_guard",
+      "armor_lc_heavyarmguard",
+      "armor_lc_heavyplate",
+      "armor_lc_leg_guard",
+      "armor_lc_light_chestplate",
+      "armor_lc_light_leg_guard",
+      "armor_lc_lightarmguard",
+      "armor_lc_lightplate",
+      "armor_lc_plate",
+      "armor_lorica",
+      "armor_mercenary_bottom",
+      "armor_mercenary_top",
+      "armor_metal_sheets",
+      "armor_metal_sheets_chain",
+      "armor_metal_sheets_chain_heavy",
+      "armor_metal_sheets_heavy",
+      "armor_nomad",
+      "armor_nomad_advanced",
+      "armor_plarmor",
+      "armor_riot",
+      "armor_riot_arm",
+      "armor_riot_leg",
+      "armor_riot_torso",
+      "armor_scrapsuit",
+      "armor_star_samurai_mask",
+      "armor_thessalonian",
+      "armor_tiresuit",
+      "art_crystal",
+      "art_disc",
+      "art_jelly",
+      "art_mask",
+      "art_napkin",
+      "art_pin",
+      "art_pyramid",
+      "art_rod",
+      "art_snake",
+      "art_sphere",
+      "art_spiral",
+      "arx160",
+      "as50",
+      "atgm_launcher",
+      "autoclave",
+      "awl_bone",
+      "axmc",
+      "b_shorts",
+      "bag_canvas",
+      "bag_canvas_small",
+      "bag_garbage",
+      "bag_iv",
+      "bag_paper_powder",
+      "bag_plastic",
+      "balance_small",
+      "ballast",
+      "ballista",
+      "barb_launcher",
+      "barometer",
+      "baseball",
+      "basket",
+      "basketball",
+      "battery_charger",
+      "bbgun",
+      "beaker",
+      "bee_balm",
+      "bee_sting",
+      "beekeeping_gloves",
+      "beekeeping_suit",
+      "beeper",
+      "belt_loop_large",
+      "belt_loop_medium",
+      "belt_loop_small",
+      "bench_vise",
+      "benelli_sa",
+      "beverly_shear",
+      "bfg50",
+      "billet_bone",
+      "billet_wood",
+      "bio_emp_gun",
+      "biollante_bud",
+      "bipod",
+      "bipod_handguard",
+      "birchbark",
+      "birchbark_funnel",
+      "birdfood",
+      "bite_suit",
+      "black_box",
+      "black_glass_shard",
+      "blade",
+      "blade_trap",
+      "blunderbuss",
+      "board_trap",
+      "boat_board",
+      "bolas",
+      "bond_410",
+      "bondage_mask",
+      "bondage_suit",
+      "bone_fossil",
+      "bone_plaster",
+      "boobytrap",
+      "book_binder",
+      "bookplate",
+      "boots",
+      "boots_chitin",
+      "boots_combat",
+      "boots_denim",
+      "boots_faux_fur",
+      "boots_fsurvivor",
+      "boots_fur",
+      "boots_h20survivor",
+      "boots_h20survivor_light",
+      "boots_h20survivor_thick",
+      "boots_hiking",
+      "boots_hsurvivor",
+      "boots_larmor",
+      "boots_lsurvivor",
+      "boots_scrap",
+      "boots_steel",
+      "boots_survivor",
+      "boots_winter",
+      "boots_wsurvivor",
+      "bootsheath",
+      "bootsheath_birchbark",
+      "bostonchan_wig",
+      "bot_EMP_hack",
+      "bot_antimateriel",
+      "bot_broken_cyborg",
+      "bot_c4_hack",
+      "bot_crows_m240",
+      "bot_dispatch",
+      "bot_dispatch_military",
+      "bot_flashbang_hack",
+      "bot_gasbomb_hack",
+      "bot_grenade_hack",
+      "bot_grocerybot",
+      "bot_grocerybot_busted",
+      "bot_hazmatbot",
+      "bot_lab_security_drone_BM",
+      "bot_lab_security_drone_BM2",
+      "bot_lab_security_drone_BS",
+      "bot_lab_security_drone_GM",
+      "bot_lab_security_drone_GR",
+      "bot_lab_security_drone_YM",
+      "bot_manhack",
+      "bot_molebot",
+      "bot_nursebot",
+      "bot_prototype_cyborg",
+      "bot_rifleturret",
+      "bot_robofac_camspy",
+      "bot_robofac_skittergun",
+      "bot_science_bot",
+      "bot_secubot",
+      "bot_secubot_liberty",
+      "bot_skitterbot",
+      "bot_talon_m202a1",
+      "bot_tazer_hack",
+      "bot_turret",
+      "bot_turret_riot",
+      "bot_turret_searchlight",
+      "bot_turret_speaker",
+      "bot_yrax_trifacet",
+      "bottle_bathroom",
+      "bottle_folding",
+      "bottle_glass_seasoning",
+      "bottle_glass_seasoning_small",
+      "bottle_gourd",
+      "bottle_metal",
+      "bottle_plastic",
+      "bottle_plastic_pill_prescription",
+      "bottle_plastic_seasoning",
+      "bottle_plastic_seasoning_small",
+      "bottle_plastic_small",
+      "bowl_clay",
+      "boxcutter",
+      "boxing_gloves",
+      "boxpack",
+      "breeches",
+      "bren2_556",
+      "bren2_762",
+      "brick_kiln",
+      "brogyaga",
+      "brogyeki",
+      "broken_EMP_hack",
+      "broken_c4_hack",
+      "broken_dispatch",
+      "broken_dispatch_military",
+      "broken_exodii_quad",
+      "broken_exodii_sniper_drone",
+      "broken_exodii_turret",
+      "broken_exodii_worker",
+      "broken_flashbang_hack",
+      "broken_gasbomb_hack",
+      "broken_grenade_hack",
+      "broken_grocerybot",
+      "broken_grocerybot_busted",
+      "broken_lab_security_drone_BM",
+      "broken_lab_security_drone_BM2",
+      "broken_lab_security_drone_BS",
+      "broken_lab_security_drone_GM",
+      "broken_lab_security_drone_GR",
+      "broken_lab_security_drone_YM",
+      "broken_manhack",
+      "broken_mech_combat",
+      "broken_mech_lifter",
+      "broken_mech_recon",
+      "broken_molebot",
+      "broken_nursebot",
+      "broken_robofac_camspy",
+      "broken_robofac_prototype",
+      "broken_robofac_skittergun",
+      "broken_science_bot",
+      "broken_secubot",
+      "broken_skitterbot",
+      "broken_talon_m202a1",
+      "broken_tazer_hack",
+      "broken_turret",
+      "broken_turret_speaker",
+      "broken_yrax_trifacet",
+      "broketent",
+      "bronze_hoe",
+      "bronze_shears",
+      "broom",
+      "browning_blr",
+      "brush",
+      "brush_toilet",
+      "bunker_coat",
+      "bunker_pants",
+      "burette",
+      "burnt_out_bionic",
+      "butane_tank",
+      "c4",
+      "c4armed",
+      "caltrops",
+      "caltrops_glass",
+      "caltrops_teeth",
+      "camelbak",
+      "camera_control",
+      "camisole",
+      "camp_chair",
+      "camping_multitool",
+      "can_drink",
+      "canister_empty",
+      "canister_goo",
+      "cannon_3in_ordnance",
+      "cannonball_4lb",
+      "canteen",
+      "canteen_wood",
+      "canvas_pants_padded",
+      "cape_fp",
+      "carbonfiber_boat_hull",
+      "carding_paddles",
+      "cargo_rack",
+      "carpet_armguards",
+      "carpet_bracers",
+      "carpet_greaves",
+      "carpet_legguards",
+      "carton_egg",
+      "carton_milk",
+      "carton_sealed",
+      "carver_on",
+      "case_violin",
+      "cassock",
+      "catalytic_cracking_reactor",
+      "catfood",
+      "catfood_dry",
+      "cattlefodder",
+      "cattlefodder_large",
+      "cattlefodder_medium",
+      "chainmail_junk_feet",
+      "chainmail_junk_hands",
+      "chainmail_junk_hood",
+      "chainsaw_off",
+      "chainsaw_on",
+      "chair_folding",
+      "chair_plywood",
+      "chair_wood",
+      "chaps_leather",
+      "char_purifier",
+      "char_purifier_clay",
+      "charcoal_cooker",
+      "cheap_ammo_pouch",
+      "cheap_ammo_pouch_belt223",
+      "cheap_ammo_pouch_belt308",
+      "cheek_pad",
+      "chemical_thrower",
+      "chemistry_set",
+      "chemistry_set_basic",
+      "chestguard_metal_sheets_heavy",
+      "chipper",
+      "chisel",
+      "chitin_plate",
+      "churn",
+      "circsaw_blade",
+      "circsaw_off",
+      "circsaw_on",
+      "clarinet",
+      "clay_canister",
+      "clay_hydria",
+      "clay_lump",
+      "clay_teapot",
+      "cloak",
+      "cloak_black",
+      "cloak_denim",
+      "cloak_fur",
+      "cloak_leather",
+      "cloak_vampire",
+      "cloak_wool",
+      "clock",
+      "closed_loop_extractor_large",
+      "closed_loop_extractor_small",
+      "clown_suit",
+      "clown_wig",
+      "clownshoes",
+      "coat_fur",
+      "coffeemaker",
+      "colt_army",
+      "colt_lightning",
+      "colt_navy",
+      "colt_ro635",
+      "colt_saa",
+      "combination_gun",
+      "combination_gun_shotgun",
+      "compact_ASRG_containment",
+      "compbow",
+      "compcrossbow",
+      "compositecrossbow",
+      "compressor",
+      "condiment_bottle_sealed",
+      "condom",
+      "copper_knife",
+      "corset",
+      "cot",
+      "counterweight",
+      "cow_bell",
+      "crackpipe",
+      "crafted_suppressor",
+      "crater_bomb",
+      "cu_pipe",
+      "cuirass_bronze",
+      "cuirass_lightplate",
+      "cuirass_scrap",
+      "cuirass_tire",
+      "cup_plastic",
+      "cured_hide",
+      "cured_pelt",
+      "curling_iron",
+      "cuvettes",
+      "cx4",
+      "cz600",
+      "damaged_shelter_kit",
+      "dance_shoes",
+      "debug_gun_no_mag_well",
+      "deck_chair",
+      "deflated_wheel",
+      "deflated_wheel_bicycle",
+      "deflated_wheel_motorbike",
+      "deflated_wheel_slick",
+      "deflated_wheel_wide",
+      "denim_overalls",
+      "diamond",
+      "digging_stick",
+      "dinosuit",
+      "directional_antenna",
+      "distaff_spindle",
+      "diveknife",
+      "diving_watch",
+      "dogbane",
+      "dogfood",
+      "dogfood_dry",
+      "down_blanket",
+      "draco",
+      "dragonsuit",
+      "draw_plate",
+      "dress",
+      "dress_shoes",
+      "dress_wedding",
+      "drift",
+      "drill_rock_primitive",
+      "dry_bag_large",
+      "duster",
+      "duster_fur",
+      "duster_leather",
+      "duster_survivor",
+      "dynamite",
+      "dynamite_bomb",
+      "e_handcuffs",
+      "earthworm",
+      "eink_tablet_pc",
+      "elbow_pads",
+      "elec_chainsaw_off",
+      "elec_chainsaw_on",
+      "elec_hairtrimmer",
+      "elec_jackhammer",
+      "elec_shears",
+      "electric_blanket",
+      "electric_masonrysaw_off",
+      "electric_masonrysaw_on",
+      "electrohack",
+      "electrolyzer_makeshift",
+      "electronics_controls",
+      "emf_detector",
+      "emp_frond",
+      "emp_gun",
+      "engineering_engine_kit",
+      "engineering_makerspace_kit",
+      "engineering_robotics_kit",
+      "enhanced_nvg",
+      "esbit_stove",
+      "exodii_ac_kit",
+      "exodii_wire_kit",
+      "extension_cable",
+      "extinguisher",
+      "face_veil",
+      "fake_dynamite_50lbs",
+      "fanning_mill",
+      "feeding_kit",
+      "felinesuit",
+      "fema_data",
+      "feral_human_thrown_rock",
+      "fiber_mat",
+      "fighter_sting",
+      "file",
+      "filter_suppressor",
+      "firecracker",
+      "firecracker_act",
+      "firecracker_pack",
+      "firecracker_pack_act",
+      "firehelmet",
+      "firework_cannon",
+      "fish_bowl",
+      "fitness_band",
+      "flashbang",
+      "flashlight_mount_wrist",
+      "flask_glass",
+      "flask_hip",
+      "flight_helmet",
+      "flight_helmet_on",
+      "flint_steel",
+      "floodlight",
+      "flotation_vest",
+      "flotation_vest_ms",
+      "fluid_preserved_brain",
+      "fn1910",
+      "fn_fal_semi",
+      "foldframe",
+      "food_processor",
+      "foodperson_mask",
+      "football",
+      "forged_shears",
+      "frame",
+      "frame_wood",
+      "frame_wood_deck",
+      "frame_wood_light",
+      "fs2000",
+      "fsurvivor_jumpsuit",
+      "fsurvivor_suit",
+      "full_barrel_bomb",
+      "full_barrel_bomb_act",
+      "funnel_separation",
+      "fur_blanket",
+      "fur_rollmat",
+      "g_shovel",
+      "gambeson",
+      "gambeson_canvas",
+      "gambeson_canvas_thinsleeved",
+      "gambeson_canvas_vest",
+      "gambeson_gloves_canvas",
+      "gambeson_gloves_nylon",
+      "gambeson_gloves_wool",
+      "gambeson_hood",
+      "gambeson_nylon",
+      "gambeson_nylon_thinsleeved",
+      "gambeson_nylon_vest",
+      "gambeson_pants",
+      "gambeson_pants_canvas",
+      "gambeson_pants_nylon",
+      "gambeson_pants_wool",
+      "gambeson_sleeve",
+      "gambeson_vest",
+      "gambeson_wool",
+      "gambeson_wool_thinsleeved",
+      "gambeson_wool_vest",
+      "game_watch",
+      "garand",
+      "garnet",
+      "gas_charger",
+      "gas_forge",
+      "gasbomb_makeshift_act",
+      "gasoline_cooker",
+      "gatling_mech_laser",
+      "gelbox",
+      "ghost_robe",
+      "ghost_robe_sheet",
+      "glass_cutter",
+      "glass_prism",
+      "glass_shard",
+      "glass_sheet",
+      "glass_thermometer",
+      "glass_tinted",
+      "glass_tube_small",
+      "glove_jackson",
+      "gloves_bag",
+      "gloves_black",
+      "gloves_denim",
+      "gloves_denim_fingerless",
+      "gloves_faux_fur",
+      "gloves_fur",
+      "gloves_h20survivor",
+      "gloves_h20survivor_light",
+      "gloves_h20survivor_thick",
+      "gloves_light",
+      "gloves_liner",
+      "gloves_winter",
+      "gloves_wool",
+      "gloves_wool_fingerless",
+      "glowstick",
+      "glowstick_dead",
+      "glowstick_lit",
+      "gobag",
+      "godcotrader_accounting_records_clean",
+      "godcotrader_accounting_records_dirty",
+      "goggles_ir",
+      "goggles_nv",
+      "goggles_welding",
+      "gold_watch",
+      "golf_ball",
+      "gosling_jacket",
+      "gradcylinder",
+      "grass_blanket",
+      "grass_cloak",
+      "grass_keffiyeh",
+      "grass_sheet",
+      "greatcoat",
+      "grenade",
+      "grenade_act",
+      "grenade_emp",
+      "grenade_emp_act",
+      "grenade_inc",
+      "grenade_inc_act",
+      "grim_reaper_robe",
+      "grinder_blade",
+      "grinder_cutoff_disc",
+      "grinder_metal_grinding_disc",
+      "grip_hook",
+      "h20survivor_jumpsuit",
+      "h20survivor_jumpsuit_light",
+      "h20survivor_suit",
+      "hacksaw",
+      "hair_dryer",
+      "half_barrel_bomb",
+      "half_barrel_bomb_act",
+      "halter_top",
+      "hammer",
+      "hammer_pocket_test",
+      "hand_axe",
+      "hand_controls",
+      "hand_drill",
+      "hand_pump",
+      "hand_rims",
+      "handflare_dead",
+      "haori",
+      "hard_plate",
+      "hd_tow_cable",
+      "hdframe",
+      "headgear",
+      "headscarf",
+      "heatpack",
+      "heatpack_used",
+      "heavy_punching_bag_sack",
+      "helmet_army",
+      "helmet_army_outdated",
+      "helmet_aztec",
+      "helmet_ball",
+      "helmet_liner",
+      "helmet_motor",
+      "helmet_motor_raised",
+      "helmet_nomad",
+      "helmet_riot",
+      "helmet_riot_raised",
+      "helmet_scavenger",
+      "helmet_scrap",
+      "henry_big_boy",
+      "hk417_13",
+      "hk_g3",
+      "hk_g36",
+      "hk_g80",
+      "hoboreel",
+      "hoe",
+      "holo_cloak",
+      "homemade_demolition_charge",
+      "homemade_demolition_charge_act",
+      "honey_scraper",
+      "hood_fsurvivor",
+      "hood_h20survivor",
+      "hood_h20survivor_light",
+      "hood_h20survivor_thick",
+      "hood_lsurvivor",
+      "hood_survivor",
+      "hood_wsurvivor",
+      "horn_bicycle",
+      "horn_big",
+      "horn_car",
+      "horse_tack",
+      "hose",
+      "hotcut",
+      "hotplate",
+      "hotplate_induction",
+      "house_coat",
+      "household_dishwasher",
+      "household_washing_machine",
+      "household_water_heater",
+      "household_water_heater_family",
+      "hpt3895",
+      "hsurvivor_jumpsuit",
+      "hsurvivor_suit",
+      "huge_crossbow",
+      "hydrogen_tank",
+      "hygrometer",
+      "hygroscope",
+      "ice_utility_exoskeleton_off",
+      "icon",
+      "id_LIXA",
+      "id_LIXA_2",
+      "id_LIXA_jason",
+      "id_LIXA_kai_mei",
+      "id_LIXA_mil",
+      "id_LIXA_najma",
+      "id_LIXA_rich",
+      "improvised_armguard_tire",
+      "improvised_legguard_tire",
+      "indoor_volleyball",
+      "inflatable_airbag",
+      "inflatable_section",
+      "integrated_chitin3_claws",
+      "integrated_electrokit",
+      "integrated_giant_pincer",
+      "integrated_multimeter",
+      "integrated_welder",
+      "inter_bayonet",
+      "ipok",
+      "it_battery_mount",
+      "iwi_tavor_x95_300blk",
+      "jacket_leather",
+      "jacket_leather_mod",
+      "jacket_leather_red",
+      "jackhammer",
+      "jeans",
+      "jeans_red",
+      "jeans_ripped",
+      "jeans_vintage",
+      "jedi_cloak",
+      "jerrycan_big",
+      "jerrypack",
+      "jumpsuit",
+      "jumpsuit_xl",
+      "k_gambeson_sleeve",
+      "kantele",
+      "kariginu",
+      "kasaya",
+      "keffiyeh",
+      "keg",
+      "keg_steel",
+      "kevlar",
+      "kevlar_harness",
+      "kevlar_shears",
+      "kiln",
+      "kimono",
+      "kittel",
+      "knee_high_boots",
+      "knee_pads",
+      "knit_scarf",
+      "knit_scarf_headwrap",
+      "knit_scarf_loose",
+      "kord",
+      "kp32",
+      "ksg",
+      "ksg-25",
+      "ksub2000",
+      "landmine",
+      "lanyard",
+      "large_damaged_shelter_kit",
+      "large_lcd_screen",
+      "large_propane_tank",
+      "large_shelter_kit",
+      "large_space_heater",
+      "large_stomach_sealed",
+      "large_tent_kit",
+      "largebroketent",
+      "laser_rifle",
+      "launcher_simple",
+      "lawn_dart",
+      "lawnmower",
+      "lc_brigandine_hands",
+      "lc_chainmail_aventail",
+      "lc_chainmail_face",
+      "lc_chainmail_feet",
+      "lc_chainmail_hands",
+      "lc_chainmail_hood",
+      "lc_elbow_guards",
+      "lc_greaves_brigandine",
+      "lc_knee_guards",
+      "lc_mirror_armor",
+      "lc_steel_facemask",
+      "lc_vambrace_brigandine",
+      "leather_bellow",
+      "leather_funnel",
+      "leather_police_jacket",
+      "leather_pouch",
+      "leather_tarp",
+      "leggings_thessalonian",
+      "legguard_bronze",
+      "legguard_chitin",
+      "legguard_hard",
+      "legguard_larmor",
+      "legguard_lc_brigandine",
+      "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",
+      "lens",
+      "lifestraw",
+      "light_detector",
+      "light_emergency_red",
+      "livestock_scale",
+      "log",
+      "long_glove_white",
+      "long_knit_scarf",
+      "long_knit_scarf_headwrap",
+      "long_knit_scarf_loose",
+      "long_patchwork_scarf",
+      "long_patchwork_scarf_headwrap",
+      "long_patchwork_scarf_loose",
+      "long_pole",
+      "lsurvivor_jumpsuit",
+      "lux_meter",
+      "m107a1",
+      "m110a1",
+      "m134",
+      "m1903",
+      "m1918",
+      "m1a",
+      "m1carbine",
+      "m2010",
+      "m202_flash",
+      "m240",
+      "m249",
+      "m26_mass_stock",
+      "m2browning",
+      "m320",
+      "m3_carlgustav",
+      "m60",
+      "m79",
+      "magnifying_glass",
+      "maker_kit_box",
+      "makeshift_funnel",
+      "makeshift_hammer",
+      "makeshift_hand_drill",
+      "makeshift_sealer",
+      "makeshift_vacuum_mold",
+      "manhole_cover",
+      "manual_tire_changer",
+      "mark19",
+      "marlin_9a",
+      "mask_bal",
+      "mask_bunker",
+      "mask_dust",
+      "mask_filter",
+      "mask_fsurvivor",
+      "mask_gas_xl",
+      "mask_gas_xs",
+      "mask_guy_fawkes",
+      "mask_h20survivor",
+      "mask_hockey",
+      "mask_hsurvivor",
+      "mask_lsurvivor",
+      "mask_plague",
+      "mask_rioter",
+      "mask_skull",
+      "mask_survivor",
+      "masonrysaw_off",
+      "masonrysaw_on",
+      "mbag",
+      "mdrx",
+      "medium_propane_tank",
+      "melting_point",
+      "mess_kit",
+      "mess_tray",
+      "metal_butcher_rack",
+      "metal_funnel",
+      "metal_smoking_rack",
+      "metal_tank",
+      "metal_tank_little",
+      "metal_tank_test",
+      "mgl",
+      "microcentrifuge",
+      "microscope",
+      "microscope_dissecting",
+      "mil_flight_suit",
+      "mil_plate",
+      "military_explosive_full_barrel_bomb",
+      "military_explosive_full_barrel_bomb_act",
+      "military_explosive_half_barrel_bomb",
+      "military_explosive_half_barrel_bomb_act",
+      "military_explosive_pipebomb",
+      "military_nvg",
+      "minidraco556",
+      "mininuke",
+      "minireactor",
+      "mirror",
+      "misc_repairkit",
+      "mittens",
+      "modern_handguard",
+      "modular_ar15",
+      "modular_m27_assault_rifle",
+      "modular_m4_carbine",
+      "molotov",
+      "molotov_lit",
+      "money_bundle_one",
+      "money_one",
+      "money_strap_one",
+      "mop",
+      "mortar_pestle",
+      "mosin44",
+      "mosin91_30",
+      "mossberg_500",
+      "mossberg_930",
+      "motor_large",
+      "motor_police_boots",
+      "mountable_cooler",
+      "mountable_heater",
+      "mrad_smr",
+      "mre_bag",
+      "mre_bag_dessert",
+      "mre_bag_jam",
+      "mre_bag_small",
+      "mre_bag_spread",
+      "mre_package",
+      "msu14_password",
+      "muffler",
+      "mugwort",
+      "multi_cooker",
+      "multimeter",
+      "multitool",
+      "mutant_bug_hydrogen_sacs",
+      "nitrogen_generator",
+      "nitrogen_tank",
+      "nm_teeth",
+      "noise_emitter",
+      "nomex_gloves",
+      "nomex_hood",
+      "nomex_socks",
+      "nomex_suit",
+      "number4_mki",
+      "nun_habit",
+      "nun_wimple",
+      "ny_hook",
+      "nylon_bag",
+      "obi_gi",
+      "office_letter_opener",
+      "officer_uniform",
+      "oil_cooker",
+      "oil_extractor_crude",
+      "oil_press_electric",
+      "omnicamera",
+      "omnicamera_reinforced",
+      "optical_cloak",
+      "outfit_storage",
+      "oxygen_cylinder",
+      "oxygen_tank",
+      "p220_10",
+      "p226_357sig",
+      "p226_9mm",
+      "paint_brush",
+      "paintballgun",
+      "pamd68",
+      "pamd71z",
+      "pants",
+      "pants_fur",
+      "pants_leather",
+      "paste_nut",
+      "paste_seed",
+      "patchwork_scarf",
+      "patchwork_scarf_headwrap",
+      "patchwork_scarf_loose",
+      "peacoat",
+      "pedal_extenders",
+      "pedal_extenders_makeshift",
+      "pedal_grindstone",
+      "peephole",
+      "petrified_eye",
+      "ph_meter",
+      "pickelhaube",
+      "pike_pole",
+      "pipe_glass",
+      "pipe_shotgun",
+      "pipe_tobacco",
+      "pipebomb",
+      "pipebomb_act",
+      "pistol_bayonet",
+      "pistol_flintlock",
+      "plaguedoctor_robe",
+      "plasma_rifle",
+      "plastic_boat_hull",
+      "plastichoboreel",
+      "platinum_grille",
+      "platinum_watch",
+      "plunger_futuristic",
+      "plunger_toilet",
+      "pocketwatch",
+      "pockknife",
+      "police_breeches",
+      "poncho",
+      "poncho_makeshift",
+      "pool_ball",
+      "poppy_bud",
+      "portal",
+      "postman_shorts",
+      "pot_makeshift",
+      "pot_makeshift_copper",
+      "pouch_autoclave",
+      "power_cord",
+      "power_supply",
+      "press_cake",
+      "pressure_cooker",
+      "pressure_tank",
+      "primitive_hammer",
+      "primitive_knife",
+      "processor",
+      "propane_cooker",
+      "pseudo_m203",
+      "psl",
+      "punch_bone",
+      "punch_nail",
+      "quilt",
+      "rack_test_tube",
+      "rack_test_tube_micro",
+      "rad_monitor",
+      "radio",
+      "radio_repeater_mod",
+      "raft_board",
+      "ragpouch",
+      "rc_car_box",
+      "rebar",
+      "rebar_plate",
+      "rebreather",
+      "rebreather_xl",
+      "rebreather_xs",
+      "receiver",
+      "recharge_station",
+      "reciprocating_saw",
+      "recoil_stock",
+      "recovery_pump",
+      "refrigerant_tank",
+      "reinforced_glass_sheet",
+      "remington700_270",
+      "remington_700",
+      "remington_870",
+      "remotevehcontrol",
+      "rep_crossbow",
+      "revolver_shotgun",
+      "rifle_22",
+      "rifle_38",
+      "rifle_44",
+      "rifle_flintlock",
+      "rm11b_sniper_rifle",
+      "rm120c",
+      "rm13_armor",
+      "rm20",
+      "rm51_assault_rifle",
+      "rm614_lmg",
+      "rm88_battle_rifle",
+      "robe",
+      "robofac_gun",
+      "robofac_gun_kit",
+      "robofac_head_rig",
+      "robot_kit_box",
+      "rock",
+      "rock_flaking",
+      "rock_quern",
+      "rollmat",
+      "rotovap",
+      "rubik_farthing",
+      "ruger_1022",
+      "ruger_arr",
+      "ruger_charger",
+      "ruger_m77",
+      "ruger_mini",
+      "rugerlcp",
+      "runner_bag",
+      "saiga_12",
+      "saiga_410",
+      "sail",
+      "samghati",
+      "sample_t_substrate",
+      "santa_beard",
+      "santa_dress",
+      "santa_dress_long",
+      "santa_dress_short",
+      "santa_gloves",
+      "santa_jacket",
+      "santa_jacket_short",
+      "santa_pants",
+      "santa_shorts",
+      "sapra",
+      "sarcophagus_access_code",
+      "sassafras_root",
+      "savage112",
+      "savage_111f",
+      "saxophone",
+      "scalpel",
+      "scar_l",
+      "scarf",
+      "scarf_faux_fur",
+      "scarf_faux_fur_headwrap",
+      "scarf_faux_fur_long",
+      "scarf_faux_fur_long_headwrap",
+      "scarf_faux_fur_long_loose",
+      "scarf_faux_fur_loose",
+      "scarf_fur",
+      "scarf_fur_headwrap",
+      "scarf_fur_long",
+      "scarf_fur_long_headwrap",
+      "scarf_fur_long_loose",
+      "scarf_fur_loose",
+      "scarf_headwrap",
+      "scarf_long",
+      "scarf_long_headwrap",
+      "scarf_long_loose",
+      "scarf_loose",
+      "scissors_child",
+      "scissors_medical",
+      "scout_stock",
+      "scrambler",
+      "scrambler_act",
+      "scraper_steel",
+      "screen_mesh",
+      "screw_press_tool",
+      "screwdriver",
+      "screwdriver_set",
+      "scuba_tank",
+      "scuba_tank_on",
+      "seat",
+      "seat_bench",
+      "sewing_kit",
+      "sextant",
+      "sf_watch",
+      "shark_suit",
+      "shark_suit_faraday",
+      "sharksuit",
+      "sharp_rock",
+      "sharps",
+      "shavingkit",
+      "shears",
+      "sheet",
+      "sheet_metal_small",
+      "shelter_kit",
+      "shorts",
+      "shorts_cargo",
+      "shorts_denim",
+      "shot_suppressor",
+      "shotgun_s",
+      "shovel",
+      "shuttlecock",
+      "sig_assault_rifle",
+      "sig_p230",
+      "signed_chit",
+      "silver_watch",
+      "sks",
+      "sleeping_bag",
+      "sleeping_bag_fur",
+      "sleeveless_duster",
+      "sleeveless_duster_fur",
+      "sleeveless_duster_leather",
+      "sleeveless_duster_survivor",
+      "sleeveless_trenchcoat",
+      "sleeveless_trenchcoat_fur",
+      "sleeveless_trenchcoat_leather",
+      "sleeveless_trenchcoat_survivor",
+      "sleeveless_tunic",
+      "sling-ready_grenade",
+      "sling-ready_molotov",
+      "sm_extinguisher",
+      "small_lcd_screen",
+      "small_printout_portal_storm_data",
+      "small_propane_tank",
+      "small_repairkit",
+      "small_scuba_tank",
+      "small_scuba_tank_on",
+      "small_space_heater",
+      "smart_lamp",
+      "smart_watch",
+      "smg_40",
+      "smg_45",
+      "smg_9mm",
+      "smle_mk3",
+      "smoxygen_tank",
+      "sneakers_steel",
+      "snow_machine_home",
+      "snuggie",
+      "socket_screwdriver_set",
+      "socket_wrench_set",
+      "soft_adobe_brick",
+      "solar_panel",
+      "solarpack",
+      "spearsling",
+      "spectrophotometer",
+      "spiked_plate",
+      "spiral_stone",
+      "splinter",
+      "spring_plate",
+      "staff_sling",
+      "stand_ring_clamps",
+      "standard_template_construct",
+      "standing_directed_floodlight",
+      "standing_floodlight",
+      "standing_lamp",
+      "steel_grille",
+      "steel_lump",
+      "steel_plate",
+      "stepladder",
+      "steyr_aug",
+      "still",
+      "still_lab",
+      "stirling_kit_box",
+      "stomach_sealed",
+      "stone_chopper",
+      "stopcock",
+      "storage_line",
+      "straw_basket",
+      "streetsweeper",
+      "striped_pants",
+      "subsuit_xl",
+      "suit",
+      "sundress",
+      "suppressor",
+      "surv_rocket_launcher",
+      "survivor_adhoc_leather_pants",
+      "survivor_hairtrimmer",
+      "survivor_jumpsuit",
+      "survivor_mess_kit",
+      "survivor_scope",
+      "survivor_shavingkit",
+      "swag_bag",
+      "swage",
+      "swimming_kickboard",
+      "tac338",
+      "tac50",
+      "tac_fullhelmet",
+      "tac_helmet",
+      "tacoma_drink_token",
+      "talking_doll",
+      "tallit_gadol",
+      "tanbark",
+      "tankard_wooden",
+      "tarp",
+      "tattered_garment",
+      "tavor_12",
+      "tearer",
+      "technician_coveralls",
+      "technician_coveralls_h",
+      "technician_pants_gray",
+      "telepad",
+      "teleporter",
+      "teleumbrella-extended",
+      "television",
+      "tempered_glass_sheet",
+      "tent_kit",
+      "tent_pole",
+      "test_100_kcal",
+      "test_200_kcal",
+      "test_2x4",
+      "test_500_kcal",
+      "test_armguard",
+      "test_armor_chitin",
+      "test_balanced_sword",
+      "test_balloon",
+      "test_bird_boots",
+      "test_boxing_gloves",
+      "test_clumsy_sword",
+      "test_compbow",
+      "test_condom",
+      "test_crafted_suppressor",
+      "test_ebook_reader",
+      "test_fire_ax",
+      "test_fire_ax_mostly_steel",
+      "test_fire_ax_mostly_wood",
+      "test_fire_sword",
+      "test_glass_pipe_mostly_glass",
+      "test_glass_pipe_mostly_steel",
+      "test_goggles_welding",
+      "test_jug_plastic",
+      "test_jumpsuit_cotton",
+      "test_jumpsuit_fur",
+      "test_jumpsuit_lycra",
+      "test_normal_sword",
+      "test_pants_fur",
+      "test_pipe",
+      "test_pointy_stick",
+      "test_power_armor",
+      "test_power_cord",
+      "test_power_cord_25_loss",
+      "test_rock_cheese",
+      "test_screwdriver",
+      "test_shackles",
+      "test_shears",
+      "test_shears_mostly_plastic",
+      "test_shears_mostly_steel",
+      "test_sheet_metal_small",
+      "test_sonic_screwdriver",
+      "test_standing_lamp",
+      "test_swat_armor",
+      "test_tube",
+      "test_tube_micro",
+      "test_umbrella",
+      "test_ups",
+      "test_waist_apron_long",
+      "test_waterproof_bag",
+      "test_waterskin",
+      "test_winglets",
+      "test_winglets_left",
+      "testflames",
+      "thawb",
+      "thermometer",
+      "thick_h20survivor_jumpsuit",
+      "thigh_high_boots",
+      "thread_cutting_set",
+      "throw_extinguisher",
+      "throw_extinguisher_act",
+      "throwing_axe",
+      "thyme",
+      "tire_bicycle",
+      "tire_medium",
+      "tire_medium_slick",
+      "tire_motorbike",
+      "tire_wide",
+      "tireplate",
+      "toecaps",
+      "toolset",
+      "torch",
+      "torch_lit",
+      "touring_suit",
+      "tourist_table",
+      "towel",
+      "towel_hanger",
+      "towel_wet",
+      "transponder",
+      "trenchcoat",
+      "trenchcoat_fur",
+      "trenchcoat_leather",
+      "trenchcoat_steampunk",
+      "trenchcoat_survivor",
+      "trimmer_off",
+      "tripwire",
+      "trumpet",
+      "trunks",
+      "tuba",
+      "tunic",
+      "turban",
+      "tux",
+      "type99",
+      "ugl_buttstock",
+      "umbrella",
+      "utility_exoskeleton_off",
+      "v_table",
+      "vac_mold",
+      "vac_oven_small",
+      "vac_pump",
+      "vac_sealer",
+      "vacutainer",
+      "vambrace_larmor",
+      "vampire_fangs",
+      "varmint_airgun",
+      "vehicle_controls",
+      "veil_wedding",
+      "vest_leather",
+      "vest_leather_mod",
+      "voltmeter",
+      "vortex",
+      "wall_light",
+      "wallet_travel",
+      "walther_p22",
+      "walther_ppk",
+      "washboard",
+      "wasp_sting",
+      "water_faucet",
+      "water_filter_sand",
+      "water_mill",
+      "water_purifier",
+      "water_wheel",
+      "watercannon",
+      "waterskin",
+      "waterskin2",
+      "waterskin3",
+      "weather_glass",
+      "weather_reader",
+      "weatherby_5",
+      "weighted_dart",
+      "welder",
+      "welding_kit",
+      "welding_mask",
+      "welding_mask_crude",
+      "welding_mask_crude_raised",
+      "welding_mask_raised",
+      "wetsuit",
+      "wetsuit_gloves",
+      "wetsuit_pants",
+      "wetsuit_spring",
+      "wetsuit_thick",
+      "wheel",
+      "wheel_10",
+      "wheel_armor",
+      "wheel_barrow",
+      "wheel_bicycle",
+      "wheel_caster",
+      "wheel_caster_large",
+      "wheel_metal",
+      "wheel_motorbike",
+      "wheel_rail",
+      "wheel_rim_medium",
+      "wheel_rim_motorbike",
+      "wheel_rim_wide",
+      "wheel_skateboard",
+      "wheel_slick",
+      "wheel_small",
+      "wheel_wheelchair",
+      "wheel_wide",
+      "wheel_wood",
+      "whistle",
+      "whistle_multitool",
+      "willowbark",
+      "win70",
+      "winchester_1887",
+      "wind_mill",
+      "wind_turbine",
+      "winter_gloves_army",
+      "wire_draw_machine",
+      "wolfsuit",
+      "wood_panel",
+      "wood_plate",
+      "wood_sheet",
+      "wood_smoother",
+      "wooden_barrel",
+      "wool_staple",
+      "wool_suit",
+      "wristwatch",
+      "wsurvivor_jumpsuit",
+      "wsurvivor_suit",
+      "xacto",
+      "xd_10",
+      "xedra_antenna",
+      "xedra_gun",
+      "xedra_seismograph",
+      "xl_propane_tank",
+      "xl_wind_turbine",
+      "xlkevlar",
+      "xlsurvivor_suit",
+      "yoke_harness",
+      "yoke_harness_heavyduty",
+      "yukata"
+    ]
+  },
+  {
+    "type": "test_data",
+    "//": "Aftershock + Aftershock Exoplanet",
+    "legacy_to_hit": [
+      "TANK",
+      "UICA_1d",
+      "afs_25mm_goa",
+      "afs_Accipitermg",
+      "afs_control_station",
+      "afs_energy_saber_off",
+      "afs_energy_saber_on",
+      "afs_explosive_pumped_laser",
+      "afs_freeze_gauntlet",
+      "afs_frontier_cryomask",
+      "afs_gibrifle",
+      "afs_gibs_shotgun",
+      "afs_kibble",
+      "afs_magellan_suit_helmet",
+      "afs_murdersaw",
+      "afs_murdersaw_on",
+      "afs_oxygen_candle",
+      "afs_power_cutter",
+      "afs_radiobeacon",
+      "afs_raketa_shotgun",
+      "afs_rebar_rifle",
+      "afs_shuttle_radiobeacon",
+      "afs_tattered_garment",
+      "afs_titanium_frame",
+      "afs_titanium_implant",
+      "afs_titanium_tooth",
+      "afs_titanium_vest",
+      "afs_titanium_watch",
+      "afs_wa2519",
+      "afs_wrist_computer",
+      "aza_sword",
+      "bioweapon_chassis",
+      "bot_bloodhound_drone",
+      "bot_chickenbot",
+      "bot_copbot",
+      "bot_eyebot",
+      "bot_laserturret_x-ray",
+      "bot_laserturret_xray",
+      "bot_migoturret",
+      "bot_riotbot",
+      "bot_sentinel_lx",
+      "bot_skitterbot_rat",
+      "bot_tankbot",
+      "bot_tripod",
+      "bot_wraitheon_kaburaya",
+      "broken_advbot_disarmed",
+      "broken_afs_mon_migoturret",
+      "broken_afs_mon_sentinel_lx",
+      "broken_bloodhound_drone",
+      "broken_chickenbot",
+      "broken_copbot",
+      "broken_defbot_disarmed",
+      "broken_eyebot",
+      "broken_fumigator",
+      "broken_mech_horse",
+      "broken_medibot",
+      "broken_milbot_disarmed",
+      "broken_riotbot",
+      "broken_tankbot",
+      "broken_utilibot",
+      "carbide_cuirass",
+      "combat_wetsuit_cecalia",
+      "crashing_ship_armory_card",
+      "crashing_ship_exobay_card",
+      "crashing_ship_locker_card",
+      "crypto_coin",
+      "exo_rod_launcher",
+      "grenade_cryo",
+      "grenade_cryo_act",
+      "humming_heart",
+      "inactive_frankenstein",
+      "laser_cannon_xray",
+      "laser_rifle_cheap",
+      "living_brain_jar",
+      "military_mess_kit",
+      "nanomesh_vest",
+      "q_solarpack",
+      "rebar_rail",
+      "scrapcrossbow",
+      "sensory_cluster",
+      "solar_panel_v3",
+      "tac_fullhelmet_uicas",
+      "tac_helmet_uicas",
+      "tripaw_xlgloves_tactical",
+      "tskbem_master_keycard",
+      "vibrating_blaster",
+      "wetsuit_cecalia",
+      "xlboots_combat",
+      "xlgloves_tactical",
+      "xlswat_armor"
+    ]
+  },
+  {
+    "type": "test_data",
+    "//": "Generic Guns",
+    "legacy_to_hit": [
+      "ammo_pouch",
+      "bot_antimateriel",
+      "bot_rifleturret",
+      "bot_secubot",
+      "bot_talon_m202a1",
+      "bot_turret",
+      "broken_secubot",
+      "broken_talon_m202a1"
+    ]
+  },
+  {
+    "type": "test_data",
+    "//": "Limb WIP",
+    "legacy_to_hit": [
+      "armor_bio_arms_basic",
+      "armor_bio_legs_basic",
+      "armor_bio_treads",
+      "debug_belt_tail",
+      "left_arm_neuroprosthetic",
+      "left_arm_prosthetic",
+      "left_arm_prosthetic_steel_old",
+      "left_arm_prosthetic_wood_old",
+      "left_leg_prosthetic",
+      "left_leg_prosthetic_steel_old",
+      "left_peg_leg_old",
+      "right_arm_neuroprosthetic",
+      "right_arm_prosthetic",
+      "right_arm_prosthetic_steel_old",
+      "right_arm_prosthetic_wood_old",
+      "right_leg_prosthetic",
+      "right_leg_prosthetic_steel_old",
+      "right_peg_leg_old"
+    ]
+  },
+  {
+    "type": "test_data",
+    "//": "Magiclysm",
+    "legacy_to_hit": [
+      "alchemist_bomb",
+      "alchemist_bomb_act",
+      "alchemist_mine",
+      "artificer_toolkit",
+      "black_dragon_tanned_hide",
+      "bonespear",
+      "boots_of_elvenkind",
+      "broken_claygolem",
+      "broken_claygolem_dm",
+      "broken_eshaper_golem",
+      "broken_forgeborn",
+      "broken_irongolem",
+      "broken_irongolem_dm",
+      "broken_plasticgolem",
+      "broken_plasticgolem_dm",
+      "broken_stonegolem",
+      "broken_stonegolem_dm",
+      "cauldron_demon_chitin",
+      "cauldron_orichalcum",
+      "decaying_boneclub",
+      "demon_chitin_plate",
+      "denarius",
+      "dragon_black_scale",
+      "druid_chair_item",
+      "druid_recurve",
+      "enchanted_blackpowder_pistol",
+      "enchanted_wood",
+      "everburning_sconce",
+      "everburning_torch_candelabra",
+      "flamesword",
+      "flaming_fist",
+      "flarewhip",
+      "force_magical_armor",
+      "gambeson_gloves_parabolan",
+      "gambeson_pants_parabolan",
+      "gambeson_parabolan",
+      "gambeson_parabolan_thinsleeved",
+      "gambeson_parabolan_vest",
+      "gauntlet_pounding",
+      "gauntlets_black_dragon_scale",
+      "gloves_black_dragon_hide",
+      "gunblade",
+      "heat_cube",
+      "helmet_black_dragon_hide",
+      "helmet_black_dragon_scale",
+      "holy_shield",
+      "impactsling",
+      "item_kelvinist_icy_freezing_container",
+      "jar_3l_force",
+      "lizardfolk_club",
+      "lizardfolk_trident",
+      "m47a1",
+      "magi_staff_greater",
+      "magi_staff_lesser",
+      "magi_staff_minor",
+      "magic_suppressor",
+      "magus_booster_1",
+      "magus_booster_1_active",
+      "magus_booster_2",
+      "magus_booster_2_active",
+      "mana_wheel",
+      "mbracer_steel_pair",
+      "mithril_ingot",
+      "mithril_lump",
+      "mtorch_everburning",
+      "orichalcum_ingot",
+      "orichalcum_lump",
+      "orrery_item",
+      "owlbear_stone",
+      "parabolan_felt_patch",
+      "parabolan_wool_staple",
+      "rune_biomancer_gun_adept_trans",
+      "rune_biomancer_weapon",
+      "rune_biomancer_weapon_adept",
+      "rune_earthshaper_weapon",
+      "rune_magus_weapon",
+      "rune_magus_weapon_adept",
+      "rune_stormshaper_weapon_adept",
+      "shield_ice",
+      "springstaff-extended",
+      "springstaff-retracted",
+      "stirge_proboscis",
+      "stonefist",
+      "stormhammer",
+      "suit_black_dragon_hide",
+      "suit_black_dragon_scale",
+      "technomancer_booster_2",
+      "technomancer_booster_2_active",
+      "technomancer_summoned_radio"
+    ]
+  },
+  {
+    "type": "test_data",
+    "//": "Mind Over Matter",
+    "legacy_to_hit": [
+      "feral_clair_thrown_rock",
+      "grenade_inferno",
+      "grenade_inferno_act",
+      "id_science_visitor_phavian",
+      "lab_file_OS647_P_item",
+      "lab_file_biokinesis_item",
+      "lab_file_clairsentience_item",
+      "lab_file_matrix_research_item",
+      "lab_file_obsidian_ring_item",
+      "lab_file_phavian_memo_item",
+      "lab_file_private_correspondence",
+      "lab_file_pyrokinesis_item",
+      "lab_file_telekinesis_item",
+      "lab_file_telepathy_item",
+      "lab_file_teleportation_item",
+      "lab_file_vitakinesis_item",
+      "matrix_shard",
+      "mom_pulse_rifle",
+      "pattern_screamer_thrown_rock",
+      "quest_starter_note_fifth_sun_cuachic",
+      "standing_pyrokinetic_lamp"
+    ]
+  },
+  {
+    "type": "test_data",
+    "//": "Xedra Evolved",
+    "legacy_to_hit": [
+      "aa_12",
+      "armor_verdant_cuirass",
+      "arvore_preservation_container",
+      "bio_launcher",
+      "blood_bank",
+      "blood_camel",
+      "boots_verdant",
+      "broken_exodii_quad_jotunn",
+      "changeling_thrown_knife",
+      "cloak_verdant",
+      "cured_glimmer_pelt",
+      "dreamdross_lump",
+      "dreamforged_bed_of_restful_repose",
+      "dreamforged_crossbow",
+      "forged_dreamstuff_ingot",
+      "golden_bridle",
+      "integrated_arvore_thorns",
+      "inventor_glauncher",
+      "inventor_pistol",
+      "item_undine_liquid_water_pocket",
+      "megachette_folded",
+      "mirror_artifact",
+      "moon_tear_ingot",
+      "pants_glimmer_fur",
+      "purity_crackers",
+      "sacrifice_table",
+      "sleeveless_duster_glimmer_fur",
+      "sleeveless_trenchcoat_glimmer_fur",
+      "trenchcoat_glimmer_fur",
+      "undine_waters_map",
+      "väinämöinens_kantele",
+      "väinämöinens_kantele_imitation",
+      "xe_art_clock",
+      "xe_art_crystal",
+      "xe_art_disc",
+      "xe_art_jelly",
+      "xe_art_napkin",
+      "xe_art_pin",
+      "xe_art_pyramid",
+      "xe_art_rod",
+      "xe_art_sculpture",
+      "xe_art_spiral",
+      "xe_oneiric_hammer"
+    ]
+  }
+]
diff --git a/data/mods/TEST_DATA/weapons.json b/data/mods/TEST_DATA/weapons.json
index 479e51e7642c7..b658522497fd2 100644
--- a/data/mods/TEST_DATA/weapons.json
+++ b/data/mods/TEST_DATA/weapons.json
@@ -10,6 +10,8 @@
     "name": { "str": "test melee weapon 1" },
     "description": "Test melee weapon 1.",
     "material": [ "test_material" ],
+    "//": "Intended to be +0",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" },
     "weight": "1 kg",
     "volume": "1 L",
     "symbol": ";"
@@ -20,6 +22,8 @@
     "name": { "str": "test melee weapon 2" },
     "description": "Test melee weapon 2.",
     "material": [ "test_material" ],
+    "//": "Intended to be +0",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" },
     "weight": "1 kg",
     "volume": "1 L",
     "symbol": ";",
diff --git a/data/mods/Tamable_Wildlife/items/comestibles/other.json b/data/mods/Tamable_Wildlife/items/comestibles/other.json
index 4ba61279dccc0..4e0821a34099c 100644
--- a/data/mods/Tamable_Wildlife/items/comestibles/other.json
+++ b/data/mods/Tamable_Wildlife/items/comestibles/other.json
@@ -10,7 +10,6 @@
     "volume": "250 ml",
     "price": "20 cent",
     "price_postapoc": "25 cent",
-    "to_hit": -5,
     "material": [ "junk" ],
     "symbol": ";",
     "calories": 400,
diff --git a/data/mods/Xedra_Evolved/items/ammo.json b/data/mods/Xedra_Evolved/items/ammo.json
index 304529cd64a08..c88fe29c97ae0 100644
--- a/data/mods/Xedra_Evolved/items/ammo.json
+++ b/data/mods/Xedra_Evolved/items/ammo.json
@@ -13,7 +13,6 @@
     "flags": [ "TRADER_AVOID", "NPC_THROWN" ],
     "volume": "100 ml",
     "weight": "460 g",
-    "to_hit": -2,
     "damage": { "damage_type": "stab", "amount": 7 },
     "range": 10,
     "dispersion": 14,
diff --git a/data/mods/Xedra_Evolved/items/armor/armor.json b/data/mods/Xedra_Evolved/items/armor/armor.json
index 78ad3e8bfc642..02464e004b4a0 100644
--- a/data/mods/Xedra_Evolved/items/armor/armor.json
+++ b/data/mods/Xedra_Evolved/items/armor/armor.json
@@ -1095,7 +1095,6 @@
     "volume": "2500 ml",
     "price": "380 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "mut_wood", "veggy" ],
     "symbol": "[",
     "looks_like": "helmet_larmor",
@@ -1213,7 +1212,6 @@
     "volume": "1750 ml",
     "price": "380 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "mut_wood", "veggy" ],
     "symbol": "[",
     "looks_like": "gauntlets_larmor",
diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
index ecad57dcf8223..62cf695c22e6b 100644
--- a/data/mods/Xedra_Evolved/items/armor/integrated.json
+++ b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -134,7 +134,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "black",
@@ -248,7 +247,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "green",
@@ -383,7 +381,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "red",
@@ -477,7 +474,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -591,7 +587,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -630,7 +625,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -707,7 +701,6 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fae_flesh" ],
     "symbol": "[",
     "color": "black",
diff --git a/data/mods/Xedra_Evolved/items/ethereal_items.json b/data/mods/Xedra_Evolved/items/ethereal_items.json
index 9aedab3864dda..d7471793adcb2 100644
--- a/data/mods/Xedra_Evolved/items/ethereal_items.json
+++ b/data/mods/Xedra_Evolved/items/ethereal_items.json
@@ -248,7 +248,6 @@
     "material": [ "dreamstuff" ],
     "volume": "250 ml",
     "price": "1 cent",
-    "to_hit": -2,
     "symbol": ",",
     "color": "light_green",
     "flags": [ "LIGHT_300", "AURA", "SEMITANGIBLE", "UNBREAKABLE", "ALLOWS_NATURAL_ATTACKS" ],
diff --git a/data/mods/Xedra_Evolved/items/guns.json b/data/mods/Xedra_Evolved/items/guns.json
index 99085a7ad3586..57aeec35a4d19 100644
--- a/data/mods/Xedra_Evolved/items/guns.json
+++ b/data/mods/Xedra_Evolved/items/guns.json
@@ -23,7 +23,6 @@
     "longest_side": "195 mm",
     "price": "950 USD",
     "price_postapoc": "30 USD",
-    "to_hit": -2,
     "material": [ "plastic", "steel" ],
     "color": "dark_gray",
     "ammo": [ "9x21mm" ],
@@ -79,7 +78,6 @@
     "longest_side": "100 cm",
     "price": "1 kUSD 800 USD",
     "price_postapoc": "175 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel" ],
     "dispersion": 358,
     "durability": 8,
diff --git a/data/mods/Xedra_Evolved/items/inventor/gun.json b/data/mods/Xedra_Evolved/items/inventor/gun.json
index e0b81714e2f91..a1ece7b47675e 100644
--- a/data/mods/Xedra_Evolved/items/inventor/gun.json
+++ b/data/mods/Xedra_Evolved/items/inventor/gun.json
@@ -8,7 +8,6 @@
     "weight": "1170 g",
     "volume": "482 ml",
     "longest_side": "16 cm",
-    "to_hit": -2,
     "melee_damage": { "bash": 6 },
     "material": [ "steel" ],
     "symbol": "(",
@@ -69,7 +68,6 @@
     "weight": "2726 g",
     "volume": "4718 ml",
     "longest_side": "896 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 6 },
     "material": [ "steel" ],
     "symbol": "(",
@@ -133,7 +131,6 @@
     "weight": "3540 g",
     "volume": "3830 ml",
     "longest_side": "991 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 6 },
     "material": [ "steel" ],
     "symbol": "(",
@@ -196,7 +193,6 @@
     "weight": "2792 g",
     "volume": "3965 ml",
     "longest_side": "114 cm",
-    "to_hit": -2,
     "melee_damage": { "bash": 6 },
     "material": [ "steel" ],
     "symbol": "(",
@@ -283,7 +279,6 @@
     "volume": "2 L",
     "price": "1 kUSD 800 USD",
     "price_postapoc": "100 USD",
-    "to_hit": -2,
     "melee_damage": { "bash": 8 },
     "ammo_type": "bio_warhead",
     "material": [ "steel", "plastic" ],
@@ -305,7 +300,6 @@
     "weight": "2260 g",
     "volume": "3130 ml",
     "longest_side": "780 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 6 },
     "material": [ "steel" ],
     "symbol": "|",
@@ -354,7 +348,6 @@
     "volume": "11920 ml",
     "longest_side": "1266 mm",
     "barrel_length": "908 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 12 },
     "material": [ "qt_steel" ],
     "symbol": "(",
@@ -378,7 +371,6 @@
     "weight": "2880 g",
     "volume": "3930 ml",
     "longest_side": "998 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 6 },
     "material": [ "steel" ],
     "symbol": "(",
@@ -704,7 +696,6 @@
     "weight": "890 g",
     "volume": "658 ml",
     "longest_side": "998 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 3 },
     "material": [ "steel" ],
     "symbol": "(",
@@ -747,7 +738,6 @@
     "weight": "1908 g",
     "volume": "3130 ml",
     "longest_side": "1160 mm",
-    "to_hit": -2,
     "melee_damage": { "bash": 3 },
     "material": [ "steel" ],
     "symbol": "|",
diff --git a/data/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json b/data/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json
index 5c880e48dd8ba..cee0a93b4e196 100644
--- a/data/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json
+++ b/data/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json
@@ -29,8 +29,7 @@
     "description": "A strange monitor with a variety of knobs and dials.  When you turn it on, it crackles and then begins tracking things that either aren't there or aren't visible to the naked eye.\nIt may have unknown powers; try activating them.",
     "symbol": "O",
     "volume": "35 ml",
-    "weight": "50 g",
-    "to_hit": -2
+    "weight": "50 g"
   },
   {
     "id": "xe_art_mess",
@@ -39,8 +38,7 @@
     "description": "What is it for?  What could it do?\nIt may have unknown powers; try activating them.",
     "symbol": "[",
     "volume": "1 L",
-    "weight": "80 g",
-    "to_hit": -2
+    "weight": "80 g"
   },
   {
     "id": "xe_art_sculpture",
@@ -72,8 +70,7 @@
     "description": "This looks like a musical instrument.  But how would you play it?\nIt may have unknown powers; try activating them.",
     "symbol": "O",
     "volume": "76 ml",
-    "weight": "125 g",
-    "to_hit": -2
+    "weight": "125 g"
   },
   {
     "id": "xe_art_napkin",
@@ -93,7 +90,6 @@
     "symbol": "O",
     "volume": "1 L",
     "weight": "800 g",
-    "to_hit": -2,
     "melee_damage": { "cut": 3 }
   },
   {
@@ -180,7 +176,6 @@
     "description": "The sound of the tide can be heard from this stone, as if it were a miniature moon moving the oceans.\nIt may have unknown powers; try activating them.",
     "symbol": "C",
     "volume": "35 ml",
-    "weight": "50 g",
-    "to_hit": -2
+    "weight": "50 g"
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/resources.json b/data/mods/Xedra_Evolved/items/resources.json
index 061f39801deba..b90e6bea22dc9 100644
--- a/data/mods/Xedra_Evolved/items/resources.json
+++ b/data/mods/Xedra_Evolved/items/resources.json
@@ -27,8 +27,7 @@
     "price_postapoc": "1 USD",
     "material": [ "moon_tears" ],
     "weight": "151 g",
-    "volume": "100 ml",
-    "to_hit": -2
+    "volume": "100 ml"
   },
   {
     "id": "scrap_moon_tears",
@@ -132,7 +131,6 @@
     "volume": "1 L",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -2,
     "material": [ "fur", "flesh" ],
     "symbol": ",",
     "color": "brown",
diff --git a/data/mods/Xedra_Evolved/items/tools.json b/data/mods/Xedra_Evolved/items/tools.json
index 31fd01bec0140..f2802facf3f73 100644
--- a/data/mods/Xedra_Evolved/items/tools.json
+++ b/data/mods/Xedra_Evolved/items/tools.json
@@ -8,7 +8,6 @@
     "volume": "500 ml",
     "price": "10 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "wood", "steel" ],
     "symbol": ";",
     "color": "red",
diff --git a/data/mods/Xedra_Evolved/monsters/monsterattacks.json b/data/mods/Xedra_Evolved/monsters/monsterattacks.json
index 365876581f54b..abec12b6b8100 100644
--- a/data/mods/Xedra_Evolved/monsters/monsterattacks.json
+++ b/data/mods/Xedra_Evolved/monsters/monsterattacks.json
@@ -73,7 +73,6 @@
     "longest_side": "211 mm",
     "price": "650 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": -4 },
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
@@ -127,7 +126,6 @@
     "longest_side": "164 mm",
     "price": "650 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -2,
     "ranged_damage": { "damage_type": "bullet", "amount": -5 },
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
diff --git a/data/mods/innawood/items/electronics.json b/data/mods/innawood/items/electronics.json
index e4cadb67668cb..c7126e42a9f9b 100644
--- a/data/mods/innawood/items/electronics.json
+++ b/data/mods/innawood/items/electronics.json
@@ -13,7 +13,6 @@
     "material": [ "iron", "copper" ],
     "weight": "113 g",
     "volume": "1 L",
-    "to_hit": -1,
     "melee_damage": { "bash": 5 }
   },
   {
diff --git a/data/mods/innawood/items/tool_tailoring.json b/data/mods/innawood/items/tool_tailoring.json
index 052e629118bb7..429a6527e43bc 100644
--- a/data/mods/innawood/items/tool_tailoring.json
+++ b/data/mods/innawood/items/tool_tailoring.json
@@ -54,7 +54,6 @@
     "volume": "500 ml",
     "price": "10 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "wood", "steel" ],
     "symbol": ";",
     "color": "red",
diff --git a/data/mods/innawood/items/tool_workshop.json b/data/mods/innawood/items/tool_workshop.json
index 7e1f132ddbc68..8e34f3f95e019 100644
--- a/data/mods/innawood/items/tool_workshop.json
+++ b/data/mods/innawood/items/tool_workshop.json
@@ -9,7 +9,6 @@
     "longest_side": "25 cm",
     "price": "50 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -2,
     "material": [ "steel", "clay" ],
     "symbol": ";",
     "color": "dark_gray",
diff --git a/data/mods/innawood/mining/items/ore.json b/data/mods/innawood/mining/items/ore.json
index d6d60fea1b52e..bc9b515c284c8 100644
--- a/data/mods/innawood/mining/items/ore.json
+++ b/data/mods/innawood/mining/items/ore.json
@@ -12,7 +12,6 @@
     "material": [ "iron" ],
     "weight": "1000 g",
     "volume": "235 ml",
-    "to_hit": -1,
     "melee_damage": { "bash": 7 }
   },
   {
diff --git a/doc/ARMOR_BALANCE_AND_DESIGN.md b/doc/ARMOR_BALANCE_AND_DESIGN.md
index 4cfd29a3616c1..8db565e9ecd5b 100644
--- a/doc/ARMOR_BALANCE_AND_DESIGN.md
+++ b/doc/ARMOR_BALANCE_AND_DESIGN.md
@@ -184,7 +184,6 @@ Sided armor is armor that even though it describes covering, both legs, both arm
   "volume": "500 ml",
   "price": "52 USD",
   "price_postapoc": "2 USD 50 cent",
-  "to_hit": -1,
   "material": [ "leather" ],
   "symbol": "[",
   "looks_like": "sheath",
diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md
index 5ffc54a77caa9..5d813be9c4769 100644
--- a/doc/GAME_BALANCE.md
+++ b/doc/GAME_BALANCE.md
@@ -238,11 +238,11 @@ Grip is a measure of how well you can control the weapon to quickly respond to s
 ### Length
 Length allows more surface area for potential contact, and reduces the need to control the positioning of the body to guarantee a hit. It also allows the player to strike from a safer distance, allowing them to worry more about trying to hit without being hit in return, and allows for swings with larger arcs, making dodging such a strike more difficult.
 
-+0 - "hand" - Any object without a length bonus.
++0 - "hand" - Objects that, from where they're held, extend less than 31 cm (or 1').
 
-+1 - "short" - Objects that, when held, extend over a foot (1/3 of a meter) in length from the hand, but less than about 3 feet. A normal American 12-inch ruler is the handy boundary guide for when an item should switch over to a +1 bonus (the ruler, losing several inches when held, does not get one - unless you added a handle to it!).
++1 - "short" - Objects that, from where they're held, extend between a 31 cm and 91 cm (or 1' to 3').
 
-+2 - "long" An object that is over 3 feet in length from the point where it is held. Includes swords, spears, quarterstaffs, poles, and a lot of other stuff.
++2 - "long" - Objects that, from where they're held, extend further than 91 cm (or 3').
 
 ### Striking Surface
 Some weapons need to strike in a certain way to be effective. Others are more difficult to use "incorrectly".
diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md
index 8d8a5cccdba08..6c81c7dab71e8 100644
--- a/doc/JSON_INFO.md
+++ b/doc/JSON_INFO.md
@@ -3449,13 +3449,13 @@ Weakpoints only match if they share the same id, so it's important to define the
   "bash": 0,
   "cut": 0
 },
-"to_hit": 0,                                 // (Optional, deprecated, default = 0) To-hit bonus if using it as a melee weapon (whatever for?).  The object version is preferred
-"to_hit" {                                   // (Optional, Preferred) To hit bonus values, see below
+"to_hit" {                                   // (Optional) To hit bonus values, omit if item isn't suited to be used as a melee weapon, see [GAME_BALANCE.md](GAME_BALANCE.md#to-hit-value) for individual value breakdowns.
   "grip": "solid",                           // the item's grip value
   "length": "long",                          // the item's length value
   "surface": "point",                        // the item's striking surface value
   "balance": "neutral"                       // the item's balance value
 },
+"to_hit": 1,                                 // (Optional, legacy, default = -2) To-hit bonus if using it as a melee weapon.
 "variant_type": "gun"      // Possible options: "gun", "generic" - controls which options enable/disable seeing the variants of this item.
 "variants": [              // Cosmetic variants this item can have
   {
@@ -3510,7 +3510,7 @@ For additional clarity, an item's `to_hit` bonus can be encoded as string of 4 f
     "balance": "neutral"   // one of "clumsy", "uneven", "neutral", or "good"
 }
 ```
-See [GAME_BALANCE.md](GAME_BALANCE.md)'s `MELEE_WEAPONS` section for the criteria for selecting each value.
+See [GAME_BALANCE.md](GAME_BALANCE.md#to-hit-value)
 
 ### Ammo
 
@@ -4098,7 +4098,12 @@ Any Item can be a container. To add the ability to contain things to an item, yo
   "cut": 12
 },
 "flags" : ["CHOP"],    // Indicates special effects
-"to_hit": 1            // To-hit bonus if using it as a melee weapon
+"to_hit" {             // (Optional) To hit bonus values, omit if item isn't suited to be used as a melee weapon, see [GAME_BALANCE.md](GAME_BALANCE.md#to-hit-value) for individual value breakdowns.
+  "grip": "solid",                           
+  "length": "long",                          
+  "surface": "point",                        
+  "balance": "neutral"                       
+}
 ```
 ### Memory Cards
 
@@ -4267,7 +4272,12 @@ Alternately, every item (book, tool, armor, even food) can be used as a gunmod i
   "bash": 12,
   "cut": 0
 },
-"to_hit": 3,          // To-hit bonus if using it as a melee weapon
+"to_hit" {             // (Optional) To hit bonus values, omit if item isn't suited to be used as a melee weapon, see [GAME_BALANCE.md](GAME_BALANCE.md#to-hit-value) for individual value breakdowns.
+  "grip": "solid",                           
+  "length": "long",                          
+  "surface": "point",                        
+  "balance": "neutral"                       
+}
 "turns_per_charge": 20, // Charges consumed over time, deprecated in favor of power_draw
 "fuel_efficiency": 0.2, // When combined with being a UPS this item will burn fuel for its given energy value to produce energy with the efficiency provided. Needs to be > 0 for this to work
 "use_action": [ "firestarter" ], // Action performed when tool is used, see special definition below
diff --git a/src/item_factory.cpp b/src/item_factory.cpp
index b5af8bfff8fc6..17734edb9d6d2 100644
--- a/src/item_factory.cpp
+++ b/src/item_factory.cpp
@@ -4191,12 +4191,13 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std:
             def.melee_relative = load_damage_map( jrel.get_object( "melee_damage" ) );
         }
     }
+    def.using_legacy_to_hit = false; // Reset to false so inherited legacy to_hit s aren't flagged
     if( jo.has_int( "to_hit" ) ) {
         assign( jo, "to_hit", def.m_to_hit, strict );
+        def.using_legacy_to_hit = true;
     } else if( jo.has_object( "to_hit" ) ) {
         io::acc_data temp;
-        bool was_loaded = false;
-        mandatory( jo, was_loaded, "to_hit", temp );
+        mandatory( jo, false, "to_hit", temp );
         def.m_to_hit = temp.sum_values();
     }
     optional( jo, false, "variant_type", def.variant_kind, itype_variant_kind::generic );
diff --git a/src/itype.h b/src/itype.h
index 68afdb3d90008..7577e289e2541 100644
--- a/src/itype.h
+++ b/src/itype.h
@@ -1416,7 +1416,10 @@ struct itype {
         /** Value after the Cataclysm, dependent upon practical usages. Price given is for a default-sized stack. */
         units::money price_post = -1_cent;
 
-        int m_to_hit = 0;  // To-hit bonus for melee combat; -5 to 5 is reasonable
+        // TODO: Add some very basic unweildiness calc for non specified to_hit?
+        int m_to_hit = -2;  // To-hit bonus for melee combat, see GAME_BALANCE.md#to-hit-value
+        // itype specifies a legacy raw int to_hit, for use with for item_new_to_hit_enforcement TEST_CASE
+        bool using_legacy_to_hit = false;
 
         unsigned light_emission = 0;   // Exactly the same as item_tags LIGHT_*, this is for lightmap.
 
diff --git a/src/test_data.cpp b/src/test_data.cpp
index 8dfe00ce120c7..e9b884bb76fc0 100644
--- a/src/test_data.cpp
+++ b/src/test_data.cpp
@@ -3,6 +3,7 @@
 #include "flexbuffer_json.h"
 #include "generic_factory.h"
 
+std::set<itype_id> test_data::legacy_to_hit;
 std::set<itype_id> test_data::known_bad;
 std::unordered_set<oter_type_id> test_data::overmap_terrain_coverage_whitelist;
 std::map<vproto_id, std::vector<double>> test_data::drag_data;
@@ -111,6 +112,12 @@ void test_data::load( const JsonObject &jo )
 {
     // It's probably not necessary, but these are set up to
     // extend existing data instead of overwrite it.
+    if( jo.has_array( "legacy_to_hit" ) ) {
+        std::set<itype_id> new_legacy_to_hit;
+        jo.read( "legacy_to_hit", new_legacy_to_hit );
+        legacy_to_hit.insert( new_legacy_to_hit.begin(), new_legacy_to_hit.end() );
+    }
+
     if( jo.has_array( "known_bad" ) ) {
         std::set<itype_id> new_known_bad;
         jo.read( "known_bad", new_known_bad );
diff --git a/src/test_data.h b/src/test_data.h
index 537740cdc7dc9..547987db43520 100644
--- a/src/test_data.h
+++ b/src/test_data.h
@@ -100,7 +100,8 @@ struct item_demographic_test_data {
 class test_data
 {
     public:
-        // todo: remove when all known bad items got fixed
+        static std::set<itype_id> legacy_to_hit;
+        // TODO: remove when all known bad items got fixed
         static std::set<itype_id> known_bad;
         static std::unordered_set<oter_type_id> overmap_terrain_coverage_whitelist;
         static std::map<vproto_id, std::vector<double>> drag_data;
diff --git a/tests/item_test.cpp b/tests/item_test.cpp
index 43e95914b4c05..68c207ab6f063 100644
--- a/tests/item_test.cpp
+++ b/tests/item_test.cpp
@@ -724,6 +724,39 @@ TEST_CASE( "water_affect_items_while_swimming_check", "[item][water][swimming]"
     }
 }
 
+
+TEST_CASE( "item_new_to_hit_enforcement", "[item]" )
+{
+    std::vector<const itype *> all_items = item_controller->all();
+    const std::set<itype_id> &blacklist = test_data::legacy_to_hit;
+    std::string msg_enforce;
+    std::string msg_prune;
+    for( const itype *type : all_items ) {
+        const bool on_blacklist = blacklist.find( type->get_id() ) != blacklist.end();
+        if( type->using_legacy_to_hit ) {
+            if( !on_blacklist ) {
+                msg_enforce += msg_enforce.empty() ? string_format( "\n[\n  \"%s\"", type->get_id().str() ) :
+                               string_format( ",\n  \"%s\"", type->get_id().str() );
+            }
+        } else if( on_blacklist ) {
+            msg_prune += msg_prune.empty() ? string_format( "\n[\n  \"%s\"", type->get_id().str() ) :
+                         string_format( ",\n  \"%s\"", type->get_id().str() );
+        }
+    }
+    if( !msg_enforce.empty() ) {
+        msg_enforce +=
+            "\n]\nThe item(s) above use legacy to_hit, please change them to the newer object method (see /docs/GAME_BALANCE.md#to-hit-value) or remove the to_hit field if the item(s) aren't intended to be used as weapons.";
+    }
+    if( !msg_prune.empty() ) {
+        msg_prune +=
+            "\n]\nThe item(s) above should be removed from the blacklist at /data/mods/TEST_DATA/legacy_to_hit.json.";
+    }
+    CAPTURE( msg_enforce );
+    REQUIRE( msg_enforce.empty() );
+    CAPTURE( msg_prune );
+    REQUIRE( msg_prune.empty() );
+}
+
 static float max_density_for_mats( const std::map<material_id, int> &mats, float total_size )
 {
     REQUIRE( !mats.empty() );
diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp
index ed08598289c8f..96a9d67435c95 100644
--- a/tests/iteminfo_test.cpp
+++ b/tests/iteminfo_test.cpp
@@ -548,7 +548,7 @@ TEST_CASE( "weapon_attack_ratings_and_moves", "[iteminfo][weapon]" )
 
         CHECK( item_info_str( halligan, to_hit ) ==
                "--\n"
-               "  To-hit bonus: <color_c_yellow>+2</color>\n" );
+               "  To-hit bonus: <color_c_yellow>+0</color>\n" );
 
         CHECK( item_info_str( mr_pointy, to_hit ) ==
                "--\n"
@@ -556,7 +556,7 @@ TEST_CASE( "weapon_attack_ratings_and_moves", "[iteminfo][weapon]" )
 
         CHECK( item_info_str( arrow, to_hit ) ==
                "--\n"
-               "  To-hit bonus: <color_c_yellow>+0</color>\n" );
+               "  To-hit bonus: <color_c_yellow>-2</color>\n" );
     }
 
     SECTION( "base moves" ) {
@@ -605,9 +605,9 @@ TEST_CASE( "weapon_attack_ratings_and_moves", "[iteminfo][weapon]" )
         CHECK( item_info_str( halligan, dps ) ==
                "--\n"
                "Typical damage per second:\n"
-               "Best: <color_c_yellow>9.38</color>"
-               "  Vs. Agile: <color_c_yellow>5.74</color>"
-               "  Vs. Armored: <color_c_yellow>2.84</color>\n" );
+               "Best: <color_c_yellow>7.55</color>"
+               "  Vs. Agile: <color_c_yellow>3.85</color>"
+               "  Vs. Armored: <color_c_yellow>2.06</color>\n" );
 
         CHECK( item_info_str( mr_pointy, dps ) ==
                "--\n"
@@ -619,8 +619,8 @@ TEST_CASE( "weapon_attack_ratings_and_moves", "[iteminfo][weapon]" )
         CHECK( item_info_str( arrow, dps ) ==
                "--\n"
                "Typical damage per second:\n"
-               "Best: <color_c_yellow>4.90</color>"
-               "  Vs. Agile: <color_c_yellow>2.46</color>"
+               "Best: <color_c_yellow>3.57</color>"
+               "  Vs. Agile: <color_c_yellow>1.47</color>"
                "  Vs. Armored: <color_c_yellow>0.00</color>\n" );
     }
 
@@ -673,9 +673,9 @@ TEST_CASE( "weapon_attack_ratings_and_moves", "[iteminfo][weapon]" )
         CHECK( item_info_str( halligan, dpstam ) ==
                "--\n"
                "Typical damage per stamina:\n"
-               "Best: <color_c_yellow>3.41</color>"
-               "  Vs. Agile: <color_c_yellow>2.09</color>"
-               "  Vs. Armored: <color_c_yellow>1.03</color>\n" );
+               "Best: <color_c_yellow>2.75</color>"
+               "  Vs. Agile: <color_c_yellow>1.40</color>"
+               "  Vs. Armored: <color_c_yellow>0.75</color>\n" );
 
         CHECK( item_info_str( mr_pointy, dpstam ) ==
                "--\n"
@@ -687,8 +687,8 @@ TEST_CASE( "weapon_attack_ratings_and_moves", "[iteminfo][weapon]" )
         CHECK( item_info_str( arrow, dpstam ) ==
                "--\n"
                "Typical damage per stamina:\n"
-               "Best: <color_c_yellow>7.21</color>"
-               "  Vs. Agile: <color_c_yellow>3.62</color>"
+               "Best: <color_c_yellow>5.25</color>"
+               "  Vs. Agile: <color_c_yellow>2.16</color>"
                "  Vs. Armored: <color_c_yellow>0.00</color>\n" );
     }
 }