Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust Weight/Volume of Ballistic Armor Plates #59284

Merged
merged 21 commits into from
Jul 19, 2022
Merged

Adjust Weight/Volume of Ballistic Armor Plates #59284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3c09dc4
Update ballistic_armor.json
ANickelN Jul 15, 2022
9074149
Update ballistic_armor.json
ANickelN Jul 15, 2022
2ccc2c6
Fix volume of Heavy Ballistic Vest
ANickelN Jul 15, 2022
82aea95
Add Longest_Side to plates
ANickelN Jul 15, 2022
fe9d530
Make carriers able to hold the plates again
ANickelN Jul 15, 2022
a143f9f
Fixed Missing Commas
ANickelN Jul 15, 2022
da91516
Updated Post Apoc Price
ANickelN Jul 15, 2022
fb46586
Merge branch 'CleverRaven:master' into Scrap-Plate-Fix
ANickelN Jul 16, 2022
eddb3d5
Reduce Prices
ANickelN Jul 16, 2022
452c648
Revert Pricing Changes
ANickelN Jul 16, 2022
8779d82
Reverted Steel_Ballistic_Plate to previous values
ANickelN Jul 16, 2022
bfb28f8
Revert ESAPI and ESBI Thickness to Original Values
ANickelN Jul 16, 2022
d807900
Change Pockets to Hold Plates Again
ANickelN Jul 16, 2022
e28c417
Correct Thickness of Heavy_Steel_Ballistic_Plate
ANickelN Jul 16, 2022
41b8265
Fix JSON Error (Hopefully)
ANickelN Jul 16, 2022
6f89360
Fix Thickness of Item
ANickelN Jul 16, 2022
5973ca2
Corrected Volume/Weight of Scrap Plates
ANickelN Jul 16, 2022
c515fdb
Mercenary Coat can now Hold Plates Again
ANickelN Jul 16, 2022
f904390
Lint
ANickelN Jul 16, 2022
8d7622a
Add Partial Material Composition to Scrap Plates
ANickelN Jul 18, 2022
7a2b995
Remove Cotton from Scrap Plates
ANickelN Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 75 additions & 52 deletions data/json/items/armor/ballistic_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
},
Expand All @@ -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" ]
},
Expand All @@ -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" ]
}
Expand All @@ -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" ],
Expand All @@ -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" ],
Expand Down Expand Up @@ -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": ",",
Expand All @@ -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&currency=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" ],
Expand All @@ -209,24 +216,25 @@
"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,
"flags": [ "ABLATIVE_LARGE", "CANT_WEAR" ],
"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" ]
Expand All @@ -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" ],
Expand All @@ -259,20 +269,21 @@
"//": "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,
"flags": [ "ABLATIVE_MEDIUM", "CANT_WEAR" ],
"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,
Expand Down Expand Up @@ -319,19 +330,21 @@
"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" ]
},
{
"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" ]
},
Expand All @@ -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" ]
},
Expand All @@ -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" ]
}
Expand Down Expand Up @@ -539,19 +554,21 @@
"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" ]
},
{
"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" ]
},
Expand Down Expand Up @@ -644,19 +661,21 @@
"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" ]
},
{
"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" ]
},
Expand Down Expand Up @@ -738,19 +757,21 @@
"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" ]
},
{
"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" ]
},
Expand Down Expand Up @@ -970,19 +991,21 @@
"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" ]
},
{
"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" ]
}
Expand Down
16 changes: 10 additions & 6 deletions data/json/items/armor/bespoke_armor/custom_overcoats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,19 +175,21 @@
"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" ]
},
{
"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" ]
},
Expand All @@ -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" ]
},
Expand All @@ -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" ]
}
Expand Down