diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index da362a55bf828..82ab22821e7c4 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -39,19 +39,22 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", + "//": "Should fit a medium ESAPI plate snugly", "flag_restriction": [ "ABLATIVE_LARGE" ] }, { "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -61,7 +64,8 @@ "volume_encumber_modifier": 0, "max_contains_volume": "800 ml", "max_contains_weight": "2 kg", - "moves": 200, + "max_item_length": "21 cm", + "moves": 800, "description": "Pocket for a medium armor plate.", "flag_restriction": [ "ABLATIVE_MEDIUM" ] }, @@ -71,7 +75,8 @@ "volume_encumber_modifier": 0, "max_contains_volume": "800 ml", "max_contains_weight": "2 kg", - "moves": 200, + "max_item_length": "21 cm", + "moves": 800, "description": "Pocket for a medium armor plate.", "flag_restriction": [ "ABLATIVE_MEDIUM" ] } @@ -97,7 +102,9 @@ "name": { "str": "ESAPI ballistic plate" }, "description": "A polygonal ballistic plate with a slightly concave profile, made of ceramic. Its inner surface is coated with UHMW polyethylene and is labeled \"TOP\", while the outer surface is labeled \"STRIKE FACE\". This is intended to be worn in a ballistic vest, and can withstand several high-energy rifle rounds before breaking.", "weight": "2500 g", - "volume": "1533 ml", + "volume": "1915 ml", + "longest_side": "32 cm", + "//": "ESAPI Medium are 24.13cm x 31.75cm and 2.5cm thick", "price": "600 USD", "price_postapoc": "1 USD", "material": [ "ceramic" ], @@ -118,6 +125,7 @@ "description": "A soft armor insert designed to protect against stab wounds. While it's not great protection, it incurs no additional encumbrance. This is intended to be inserted into a ballistic vest, and can't be worn on its own.", "weight": "500 g", "volume": "300 ml", + "longest_side": "16 cm", "price": "600 USD", "price_postapoc": "1 USD", "material": [ "kevlar", "nylon" ], @@ -151,6 +159,7 @@ "//3": "30cm x 25cm x .35cm", "volume": "262 ml", "price": "600 USD", + "longest_side": "30 cm", "price_postapoc": "1 USD", "material": [ "qt_steel", "nylon" ], "symbol": ",", @@ -177,24 +186,22 @@ "name": { "str": "heavy steel ballistic plate" }, "repairs_like": "hsurvivor_jumpsuit", "//": "based on level 3 plates. Discuss high temp quenching so gonna assume tempered steel", - "//2": "link like: https://www.shindn.com/products/nij-iiia?variant=35614363582627¤cy=USD&utm_medium=product_sync&utm_source=google&utm_content=sag_organic&utm_campaign=sag_organic&utm_campaign=gs-2019-08-03&utm_source=google&utm_medium=smart_campaign&gclid=Cj0KCQjw5-WRBhCKARIsAAId9FlGQAManRGZ0qpV9AIkD23FZfpm4aPDI4PHE9qPktZ2bdQY2NmcIVkaAs2pEALw_wcB", + "//2": "link like: https://www.spartanarmorsystems.com/spartan-omega-ar500-body-armor-single-plate/", "description": "A heavy concave ballistic plate made of tempered steel, designed to stop small-caliber rounds. \"NIJ III PROTECTION\" is etched into the back of the plate. This is intended to be inserted into a ballistic vest, and can't be worn on its own.", - "weight": "2500 g", - "//3": "30cm x 25cm x .55cm", - "volume": "413 ml", + "weight": "3912 g", + "//3": "25.4cm x 30.48cm x 0.635cm plate measurements (thin plate!)", + "volume": "194 ml", + "longest_side": "30 cm", "price": "600 USD", "price_postapoc": "1 USD", "material": [ "qt_steel", "nylon" ], "symbol": ",", "color": "dark_gray", - "material_thickness": 5, + "material_thickness": 6.35, "flags": [ "ABLATIVE_LARGE", "CANT_WEAR" ], "armor": [ { - "material": [ - { "type": "nylon", "covered_by_mat": 100, "thickness": 1.0 }, - { "type": "qt_steel", "covered_by_mat": 100, "thickness": 4.5 } - ], + "material": [ { "type": "qt_steel", "covered_by_mat": 100, "thickness": 6.35 } ], "encumbrance": 2, "coverage": 45, "covers": [ "torso" ], @@ -209,13 +216,14 @@ "name": { "str": "scrap ESAPI plate" }, "//": "some crude metal chopped and bent to fit into a plate carrier. not great, but better than nothing. added the cotton component cause i'd imagine a jagged piece of metal would cut through a ballistic vest and this is based on the existing scrap armor", "//2": "requested in https://github.com/CleverRaven/Cataclysm-DDA/issues/49477", - "description": "A flat piece of salvaged steel, crudely cut and bent into the shape of an ESAPI ballistic plate. It's wrapped in rags to cover the sharp edges. Better than nothing, but it's heavy, and not very strong. This is intended to be inserted into a ballistic vest, and can't be worn on its own.", - "weight": "900 g", - "//3": "30cm x 25cm x 1.5cm", - "volume": "188 ml", + "description": "A flat piece of salvaged steel, crudely cut and bent into the shape of an ESAPI ballistic plate. It's wrapped in rags to cover the sharp edges. Better than nothing, but it's heavier than the real thing, and not very strong. This is intended to be inserted into a ballistic vest, and can't be worn on its own.", + "weight": "1181 g", + "//3": "30cm x 25cm x 0.2cm", + "longest_side": "30 cm", + "volume": "150 ml", "price": "50 USD", "price_postapoc": "1 USD", - "material": [ "budget_steel", "cotton" ], + "material": [ "budget_steel" ], "symbol": ",", "color": "dark_gray", "material_thickness": 3, @@ -223,10 +231,10 @@ "armor": [ { "material": [ - { "type": "budget_steel", "covered_by_mat": 90, "thickness": 1.5 }, + { "type": "budget_steel", "covered_by_mat": 90, "thickness": 2 }, { "type": "cotton", "covered_by_mat": 100, "thickness": 1 } ], - "encumbrance": 2, + "encumbrance": 3, "coverage": 45, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] @@ -238,9 +246,11 @@ "type": "ARMOR", "category": "armor", "name": { "str": "ESBI ballistic plate" }, + "//3": "20.32cm x 15.24cm x 2.5cm", "description": "A polygonal ballistic plate with a slightly concave profile, made of ceramic. \"STRIKE FACE\" is printed on its outer surface. This is designed to be worn in the sides of a plate carrier, and can withstand several high-energy rifle rounds before breaking.", - "weight": "1 kg", - "volume": "600 ml", + "weight": "993 g", + "volume": "774 ml", + "longest_side": "20 cm", "price": "600 USD", "price_postapoc": "1 USD", "material": [ "ceramic" ], @@ -259,12 +269,13 @@ "//": "some crude metal chopped and bent to fit into a plate carrier. not great, but better than nothing. added the cotton component cause i'd imagine a jagged piece of metal would cut through a ballistic vest and this is based on the existing scrap armor", "//2": "requested in https://github.com/CleverRaven/Cataclysm-DDA/issues/49477", "description": "A flat piece of salvaged steel, crudely cut and bent into the shape of an ESBI ballistic plate. It's wrapped in rags to cover the sharp edges. Better than nothing, but it's heavy, and not very strong. This is intended to be inserted into a ballistic vest, and can't be worn on its own.", - "weight": "450 g", - "//3": "18cm x 20cm x 1.5cm", - "volume": "188 ml", + "weight": "488 g", + "//3": "15.24cm x 20.32cm x 0.2cm", + "volume": "62 ml", + "longest_side": "20 cm", "price": "30 USD", "price_postapoc": "1 USD", - "material": [ "budget_steel", "cotton" ], + "material": [ "budget_steel" ], "symbol": ",", "color": "dark_gray", "material_thickness": 3, @@ -272,7 +283,7 @@ "armor": [ { "material": [ - { "type": "budget_steel", "covered_by_mat": 90, "thickness": 1.5 }, + { "type": "budget_steel", "covered_by_mat": 90, "thickness": 2 }, { "type": "cotton", "covered_by_mat": 100, "thickness": 1 } ], "encumbrance": 1, @@ -319,9 +330,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -329,9 +341,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -341,7 +354,8 @@ "volume_encumber_modifier": 0, "max_contains_volume": "800 ml", "max_contains_weight": "2 kg", - "moves": 200, + "max_item_length": "21 cm", + "moves": 800, "description": "Pocket for a medium armor plate.", "flag_restriction": [ "ABLATIVE_MEDIUM" ] }, @@ -351,7 +365,8 @@ "volume_encumber_modifier": 0, "max_contains_volume": "800 ml", "max_contains_weight": "2 kg", - "moves": 200, + "max_item_length": "21 cm", + "moves": 800, "description": "Pocket for a medium armor plate.", "flag_restriction": [ "ABLATIVE_MEDIUM" ] } @@ -539,9 +554,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -549,9 +565,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -644,9 +661,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -654,9 +672,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -738,9 +757,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -748,9 +768,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -970,9 +991,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -980,9 +1002,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for a large armor plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] } diff --git a/data/json/items/armor/bespoke_armor/custom_overcoats.json b/data/json/items/armor/bespoke_armor/custom_overcoats.json index 55ef82d3c8b63..1c614e54a360f 100644 --- a/data/json/items/armor/bespoke_armor/custom_overcoats.json +++ b/data/json/items/armor/bespoke_armor/custom_overcoats.json @@ -175,9 +175,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for front plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -185,9 +186,10 @@ "pocket_type": "CONTAINER", "ablative": true, "volume_encumber_modifier": 0, - "max_contains_volume": "1600 ml", + "max_contains_volume": "2000 ml", "max_contains_weight": "5 kg", - "moves": 200, + "max_item_length": "33 cm", + "moves": 800, "description": "Pocket for back plate.", "flag_restriction": [ "ABLATIVE_LARGE" ] }, @@ -197,7 +199,8 @@ "volume_encumber_modifier": 0, "max_contains_volume": "800 ml", "max_contains_weight": "2 kg", - "moves": 200, + "max_item_length": "21 cm", + "moves": 800, "description": "Pocket for right side plate.", "flag_restriction": [ "ABLATIVE_MEDIUM" ] }, @@ -207,7 +210,8 @@ "volume_encumber_modifier": 0, "max_contains_volume": "800 ml", "max_contains_weight": "2 kg", - "moves": 200, + "max_item_length": "21 cm", + "moves": 800, "description": "Pocket for left side plate.", "flag_restriction": [ "ABLATIVE_MEDIUM" ] }