Pruning the old to-hit syntax - Part 7 (#76238)

* ``armor\suits_protection.json`` * many many files * all the files * ``armor\arms_armor.json`` * ``armor\custom_bodysuits.json`` * ``armor\custom_boots.json`` * ``armor\custom_headgear.json`` * ``custom_overcoats.json`` * accidentals * Update legacy_to_hit.json
CleverRaven · Sep 7, 2024 · 1c4635d · 1c4635d
1 parent a134527
commit 1c4635d
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 230 deletions.
diff --git a/data/json/items/ammo/sling-ready_grenade.json b/data/json/items/ammo/sling-ready_grenade.json
@@ -10,7 +10,7 @@
     "longest_side": "276 mm",
     "price": "5 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "glass", "cotton" ],
     "symbol": "*",
     "color": "light_gray",
@@ -44,7 +44,7 @@
     "volume": "540 ml",
     "price": "15 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" },
     "material": [ "steel", "plastic" ],
     "symbol": "*",
     "color": "green",

diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
@@ -9,7 +9,7 @@
     "volume": "1500 ml",
     "price": "5 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
     "material": [ "wood" ],
     "symbol": "[",
     "looks_like": "arm_splint",
@@ -29,7 +29,7 @@
         "specifically_covers": [ "arm_lower_r", "arm_lower_l" ]
       }
     ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "carpet_armguards",
@@ -42,7 +42,6 @@
     "volume": "3 L",
     "price": "20 cent",
     "price_postapoc": "10 cent",
-    "to_hit": 1,
     "material": [ "plastic", "carpet_pilling" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -77,7 +76,6 @@
     "volume": "2 L",
     "price": "10 cent",
     "price_postapoc": "5 cent",
-    "to_hit": 1,
     "material": [ "plastic", "carpet_pilling" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -111,7 +109,6 @@
     "volume": "2500 ml",
     "price": "200 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": 1,
     "material": [ "chitin" ],
     "symbol": "[",
     "looks_like": "armguard_hard",
@@ -213,7 +210,6 @@
     "volume": "3 L",
     "price": "35 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 1,
     "material": [ "plastic", "neoprene" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -283,7 +279,6 @@
     "volume": "2 L",
     "price": "40 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -330,7 +325,6 @@
     "volume": "5500 ml",
     "price": "200 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -1,
     "material": [ "steel", "leather" ],
     "symbol": "[",
     "looks_like": "armguard_metal",
@@ -378,7 +372,6 @@
     "volume": "2750 ml",
     "price": "300 USD",
     "price_postapoc": "10 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "repairs_with": [ "steel" ],
     "symbol": "[",
@@ -420,7 +413,6 @@
     "volume": "1 L",
     "price": "150 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "repairs_with": [ "steel" ],
     "symbol": "[",
@@ -462,7 +454,6 @@
     "volume": "2 L",
     "price": "5 USD",
     "price_postapoc": "4 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "repairs_with": [ "steel" ],
     "symbol": "m",
@@ -501,7 +492,6 @@
     "volume": "1 L",
     "price": "5 USD",
     "price_postapoc": "4 USD",
-    "to_hit": 1,
     "material": [ "lc_steel" ],
     "repairs_with": [ "steel" ],
     "symbol": "m",
@@ -556,7 +546,6 @@
     "volume": "500 ml",
     "price": "2 USD 30 cent",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "paper" ],
     "symbol": "[",
     "looks_like": "armguard_larmor",
@@ -586,7 +575,6 @@
     "volume": "2 L",
     "price": "23 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "rubber" ],
     "symbol": "[",
     "looks_like": "armguard_larmor",
@@ -616,7 +604,7 @@
     "volume": "4750 ml",
     "price": "200 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" },
     "material": [ "budget_steel", "cotton" ],
     "symbol": "[",
     "looks_like": "armguard_metal",
@@ -664,7 +652,6 @@
     "volume": "4750 ml",
     "price": "200 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "rubber" ],
     "symbol": "[",
     "looks_like": "armguard_metal",
@@ -710,7 +697,6 @@
     "volume": "1500 ml",
     "price": "12 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "neoprene", "cotton" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -756,7 +742,6 @@
     "volume": "500 ml",
     "price": "12 USD",
     "price_postapoc": "4 USD",
-    "to_hit": 1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -793,7 +778,6 @@
     "volume": "840 ml",
     "price": "12 USD",
     "price_postapoc": "4 USD",
-    "to_hit": 1,
     "material": [ { "type": "kevlar_layered", "portion": 6 }, { "type": "kevlar", "portion": 4 } ],
     "symbol": "[",
     "looks_like": "arm_warmers",
@@ -853,7 +837,6 @@
     "longest_side": "9 cm",
     "price": "75 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -1,
     "symbol": "[",
     "looks_like": "armguard_metal",
     "material": [ "steel" ],
@@ -1102,7 +1085,6 @@
     "volume": "750 ml",
     "price": "35 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
     "looks_like": "armguard_hard",
@@ -1131,7 +1113,7 @@
     "volume": "5250 ml",
     "price": "400 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
     "material": [ "bronze", "leather" ],
     "symbol": "[",
     "looks_like": "armguard_lightplate",
@@ -1149,7 +1131,8 @@
         "cover_vitals": 70,
         "specifically_covers": [ "arm_lower_r", "arm_lower_l" ]
       }
-    ]
+    ],
+    "melee_damage": { "bash": 5 }
   },
   {
     "id": "xl_armguard_bronze",
@@ -1177,7 +1160,6 @@
     "volume": "1 L",
     "price": "20 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "armguard_larmor",
@@ -1236,7 +1218,7 @@
     "volume": "2916 ml",
     "price": "600 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
     "symbol": "[",
     "looks_like": "armguard_metal",
     "material": [ "lc_steel", "lc_steel_chain" ],
@@ -1395,7 +1377,7 @@
     "volume": "2916 ml",
     "price": "600 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
     "symbol": "[",
     "looks_like": "armor_larmor",
     "material": [ "lc_steel", "lc_steel_chain" ],
@@ -1554,7 +1536,7 @@
     "volume": "2916 ml",
     "price": "600 USD",
     "price_postapoc": "120 USD",
-    "to_hit": -5,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
     "symbol": "[",
     "looks_like": "armor_larmor",
     "color": "light_gray",
@@ -1752,7 +1734,6 @@
     "volume": "2500 ml",
     "price": "100 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -3,
     "material": [ "thermo_resin", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "armguard_hard",

diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
@@ -355,7 +355,6 @@
     "volume": "40 ml",
     "price": "6 USD",
     "price_postapoc": "15 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "leather_pouch",
@@ -407,7 +406,6 @@
     "volume": "40 ml",
     "price": "6 USD",
     "price_postapoc": "15 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "leather_pouch",
@@ -433,7 +431,6 @@
     "volume": "40 ml",
     "price": "6 USD",
     "price_postapoc": "15 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "leather_pouch",

diff --git a/data/json/items/armor/belts.json b/data/json/items/armor/belts.json
@@ -73,7 +73,6 @@
     "volume": "250 ml",
     "price": "10 USD",
     "price_postapoc": "25 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "material_thickness": 2,
@@ -236,7 +235,6 @@
     "volume": "250 ml",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "dark_gray"