Pruning the old to-hit syntax - Part 12 (CleverRaven#78496)

* ranged folder * wood and tailoring * stone and misc * glass, metal, and home improvement * get started on tools * clean up the comments in this one or I'll go insane * deployables * the booms * Update throwing.json * please the tests
RenechCDDA · Dec 12, 2024 · d8b8100 · d8b8100
1 parent 2a8e243
commit d8b8100
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 281 deletions.
diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json
@@ -81,7 +81,7 @@
     "volume": "1375 ml",
     "longest_side": "150 cm",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "uneven" },
     "ranged_damage": { "damage_type": "bullet", "amount": 10 },
     "range": 10,
     "dispersion": 200,
@@ -90,7 +90,7 @@
     "valid_mod_locations": [ [ "bore", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "rock": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 16 }
+    "melee_damage": { "bash": 14 }
   },
   {
     "id": "wristrocket",

diff --git a/data/json/items/ranged/throwing.json b/data/json/items/ranged/throwing.json
@@ -12,7 +12,6 @@
     "material": [ "cotton", "stone" ],
     "symbol": ";",
     "color": "blue",
-    "to_hit": -1,
     "ammo_type": "thrown",
     "flags": [ "NOGIB", "TANGLE", "PRIMITIVE_RANGED_WEAPON" ]
   },
@@ -44,9 +43,7 @@
     "description": "A plastic frisbee made for outdoor games.",
     "material": [ "plastic" ],
     "volume": "500 ml",
-    "weight": "175 g",
-    "thrown_damage": [ { "damage_type": "bash", "amount": 1 } ],
-    "melee_damage": { "bash": 1 }
+    "weight": "175 g"
   },
   {
     "id": "net",
@@ -78,9 +75,9 @@
     "volume": "500 ml",
     "weight": "175 g",
     "longest_side": "30 cm",
-    "to_hit": -1,
-    "thrown_damage": [ { "damage_type": "stab", "amount": 16 } ],
-    "melee_damage": { "cut": 8 }
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
+    "thrown_damage": [ { "damage_type": "stab", "amount": 12 } ],
+    "melee_damage": { "cut": 4 }
   },
   {
     "type": "GENERIC",
@@ -97,7 +94,7 @@
     "volume": "500 ml",
     "weight": "300 g",
     "longest_side": "30 cm",
-    "to_hit": -1,
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "neutral" },
     "thrown_damage": [ { "damage_type": "stab", "amount": 18 }, { "damage_type": "bash", "amount": 4 } ],
     "melee_damage": { "cut": 8 }
   },
@@ -115,7 +112,7 @@
     "volume": "3058 ml",
     "weight": "1000 g",
     "longest_side": "43 cm",
-    "to_hit": -1,
+    "to_hit": { "grip": "weapon", "length": "short", "surface": "line", "balance": "uneven" },
     "weapon_category": [ "HAND_AXES" ],
     "thrown_damage": [ { "damage_type": "bash", "amount": 6 }, { "damage_type": "cut", "amount": 16 } ],
     "melee_damage": { "bash": 10, "cut": 17 }
@@ -126,7 +123,7 @@
     "category": "weapons",
     "price": "52 USD",
     "price_postapoc": "5 USD",
-    "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "neutral" },
+    "to_hit": { "grip": "none", "length": "hand", "surface": "point", "balance": "neutral" },
     "name": { "str": "throwing knife", "str_pl": "throwing knives" },
     "symbol": ";",
     "color": "light_gray",
@@ -138,7 +135,7 @@
     "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ],
     "weapon_category": [ "KNIVES" ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ],
-    "melee_damage": { "bash": 1, "stab": 10 }
+    "melee_damage": { "stab": 10 }
   },
   {
     "id": "throwing_stick",

diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json
@@ -18,7 +18,7 @@
       "done_message": "You carefully place the shards on the ground, ready to be cracked by something passing by."
     },
     "flags": [ "HURT_WHEN_WIELDED", "TRADER_AVOID", "SINGLE_USE", "FRAGILE_MELEE", "ALLOWS_BODY_BLOCK" ],
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "point", "balance": "neutral" },
     "melee_damage": { "cut": 6 },
     "weapon_category": [ "SHIVS" ]
   },
