Pruning the old to-hit syntax - Part 9 (#76327)

* three files * ``armor\head_attachments.json`` * ``armor\helmets.json`` * group commit * ``armor\jewelry.json`` * ``armor\legs_armor.json`` * ``armor\masks.json`` * ``armor\storage.json`` * Update helmets.json * Update legacy_to_hit.json * Update integrated.json * Update integrated_dps.json
CleverRaven · Oct 24, 2024 · a59aed1 · a59aed1
1 parent 96d0a8c
commit a59aed1
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 220 deletions.
diff --git a/data/json/items/armor/cardboard.json b/data/json/items/armor/cardboard.json
@@ -22,8 +22,7 @@
     "material_thickness": 5,
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "WATER_DISSOLVE", "VARSIZE", "HARD", "PSYSHIELD_PARTIAL", "FRAGILE" ],
-    "melee_damage": { "bash": 0 }
+    "flags": [ "WATER_DISSOLVE", "VARSIZE", "HARD", "PSYSHIELD_PARTIAL", "FRAGILE" ]
   },
   {
     "id": "armor_cardboard",
@@ -36,7 +35,6 @@
     "volume": "17500 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -5,
     "material": [ "cardboard", "paper" ],
     "symbol": "[",
     "color": "brown_yellow",
@@ -72,8 +70,7 @@
         "coverage": 100,
         "encumbrance": 23
       }
-    ],
-    "melee_damage": { "bash": 0 }
+    ]
   },
   {
     "id": "armor_cardboard_cuirass",
@@ -86,16 +83,14 @@
     "volume": "6 L",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -5,
     "material": [ "cardboard", "paper" ],
     "symbol": "[",
     "color": "brown_yellow",
     "longest_side": "60 cm",
     "warmth": 15,
     "material_thickness": 6,
     "flags": [ "WATER_DISSOLVE", "FRAGILE_MELEE", "VARSIZE", "OUTER", "HARD" ],
-    "armor": [ { "encumbrance": 12, "coverage": 90, "covers": [ "torso" ] } ],
-    "melee_damage": { "bash": 0 }
+    "armor": [ { "encumbrance": 12, "coverage": 90, "covers": [ "torso" ] } ]
   },
   {
     "id": "cardboard_crown",

diff --git a/data/json/items/armor/exotic.json b/data/json/items/armor/exotic.json
@@ -237,7 +237,6 @@
     "volume": "250 ml",
     "price": "10 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "plastic", "steel" ],
     "symbol": ",",
     "color": "red",
@@ -365,7 +364,6 @@
     "volume": "1 L",
     "price": "49 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -3,
     "material": [ "monolith" ],
     "symbol": "[",
     "color": "dark_gray",

diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json
@@ -233,7 +233,6 @@
     "volume": "250 ml",
     "price": "14 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -3,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "glasses_safety",

diff --git a/data/json/items/armor/head_attachments.json b/data/json/items/armor/head_attachments.json
@@ -219,7 +219,6 @@
     "material": [ "plastic", "steel", "glass" ],
     "symbol": "[",
     "color": "dark_gray",
-    "to_hit": -3,
     "charges_per_use": 1,
     "ammo": "battery",
     "use_action": {
@@ -278,7 +277,6 @@
     "material": [ "plastic", "steel", "glass" ],
     "symbol": "[",
     "color": "dark_gray",
-    "to_hit": -3,
     "charges_per_use": 1,
     "ammo": "battery",
     "use_action": {
@@ -345,7 +343,6 @@
     "material": [ "plastic", "steel", "glass" ],
     "symbol": "[",
     "color": "dark_gray",
-    "to_hit": -3,
     "charges_per_use": 1,
     "ammo": "battery",
     "use_action": {
@@ -482,11 +479,10 @@
     "category": "armor",
     "name": { "str": "mild steel chainmail partial aventail" },
     "description": "A wide chainmail ring designed to attach to a cap helmet, hanging down to extend protection to the face and neck.",
-    "weight": "1000 g",
+    "weight": "1 kg",
     "volume": "300 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "lc_steel_chain" ],
     "symbol": "[",
     "warmth": 3,
@@ -627,7 +623,6 @@
     "volume": "450 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "13 USD",
-    "to_hit": -1,
     "material": [ "lc_steel_chain" ],
     "symbol": "[",
     "warmth": 3,
@@ -763,11 +758,10 @@
     "category": "armor",
     "name": { "str": "mild steel armored face mask" },
     "description": "A metal face mask designed to attach to a cap helmet to protect the lower half.  This is a crude, dull facsimile of the original masterpieces made of mild steel.",
-    "weight": "2000 g",
+    "weight": "2 kg",
     "volume": "300 ml",
     "price": "50 USD 12 cent",
     "price_postapoc": "13 USD",
-    "to_hit": -1,
     "material": [ "lc_steel" ],
     "symbol": "[",
     "warmth": 3,

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
@@ -116,7 +116,6 @@
     "volume": "1 L",
     "price": "40 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "plastic_pad", "leather" ],
     "symbol": "[",
     "looks_like": "balclava",
@@ -168,7 +167,7 @@
     "longest_side": "28 cm",
     "price": "150 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "hat_hard",
@@ -255,7 +254,7 @@
         "transparent": true
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_army_outdated",
@@ -270,7 +269,7 @@
     "price": "200 USD",
     "//": "assuming this is an antique and not a cheap replica",
     "price_postapoc": "12 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "hc_steel", "plastic", "leather" ],
     "repairs_with": [ "hc_steel" ],
     "symbol": "[",
@@ -349,7 +348,7 @@
     "volume": "2250 ml",
     "price": "250 USD",
     "price_postapoc": "25 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "helmet_motor",
@@ -377,7 +376,7 @@
         "inherits_flags": false
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "tac_helmet",
@@ -389,7 +388,7 @@
     "volume": "1850 ml",
     "price": "200 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "kevlar_rigid", "plastic" ],
     "symbol": "[",
     "looks_like": "tac_fullhelmet",
@@ -476,7 +475,7 @@
         "transparent": true
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "firehelmet",
@@ -489,7 +488,7 @@
     "longest_side": "30 cm",
     "price": "240 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "nomex" ],
     "symbol": "[",
     "looks_like": "cowboy_hat",
@@ -517,7 +516,7 @@
         "specifically_covers": [ "head_ear_l", "head_ear_r", "head_nape" ]
       }
     ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_ball",
@@ -529,7 +528,6 @@
     "volume": "1750 ml",
     "price": "31 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
     "material": [ "plastic", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "hat_hard",
@@ -560,8 +558,7 @@
         "covers": [ "head" ],
         "specifically_covers": [ "head_ear_l", "head_ear_r" ]
       }
-    ],
-    "melee_damage": { "bash": 2 }
+    ]
   },
   {
     "id": "helmet_aztec",
@@ -577,8 +574,8 @@
     "price": "150 USD",
     "price_postapoc": "12 USD 50 cent",
     "material": [ "wood", "cotton" ],
-    "to_hit": -1,
-    "melee_damage": { "bash": 6 },
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "melee_damage": { "bash": 1 },
     "techniques": [ "WBLOCK_1" ],
     "warmth": 15,
     "flags": [ "VARSIZE", "STURDY", "PADDED", "WATERPROOF", "NO_REPAIR" ],
@@ -669,7 +666,8 @@
     "material_thickness": 4,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "STURDY" ],
