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 #74271

Merged
merged 11 commits into from
Jun 7, 2024
Merged

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Jun 2, 2024

Summary

Content "Adds a variety of marine plants."

Purpose of change

Revives #71844, splitting the bugfixes to a different PR

Describe the solution

Most of this is just fairyarmadillos original PR so see that
Makes the kelp patches they gave up on spawn (I think they were just missing the "extras" entry on the overmap_terrain)
Adds a kelp forest mutable which heavily cargo cults the meadow mutable bc fairyarmadillo appeared to be trying to do a multitile map extra which isn't a thing you can do (in json at least)

Describe alternatives you've considered

I don't think we have any way to place a mutables root at non z0 zlevels which is kinda ugly but I don't feel like adding code to deal with that rn and it's easy enough to work around
I've no idea how large, varied in size or what shape kelp forests tend to be irl and don't really feel like researching it, tweaking both is pretty simple tho

Testing

Kelp patch

image

Example kelp forest

image

Example kelp forest layouts

image

image

image

image

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Code: Tests Measurement, self-control, statistics, balancing. [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 Jun 2, 2024
Copy link
Contributor

github-actions bot commented Jun 4, 2024

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

Click to expand
  • 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.
  • Sometimes known as green laver, this leafy algae from the Ulva genus grows in leafy little patches around shallows and tide pools. Though small, it makes a tasty snack.

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.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jun 4, 2024
@worm-girl
Copy link
Contributor

fairyarmadillo appeared to be trying to do a multitile map extra which isn't a thing you can do (in json at least)

Gonna be real with you, I had no idea what I was doing with map stuff lol.

@Procyonae
Copy link
Contributor Author

Gonna be real with you, I had no idea what I was doing with map stuff lol.

If you want any help with future stuff just gimme a shout anywhere ^^

@Procyonae Procyonae marked this pull request as ready for review June 4, 2024 18:19
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 6, 2024
@Maleclypse Maleclypse merged commit 59b112e into CleverRaven:master Jun 7, 2024
27 checks passed
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
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` Code: Tests Measurement, self-control, statistics, balancing. 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 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.

3 participants