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

Rework river generation #74261

Closed
wants to merge 9 commits into from
Closed

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Jun 2, 2024

Summary

Features "Reworked river generation to be more natural"

Purpose of change

Resurrect #38894

Describe the solution

Aims to get the nicer looking rivers from #38894 to a mergeable state
For now isn't attempting to solve #36630 / #59433

Describe alternatives you've considered

Testing

Compiles and loads, yields similar rivers to original PRs screenshots
Having an occasional hang that VS's debugger isn't catching

Additional context

I do find it pretty amusing that the author of the original PR came out of nowhere, made 3 really impactful PRs then disappeared before any of the got merged https://github.com/CleverRaven/Cataclysm-DDA/pulls?q=author%3ADiabolus-Engi
Random other peeves with existing water related overmap scale world gen:
I don't like that lake logic is pretty much completely disconnected from rivers logic
I don't like that rivers don't slightly favour flowing towards the nearest ocean
The river nodes should probably be tracked per river on a world scale
Rivers should be able to realistically merge rather than just cross
Lakes and wide rivers and should have variable depths, currently rivers never go lower than z0 while lakes go straight to z-5 after the shore omt
Cities should be able to span rivers
Streams should be connections so they can path to rivers
Water should actually flow in a direction so boats are less like reskinned cars
1 omt wide rivers should be supported

@github-actions github-actions bot added Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jun 2, 2024
@Procyonae Procyonae removed the <Bugfix> This is a fix for a bug (or closes open issue) label Jun 2, 2024
src/overmap.cpp Outdated Show resolved Hide resolved
Procyonae added 6 commits June 3, 2024 11:53
This reverts commit 35b940e.
…d remove from ocean gen

Rivers will naturally join the ocean without this and finding the northmost and southmost points of the closest east ocean doesn't exactly make any sense to begin with
Copy link
Contributor

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Jul 10, 2024
@Night-Pryanik
Copy link
Contributor

Closing as stale. If you wish to continue working on this, ping me to reopen.

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 [C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display stale Closed for lack of activity, but still valid.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants