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

Audit Overmap Terrains for correct application of Riot Damage #79593

Merged
merged 5 commits into from
Feb 9, 2025

Conversation

QuillInkwell
Copy link
Contributor

Summary

Bugfixes "Audit Overmap Terrains for correct application of Riot Damage"

Purpose of change

Fix #79587. A number of non-city maps are being affected by riot damage. Additionally a number of in-city maps are incorrectly being spared from riot damage.

Describe the solution

Go over just about every file in the overmap terrain folder and one by one add or delete the flag.
Specials spawning in cities should all have the flag now. Specials spawning outside of cities should have the flag deleted from their terrain.

In the case of terrains used in both:
All motels currently generate riot damage. I could be miss-reading this but it looks like the same terrains are used for the in-city special as the out of city special. It's a bit of a confusing web so I left the flag on all motels.
I was able to separate out the rural gas station so it won't have the flag applied to itself.
Some map specials make use of parking lots and s lots. I am not crazy enough to try and untangle that whole mess so for now the majority of parking lots are excluded from the flag. (The mine and sugar house notably).

FEMA camps were specifically included in the riot damage flag as the only map special I deliberately added it to. In my mind there would likely be rioting there as well in the final days. Or at the very least chaos on par with rioting.

Describe alternatives you've considered

Not adding the flag to FEMA camps.
Trying to untangle all instances of parking lots used in map specials to separate them from parking lots in city specials.
Removing the copy from on some map specials that are clearly not in city buildings.

Testing

Loaded up a new world. Teleported around to the locations, verifying behavior as expected. Map specials were not rioted. City Specials are.

I did notice it behaves erratically when Nested Mapgen is used. Specifically the strip mall totally overwrites the riot damage and it is never applied to the nested chunk. Something to look out and bug report I guess.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions labels Feb 7, 2025
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@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 Feb 7, 2025
@QuillInkwell QuillInkwell marked this pull request as draft February 8, 2025 05:47
@QuillInkwell
Copy link
Contributor Author

Returning this to draft because I need to remove basements from being flagged. I will also remove all roofs because it's a little weird to have so much blood on every random house and store roof. I think generally speaking if basements and subway stations are being excluded, roofs can be as well.

@QuillInkwell QuillInkwell marked this pull request as ready for review February 8, 2025 13:32
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 8, 2025
@Maleclypse Maleclypse merged commit 778d40a into CleverRaven:master Feb 9, 2025
27 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 9, 2025
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 <Bugfix> This is a fix for a bug (or closes open issue) Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Impliment Riot Damage in Cities is applying to farm fields
2 participants