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

Basic beach decorations #78638

Merged
merged 3 commits into from
Dec 18, 2024
Merged

Basic beach decorations #78638

merged 3 commits into from
Dec 18, 2024

Conversation

Night-Pryanik
Copy link
Contributor

Summary

Content "Basic beach decorations"

Purpose of change

Resurrect #70173 by @I-am-Erk.

Describe the solution

Big part of work was already done by @I-am-Erk, kudos to him, I just made the whole thing work and fixed some errors along the way.

Added most of the beach furniture and terrain from that PR:

  • f_beach_log: an old log on the beach.
  • f_broken_boat: a washed up chunk of an abandoned boat
  • f_beach_seaweed: seaweed piled at the high waterline
  • t_coast_rock_surf: a rocky coastline on the edge of the water, to connect to the surf and create a graphically interesting edge
  • t_tidepool: a small basin of salt water in the sand.

Added the beach_formations connection group so that coast rock can connect to itself and its other versions, and sand can connect to it (but it doesn't connect to sand).

Instead of non-finished json version of map extra from that PR, I added a hardcoded version (for the time being). It doesn't create any "directional lines" of beach terrain or furniture, it just randomly populates the sandy beaches and surf line with various beach decorations.

Also, while I'm here, I made surf line look pretty instead of "straight cut" where it meets the sand.

Describe alternatives you've considered

Try to understand the idea of json mapgen of map extra from the PR and make it work.

Testing

Teleported to the ocean shore, hiked along the water, checked that sandy beaches are no longer empty.

Additional context

Before:
изображение

After:
изображение

Note: all sprites for the new terrain and furniture are placeholders.

@Night-Pryanik Night-Pryanik 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` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Dec 18, 2024
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 18, 2024
@Maleclypse Maleclypse merged commit 8028a07 into CleverRaven:master Dec 18, 2024
29 checks passed
@Night-Pryanik Night-Pryanik deleted the beach branch December 19, 2024 07:38
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` 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