From 80d3258b30407a7544770269798fd9297b78f4c4 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Thu, 5 Sep 2024 02:42:01 +0200 Subject: [PATCH] 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 --- data/json/items/armor/ammo_pouch.json | 20 ++-- data/json/items/armor/cloaks.json | 15 --- data/json/items/armor/scarfs.json | 35 ------- data/json/items/comestibles/other.json | 12 --- data/json/items/comestibles/raw_veggy.json | 3 - data/json/items/generic.json | 48 ++++------ data/json/items/resources/alien.json | 14 +-- data/json/items/tool_armor.json | 1 - .../expected_dps_data/shortswords_dps.json | 1 - .../expected_dps_data/swords_dps.json | 1 - data/mods/TEST_DATA/legacy_to_hit.json | 91 +------------------ 11 files changed, 28 insertions(+), 213 deletions(-) diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index bbe6239955052..194f17161ade8 100644 --- 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 index 88c95761a158b..aef23a62b7659 100644 --- 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", diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json index 2c99f03665ada..5f033b4f1c49a 100644 --- a/data/json/items/armor/scarfs.json +++ b/data/json/items/armor/scarfs.json @@ -27,7 +27,6 @@ "volume": "250 ml", "price": "85 cent", "price_postapoc": "50 cent", - "to_hit": -1, "material": [ "cotton" ], "symbol": "[", "looks_like": "scarf", @@ -47,7 +46,6 @@ "volume": "564 ml", "price": "2 USD 50 cent", "price_postapoc": "50 cent", - "to_hit": -1, "material": [ "cotton" ], "symbol": "[", "looks_like": "scarf", @@ -71,7 +69,6 @@ "material": [ "cotton" ], "weight": "60 g", "volume": "500 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "patchwork_scarf_loose", "menu_text": "Loosen" }, "flags": [ "OUTER" ], "warmth": 20, @@ -92,7 +89,6 @@ "material": [ "cotton" ], "weight": "60 g", "volume": "500 ml", - "to_hit": -3, "revert_to": "patchwork_scarf", "use_action": { "type": "transform", @@ -119,7 +115,6 @@ "material": [ "cotton" ], "weight": "60 g", "volume": "500 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "patchwork_scarf", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 20, @@ -140,7 +135,6 @@ "material": [ "cotton" ], "weight": "120 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "long_patchwork_scarf_loose", "menu_text": "Loosen" }, "flags": [ "OVERSIZE", "POCKETS", "OUTER" ], "warmth": 20, @@ -161,7 +155,6 @@ "material": [ "cotton" ], "weight": "120 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You wrap your %s around your head.", @@ -188,7 +181,6 @@ "material": [ "cotton" ], "weight": "120 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "long_patchwork_scarf", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 20, @@ -209,7 +201,6 @@ "material": [ "cotton" ], "weight": "96 g", "volume": "750 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "knit_scarf_loose", "menu_text": "Loosen" }, "flags": [ "OUTER" ], "warmth": 20, @@ -230,7 +221,6 @@ "material": [ "cotton" ], "weight": "96 g", "volume": "750 ml", - "to_hit": -3, "revert_to": "knit_scarf", "use_action": { "type": "transform", @@ -257,7 +247,6 @@ "material": [ "cotton" ], "weight": "96 g", "volume": "750 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "knit_scarf", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 20, @@ -278,7 +267,6 @@ "material": [ "cotton" ], "weight": "192 g", "volume": "1250 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "long_knit_scarf_loose", "menu_text": "Loosen" }, "flags": [ "OVERSIZE", "POCKETS", "OUTER" ], "warmth": 20, @@ -299,7 +287,6 @@ "material": [ "cotton" ], "weight": "192 g", "volume": "1250 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You wrap your %s around your head.", @@ -326,7 +313,6 @@ "material": [ "cotton" ], "weight": "192 g", "volume": "1250 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "long_knit_scarf", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 20, @@ -347,7 +333,6 @@ "material": [ "wool" ], "weight": "100 g", "volume": "750 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_loose", "menu_text": "Loosen" }, "flags": [ "OUTER" ], "warmth": 45, @@ -368,7 +353,6 @@ "material": [ "wool" ], "weight": "80 g", "volume": "750 ml", - "to_hit": -3, "revert_to": "scarf", "use_action": { "type": "transform", @@ -395,7 +379,6 @@ "material": [ "wool" ], "weight": "80 g", "volume": "750 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 45, @@ -416,7 +399,6 @@ "material": [ "wool" ], "weight": "160 g", "volume": "1250 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_long_loose", "menu_text": "Loosen" }, "flags": [ "OVERSIZE", "POCKETS", "OUTER" ], "warmth": 45, @@ -437,7 +419,6 @@ "material": [ "wool" ], "weight": "160 g", "volume": "1250 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You wrap your %s around your head.", @@ -464,7 +445,6 @@ "material": [ "wool" ], "weight": "160 g", "volume": "1250 ml", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_long", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 45, @@ -485,7 +465,6 @@ "material": [ "fur" ], "weight": "140 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_fur_loose", "menu_text": "Loosen" }, "flags": [ "OUTER" ], "warmth": 65, @@ -506,7 +485,6 @@ "material": [ "fur" ], "weight": "140 g", "volume": "1 L", - "to_hit": -3, "revert_to": "scarf_fur", "use_action": { "type": "transform", @@ -533,7 +511,6 @@ "material": [ "fur" ], "weight": "140 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_fur", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 65, @@ -554,7 +531,6 @@ "material": [ "fur" ], "weight": "280 g", "volume": "2 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_fur_long_loose", "menu_text": "Loosen" }, "flags": [ "OVERSIZE", "POCKETS", "OUTER" ], "warmth": 65, @@ -575,7 +551,6 @@ "material": [ "fur" ], "weight": "280 g", "volume": "2 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You wrap your %s around your head.", @@ -602,7 +577,6 @@ "material": [ "fur" ], "weight": "280 g", "volume": "2 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_fur_long", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 65, @@ -623,7 +597,6 @@ "material": [ "faux_fur" ], "weight": "140 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_faux_fur_loose", "menu_text": "Loosen" }, "flags": [ "OUTER" ], "warmth": 50, @@ -645,7 +618,6 @@ "material": [ "faux_fur" ], "weight": "140 g", "volume": "1 L", - "to_hit": -3, "revert_to": "scarf_faux_fur", "use_action": { "type": "transform", @@ -672,7 +644,6 @@ "material": [ "faux_fur" ], "weight": "140 g", "volume": "1 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_faux_fur", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 50, @@ -693,7 +664,6 @@ "material": [ "faux_fur" ], "weight": "280 g", "volume": "2 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_faux_fur_long_loose", "menu_text": "Loosen" }, "flags": [ "OVERSIZE", "POCKETS", "OUTER" ], "warmth": 50, @@ -715,7 +685,6 @@ "material": [ "faux_fur" ], "weight": "280 g", "volume": "2 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You wrap your %s around your head.", @@ -742,7 +711,6 @@ "material": [ "faux_fur" ], "weight": "280 g", "volume": "2 L", - "to_hit": -3, "use_action": { "type": "transform", "msg": "You lower your %s.", "target": "scarf_faux_fur_long", "menu_text": "Lower" }, "flags": [ "OUTER" ], "warmth": 50, @@ -768,7 +736,6 @@ "volume": "1250 ml", "price": "10 cent", "price_postapoc": "5 cent", - "to_hit": -1, "material": [ "dry_plant" ], "symbol": "[", "looks_like": "scarf", @@ -788,7 +755,6 @@ "volume": "250 ml", "price": "6 USD", "price_postapoc": "60 cent", - "to_hit": -1, "material": [ "cotton" ], "symbol": "[", "color": "white", @@ -811,7 +777,6 @@ "material": [ "wool" ], "weight": "500 g", "volume": "1 L", - "to_hit": -3, "flags": [ "OUTER", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ], "warmth": 45, "environmental_protection": 2, diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 2990a08da224d..c7744f9c84f68 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -1021,7 +1021,6 @@ "volume": "250 ml", "price": "1 USD", "price_postapoc": "25 cent", - "to_hit": -5, "material": [ "veggy" ], "symbol": ";", "quench": 1, @@ -1044,7 +1043,6 @@ "volume": "1750 ml", "price": "7 USD", "price_postapoc": "1 USD 75 cent", - "to_hit": -5, "material": [ "veggy" ], "symbol": ";", "quench": 1, @@ -1067,7 +1065,6 @@ "volume": "9000 ml", "price": "360 USD", "price_postapoc": "9 USD", - "to_hit": -5, "material": [ "veggy" ], "symbol": ";", "quench": 1, @@ -1090,7 +1087,6 @@ "volume": "250 ml", "price": "20 cent", "price_postapoc": "25 cent", - "to_hit": -5, "material": [ "veggy" ], "symbol": ";", "calories": 400, @@ -1114,7 +1110,6 @@ "volume": "500 ml", "price": "3 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": -5, "material": [ "flesh" ], "symbol": ";", "quench": 2, @@ -1138,7 +1133,6 @@ "volume": "250 ml", "price": "3 USD", "price_postapoc": "4 USD", - "to_hit": -5, "material": [ "flesh" ], "symbol": ";", "quench": -1, @@ -1163,7 +1157,6 @@ "volume": "250 ml", "price": "3 USD", "price_postapoc": "4 USD", - "to_hit": -5, "material": [ "flesh" ], "symbol": ";", "quench": 2, @@ -1187,7 +1180,6 @@ "volume": "250 ml", "price": "3 USD", "price_postapoc": "4 USD", - "to_hit": -5, "material": [ "flesh" ], "symbol": ";", "healthy": -1, @@ -1425,7 +1417,6 @@ "volume": "250 ml", "price": "1 USD", "price_postapoc": "25 cent", - "to_hit": -5, "material": [ "veggy" ], "symbol": "%", "color": "yellow", @@ -1446,7 +1437,6 @@ "volume": "5 ml", "price": "0 cent", "price_postapoc": "0 cent", - "to_hit": -5, "material": [ "flesh" ], "symbol": "c", "color": "brown", @@ -1542,7 +1532,6 @@ "volume": "100 ml", "price": "1 USD", "price_postapoc": "25 cent", - "to_hit": -5, "material": [ "veggy" ], "symbol": "%", "color": "brown", @@ -1563,7 +1552,6 @@ "volume": "100 ml", "price": "1 USD", "price_postapoc": "25 cent", - "to_hit": -5, "material": [ "nut" ], "symbol": "%", "color": "brown", diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 8eb82d59f27ed..16c589ab631bd 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -8,7 +8,6 @@ "calories": 2, "fun": -5, "weight": "10 g", - "to_hit": -3, "color": "white", "symbol": ",", "material": [ "veggy" ], @@ -506,7 +505,6 @@ "calories": 9, "fun": -15, "weight": "40 g", - "to_hit": -3, "color": "magenta", "symbol": ",", "material": [ "veggy" ], @@ -644,7 +642,6 @@ "calories": 9, "fun": -8, "weight": "40 g", - "to_hit": -3, "color": "magenta", "symbol": ",", "material": [ "veggy" ], diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 76d610b4ea035..b651e44c38552 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -126,7 +126,6 @@ "category": "books", "description": "Several documents containing all kinds of information, customer data, and charts, kept together in a manila folder. Pretty useless now.", "weight": "15 g", - "to_hit": -3, "color": "white", "symbol": ",", "material": [ "paper" ], @@ -183,7 +182,6 @@ "category": "books", "description": "A small scrap of paper with two long character sequences scribbled on it.", "weight": "1 g", - "to_hit": -3, "color": "white", "symbol": ",", "material": [ "paper" ], @@ -197,7 +195,6 @@ "category": "books", "description": "A sequence of overlapping numbers plotted in thermal paper, at times so densely-packed that they disappear into thick blots of oxide-colored ink. A few number sequences repeat in an almost orderly fashion, but you can't tell whether that means anything.", "weight": "1 g", - "to_hit": -3, "color": "white", "symbol": ",", "material": [ "paper" ], @@ -385,6 +382,7 @@ "price": "80 USD", "qualities": [ [ "ROPE", 2 ] ], "price_postapoc": "50 cent", + "to_hit": { "grip": "none", "length": "long", "surface": "line", "balance": "uneven" }, "melee_damage": { "bash": 26 } }, { @@ -402,8 +400,7 @@ "flags": [ "NO_SALVAGE" ], "milling": { "into": "meal_chitin_piece", "recipe": "meal_chitin_piece_mill_1_4" }, "weight": "89 g", - "volume": "250 ml", - "melee_damage": { "bash": 1 } + "volume": "250 ml" }, { "type": "GENERIC", @@ -419,8 +416,7 @@ "flags": [ "NO_SALVAGE" ], "milling": { "into": "meal_chitin_piece", "recipe": "meal_chitin_piece_mill_1_4" }, "weight": "89 g", - "volume": "300 ml", - "melee_damage": { "bash": 1 } + "volume": "300 ml" }, { "type": "COMESTIBLE", @@ -436,7 +432,6 @@ "flags": [ "NO_SALVAGE" ], "weight": "50 g", "volume": "250 ml", - "to_hit": -4, "fun": -25, "vitamins": [ [ "meat_allergen", 1 ] ] }, @@ -452,8 +447,7 @@ "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": "50 g", - "volume": "250 ml", - "to_hit": -4 + "volume": "250 ml" }, { "type": "GENERIC", @@ -462,8 +456,7 @@ "name": { "str": "chunk of biosilicified chitin", "str_pl": "chunks of biosilicified chitin" }, "description": "A lump of exoskeleton that has undergone biosilicification. It is acid-resistant but rather brittle.", "material": [ "acidchitin" ], - "flags": [ "NO_SALVAGE" ], - "relative": { "melee_damage": { "bash": 2 } } + "flags": [ "NO_SALVAGE" ] }, { "id": "bundle_rag", @@ -661,9 +654,7 @@ "price_postapoc": "0 cent", "material": [ "stone" ], "weight": "100 g", - "volume": "250 ml", - "to_hit": -3, - "melee_damage": { "bash": 1 } + "volume": "250 ml" }, { "type": "GENERIC", @@ -676,8 +667,7 @@ "price_postapoc": "0 cent", "material": [ "veggy" ], "weight": "60 g", - "volume": "250 ml", - "to_hit": -3 + "volume": "250 ml" }, { "type": "GENERIC", @@ -690,7 +680,6 @@ "material": [ "steel" ], "weight": "40 g", "volume": "263 ml", - "to_hit": -1, "qualities": [ [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], "use_action": [ "HEAT_LIQUID_ITEMS" ], "pocket_data": [ @@ -703,8 +692,7 @@ "max_contains_weight": "1 kg", "sealed_data": { "spoil_multiplier": 0.0 } } - ], - "melee_damage": { "bash": 2 } + ] }, { "type": "GENERIC", @@ -718,9 +706,9 @@ "material": [ "stone" ], "weight": "700 g", "volume": "250 ml", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" }, "qualities": [ [ "HAMMER", 1 ] ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 5 } }, { "type": "GENERIC", @@ -735,9 +723,9 @@ "material": [ "stone" ], "weight": "493 g", "volume": "250 ml", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" }, "qualities": [ [ "HAMMER", 1 ] ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 3 } }, { "type": "TOOL", @@ -825,8 +813,7 @@ "price_postapoc": "50 cent", "material": [ "plastic" ], "weight": "30 g", - "volume": "250 ml", - "to_hit": -3 + "volume": "250 ml" }, { "type": "GENERIC", @@ -838,7 +825,6 @@ "price_postapoc": "0 cent", "weight": "1 g", "volume": "1 ml", - "to_hit": -3, "color": "white", "symbol": "r", "material": [ "paper" ] @@ -853,7 +839,6 @@ "price_postapoc": "0 cent", "weight": "1 g", "volume": "1 ml", - "to_hit": -3, "color": "white", "symbol": "r", "material": [ "paper" ] @@ -916,7 +901,7 @@ "material": [ "steel" ], "weight": "553 g", "volume": "750 ml", - "to_hit": -1, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "neutral" }, "qualities": [ [ "BUTCHER", -38 ] ], "flags": [ "ALLOWS_BODY_BLOCK", "SHEATH_KNIFE" ], "melee_damage": { "bash": 6, "cut": 8 }, @@ -933,9 +918,10 @@ "price": "280 USD", "price_postapoc": "50 cent", "material": [ "steel" ], - "weight": "1000 g", + "weight": "1 kg", "volume": "1500 ml", "qualities": [ [ "BUTCHER", -38 ] ], + "to_hit": { "grip": "bad", "length": "short", "surface": "line", "balance": "neutral" }, "melee_damage": { "bash": 6, "cut": 8 } }, { @@ -953,7 +939,7 @@ "volume": "250 ml", "longest_side": "204 mm", "flags": [ "HURT_WHEN_WIELDED" ], - "to_hit": -4, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "neutral" }, "melee_damage": { "cut": 14 } }, { diff --git a/data/json/items/resources/alien.json b/data/json/items/resources/alien.json index 1adbef200ec1c..58ec4e0d47e76 100644 --- a/data/json/items/resources/alien.json +++ b/data/json/items/resources/alien.json @@ -39,12 +39,10 @@ "material": [ "wood" ], "flags": [ "TRADER_AVOID", "FIREWOOD" ], "weight": "80 g", - "volume": "5000 ml", + "volume": "5 L", "longest_side": "260 cm", "looks_like": "stick", - "to_hit": -3, - "category": "spare_parts", - "melee_damage": { "bash": 1 } + "category": "spare_parts" }, { "type": "GENERIC", @@ -299,9 +297,7 @@ "price_postapoc": "20 USD", "material": [ "aluminum", "plastic", "copper" ], "weight": "250 g", - "volume": "1 L", - "to_hit": -1, - "melee_damage": { "bash": 5 } + "volume": "1 L" }, { "type": "GENERIC", @@ -315,9 +311,7 @@ "price_postapoc": "20 USD", "material": [ "aluminum", "plastic", "copper" ], "weight": "500 g", - "volume": "1 L", - "to_hit": -1, - "melee_damage": { "bash": 5 } + "volume": "1 L" }, { "type": "GENERIC", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 7d42da19c7fae..d96f612138109 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -584,7 +584,6 @@ "volume": "3500 ml", "price": "55 kUSD", "price_postapoc": "100 USD", - "to_hit": -1, "material": [ "superalloy" ], "symbol": "[", "color": "light_gray", diff --git a/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json b/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json index 4464b16ed2b53..d70650daeeca4 100644 --- a/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json @@ -6,7 +6,6 @@ "fencing_foil": 2.0, "fencing_sabre": 4.63, "fencing_epee": 5.93, - "blade": 7.0, "wakizashi_fake": 7.0, "makeshift_machete": 7.49, "scimitar_fake": 7.526, diff --git a/data/mods/TEST_DATA/expected_dps_data/swords_dps.json b/data/mods/TEST_DATA/expected_dps_data/swords_dps.json index 375ab38557193..e37e2d80a6e2f 100644 --- a/data/mods/TEST_DATA/expected_dps_data/swords_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/swords_dps.json @@ -4,7 +4,6 @@ "//": "expected value 24, does not include shortswords", "//2": "arming_sword: heavier than a broadsword", "expected_dps": { - "blade_scythe": 5.25, "jian_fake": 8.792, "rapier_fake": 9.034, "broadsword_fake": 9.828, diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json index b4ac9b26d6102..b2231078e40fe 100644 --- a/data/mods/TEST_DATA/legacy_to_hit.json +++ b/data/mods/TEST_DATA/legacy_to_hit.json @@ -39,11 +39,8 @@ "aketon_wool", "aketon_wool_vest", "aksemi", - "alien_fern", "alloy_plate", "aluminum_boat_hull", - "american_flag", - "ammo_pouch", "ammonia_machine_pipework", "ammonia_machine_reactor", "analytical_set_basic", @@ -134,7 +131,6 @@ "axmc", "b_shorts", "balance_small", - "ballast", "ballista", "barb_launcher", "barometer", @@ -143,29 +139,22 @@ "basketball", "battery_charger", "bbgun", - "bee_balm", "bee_sting", "beekeeping_gloves", "beekeeping_suit", "beeper", - "belt_loop_large", - "belt_loop_medium", - "belt_loop_small", "benelli_sa", "beverly_shear", "bfg50", "billet_bone", "billet_wood", "bio_emp_gun", - "biollante_bud", "bipod", "bipod_handguard", "birchbark_funnel", - "birdfood", "bite_suit", "black_box", "black_glass_shard", - "blade", "blade_trap", "blunderbuss", "board_trap", @@ -268,12 +257,10 @@ "camera_control", "camisole", "camp_chair", - "canister_empty", "canister_goo", "cannon_3in_ordnance", "cannonball_4lb", "canvas_pants_padded", - "cape_fp", "carbonfiber_boat_hull", "cargo_rack", "carpet_armguards", @@ -283,11 +270,6 @@ "case_violin", "cassock", "catalytic_cracking_reactor", - "catfood", - "catfood_dry", - "cattlefodder", - "cattlefodder_large", - "cattlefodder_medium", "chainmail_junk_feet", "chainmail_junk_hands", "chainmail_junk_hood", @@ -308,17 +290,9 @@ "chisel", "chitin_plate", "churn", - "circsaw_blade", "circsaw_off", "circsaw_on", "clarinet", - "cloak", - "cloak_black", - "cloak_denim", - "cloak_fur", - "cloak_leather", - "cloak_vampire", - "cloak_wool", "closed_loop_extractor_large", "closed_loop_extractor_small", "clown_suit", @@ -368,9 +342,6 @@ "directional_antenna", "diveknife", "diving_watch", - "dogbane", - "dogfood", - "dogfood_dry", "down_blanket", "dragonsuit", "draw_plate", @@ -386,7 +357,6 @@ "dynamite", "dynamite_bomb", "e_handcuffs", - "earthworm", "elbow_pads", "elec_chainsaw_off", "elec_chainsaw_on", @@ -403,19 +373,15 @@ "engineering_makerspace_kit", "engineering_robotics_kit", "enhanced_nvg", - "exodii_ac_kit", - "exodii_wire_kit", "extension_cable", "extinguisher", "face_veil", "fake_dynamite_50lbs", "feeding_kit", "felinesuit", - "fema_data", "feral_human_thrown_rock", "fiber_mat", "fighter_sting", - "file", "filter_suppressor", "firecracker", "firecracker_act", @@ -503,8 +469,6 @@ "glowstick_dead", "glowstick_lit", "gobag", - "godcotrader_accounting_records_clean", - "godcotrader_accounting_records_dirty", "goggles_ir", "goggles_nv", "goggles_welding", @@ -512,8 +476,6 @@ "golf_ball", "gosling_jacket", "grass_blanket", - "grass_cloak", - "grass_keffiyeh", "grass_sheet", "greatcoat", "grenade", @@ -540,7 +502,6 @@ "hd_tow_cable", "hdframe", "headgear", - "headscarf", "helmet_army", "helmet_army_outdated", "helmet_aztec", @@ -558,7 +519,6 @@ "hk_g3", "hk_g80", "hoe", - "holo_cloak", "homemade_demolition_charge", "homemade_demolition_charge_act", "honey_scraper", @@ -607,7 +567,6 @@ "jeans_red", "jeans_ripped", "jeans_vintage", - "jedi_cloak", "jerrypack", "jumpsuit", "jumpsuit_xl", @@ -615,7 +574,6 @@ "kantele", "kariginu", "kasaya", - "keffiyeh", "kevlar", "kevlar_harness", "kevlar_shears", @@ -623,9 +581,6 @@ "kittel", "knee_high_boots", "knee_pads", - "knit_scarf", - "knit_scarf_headwrap", - "knit_scarf_loose", "kord", "kp32", "ksg", @@ -673,12 +628,6 @@ "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", @@ -762,11 +711,8 @@ "mountable_cooler", "mountable_heater", "mrad_smr", - "msu14_password", "muffler", - "mugwort", "multimeter", - "mutant_bug_hydrogen_sacs", "nitrogen_generator", "nitrogen_tank", "noise_emitter", @@ -776,7 +722,6 @@ "nomex_suit", "number4_mki", "nun_habit", - "nun_wimple", "ny_hook", "obi_gi", "office_letter_opener", @@ -785,7 +730,6 @@ "oil_press_electric", "omnicamera", "omnicamera_reinforced", - "optical_cloak", "outfit_storage", "oxygen_cylinder", "oxygen_tank", @@ -798,17 +742,11 @@ "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", @@ -826,15 +764,12 @@ "plunger_toilet", "pockknife", "police_breeches", - "poncho", - "poncho_makeshift", "pool_ball", "portal", "postman_shorts", "pot_makeshift", "pot_makeshift_copper", "power_cord", - "press_cake", "pressure_tank", "primitive_knife", "pseudo_m203", @@ -891,7 +826,6 @@ "saiga_410", "sail", "samghati", - "sample_t_substrate", "santa_beard", "santa_dress", "santa_dress_long", @@ -907,24 +841,6 @@ "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", @@ -974,7 +890,6 @@ "sling-ready_grenade", "sling-ready_molotov", "sm_extinguisher", - "small_printout_portal_storm_data", "small_scuba_tank", "small_scuba_tank_on", "smart_watch", @@ -984,13 +899,11 @@ "smle_mk3", "smoxygen_tank", "sneakers_steel", - "snuggie", "solar_panel", "solarpack", "spearsling", "spectrophotometer", "spiked_plate", - "spiral_stone", "splinter", "spring_plate", "staff_sling", @@ -1022,7 +935,6 @@ "tac_fullhelmet", "tac_helmet", "talking_doll", - "tallit_gadol", "tarp", "tavor_12", "tearer", @@ -1196,7 +1108,6 @@ "xedra_gun", "xedra_seismograph", "xl_wind_turbine", - "xlkevlar", "xlsurvivor_suit", "yoke_harness", "yoke_harness_heavyduty", @@ -1302,7 +1213,7 @@ { "type": "test_data", "//": "Generic Guns", - "legacy_to_hit": [ "ammo_pouch", "bot_antimateriel", "bot_rifleturret", "bot_secubot", "bot_talon_m202a1", "bot_turret" ] + "legacy_to_hit": [ "bot_antimateriel", "bot_rifleturret", "bot_secubot", "bot_talon_m202a1", "bot_turret" ] }, { "type": "test_data",