@@ -36,7 +36,7 @@
     "weight": "6577 g",
     "volume": "2655 ml",
     "longest_side": "122 cm",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "use_action": {
       "type": "place_trap",
       "trap": "tr_glass",
@@ -61,7 +61,7 @@
     "weight": "45900 g",
     "volume": "21200 ml",
     "longest_side": "122 cm",
-    "to_hit": -6,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 6 }
   },
   {
@@ -94,7 +94,7 @@
     "weight": "17514 g",
     "volume": "7070 ml",
     "longest_side": "122 cm",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 6 }
   }
 ]
diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json
@@ -182,8 +182,7 @@
     "price_postapoc": "50 cent",
     "material": [ "brass", "glass" ],
     "weight": "5 g",
-    "volume": "250 ml",
-    "to_hit": -3
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -198,7 +197,6 @@
     "price_postapoc": "50 cent",
     "material": [ "plastic" ],
     "weight": "25 g",
-    "volume": "1000 ml",
-    "to_hit": -3
+    "volume": "1000 ml"
   }
 ]
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
@@ -65,7 +65,7 @@
     "category": "spare_parts",
     "weight": "345 g",
     "longest_side": "60 cm",
-    "to_hit": -1,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "neutral" },
     "color": "light_red",
     "symbol": "/",
     "material": [ "copper" ],
@@ -248,7 +248,7 @@
     "//": "Roughly in the 15cm×15cm to 20cm×20cm range. Compact and stacks well, so equally dense as a solid block.",
     "price": "20 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "stack_size": 8,
     "material": [ "lc_steel" ],
     "symbol": "]",
@@ -288,7 +288,7 @@
     "//1": "250ml × 8.0 = 2kg -> 1000g/unit @ stack 2; formed as a solid ingot so weight is 100% of this",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -4,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "stack_size": 2,
     "material": [ "steel" ],
     "symbol": ",",

diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -3,9 +3,9 @@
     "type": "GENERIC",
     "id": "bee_sting",
     "name": { "str": "bee stinger" },
-    "description": "A six-inch stinger from a giant bee.  Makes a mediocre melee weapon.",
+    "description": "A six-inch stinger from a giant bee.  Makes a poor melee weapon.",
     "weight": "540 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "point", "balance": "neutral" },
     "color": "white",
     "symbol": ",",
     "material": [ "flesh" ],
@@ -14,7 +14,7 @@
     "weapon_category": [ "SHIVS" ],
     "price": "30 USD",
     "price_postapoc": "0 cent",
-    "melee_damage": { "stab": 10 }
+    "melee_damage": { "stab": 8 }
   },
   {
     "type": "GENERIC",
@@ -23,7 +23,7 @@
     "description": "A long-handled broom.  Makes a terrible weapon unless you're chasing cats.",
     "weight": "929 g",
     "longest_side": "140 cm",
-    "to_hit": 1,
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "neutral" },
     "color": "yellow",
     "symbol": "/",
     "material": [ "wood" ],
@@ -57,7 +57,7 @@
     "name": { "str": "fungal fighter stinger" },
     "description": "A short dart from a fungal fighter.  Makes a poor melee weapon.",
     "weight": "270 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "point", "balance": "neutral" },
     "color": "green",
     "symbol": ",",
     "material": [ "veggy" ],
@@ -165,7 +165,7 @@
     "weight": "500 g",
     "volume": "250 ml",
     "longest_side": "8 cm",
-    "to_hit": -3,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "line", "balance": "neutral" },
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -50 ] ],
     "flags": [ "ALLOWS_BODY_BLOCK" ],
     "melee_damage": { "bash": 5, "cut": 3 },
@@ -228,16 +228,15 @@
     "price_postapoc": "2 USD 50 cent",
     "material": [ "plastic", "steel" ],
     "weight": "600 g",
-    "volume": "250 ml",
-    "to_hit": 1
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
     "id": "wasp_sting",
     "name": { "str": "wasp stinger" },
     "description": "A six-inch stinger from a giant wasp.  Makes a poor melee weapon.",
     "weight": "540 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "point", "balance": "neutral" },
     "color": "dark_gray",
     "symbol": ",",
     "material": [ "flesh" ],
