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

adds a sandy margin to ocean beaches #70175

Merged
merged 14 commits into from
Dec 20, 2023
Merged

Conversation

I-am-Erk
Copy link
Member

@I-am-Erk I-am-Erk commented Dec 13, 2023

Summary

Features "Adds sand to ocean beaches"

Purpose of change

Oceans were added in #70070 but are currently just a sudden batch of salt water where once there was grass.

Describe the solution

Adds sand to beaches and adjusts the spawning of ocean shores such that:

  1. ocean shores are less 'noisy' than lakes, with a smoother boundary into water
  2. the transition from shore to water is more gradual, going from surrounding terrain to sand to water over most of an OMT
  3. amount of sand can be specified in json settings

Describe alternatives you've considered

I'm considering some alternative beach formations depending on the aliased terrain but I think that's probably better handled with map extras. I would like to manage the additional contents of beaches through map specials and map extras that allow us to dynamically turn chunks of the shoreline into rocks and other features, and that will come after this basic step.

Testing

image
I used ascii here because t_swater_surf isn't ready yet. The cyan line is the "surf" zone, which will be a transitional art tile showing waves crashing on the sand (I hope) or at least a nice boundary if I can't get that to work properly. The yellow is the sandy beach, the rest is salt water.

image
There are some artifacts to work out, such as the boundary with rivers. I also don't like that it's a constant unchanging bar of sand. However this at least opens things up to adding some map extras and stuff that will improve the look.

Additional context

#70173 will add some extra terrain and perhaps some map extras to spawn here.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display [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 Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Dec 13, 2023
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Dec 13, 2023
@ADekema
Copy link

ADekema commented Dec 13, 2023

These could be added to portions of rivers and lakes as well.

@I-am-Erk
Copy link
Member Author

I-am-Erk commented Dec 13, 2023

These could be added to portions of rivers and lakes as well.

The mapgen as it works currently is pretty rigid and won't do that very well, but it may be possible eventually. They'll likely want their own systems

@I-am-Erk I-am-Erk marked this pull request as ready for review December 13, 2023 22:27
src/mapgen_functions.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Dec 13, 2023
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Dec 13, 2023
@Procyonae
Copy link
Contributor

These could be added to portions of rivers and lakes as well.

The mapgen as it works currently is pretty rigid and won't do that very well, but it may be possible eventually. They'll likely want their own systems

You could feasibly do it with a mutable map but I'm not sure if that's really very sensible

@github-actions github-actions bot added Mods Issues related to mods or modding Mods: No Hope Relating to the mod No Hope labels Dec 14, 2023
@github-actions github-actions bot added Mods: Aftershock Anything to do with the Aftershock mod Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. labels Dec 14, 2023
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: @Night-Pryanik

@github-actions github-actions bot added 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 BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 19, 2023
@Maleclypse Maleclypse merged commit bee4953 into CleverRaven:master Dec 20, 2023
26 checks passed
@I-am-Erk I-am-Erk deleted the beaches-1 branch December 21, 2023 06:26
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 [C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing 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 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: Desert Region Anything relating to the Desert Region mod Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants