Pruning the old to-hit syntax - Part 5 (#76140)

* ``resources\alien.json`` * ``generic.json`` * ``armor\ammo_pouch.json`` + ``armor\cloaks.json`` * ``comestibles\other.json`` + ``comestibles\raw_veggy.json`` * ``armor\scarfs.json`` * tests
CleverRaven · Sep 5, 2024 · 80d3258 · 80d3258
1 parent 9eb34ae
commit 80d3258
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 213 deletions.
diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
@@ -8,7 +8,6 @@
     "volume": "500 ml",
     "price": "20 USD",
     "price_postapoc": "6 USD",
-    "to_hit": 1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "leather_pouch",
@@ -71,8 +70,7 @@
       }
     ],
     "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY", "PALS_LARGE" ],
-    "armor": [ { "encumbrance": 2, "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance": 2, "coverage": 100, "covers": [ "torso" ], "specifically_covers": [ "torso_waist" ] } ]
   },
   {
     "id": "ammo_satchel",
@@ -1269,7 +1267,7 @@
     "weight": "4210 g",
     "volume": "8 L",
     "price_postapoc": "25 USD",
-    "to_hit": -3,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" },
     "material": [ "kevlar_layered", "nylon" ],
     "symbol": "[",
     "looks_like": "kevlar",
@@ -1302,7 +1300,7 @@
         "specifically_covers": [ "torso_lower" ]
       }
     ],
-    "melee_damage": { "bash": 6 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "ammo_satchel_leather",
@@ -1371,7 +1369,6 @@
     "volume": "25 ml",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 1,
     "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "leather_pouch",
@@ -1390,8 +1387,7 @@
       }
     ],
     "flags": [ "CANT_WEAR", "WATER_FRIENDLY", "PALS_SMALL" ],
-    "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso" ] } ]
   },
   {
     "id": "belt_loop_medium",
@@ -1402,7 +1398,6 @@
     "volume": "50 ml",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 1,
     "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "leather_pouch",
@@ -1421,8 +1416,7 @@
       }
     ],
     "flags": [ "CANT_WEAR", "WATER_FRIENDLY", "PALS_MEDIUM" ],
-    "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso" ] } ]
   },
   {
     "id": "belt_loop_large",
@@ -1433,7 +1427,6 @@
     "volume": "100 ml",
     "price": "10 USD",
     "price_postapoc": "1 USD",
-    "to_hit": 1,
     "material": [ "nylon" ],
     "symbol": "[",
     "looks_like": "leather_pouch",
@@ -1452,7 +1445,6 @@
       }
     ],
     "flags": [ "CANT_WEAR", "WATER_FRIENDLY", "PALS_LARGE" ],
-    "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso" ] } ],
-    "melee_damage": { "bash": 1 }
+    "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "torso" ] } ]
   }
 ]
diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json
@@ -8,7 +8,6 @@
     "volume": "2 L",
     "price": "50 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "towel",
@@ -1565,7 +1564,6 @@
     "volume": "3 L",
     "price": "50 USD",
     "price_postapoc": "1 USD 50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "]",
     "looks_like": "cloak",
@@ -1641,7 +1639,6 @@
     "volume": "1600 ml",
     "price": "20 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "dry_plant" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -1669,7 +1666,6 @@
     "volume": "3 L",
     "price": "107 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "coat_rain",
@@ -1700,7 +1696,6 @@
     "price": "200 USD",
     "price_postapoc": "15 USD",
     "material": [ "denim" ],
-    "to_hit": -3,
     "looks_like": "coat_rain",
     "symbol": "[",
     "color": "light_blue",
@@ -1727,7 +1722,6 @@
     "volume": "2500 ml",
     "price": "108 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -1776,7 +1770,6 @@
     "volume": "2000 ml",
     "price": "90 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -1804,7 +1797,6 @@
     "volume": "4 L",
     "price": "245 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
     "material": [ "fur" ],
     "symbol": "[",
     "looks_like": "cloak_leather",
@@ -1833,7 +1825,6 @@
     "volume": "3500 ml",
     "price": "245 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "leather" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -1862,7 +1853,6 @@
     "volume": "3750 ml",
     "price": "245 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
     "material": [ "wool" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -1891,7 +1881,6 @@
     "volume": "2500 ml",
     "price": "225 USD",
     "price_postapoc": "5 USD",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "robe",
@@ -1920,7 +1909,6 @@
     "volume": "3500 ml",
     "price": "55 kUSD",
     "price_postapoc": "250 USD",
-    "to_hit": -1,
     "material": [ "plastic" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -1976,7 +1964,6 @@
     "volume": "1250 ml",
     "price": "120 USD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
     "material": [ "wool" ],
     "symbol": "[",
     "looks_like": "cloak",
@@ -2016,7 +2003,6 @@
     "material": [ "vinyl" ],
     "weight": "30 g",
     "volume": "50 ml",
-    "to_hit": -1,
     "flags": [ "RAINPROOF", "OVERSIZE", "HOOD", "BELTED" ],
     "environmental_protection": 1,
     "material_thickness": 0.1,
@@ -2085,7 +2071,6 @@
     "volume": "3 L",
     "price": "36 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "blanket",