Skip to content

Implement new region settings #83033

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

Jump to bottom
Merged
merged 4 commits into from
Sep 30, 2025
Merged

Implement new region settings #83033

merged 4 commits into from
Sep 30, 2025

Conversation

ShnitzelX2
Copy link
Contributor

Summary

Infrastructure "region settings overhaul"

Purpose of change

Describe the solution

This is it, this is the big one! Swaps out all old region settings classes/structs for the new ones.

Also:

  • Assigns EXTERNAL_OPTION: DEFAULT_REGION for each mod's new default region settings
  • Dedupes a bunch of accesses to region settings where applicable.
  • Aftershock is throwing a bunch of highway generation errors, probably because of how highways find lakes, so I'm temporarily disabling highways in Aftershock until they can get fixed.

Describe alternatives you've considered

Testing

Built locally, loaded a vanilla world and aftershock without errors, CI pending

Additional context

👍Big thanks👍 to the mergers for their work managing all of my PRs, I know it's a lot

@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Weather Rain, snow, portal storms and non-temperature environment Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Innawood 🌲 Anything to do with Innawood mod Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Desert Region Anything relating to the Desert Region mod Mods: Backrooms Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol labels Sep 25, 2025
github-actions[bot]
github-actions bot reviewed Sep 25, 2025
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @onura46 @Light-Wave

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Sep 25, 2025
@GuardianDll
Copy link
Member

weather_test is not happy

@ShnitzelX2 ShnitzelX2 force-pushed the regset-replacement branch 2 times, most recently from 5d42e72 to 1da10fa Compare September 28, 2025 02:16
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 28, 2025
@GuardianDll
Copy link
Member

Dang, now there is a conflict

@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 29, 2025
@GuardianDll
Copy link
Member

This PR is clearly cursed, but rebasing should fix it

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 30, 2025
@GuardianDll GuardianDll merged commit 7a8a027 into CleverRaven:master Sep 30, 2025
29 checks passed
@GuardianDll
Copy link
Member

🫡

@YuPro
Copy link

YuPro commented Sep 30, 2025 •
edited
Loading

I suspect this PR is breaking Aftershock save.
After loading yesterday game temperature on outside was +20°C, and +80° inside the ship.
Went back to 09-29-2245 and temperature is good again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@I-am-Erk I-am-Erk Awaiting requested review from I-am-Erk

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
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) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Code: Tests Measurement, self-control, statistics, balancing. Info / User Interface Game - player communication, menus, etc. [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 Mechanics: Weather Rain, snow, portal storms and non-temperature environment Mods: Aftershock Anything to do with the Aftershock mod Mods: Backrooms Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Desert Region Anything relating to the Desert Region mod Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

region_settings overwrites all previous region_overlays
3 participants
@ShnitzelX2 @GuardianDll @YuPro