@@ -258,7 +257,7 @@
     "material": [ "steel" ],
     "weight": "1814 g",
     "volume": "200 ml",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "flags": [ "TRADER_AVOID" ],
     "melee_damage": { "bash": 15 }
   },

diff --git a/data/json/items/resources/stone.json b/data/json/items/resources/stone.json
@@ -17,7 +17,7 @@
     "range": 10,
     "dispersion": 14,
     "loudness": 0,
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" },
     "recovery_chance": 98,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "bash": 7 }
@@ -85,7 +85,7 @@
     "material": [ "stone" ],
     "volume": "250 ml",
     "longest_side": "40 cm",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
     "melee_damage": { "bash": 7 }
   },
   {
@@ -101,8 +101,8 @@
     "price_postapoc": "20 cent",
     "material": [ "stone" ],
     "volume": "36 L",
-    "longest_side": "2000 cm",
-    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
+    "longest_side": "200 cm",
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 28 }
   },
   {
@@ -119,8 +119,8 @@
     "material": [ "stone" ],
     "volume": "250 ml",
     "longest_side": "40 cm",
-    "to_hit": -1,
-    "melee_damage": { "bash": 7 }
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
+    "melee_damage": { "bash": 5 }
   },
   {
     "type": "GENERIC",
@@ -135,8 +135,8 @@
     "price_postapoc": "20 cent",
     "material": [ "stone" ],
     "volume": "36 L",
-    "longest_side": "2000 cm",
-    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
+    "longest_side": "200 cm",
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 28 }
   }
 ]
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
@@ -259,8 +259,7 @@
     "flags": [ "NO_SALVAGE" ],
     "weight": "40 g",
     "volume": "125 ml",
-    "category": "spare_parts",
-    "to_hit": -1
+    "category": "spare_parts"
   },
   {
     "type": "GENERIC",
@@ -310,8 +309,7 @@
     "flags": [ "NO_SALVAGE" ],
     "weight": "372 g",
     "volume": "465 ml",
-    "category": "spare_parts",
-    "to_hit": -1
+    "category": "spare_parts"
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/resources/wood.json b/data/json/items/resources/wood.json
@@ -13,7 +13,7 @@
     "weight": "30 kg",
     "volume": "50 L",
     "longest_side": "140 cm",
-    "to_hit": -10,
+    "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" },
     "flags": [ "FIREWOOD" ],
     "melee_damage": { "bash": 10 }
   },
@@ -29,11 +29,11 @@
     "weight": "150 g",
     "volume": "250 ml",
     "longest_side": "30 cm",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "neutral" },
     "qualities": [ [ "COOK", 1 ] ],
     "use_action": [ "HEAT_SOLID_ITEMS" ],
     "flags": [ "NO_SALVAGE", "TRADER_AVOID", "FIREWOOD" ],
-    "melee_damage": { "bash": 4 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "type": "GENERIC",
@@ -363,7 +363,7 @@
     "category": "spare_parts",
     "weight": "12 kg",
     "longest_side": "122 cm",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" },
     "color": "brown",
     "looks_like": "2x4",
     "symbol": "H",
@@ -383,7 +383,7 @@
     "//": "Weight and volume assumes 32 square feet of 1/2 inch plywood.  Due to its enormously bulky shape, volume is higher than actual displacement volume",
     "category": "spare_parts",
     "weight": "24 kg",
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" },
     "color": "brown",
     "symbol": "H",
     "material": [ "wood" ],
@@ -402,8 +402,8 @@
     "description": "A giant screw carved out of solid wood, a simple component used to convert rotational energy into a downward movement of greater force.",
     "category": "spare_parts",
     "//": "weight for a bit less than 3x3x4 wooden beam at 0.60 g/cm3 density, substracted from wood beam stats above",
-    "weight": "15000 g",
-    "volume": "25000 ml",
+    "weight": "15 kg",
+    "volume": "25 L",
     "longest_side": "120 cm",
     "color": "brown",
     "symbol": "§",