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.

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

merged 21 commits into from
Jul 19, 2022

Conversation

ANickelN
Copy link
Contributor

@ANickelN ANickelN commented Jul 15, 2022

Summary

Balance "Adjust Weight/Volume of Ballistic Armor Plates"

Purpose of change

To adjust the weight and/or volume of some of the armor plates present in the game.
The makeshift plates added in #57881 were really, really light and small for what they are supposed to be so they got adjusted as well.

The time to put in plates and remove them was also changed, as 2 seconds for inserting or removing an armor plate is ridiculous. 8 seconds is the new time to insert considering they have to be secured as well as forced in.

Describe the solution

Go to manufacturer's sites in order to get information on commercially available plates and input that.

Describe alternatives you've considered

Do nothing.

Testing

Only minor testing done, but the plates seem to be correctly sized and able to fit in the carriers.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Armor / Clothing Armor and clothing Game: Balance Balancing of (existing) in-game features. labels Jul 15, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jul 15, 2022
ANickelN added 2 commits July 14, 2022 22:55
4 inch long plates probably aren't particularly effective at covering your organs...
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Jul 15, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 15, 2022
@ANickelN
Copy link
Contributor Author

Finished here, I'd like to go in and change some more stuff but I will leave it for a later PR.

Copy link
Contributor

@bombasticSlacks bombasticSlacks left a comment

Choose a reason for hiding this comment

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

On top of what's been posted here you also missed items that have ablative pockets. If these changes are merged all of those will break unless also updated.

data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
data/json/items/armor/ballistic_armor.json Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 16, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Jul 16, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 16, 2022
@ANickelN ANickelN requested a review from bombasticSlacks July 16, 2022 23:13
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Jul 16, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 16, 2022
@ANickelN
Copy link
Contributor Author

Not sure why it is failing at this point, let me know if it is something I did or unrelated.

@anothersimulacrum
Copy link
Member

The item density tests (which matter now) are failing: https://github.com/CleverRaven/Cataclysm-DDA/runs/7373858781?check_suite_focus=true#step:16:208

@bombasticSlacks
Copy link
Contributor

Yeah it looks like your scrap plates are per volume still too heavy. Im good with all these changes generally however 👍

@ANickelN
Copy link
Contributor Author

ANickelN commented Jul 18, 2022

My calculations for the scrap ESAPI plate was:
"30cm x 25cm x 0.2cm" = 150ml of space
150 ml = 150 cubic centimeters

Steel has a density of 8g/cm3, multiply 150cm3 * 8g and you get 1,200g. The plates are currently weighted at 1181g (very slightly lower because I used 7.87g/cm3 as my reference). Am I making a mistake here or is there an error in the test? How are they too heavy?

@anothersimulacrum
Copy link
Member

It is because nylon is also listed as a material they are made of.

@ANickelN
Copy link
Contributor Author

It is because nylon is also listed as a material they are made of.

There is no nylon in either of the scrap metal recipes. There is cotton though, should I make it a proportion then?
Ex: "material": [ { "type": "budget_steel", "portion": 15 }, { "type": "cotton", "portion": 1 } ]

@anothersimulacrum
Copy link
Member

anothersimulacrum commented Jul 18, 2022

Yeah, something like that would work. Or outright removal: #59333

@ANickelN
Copy link
Contributor Author

Again a failure, but pretty sure it isn't my fault this time. Looked in the error log and couldn't even figure out what failed. Basic build passed.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 19, 2022
@anothersimulacrum
Copy link
Member

@bombasticSlacks bombasticSlacks merged commit b9db130 into CleverRaven:master Jul 19, 2022
@ANickelN ANickelN deleted the Scrap-Plate-Fix branch July 19, 2022 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Game: Balance Balancing of (existing) in-game features. Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants