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

feat(content): Stuffed animals, wool pillows & mattresses #4496

Merged
merged 7 commits into from
Apr 19, 2024

Conversation

yay855
Copy link
Collaborator

@yay855 yay855 commented Apr 19, 2024

Added in a crafting recipe for teddy bears, and changed their description to not call them mass-produced. Added in wool mattresses, wool pillows, and appropriate crafting recipes, which are a thing IRL. Crafted body pillows can now be made with yarn instead of cotton balls, since it doesn't have a specific disassembly recipe.

Purpose of change

Teddy bears were previously uncraftable despite being easily handmade. Furthermore, crafting pillows, body pillows, and mattresses was previously impossible innawoods (and extremely difficult with farms but no cities) thanks to the rarity of cotton seeds and cotton balls, and the fact that you can't get down feathers any way but disassembling down feather pillows and mattresses.

Describe the solution

There are now a new wool mattress and wool pillows, a crafting recipe and adjusted description for teddy bears, and body pillows can now be made with yarn as an alternative to cotton balls. Wool pillows and mattresses have been added to spawn groups alongside down pillows and mattresses, respectively.

Describe alternatives you've considered

Testing

Additional context

Checklist

yay855 added 6 commits April 18, 2024 21:08
Added in stuffed animal, a homemade equivalent of the teddy bear, and crafting recipe. Crafted pillows, body pillows, and down mattresses can now be made with yarn instead of cotton balls or down feathers, since wool-stuffed pillows and mattresses are a thing IRL. Renamed down mattress to 'cushiony mattress' to represent its now possible materials, with description adjusted to match.
Stuffed animal is removed, teddy bear is now craftable and has a changed description.
Down mattress is made with down feathers again, now wool mattress is its own thing.
Pillows have a specific uncraft, so instead of using pillows to turn cotton balls into yarn, wool pillows are now a thing. Also added wool pillows to appropriate construction recipes.
Added wool mattresses to spawn in locations with the same chance as down mattresses.
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Apr 19, 2024
Copy link
Contributor

autofix-ci bot commented Apr 19, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@RobbieNeko
Copy link
Collaborator

Craftable body pillows innawoods, let's gooooo.

And yeah, I see no real reason you couldn't make a pretty decent body pillow using yarn or something similar instead of cotton balls. Hell, modern pillow filling is actually often polyester evidently.

@chaosvolt chaosvolt merged commit 386a8f1 into cataclysmbnteam:main Apr 19, 2024
10 checks passed
@yay855 yay855 deleted the wool-teddies branch April 20, 2024 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants