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

Disable riot damage in city (without removing code support) #79594

Closed
wants to merge 1 commit into from

Conversation

moxian
Copy link
Contributor

@moxian moxian commented Feb 7, 2025

Summary

None

Purpose of change

This is an alternative to #79580 which effectively reverts the #79535 changes as far as user experience goes, but leaves the code support in so that it can be further worked on behind the curtains until it's in better shape (see #79584 and #79575)

tagging #79565, although this does not technically fix the core issue

Describe the solution

JSON-only change. With this PR no overmap has PP_GENERATE_RIOT_DAMAGE flag so the riot damage generator never runs.
But it can still be enabled locally for testing very easily.

Describe alternatives you've considered

Completely revert the code as #79580 does. That would be preferable if this feature is fundamentally unfixable (since the current PR effectively creates dead code, and having dead code is not ideal)

Testing

20250207-131512-cataclysm-tiles
20250207-131630-cataclysm-tiles

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. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 7, 2025
@GuardianDll
Copy link
Member

#79575 resolved the error, so i do not see a reason to remove generator anymore

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 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.

2 participants