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

Add a variety of marine plants #71844

Closed
wants to merge 23 commits into from

Conversation

worm-girl
Copy link
Contributor

@worm-girl worm-girl commented Feb 19, 2024

Summary

Content "Adds a variety of marine plants, fixes some bugs related to diving and surfacing."

Purpose of change

#70341 got posted. I came up with some ideas. I had half an hour to kill. Now we have marine plants.

Describe the solution

Adds green algae, red algae, sugar kelp, bladderwrack, sea lettuce, sea anemones, and sea sponges.

Green and red algae are inedible varieties that grow in shalow and deep water, and are by far the most common marine plants. They can be harvested, and the resulting seaweed can be dried and used as fuel for fires. There are probably a million other things that could reasonably be done with it.

Sugar kelp can be harvested with a knife in spring or summer. It gives you big pieces of edible kelp which can be dried to make kombu. Kombu is great for making soup stock. It only grows in deeper water.

Sea anemones are basically just decoration that grows underwater. They can also be used to spice up marine map specials.

Sea sponges are just decoration for now. If someone comes up with a crafting recipe, we could turn them into cleaning sponges.

Dots some random stuff around the sea floor. I tried making kelp patches work, but I couldn't get the game to automatically generate map extras on the ocean floor.

Shallow water plants:

Bladderwrack is edible, and is a component in a lot of natural (probably fake) medicine. One thing that it does do is act as an anticoagulant, but studies show that eating it doesn't seem to have much of an effect due to low intestinal absorption: https://pubmed.ncbi.nlm.nih.gov/19696660/ Maybe we can use it for something later, but for now it's just food.

Sea lettuce is another edible seaweed. Like bladderwrack, it can be found in shallow water.

Currently, these two plants don't spawn because I'm waiting on #70173 so I can add them to the jsons there.

attn @I-am-Erk - I don't want this stuff to conflict with what you're working on, I'd appreciate a review if you get time. Specifically I want to make sure the method I used to spawn plants underwater is acceptable.

Bugfixes

It was impossible to swim all the way to the bottom of the sea (or a lake) because the game was only checking for WATER_CUBE and not GOES_UP. I've fixed this. It was also impossible to dive in some circumstances because a check for DEEP_WATER was missing, I fixed that too.

Describe alternatives you've considered

I tried to make kelp patches and kelp forests, but I was having difficulty getting map extras or anything else to spawn on the sea bed, so for now I'm just adding these plants and items so anyone who wants to take a crack at that has some stuff to work with.

Testing

  • Wandered around, harvested some plants, saw that I was getting the right items from them.
  • Tried harvesting kelp without a knife. This was impossible. I came back with a knife and it was fine.

Additional context

yes i know anemone and sponges are not technically plants

image
For now, this is how the sea floor looks. The New England seabed has a lot of boulders, apparently.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. astyled astyled PR, label is assigned by github actions labels Feb 19, 2024
@Karol1223
Copy link
Contributor

Wait, those actually generate on the seafloor? Or do they work like lilypads?

@worm-girl
Copy link
Contributor Author

Wait, those actually generate on the seafloor? Or do they work like lilypads?

Currently neither. Unless there's some unforseen problem, some will be like lilypads and some will grow on the sea floor.

@Karol1223
Copy link
Contributor

Currently neither. Unless there's some unforseen problem, some will be like lilypads and some will grow on the sea floor.

In this case this is significantly more exciting than I initially thought. I've been waiting for ages for seafloor spawns.

@RedMisao
Copy link
Contributor

Yay molusks will return!

@github-actions github-actions bot added the Map / Mapgen Overmap, Mapgen, Map extras, Map display label Feb 19, 2024
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` and removed astyled astyled PR, label is assigned by github actions labels Feb 19, 2024
@worm-girl
Copy link
Contributor Author

I can manually spawn the kelp patch, but adding it to regional map settings for the ocean_bed terrain doesn't seem to work. I may just leave that to somebody else for now.

@github-actions github-actions bot added the Crafting / Construction / Recipes Includes: Uncrafting / Disassembling label Feb 20, 2024
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A handful of slimy seaweed. It doesn't look edible, but properly dried, it might make for decent kindling.
  • A slimy heap of seaweed. It doesn't look edible, but properly dried, it might make for decent kindling.
  • Also known as kombu, this brown algae grows in a single leaflike blade that can reach more than twice the height of a man. Young fronds make for excellent soup stock and can even be eaten raw.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@Consoleable
Copy link
Contributor

Very excited for more marine content!

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 Mar 24, 2024
@github-actions github-actions bot removed the stale Closed for lack of activity, but still valid. label Mar 29, 2024
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 Apr 28, 2024
@github-actions github-actions bot closed this May 28, 2024
Procyonae pushed a commit to Procyonae/Cataclysm-DDA that referenced this pull request Jun 2, 2024
Maleclypse pushed a commit that referenced this pull request Jun 7, 2024
* Add a variety of marine plants #71844

* Ocean bed tweak

* Kelp forest mutable

* Kelp patch extra

* Coverage test blacklist

* Fix accidently using an outdated version of the ocean bed rates

* Realised it should probably be a regional furniture but until #73602 is done that'd be a pain

* Update coverage test message to reflect JSONification of whitelist

* Identical str and str_pl -> str_sp

* Temporarily disable OCEAN omts counting as missing for overmap_coverage_test

---------

Co-authored-by: fairyarmadillo <[email protected]>
feinorgh pushed a commit to feinorgh/Cataclysm-DDA that referenced this pull request Jun 8, 2024
* Add a variety of marine plants CleverRaven#71844

* Ocean bed tweak

* Kelp forest mutable

* Kelp patch extra

* Coverage test blacklist

* Fix accidently using an outdated version of the ocean bed rates

* Realised it should probably be a regional furniture but until CleverRaven#73602 is done that'd be a pain

* Update coverage test message to reflect JSONification of whitelist

* Identical str and str_pl -> str_sp

* Temporarily disable OCEAN omts counting as missing for overmap_coverage_test

---------

Co-authored-by: fairyarmadillo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display stale Closed for lack of activity, but still valid.
Projects
Status: Abandoned PRs with no one to pick them up
Development

Successfully merging this pull request may close these issues.

5 participants