-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
CDDA is about to E.X.P.L.O.D.E. (EOD stuff) #69063
Conversation
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details. Click to expand
This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to |
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: Antti Riikonen <harava@gmail.com>
* Everything EOD. I hope. * eod2 - these stupid deltoid plates * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Descriptions. * Update data/json/items/armor/ballistic_armor.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * accidentally some plates * Update professions.json * Update data/json/items/armor/legs_armor.json Co-authored-by: Antti Riikonen <harava@gmail.com> * Update boots.json * appease density test --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: Antti Riikonen <harava@gmail.com>
nice to see these get some love, would be interesting to add some recipes for custom up armoring them in a similar branch to survivor gear, just heavier and more encumbering. |
Summary
Content "EOD suit adjustments and EOD paraphernalia"
Purpose of change
EOD suits were previously providing considerable ballistic protection, all over the body. This would not be accurate; EOD suits are primarily meant to protect from blast and fragmentation on approach, not bullets.
Describe the solution
I changed the material type of the EOD suits and scaled their protection to values that might give some protection to very weak bullets, but nothing more. I added a central plate pocket to both the EOD suit and the light EOD suit (renamed to tactical EOD suit to better reflect usage) that offered some more ballistic protection as a side effect of design.
Along the way I also adjusted price (https://online.ogs.ny.gov/purchase/spg/awards/3823223173Can.htm) , added some paraphernalia to the EOD spawns, And also added LVL III deltoid plates that the tactical eod suit could accept.
ALSO added spots in police dept mapgen where cop_armory wasn't spawning.
Describe alternatives you've considered
Making the tactical EOD suit as modular as it's supposed to be - there's like a kajillion pieces.
![image](https://private-user-images.githubusercontent.com/7764202/279792029-5b57e144-5b74-427f-9d57-e3d187da8b6e.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2MTcyNzMsIm5iZiI6MTczOTYxNjk3MywicGF0aCI6Ii83NzY0MjAyLzI3OTc5MjAyOS01YjU3ZTE0NC01Yjc0LTQyN2YtOWQ1Ny1lM2QxODdkYThiNmUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTVUMTA1NjEzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NmVjZmNhODY1ZDIyZjJmMjE4ZTlhZmVhZWQ0MzRjOWViZDQ0NTM4NjE0MjQyMjAyMTc1MmViNmY3NDcyMDE4NCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.B6qA9gRLSumAX4rX3XlBNI7CnJWvGm8mCS0MTnKUj0E)
Adding a flag for deltoid plates instead of limiting what can be put in the deltoid pockets via item length.
Not adding these stupid plates.
![image](https://private-user-images.githubusercontent.com/7764202/279793106-def709b6-302e-4126-8460-9172a125465f.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2MTcyNzMsIm5iZiI6MTczOTYxNjk3MywicGF0aCI6Ii83NzY0MjAyLzI3OTc5MzEwNi1kZWY3MDliNi0zMDJlLTQxMjYtODQ2MC05MTcyYTEyNTQ2NWYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTVUMTA1NjEzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NTVhZDIxZmUwMzRjN2ViMDIxM2VhODMzMzg0ZTVlNjRkMmM5MzQ3NzkwODUxNjk5MmNmZmRmODY4OGI4YjFiYSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.vzUgfZpXsp3aQv_DhsHjbq6ee3iUOy2b2LhJVRJHeHA)
Adding a gorget/mega collar to the EOD suit, but I ran into issues doing that. See issue #69049 .
![image](https://private-user-images.githubusercontent.com/7764202/279792613-84744272-22e1-41e8-aee4-0ed374115034.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2MTcyNzMsIm5iZiI6MTczOTYxNjk3MywicGF0aCI6Ii83NzY0MjAyLzI3OTc5MjYxMy04NDc0NDI3Mi0yMmUxLTQxZTgtYWVlNC0wZWQzNzQxMTUwMzQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTVUMTA1NjEzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NmVlODBjOGE0MTk1YjNkYmMxMTM3MmU2NjAwZDQyZmQ5N2FlZWFhMmJlMDExYjA1ZmMwN2U2MGQ0MTkwYWFmZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.-dUJ0RjsLYWACTHHeZHqhmpgoT5oSVpBBZQNBSsHk8Y)
I think also we need a separate overpressure damage type for concussions. Or otherwise just have explosives deal bash damage.
Testing
Loaded game, spawned items, checked spawns. Tossed some grenades to 5 tiles away - at the cusp of the kill radius - and didn't die sometimes, which is about what I'd expect of an EOD suit. Tried putting plates in and out.
Additional context
While it wasn't terribly helpful I did use https://www.youtube.com/watch?v=s3pTJ1dIvMg as a source of some information, primarily plate composition.