-    "melee_damage": { "bash": 3 }
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "xl_helmet_barbute",
@@ -1220,16 +1218,14 @@
     "volume": "250 ml",
     "price": "10 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "balclava",
     "color": "green",
     "warmth": 30,
     "material_thickness": 0.5,
     "flags": [ "VARSIZE", "SKINTIGHT" ],
-    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ]
   },
   {
     "id": "helmet_motor",
@@ -1242,7 +1238,7 @@
     "longest_side": "33 cm",
     "price": "325 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "hard_plastic_transp", "epoxy", "plastic_pad" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -1319,7 +1315,7 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "WATERPROOF", "STURDY", "PADDED", "SUN_GLASSES" ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_motor_raised",
@@ -1334,7 +1330,7 @@
     "longest_side": "33 cm",
     "price": "325 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "epoxy" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -1389,7 +1385,7 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "WATERPROOF", "STURDY", "PADDED" ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 1 }
   },
   {
     "id": "helmet_riding",
@@ -1710,6 +1706,7 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "STURDY" ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 3 }
   },
   {
@@ -1765,7 +1762,8 @@
     "environmental_protection": 1,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "STURDY" ],
-    "melee_damage": { "bash": 1 }
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "xl_helmet_kettle",
@@ -1785,7 +1783,7 @@
     "volume": "2750 ml",
     "price": "350 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "budget_steel", "cotton" ],
     "symbol": "[",
     "looks_like": "helmet_plate",
@@ -1804,7 +1802,7 @@
         "encumbrance_modifiers": [ "IMBALANCED" ]
       }
     ],
-    "melee_damage": { "bash": 1 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "xl_helmet_scrap",
@@ -1865,6 +1863,7 @@
         "encumbrance": 10
       }
     ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 3 }
   },
   {
@@ -1907,6 +1906,7 @@
         "encumbrance_modifiers": [ "RESTRICTS_NECK", "WELL_SUPPORTED" ]
       }
     ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 3 }
   },
   {
@@ -1944,6 +1944,7 @@
         "specifically_covers": [ "head_crown", "head_forehead" ]
       }
     ],
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 2 }
   },
   {
@@ -1956,7 +1957,7 @@
     "volume": "1750 ml",
     "price": "240 USD",
     "price_postapoc": "35 USD",
-    "to_hit": -3,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "point", "balance": "clumsy" },
     "material": [ "leather", "iron" ],
     "symbol": "[",
     "looks_like": "helmet_plate",
@@ -2917,7 +2918,6 @@
     "volume": "1850 ml",
     "price": "60 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "plastic", "plastic_pad" ],
     "symbol": "[",
     "looks_like": "helmet_army",
@@ -3010,8 +3010,7 @@
         "flag_restriction": [ "HELMET_HEAD_ATTACHMENT" ],
         "transparent": true
       }
-    ],
-    "melee_damage": { "bash": 1 }
+    ]
   },
   {
     "id": "lc_helmet_turban",