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

fix mapgen special build errors #77468

Closed

Conversation

LyleSY
Copy link
Contributor

@LyleSY LyleSY commented Oct 31, 2024

Summary

Bugfixes "fix mapgen special build errors"

Purpose of change

Fix build

Describe the solution

Removing existing road requirements from new map specials

Describe alternatives you've considered

Set the minimum occurrences of these non-unique map specials:

  • wind turbine
  • Motel
  • motel-twd

...to zero as stated in the relevant doc. See https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/OVERMAP.md

Add related terrains to overmap_terrain_coverage_whitelist

Testing

WIP

Additional context

Thanks to @Maleclypse for the idea

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Oct 31, 2024
@LyleSY LyleSY changed the title fix wind turbine mapgen error fix mapgen special build errors Oct 31, 2024
@github-actions github-actions bot added Code: Tests Measurement, self-control, statistics, balancing. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Oct 31, 2024
@Maleclypse Maleclypse marked this pull request as ready for review October 31, 2024 04:49
@Maleclypse
Copy link
Member

Assuming this passes the test you'll want to update the summary notes.

@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Oct 31, 2024
@Procyonae
Copy link
Contributor

Why are you removing the existing road requirement? These are supposed to place on preexisting roads to look more natural, it doesn't make sense to have a motel at the end of a long road to nowhere, they also have priority -1 to ensure they place after all the other roads are in

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Oct 31, 2024
@LyleSY
Copy link
Contributor Author

LyleSY commented Oct 31, 2024

Why are you removing the existing road requirement? These are supposed to place on preexisting roads to look more natural, it doesn't make sense to have a motel at the end of a long road to nowhere, they also have priority -1 to ensure they place after all the other roads are in

It's a different idea that @Maleclypse had for the same issue. My personal concern is to get the mapgen to a place where it can reliably run. I don't have a strong opinion on this solution.

@Procyonae
Copy link
Contributor

Procyonae commented Oct 31, 2024

I don't really see why a 6 month old change needs a bandaid fix, I've just opened up a new world to check nothing derped recently and in 3 OMs there's 3 successful wind turbine spawns and 6 varying motel spawns, with at least 1 of each. Either the test fail wants changing so it doesn't just accumulate failed minimum occurrence attempts regardless of successful spawns in between resulting in it failing over large areas unless I've misremembered how it works or the special placement code wants improving to be more reliable. I also have no clue why you think this would speed up mapgen

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 31, 2024
@LyleSY
Copy link
Contributor Author

LyleSY commented Nov 1, 2024

Agreed, I don't think this solution will speed up mapgen. I've removed that

@LyleSY
Copy link
Contributor Author

LyleSY commented Nov 2, 2024

Closing for now. Happy to reopen if there is interest in the future.

@LyleSY LyleSY closed this Nov 2, 2024
@LyleSY LyleSY deleted the fix_wind_turbine_build_error branch November 4, 2024 20:06
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) Code: Tests Measurement, self-control, statistics, balancing. 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.

4 participants