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

Update materials for bullet damage type #40112

Merged
merged 3 commits into from
May 4, 2020
Merged

Update materials for bullet damage type #40112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3ac04b
Adjust materials for bullet damage type
anothersimulacrum May 3, 2020
4457400
Update power armor and turnout gear for bullet dmg
anothersimulacrum May 3, 2020
8df147a
update ESAPI vest and kevlar vest
anothersimulacrum May 4, 2020
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
2 changes: 1 addition & 1 deletion 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,7 +39,7 @@
"coverage": 85,
"encumbrance": 10,
"warmth": 15,
"material_thickness": 20,
"material_thickness": 16,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong. ESAPI plates are 20mm thick on the lowest end.

Copy link
Member Author

@anothersimulacrum anothersimulacrum May 4, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that what material thickness is supposed to represent? I was under the impression it's a magic number for determining armor values. If that is not so, ceramic or nylon need changes to prevent this from getting a buff if that is changed back.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to outline how I see this working real quick, I'd like to standardize on a physical thickness measurement (ideally with units etc), and then we loop back and have some unit tests where we essentially recreate various ballistic acceptance testing procedures like, "this will block 3 rounds of 9mm Parabellum".

"flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "NO_REPAIR" ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/coats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"price": 91000,
"price_postapoc": 1500,
"to_hit": -1,
"material": [ "nomex", "kevlar" ],
"material": [ "nomex", "kevlar", "lycra" ],
"symbol": "[",
"looks_like": "coat_winter",
"color": "yellow",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/legs_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"price": 81500,
"price_postapoc": 500,
"to_hit": -1,
"material": [ "nomex", "kevlar" ],
"material": [ "nomex", "kevlar", "lycra" ],
"symbol": "[",
"looks_like": "pants_cargo",
"color": "dark_gray",
Expand Down
24 changes: 12 additions & 12 deletions data/json/items/armor/power_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"price_postapoc": 30000,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "depowered_armor",
"color": "light_gray",
Expand All @@ -72,7 +72,7 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "15 kg", "moves": 200 } ],
"warmth": 90,
"power_armor": true,
"material_thickness": 11,
"material_thickness": 14,
"environmental_protection": 16,
"use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
"flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
Expand Down Expand Up @@ -113,7 +113,7 @@
"price_postapoc": 40000,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "power_armor_basic",
"color": "dark_gray",
Expand All @@ -123,7 +123,7 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
"warmth": 60,
"power_armor": true,
"material_thickness": 12,
"material_thickness": 16,
"environmental_protection": 16,
"use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
"flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
Expand All @@ -140,7 +140,7 @@
"price_postapoc": 7500,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "depowered_helmet",
"color": "light_gray",
Expand All @@ -149,7 +149,7 @@
"encumbrance": 50,
"warmth": 90,
"power_armor": true,
"material_thickness": 11,
"material_thickness": 14,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 2 ] ],
"flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES" ]
Expand All @@ -166,7 +166,7 @@
"price_postapoc": 10000,
"to_hit": 1,
"bashing": 1,
"material": [ "hardsteel", "steel" ],
"material": [ "hardsteel", "ceramic", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "power_armor_helmet_basic",
"color": "dark_gray",
Expand All @@ -175,7 +175,7 @@
"encumbrance": 60,
"warmth": 60,
"power_armor": true,
"material_thickness": 12,
"material_thickness": 16,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 2 ] ],
"flags": [ "WATCH", "WATERPROOF", "STURDY", "PARTIAL_DEAF", "THERMOMETER", "SUN_GLASSES" ]
Expand All @@ -192,7 +192,7 @@
"price_postapoc": 10000,
"to_hit": 1,
"bashing": 1,
"material": [ "superalloy", "plastic" ],
"material": [ "hardsteel", "kevlar", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "power_armor_helmet_basic",
"color": "dark_gray",
Expand All @@ -201,7 +201,7 @@
"encumbrance": 40,
"warmth": 60,
"power_armor": true,
"material_thickness": 9,
"material_thickness": 8,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 1 ] ],
"flags": [ "WATCH", "WATERPROOF", "STURDY", "THERMOMETER", "SUN_GLASSES" ]
Expand All @@ -218,7 +218,7 @@
"price_postapoc": 40000,
"to_hit": 1,
"bashing": 1,
"material": [ "superalloy", "plastic" ],
"material": [ "hardsteel", "kevlar", "kevlar_rigid" ],
"symbol": "[",
"looks_like": "depowered_armor",
"color": "dark_gray",
Expand All @@ -228,7 +228,7 @@
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "4 L", "max_contains_weight": "30 kg", "moves": 200 } ],
"warmth": 60,
"power_armor": true,
"material_thickness": 9,
"material_thickness": 8,
"environmental_protection": 16,
"use_action": { "type": "ups_based_armor", "activate_msg": "Your power armor engages." },
"flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE" ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/torso_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
"coverage": 85,
"encumbrance": 5,
"warmth": 15,
"material_thickness": 4,
"material_thickness": 3,
"flags": [ "STURDY", "SKINTIGHT" ]
},
{
Expand Down
46 changes: 23 additions & 23 deletions data/json/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"latent_heat": 398,
"bash_resist": 0,
"cut_resist": 4,
"bullet_resist": 3,
"bullet_resist": 2,
"acid_resist": 4,
"fire_resist": 2,
"elec_resist": 0,
Expand All @@ -77,7 +77,7 @@
"latent_heat": 333,
"bash_resist": 3,
"cut_resist": 4,
"bullet_resist": 3,
"bullet_resist": 1,
"acid_resist": 13,
"fire_resist": 2,
"elec_resist": 2,
Expand Down Expand Up @@ -105,7 +105,7 @@
"rotting": true,
"bash_resist": 2,
"cut_resist": 3,
"bullet_resist": 2,
"bullet_resist": 1,
"acid_resist": 7,
"fire_resist": 1,
"elec_resist": 2,
Expand All @@ -132,7 +132,7 @@
"latent_heat": 205,
"bash_resist": 3,
"cut_resist": 4,
"bullet_resist": 3,
"bullet_resist": 2,
"acid_resist": 16,
"fire_resist": 2,
"elec_resist": 0,
Expand All @@ -148,7 +148,7 @@
"density": 58,
"bash_resist": 4,
"cut_resist": 5,
"bullet_resist": 4,
"bullet_resist": 2,
"acid_resist": 1,
"fire_resist": 2,
"elec_resist": 0,
Expand All @@ -170,7 +170,7 @@
"latent_heat": 273,
"bash_resist": 6,
"cut_resist": 6,
"bullet_resist": 5,
"bullet_resist": 2,
"acid_resist": 7,
"fire_resist": 3,
"elec_resist": 0,
Expand Down Expand Up @@ -212,8 +212,8 @@
"specific_heat_solid": 1,
"latent_heat": 333,
"bash_resist": 2,
"cut_resist": 6,
"bullet_resist": 5,
"cut_resist": 4,
"bullet_resist": 7,
"acid_resist": 10,
"fire_resist": 10,
"elec_resist": 10,
Expand Down Expand Up @@ -248,7 +248,7 @@
"latent_heat": 333,
"bash_resist": 3,
"cut_resist": 4,
"bullet_resist": 3,
"bullet_resist": 1,
"acid_resist": 6,
"fire_resist": 2,
"elec_resist": 2,
Expand Down Expand Up @@ -342,9 +342,9 @@
"specific_heat_liquid": 0.52,
"specific_heat_solid": 0.52,
"latent_heat": 5200,
"bash_resist": 14,
"cut_resist": 20,
"bullet_resist": 16,
"bash_resist": 5,
"cut_resist": 5,
"bullet_resist": 2,
"acid_resist": 10,
"fire_resist": 3,
"elec_resist": 3,
Expand All @@ -361,9 +361,9 @@
"specific_heat_liquid": 0.52,
"specific_heat_solid": 0.52,
"latent_heat": 5200,
"bash_resist": 14,
"cut_resist": 20,
"bullet_resist": 16,
"bash_resist": 5,
"cut_resist": 5,
"bullet_resist": 2,
"acid_resist": 10,
"fire_resist": 3,
"elec_resist": 3,
Expand Down Expand Up @@ -605,7 +605,7 @@
"latent_heat": 273,
"bash_resist": 10,
"cut_resist": 16,
"bullet_resist": 13,
"bullet_resist": 9,
"acid_resist": 6,
"fire_resist": 3,
"elec_resist": 0,
Expand Down Expand Up @@ -727,7 +727,7 @@
"latent_heat": 273,
"bash_resist": 4,
"cut_resist": 4,
"bullet_resist": 3,
"bullet_resist": 2,
"acid_resist": 5,
"fire_resist": 3,
"elec_resist": 0,
Expand Down Expand Up @@ -776,8 +776,8 @@
"latent_heat": 273,
"soft": true,
"bash_resist": 2,
"cut_resist": 4,
"bullet_resist": 3,
"cut_resist": 3,
"bullet_resist": 5,
"acid_resist": 5,
"fire_resist": 3,
"elec_resist": 2,
Expand All @@ -796,9 +796,9 @@
"specific_heat_liquid": 0.82,
"specific_heat_solid": 0.45,
"latent_heat": 273,
"bash_resist": 2,
"bash_resist": 3,
"cut_resist": 4,
"bullet_resist": 3,
"bullet_resist": 5,
"acid_resist": 5,
"fire_resist": 3,
"elec_resist": 2,
Expand Down Expand Up @@ -1225,7 +1225,7 @@
"specific_heat_solid": 0.45,
"latent_heat": 273,
"cut_resist": 6,
"bullet_resist": 5,
"bullet_resist": 3,
"acid_resist": 7,
"fire_resist": 3,
"elec_resist": 0,
Expand All @@ -1248,7 +1248,7 @@
"latent_heat": 273,
"bash_resist": 6,
"cut_resist": 6,
"bullet_resist": 5,
"bullet_resist": 3,
"acid_resist": 8,
"fire_resist": 3,
"elec_resist": 2,
Expand Down