From 1c4635d20dc47d1fbc9463546b6c0e869c972c2e Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:40:33 +0200 Subject: [PATCH] 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 --- data/json/items/ammo/sling-ready_grenade.json | 4 +- data/json/items/armor/arms_armor.json | 37 ++----- data/json/items/armor/bandolier.json | 3 - data/json/items/armor/belts.json | 2 - .../armor/bespoke_armor/custom_bodysuits.json | 34 +++---- .../armor/bespoke_armor/custom_boots.json | 14 ++- .../armor/bespoke_armor/custom_gloves.json | 3 - .../armor/bespoke_armor/custom_headgear.json | 20 +--- .../armor/bespoke_armor/custom_overcoats.json | 5 - .../armor/bespoke_armor/cuttingroom.json | 8 +- data/json/items/armor/brigandine.json | 1 - data/json/items/armor/robofac_armor.json | 1 - data/json/items/armor/sheath.json | 3 - data/json/items/armor/suits_protection.json | 51 ++++------ data/json/items/armor/undergarment.json | 2 - data/mods/TEST_DATA/legacy_to_hit.json | 98 ------------------- 16 files changed, 56 insertions(+), 230 deletions(-) diff --git a/data/json/items/ammo/sling-ready_grenade.json b/data/json/items/ammo/sling-ready_grenade.json index e5b55c098a191..0b270add05840 100644 --- 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 index 1a7e5b9efd7d4..8813434bbf814 100644 --- 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 index 5577a38d10d38..7ba1c849ca503 100644 --- 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 index 3d1e38f9655cc..5da33f1689489 100644 --- 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" diff --git a/data/json/items/armor/bespoke_armor/custom_bodysuits.json b/data/json/items/armor/bespoke_armor/custom_bodysuits.json index ce7060395a629..fbabd5d233131 100644 --- a/data/json/items/armor/bespoke_armor/custom_bodysuits.json +++ b/data/json/items/armor/bespoke_armor/custom_bodysuits.json @@ -7,7 +7,6 @@ "weight": "3600 g", "volume": "3500 ml", "price_postapoc": "17 USD 50 cent", - "to_hit": -3, "material": [ "denim", "leather" ], "symbol": "[", "looks_like": "touring_suit", @@ -40,7 +39,6 @@ "volume": "3500 ml", "price": "350 USD", "price_postapoc": "17 USD 50 cent", - "to_hit": -3, "material": [ "denim", "leather" ], "symbol": "[", "looks_like": "touring_suit", @@ -148,7 +146,7 @@ "price": "1 kUSD 100 USD", "price_postapoc": "50 USD", "material": [ "kevlar", "lycra", "nylon" ], - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "symbol": "[", "looks_like": "survivor_jumpsuit", "color": "green", @@ -186,7 +184,7 @@ "warmth": 15, "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xl_lsurvivor_jumpsuit", @@ -215,7 +213,7 @@ "price": "1 kUSD 500 USD", "price_postapoc": "50 USD", "material": [ "kevlar", "lycra", "nylon" ], - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "symbol": "[", "looks_like": "touring_suit", "color": "brown", @@ -255,7 +253,7 @@ "valid_mods": [ "steel_padded" ], "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xlsurvivor_jumpsuit", @@ -283,7 +281,7 @@ "volume": "12 L", "price": "2 kUSD", "price_postapoc": "70 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "kevlar", "qt_steel", "lycra", "nylon" ], "symbol": "[", "looks_like": "survivor_suit", @@ -309,7 +307,7 @@ "warmth": 25, "environmental_protection": 3, "flags": [ "VARSIZE", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "NORMAL" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xl_hsurvivor_jumpsuit", @@ -337,7 +335,7 @@ "volume": "14 L", "price": "2 kUSD", "price_postapoc": "50 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "kevlar", "fur", "lycra" ], "symbol": "[", "looks_like": "survivor_suit", @@ -362,7 +360,7 @@ "warmth": 75, "environmental_protection": 5, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xl_wsurvivor_jumpsuit", @@ -429,7 +427,7 @@ "price_postapoc": "50 USD", "material": [ "neoprene", "kevlar" ], "symbol": "[", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "looks_like": "wetsuit", "color": "dark_gray", "armor": [ @@ -486,7 +484,7 @@ "warmth": 41, "environmental_protection": 12, "flags": [ "VARSIZE", "WATER_FRIENDLY", "WATERPROOF", "STURDY", "SKINTIGHT", "NORMAL" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xs_h20survivor_jumpsuit", @@ -515,7 +513,7 @@ "price_postapoc": "50 USD", "material": [ "neoprene", "kevlar" ], "symbol": "[", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "looks_like": "wetsuit", "color": "dark_gray", "armor": [ @@ -572,7 +570,7 @@ "warmth": 30, "environmental_protection": 10, "flags": [ "VARSIZE", "WATER_FRIENDLY", "WATERPROOF", "STURDY" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xs_h20survivor_jumpsuit_light", @@ -601,7 +599,7 @@ "price_postapoc": "50 USD", "material": [ "neoprene", "nylon", "kevlar" ], "symbol": "[", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "looks_like": "wetsuit", "color": "dark_gray", "armor": [ @@ -658,7 +656,7 @@ "warmth": 70, "environmental_protection": 14, "flags": [ "VARSIZE", "WATER_FRIENDLY", "WATERPROOF", "STURDY", "SKINTIGHT", "NORMAL" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xs_thick_h20survivor_jumpsuit", @@ -686,7 +684,7 @@ "volume": "11500 ml", "price": "2 kUSD", "price_postapoc": "50 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "nomex", "kevlar" ], "symbol": "[", "looks_like": "survivor_suit", @@ -710,7 +708,7 @@ "warmth": 15, "environmental_protection": 4, "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ], - "melee_damage": { "bash": 6 } + "melee_damage": { "bash": 2 } }, { "id": "xs_fsurvivor_jumpsuit", diff --git a/data/json/items/armor/bespoke_armor/custom_boots.json b/data/json/items/armor/bespoke_armor/custom_boots.json index 9b6d2fdad02c0..3729bf8131662 100644 --- a/data/json/items/armor/bespoke_armor/custom_boots.json +++ b/data/json/items/armor/bespoke_armor/custom_boots.json @@ -9,7 +9,7 @@ "volume": "2 L", "price": "240 USD", "price_postapoc": "50 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "nomex", "leather" ], "symbol": "[", "looks_like": "boots_combat", @@ -80,7 +80,7 @@ "volume": "2500 ml", "price": "240 USD", "price_postapoc": "60 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "nomex", "leather", "steel" ], "symbol": "[", "looks_like": "boots_combat", @@ -216,7 +216,7 @@ "volume": "3500 ml", "price": "240 USD", "price_postapoc": "60 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "leather", "nomex", "fur", "steel" ], "symbol": "[", "looks_like": "boots_fur", @@ -290,7 +290,7 @@ "volume": "1500 ml", "price": "240 USD", "price_postapoc": "60 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "neoprene", "rubber", "nylon" ], "symbol": "[", "looks_like": "boots_bunker", @@ -371,7 +371,6 @@ "volume": "1200 ml", "price": "240 USD", "price_postapoc": "60 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "rubber", "nylon" ], "symbol": "[", "looks_like": "boots_h20survivor", @@ -422,8 +421,7 @@ "description": "mounting for a pair of custom fins.", "flag_restriction": [ "BOOT_FINS_CUSTOM" ] } - ], - "melee_damage": { "bash": 1 } + ] }, { "id": "xl_boots_h20survivor_light", @@ -451,7 +449,7 @@ "volume": "1500 ml", "price": "240 USD", "price_postapoc": "60 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "neoprene", "rubber", "nylon" ], "symbol": "[", "looks_like": "boots_h20survivor", diff --git a/data/json/items/armor/bespoke_armor/custom_gloves.json b/data/json/items/armor/bespoke_armor/custom_gloves.json index e2c31e6160859..3b21e6aab02ad 100644 --- a/data/json/items/armor/bespoke_armor/custom_gloves.json +++ b/data/json/items/armor/bespoke_armor/custom_gloves.json @@ -243,7 +243,6 @@ "volume": "750 ml", "price": "180 USD", "price_postapoc": "20 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "nylon" ], "symbol": "[", "looks_like": "gloves_rubber", @@ -291,7 +290,6 @@ "volume": "750 ml", "price": "180 USD", "price_postapoc": "20 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "nylon" ], "symbol": "[", "looks_like": "gloves_h20survivor", @@ -338,7 +336,6 @@ "volume": "750 ml", "price": "180 USD", "price_postapoc": "20 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "nylon" ], "symbol": "[", "looks_like": "gloves_h20survivor", diff --git a/data/json/items/armor/bespoke_armor/custom_headgear.json b/data/json/items/armor/bespoke_armor/custom_headgear.json index 27dca486ae038..f7c8f8f4dd2aa 100644 --- a/data/json/items/armor/bespoke_armor/custom_headgear.json +++ b/data/json/items/armor/bespoke_armor/custom_headgear.json @@ -7,7 +7,6 @@ "weight": "470 g", "volume": "2500 ml", "price_postapoc": "2 USD 50 cent", - "to_hit": -3, "material": [ "denim", "leather", "plastic" ], "symbol": "[", "looks_like": "balclava", @@ -74,7 +73,6 @@ "volume": "2 L", "price": "580 USD", "price_postapoc": "40 USD", - "to_hit": -1, "material": [ "kevlar_layered", "leather" ], "symbol": "[", "looks_like": "hood_rain", @@ -84,8 +82,7 @@ "environmental_protection": 3, "techniques": [ "WBLOCK_1" ], "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ], - "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 } + "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ] }, { "id": "hood_wsurvivor", @@ -97,7 +94,6 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "35 USD", - "to_hit": -1, "material": [ "kevlar_layered", "fur" ], "symbol": "[", "looks_like": "hood_survivor", @@ -106,8 +102,7 @@ "material_thickness": 5, "environmental_protection": 5, "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ], - "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 } + "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ] }, { "id": "xl_hood_wsurvivor", @@ -151,7 +146,6 @@ "volume": "750 ml", "price": "580 USD", "price_postapoc": "30 USD", - "to_hit": -1, "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "hood_survivor", @@ -160,8 +154,7 @@ "material_thickness": 4, "environmental_protection": 3, "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ], - "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 } + "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ] }, { "id": "xl_hood_lsurvivor", @@ -221,7 +214,6 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "15 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "nylon" ], "symbol": "[", "looks_like": "wetsuit_hood", @@ -241,7 +233,6 @@ "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 }, "pocket_data": [ { "pocket_type": "CONTAINER", @@ -300,7 +291,6 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "15 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "nylon" ], "symbol": "[", "looks_like": "wetsuit_hood", @@ -320,7 +310,6 @@ "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 }, "pocket_data": [ { "pocket_type": "CONTAINER", @@ -378,7 +367,6 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "15 USD", - "to_hit": -1, "material": [ "kevlar", "neoprene", "nylon" ], "symbol": "[", "looks_like": "wetsuit_hood", @@ -398,7 +386,6 @@ "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 }, "pocket_data": [ { "pocket_type": "CONTAINER", @@ -454,7 +441,6 @@ "volume": "2500 ml", "price": "550 USD", "price_postapoc": "35 USD", - "to_hit": -3, "material": [ "kevlar_layered", "cotton" ], "symbol": "[", "looks_like": "mask_gas", diff --git a/data/json/items/armor/bespoke_armor/custom_overcoats.json b/data/json/items/armor/bespoke_armor/custom_overcoats.json index e9963790d1fad..9d878d3a934d0 100644 --- a/data/json/items/armor/bespoke_armor/custom_overcoats.json +++ b/data/json/items/armor/bespoke_armor/custom_overcoats.json @@ -9,7 +9,6 @@ "volume": "9500 ml", "price": "400 USD", "price_postapoc": "80 USD", - "to_hit": -1, "material": [ "canvas", "kevlar" ], "symbol": "[", "looks_like": "duster_leather", @@ -102,7 +101,6 @@ "volume": "8 L", "price": "340 USD", "price_postapoc": "45 USD", - "to_hit": -1, "material": [ "canvas", "kevlar" ], "symbol": "[", "looks_like": "duster_survivor", @@ -141,7 +139,6 @@ "volume": "7500 ml", "price": "1 kUSD 800 USD", "price_postapoc": "20 USD", - "to_hit": -3, "material": [ "kevlar_layered", "nylon" ], "symbol": "[", "looks_like": "armor_scavenger", @@ -234,7 +231,6 @@ "volume": "7 L", "price": "400 USD", "price_postapoc": "80 USD", - "to_hit": -1, "material": [ "canvas", "kevlar" ], "symbol": "[", "looks_like": "trenchcoat", @@ -317,7 +313,6 @@ "volume": "6 L", "price": "340 USD", "price_postapoc": "5 USD", - "to_hit": -1, "material": [ "canvas", "kevlar" ], "symbol": "[", "looks_like": "sleeveless_duster_survivor", diff --git a/data/json/items/armor/bespoke_armor/cuttingroom.json b/data/json/items/armor/bespoke_armor/cuttingroom.json index 498966c64ff8f..43ea9b94d2b9e 100644 --- a/data/json/items/armor/bespoke_armor/cuttingroom.json +++ b/data/json/items/armor/bespoke_armor/cuttingroom.json @@ -9,7 +9,7 @@ "volume": "3 L", "price": "240 USD", "price_postapoc": "60 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "nomex" ], "symbol": "[", "looks_like": "boots_combat", @@ -47,7 +47,7 @@ "volume": "3 L", "price": "240 USD", "price_postapoc": "80 USD", - "to_hit": -1, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "kevlar", "steel" ], "symbol": "[", "looks_like": "boots_combat", @@ -221,7 +221,6 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "40 USD", - "to_hit": -1, "material": [ "kevlar_layered", "nomex" ], "symbol": "[", "looks_like": "hood_survivor", @@ -230,8 +229,7 @@ "material_thickness": 5, "environmental_protection": 10, "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ], - "armor": [ { "encumbrance": 30, "coverage": 100, "covers": [ "head" ] } ], - "melee_damage": { "bash": 4 } + "armor": [ { "encumbrance": 30, "coverage": 100, "covers": [ "head" ] } ] }, { "id": "xl_hood_fsurvivor", diff --git a/data/json/items/armor/brigandine.json b/data/json/items/armor/brigandine.json index 74ee8fd6ca8a3..a0974c12f76c3 100644 --- a/data/json/items/armor/brigandine.json +++ b/data/json/items/armor/brigandine.json @@ -679,7 +679,6 @@ "longest_side": "30 cm", "price": "300 USD", "price_postapoc": "10 USD", - "to_hit": 1, "material": [ "lc_steel", "canvas" ], "symbol": "[", "looks_like": "armguard_hard", diff --git a/data/json/items/armor/robofac_armor.json b/data/json/items/armor/robofac_armor.json index f5c865c641a4d..a4fccbd6bde37 100644 --- a/data/json/items/armor/robofac_armor.json +++ b/data/json/items/armor/robofac_armor.json @@ -281,7 +281,6 @@ "volume": "1200 ml", "price": "100 USD", "price_postapoc": "20 USD", - "to_hit": -1, "material": [ "nylon", "kevlar" ], "symbol": "[", "color": "dark_gray", diff --git a/data/json/items/armor/sheath.json b/data/json/items/armor/sheath.json index 2ed210be7e11a..53e81757e55a4 100644 --- a/data/json/items/armor/sheath.json +++ b/data/json/items/armor/sheath.json @@ -286,7 +286,6 @@ "volume": "500 ml", "price": "52 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": -1, "material": [ "leather" ], "symbol": "[", "looks_like": "sheath", @@ -326,7 +325,6 @@ "volume": "500 ml", "price": "12 USD", "price_postapoc": "1 USD 50 cent", - "to_hit": -1, "material": [ "wood" ], "symbol": "[", "looks_like": "bootsheath", @@ -546,7 +544,6 @@ "volume": "500 ml", "price": "52 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": -1, "material": [ "leather" ], "symbol": "[", "looks_like": "bscabbard", diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index c49a640897232..df1cea5ca74e2 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -9,7 +9,6 @@ "volume": "9500 ml", "price": "260 USD", "price_postapoc": "30 USD", - "to_hit": -5, "material": [ "leather" ], "symbol": "[", "longest_side": "60 cm", @@ -28,8 +27,7 @@ "warmth": 20, "material_thickness": 6, "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "STURDY", "OUTER" ], - "melee_damage": { "bash": 2 } + "flags": [ "VARSIZE", "STURDY", "OUTER" ] }, { "id": "armor_chitin", @@ -41,7 +39,6 @@ "volume": "17500 ml", "price": "1 kUSD 200 USD", "price_postapoc": "30 USD", - "to_hit": -5, "material": [ "chitin" ], "symbol": "[", "looks_like": "armor_larmor", @@ -117,7 +114,6 @@ "volume": "10 L", "price": "1 kUSD", "price_postapoc": "15 USD", - "to_hit": -5, "material": [ "fur" ], "symbol": "[", "longest_side": "30 cm", @@ -147,8 +143,7 @@ "warmth": 45, "material_thickness": 4, "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ], - "melee_damage": { "bash": 2 } + "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ] }, { "id": "xl_armor_farmor", @@ -177,7 +172,6 @@ "volume": "10 L", "price": "1 kUSD", "price_postapoc": "15 USD", - "to_hit": -5, "material": [ "faux_fur" ], "symbol": "[", "longest_side": "30 cm", @@ -206,8 +200,7 @@ ], "warmth": 40, "material_thickness": 4, - "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ], - "melee_damage": { "bash": 2 } + "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OUTER" ] }, { "id": "xl_armor_faux_farmor", @@ -235,7 +228,6 @@ "volume": "7 L", "price": "120 USD", "price_postapoc": "25 USD", - "to_hit": -5, "material": [ "leather" ], "symbol": "[", "longest_side": "60 cm", @@ -254,8 +246,7 @@ "warmth": 25, "material_thickness": 4, "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "STURDY", "OUTER" ], - "melee_damage": { "bash": 2 } + "flags": [ "VARSIZE", "STURDY", "OUTER" ] }, { "id": "xl_armor_larmor", @@ -284,7 +275,7 @@ "volume": "17500 ml", "price": "600 USD", "price_postapoc": "120 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "budget_steel", "leather" ], "symbol": "[", "looks_like": "armor_larmor", @@ -306,7 +297,7 @@ "volume": "17500 ml", "price": "60 USD", "price_postapoc": "12 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel" ], "symbol": "[", "looks_like": "armor_junk_lightplate", @@ -341,7 +332,7 @@ "volume": "17500 ml", "price": "60 USD", "price_postapoc": "13 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel" ], "symbol": "[", "looks_like": "armor_junk_lightplate", @@ -410,7 +401,7 @@ "volume": "17500 ml", "price": "60 USD", "price_postapoc": "13 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_junk_lightplate", @@ -460,7 +451,7 @@ "volume": "17500 ml", "price": "60 USD", "price_postapoc": "13 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_junk_lightplate", @@ -585,7 +576,7 @@ "volume": "17500 ml", "price": "600 USD", "price_postapoc": "120 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", @@ -710,7 +701,7 @@ "volume": "17500 ml", "price": "600 USD", "price_postapoc": "120 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", @@ -838,7 +829,7 @@ "volume": "17500 ml", "price": "600 USD", "price_postapoc": "120 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "lc_steel", "lc_steel_chain" ], "symbol": "[", "looks_like": "armor_larmor", @@ -963,7 +954,7 @@ "volume": "9 L", "price": "1 kUSD 100 USD", "price_postapoc": "30 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "leather", "budget_steel" ], "symbol": "[", "color": "brown", @@ -1046,7 +1037,7 @@ "volume": "30 L", "price": "7 kUSD 800 USD", "price_postapoc": "60 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "budget_steel", "leather" ], "symbol": "[", "looks_like": "armor_lightplate", @@ -1068,7 +1059,6 @@ "volume": "12500 ml", "price": "600 USD", "price_postapoc": "40 USD", - "to_hit": -3, "material": [ "thermo_resin", "plastic_pad" ], "symbol": "[", "looks_like": "kevlar", @@ -1157,7 +1147,7 @@ "volume": "15500 ml", "price": "600 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": -5, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" }, "material": [ "budget_steel", "cotton" ], "symbol": "[", "looks_like": "armor_lightplate", @@ -1194,7 +1184,7 @@ "encumbrance": 15 } ], - "melee_damage": { "bash": 6, "cut": 8 } + "melee_damage": { "bash": 6, "cut": 3 } }, { "id": "armor_xl_scrapsuit", @@ -1222,7 +1212,6 @@ "volume": "15500 ml", "price": "500 USD", "price_postapoc": "2 USD", - "to_hit": -5, "material": [ "rubber" ], "symbol": "[", "looks_like": "armor_scrapsuit", @@ -1242,7 +1231,6 @@ "volume": "3500 ml", "price": "120 USD", "price_postapoc": "1 USD", - "to_hit": -5, "material": [ "cotton" ], "symbol": "[", "looks_like": "hazmat_suit", @@ -2681,7 +2669,6 @@ "volume": "8255 ml", "price": "200 USD", "price_postapoc": "100 USD", - "to_hit": -5, "//": "real bite suits are made with linen, but we don't have linen, so denim is the closest approx. (canvas is always waterproofed and these suits are not)", "material": [ "kevlar", "denim" ], "symbol": "[", @@ -2779,7 +2766,6 @@ "volume": "1500 ml", "price": "130 USD", "price_postapoc": "7 USD 50 cent", - "to_hit": -5, "material": [ "nomex" ], "symbol": "[", "looks_like": "jumpsuit", @@ -3117,7 +3103,6 @@ "volume": "4750 ml", "price": "200 USD", "price_postapoc": "5 USD", - "to_hit": -5, "material": [ "cotton" ], "symbol": "[", "looks_like": "jumpsuit", @@ -3198,7 +3183,7 @@ "volume": "6500 ml", "price": "580 USD", "price_postapoc": "10 USD", - "to_hit": -5, + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "neutral" }, "material": [ "leather", "plastic_pad" ], "symbol": "[", "looks_like": "jumpsuit", @@ -3264,7 +3249,6 @@ "volume": "4750 ml", "price": "224 USD", "price_postapoc": "5 USD 50 cent", - "to_hit": -5, "material": [ "cotton" ], "symbol": "[", "looks_like": "suit", @@ -3298,7 +3282,6 @@ "volume": "4687 ml", "price": "220 USD 65 cent", "price_postapoc": "5 USD", - "to_hit": -3, "material": [ "nomex" ], "symbol": "[", "looks_like": "touring_suit", diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json index 2709688a72489..45acdb6c53129 100644 --- a/data/json/items/armor/undergarment.json +++ b/data/json/items/armor/undergarment.json @@ -593,7 +593,6 @@ "volume": "500 ml", "price": "20 USD", "price_postapoc": "50 cent", - "to_hit": -5, "material": [ "cotton" ], "symbol": "[", "looks_like": "tank_top", @@ -686,7 +685,6 @@ "volume": "1250 ml", "price": "110 USD", "price_postapoc": "1 USD", - "to_hit": -3, "material": [ "leather" ], "symbol": "[", "looks_like": "vest_leather", diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json index 8d433080e3045..c93df2d0dc7a0 100644 --- a/data/mods/TEST_DATA/legacy_to_hit.json +++ b/data/mods/TEST_DATA/legacy_to_hit.json @@ -5,7 +5,6 @@ "legacy_to_hit": [ "1895sbl", "2_shot_special", - "2byarm_guard", "2byshin_guard", "EMPbomb", "EMPbomb_act", @@ -51,33 +50,11 @@ "ar10", "arisaka_monopod", "armchair", - "armguard_bronze", - "armguard_chitin", - "armguard_hard", - "armguard_larmor", - "armguard_lc_brigandine", - "armguard_lightplate", - "armguard_metal", - "armguard_metal_sheets_bracer", - "armguard_metal_sheets_elbows", - "armguard_metal_sheets_shoulders", - "armguard_paper", - "armguard_scrap", - "armguard_soft", - "armguard_tire", "armor_aztec", - "armor_blarmor", "armor_cardboard", "armor_cardboard_cuirass", - "armor_chitin", "armor_cuirass", - "armor_farmor", - "armor_faux_farmor", - "armor_junk_lightplate", - "armor_junk_plate", - "armor_larmor", "armor_larmor_chest", - "armor_lc_armguard", "armor_lc_brigandine", "armor_lc_brigandine_shoulders", "armor_lc_chestplate", @@ -85,32 +62,15 @@ "armor_lc_coat_brigandine_shoulders", "armor_lc_heavy_chestplate", "armor_lc_heavy_leg_guard", - "armor_lc_heavyarmguard", - "armor_lc_heavyplate", "armor_lc_leg_guard", "armor_lc_light_chestplate", "armor_lc_light_leg_guard", - "armor_lc_lightarmguard", - "armor_lc_lightplate", - "armor_lc_plate", "armor_lorica", "armor_mercenary_bottom", - "armor_mercenary_top", - "armor_metal_sheets", - "armor_metal_sheets_chain", - "armor_metal_sheets_chain_heavy", - "armor_metal_sheets_heavy", - "armor_nomad", - "armor_nomad_advanced", - "armor_plarmor", - "armor_riot", - "armor_riot_arm", "armor_riot_leg", "armor_riot_torso", - "armor_scrapsuit", "armor_star_samurai_mask", "armor_thessalonian", - "armor_tiresuit", "art_crystal", "art_disc", "art_jelly", @@ -138,7 +98,6 @@ "bbgun", "bee_sting", "beekeeping_gloves", - "beekeeping_suit", "beeper", "benelli_sa", "beverly_shear", @@ -149,7 +108,6 @@ "bipod", "bipod_handguard", "birchbark_funnel", - "bite_suit", "black_box", "black_glass_shard", "blade_trap", @@ -169,22 +127,12 @@ "boots_combat", "boots_denim", "boots_faux_fur", - "boots_fsurvivor", "boots_fur", - "boots_h20survivor", - "boots_h20survivor_light", - "boots_h20survivor_thick", "boots_hiking", - "boots_hsurvivor", "boots_larmor", - "boots_lsurvivor", "boots_scrap", "boots_steel", - "boots_survivor", "boots_winter", - "boots_wsurvivor", - "bootsheath", - "bootsheath_birchbark", "bot_EMP_hack", "bot_antimateriel", "bot_broken_cyborg", @@ -250,7 +198,6 @@ "caltrops_glass", "caltrops_teeth", "camera_control", - "camisole", "camp_chair", "canister_goo", "cannon_3in_ordnance", @@ -258,8 +205,6 @@ "canvas_pants_padded", "carbonfiber_boat_hull", "cargo_rack", - "carpet_armguards", - "carpet_bracers", "carpet_greaves", "carpet_legguards", "case_violin", @@ -274,9 +219,6 @@ "chair_plywood", "chair_wood", "chaps_leather", - "cheap_ammo_pouch", - "cheap_ammo_pouch_belt223", - "cheap_ammo_pouch_belt308", "cheek_pad", "chemical_thrower", "chemistry_set", @@ -305,7 +247,6 @@ "compositecrossbow", "compressor", "copper_knife", - "corset", "cot", "counterweight", "crafted_suppressor", @@ -345,11 +286,9 @@ "duster", "duster_fur", "duster_leather", - "duster_survivor", "dynamite", "dynamite_bomb", "e_handcuffs", - "elbow_pads", "elec_chainsaw_off", "elec_chainsaw_on", "elec_hairtrimmer", @@ -393,7 +332,6 @@ "frame_wood_deck", "frame_wood_light", "fs2000", - "fsurvivor_jumpsuit", "fsurvivor_suit", "full_barrel_bomb", "full_barrel_bomb_act", @@ -415,7 +353,6 @@ "gambeson_pants_canvas", "gambeson_pants_nylon", "gambeson_pants_wool", - "gambeson_sleeve", "gambeson_vest", "gambeson_wool", "gambeson_wool_thinsleeved", @@ -440,9 +377,6 @@ "gloves_denim_fingerless", "gloves_faux_fur", "gloves_fur", - "gloves_h20survivor", - "gloves_h20survivor_light", - "gloves_h20survivor_thick", "gloves_light", "gloves_liner", "gloves_winter", @@ -466,8 +400,6 @@ "grenade_inc_act", "grim_reaper_robe", "grinder_blade", - "h20survivor_jumpsuit", - "h20survivor_jumpsuit_light", "h20survivor_suit", "hair_dryer", "half_barrel_bomb", @@ -488,8 +420,6 @@ "helmet_liner", "helmet_motor", "helmet_motor_raised", - "helmet_nomad", - "helmet_scavenger", "helmet_scrap", "henry_big_boy", "hk417_13", @@ -499,24 +429,15 @@ "homemade_demolition_charge", "homemade_demolition_charge_act", "honey_scraper", - "hood_fsurvivor", - "hood_h20survivor", - "hood_h20survivor_light", - "hood_h20survivor_thick", - "hood_lsurvivor", - "hood_survivor", - "hood_wsurvivor", "horse_tack", "hotcut", "house_coat", "hpt3895", - "hsurvivor_jumpsuit", "hsurvivor_suit", "huge_crossbow", "hydrogen_tank", "hygrometer", "hygroscope", - "improvised_armguard_tire", "improvised_legguard_tire", "indoor_volleyball", "inflatable_airbag", @@ -535,7 +456,6 @@ "jerrypack", "jumpsuit", "jumpsuit_xl", - "k_gambeson_sleeve", "kantele", "kariginu", "kasaya", @@ -594,7 +514,6 @@ "log", "long_glove_white", "long_pole", - "lsurvivor_jumpsuit", "lux_meter", "m107a1", "m110a1", @@ -639,7 +558,6 @@ "microcentrifuge", "microscope", "microscope_dissecting", - "mil_flight_suit", "mil_plate", "military_explosive_full_barrel_bomb", "military_explosive_full_barrel_bomb_act", @@ -675,13 +593,10 @@ "nomex_gloves", "nomex_hood", "nomex_socks", - "nomex_suit", "number4_mki", "nun_habit", "ny_hook", - "obi_gi", "office_letter_opener", - "officer_uniform", "oil_extractor_crude", "oil_press_electric", "omnicamera", @@ -755,7 +670,6 @@ "rm88_battle_rifle", "robe", "robofac_gun", - "robofac_head_rig", "rock", "rock_flaking", "rotovap", @@ -813,14 +727,10 @@ "sleeveless_duster", "sleeveless_duster_fur", "sleeveless_duster_leather", - "sleeveless_duster_survivor", "sleeveless_trenchcoat", "sleeveless_trenchcoat_fur", "sleeveless_trenchcoat_leather", - "sleeveless_trenchcoat_survivor", "sleeveless_tunic", - "sling-ready_grenade", - "sling-ready_molotov", "sm_extinguisher", "smg_40", "smg_45", @@ -828,7 +738,6 @@ "smle_mk3", "sneakers_steel", "solar_panel", - "spearsling", "spectrophotometer", "spiked_plate", "splinter", @@ -845,12 +754,10 @@ "storage_line", "straw_basket", "subsuit_xl", - "suit", "suppressor", "surv_rocket_launcher", "survivor_adhoc_leather_pants", "survivor_hairtrimmer", - "survivor_jumpsuit", "survivor_shavingkit", "swag_bag", "swage", @@ -921,7 +828,6 @@ "test_winglets_left", "testflames", "thawb", - "thick_h20survivor_jumpsuit", "thigh_high_boots", "throw_extinguisher", "throw_extinguisher_act", @@ -936,14 +842,12 @@ "toolset", "torch", "torch_lit", - "touring_suit", "tourist_table", "towel_hanger", "trenchcoat", "trenchcoat_fur", "trenchcoat_leather", "trenchcoat_steampunk", - "trenchcoat_survivor", "trimmer_off", "tripwire", "trumpet", @@ -956,7 +860,6 @@ "v_table", "vac_oven_small", "vac_pump", - "vambrace_larmor", "varmint_airgun", "vehicle_controls", "vest_leather_mod", @@ -1009,7 +912,6 @@ "wood_sheet", "wool_suit", "wristwatch", - "wsurvivor_jumpsuit", "wsurvivor_suit", "xd_10", "xedra_antenna",