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): rice farming, rice bran, sake, sikhye #4120

Merged
merged 16 commits into from
Jan 19, 2024

Conversation

yay855
Copy link
Contributor

@yay855 yay855 commented Jan 18, 2024

Purpose of change

Rice is currently unfarmable, so I decided to make it farmable as well as add in related rice products such as rice bran, sake, and by Scarf's request, sikhe.

Describe the solution

Rice now is farmable in shallow water, and produces more of its own seeds (as well as straw) as a product. Rice seeds can be processed into dried rice with rice bran as a byproduct, and rice can now be used to make sake and sikhye, two new items. Rice bran is used to make vegetable oil.

I've also noticed that fruit wine only has a fun value of 2, so I've edited that to be 20.

Describe alternatives you've considered

Testing

The json checks out, it loads fine.

Additional context

Checklist

Added rice seeds, rice bran, sake, sikhye.
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jan 18, 2024
Copy link
Contributor

autofix-ci bot commented Jan 18, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  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.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

lol, sorry~

Co-authored-by: scarf <greenscarf005@gmail.com>
Co-authored-by: scarf <greenscarf005@gmail.com>
Increased fun value of sake, and of fruit wine.
Co-authored-by: scarf <greenscarf005@gmail.com>
scarf005
scarf005 previously approved these changes Jan 18, 2024
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, haven't playtested yet tho

Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked it over, discussed most of the changes already on the discord. Looks good to me.

@chaosvolt
Copy link
Member

Test fail:

 (~[slow] ~[.],starting_items)=> ../tests/comestible_test.cpp:145: FAILED:
(~[slow] ~[.],starting_items)=>   CHECK( mystats.calories.avg() <= upper_bound )
(~[slow] ~[.],starting_items)=> with expansion:
(~[slow] ~[.],starting_items)=>   965.0 <= 144.0f

scarf005
scarf005 previously approved these changes Jan 18, 2024
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chaosvolt pls merge after tests pass

@yay855
Copy link
Contributor Author

yay855 commented Jan 18, 2024

Actually, I wanted to make wild rice forageable from bushes first. I forgot to actually make it spawn.

@yay855 yay855 marked this pull request as draft January 18, 2024 02:39
@chaosvolt
Copy link
Member

chaosvolt commented Jan 18, 2024

pfft, aight XD

EDIT: ihatecomestibletestsihatecomestibletestsihatecomestibletests

Made it possible to forage wild rice from shrubs in the summer, since that's when they grow IRL.
@yay855 yay855 marked this pull request as ready for review January 18, 2024 02:45
@NappingOcean
Copy link
Contributor

Would you consider adding the EATEN_HOT flag to sake? I think that eating sake warm could become the unique characteristic of that drink.
However, if adding this flag conflicts with EATEN_COLD, don't bother.

Made rice seeds able to be made into bird feed, rice bran able to be made into bird feed, cattle feed, and flour.
@RobbieNeko
Copy link
Contributor

image
Gotta love Rice Brain

@yay855
Copy link
Contributor Author

yay855 commented Jan 18, 2024

image Gotta love Rice Brain

Thank you, Robbie! I missed that.

@RobbieNeko
Copy link
Contributor

image Gotta love Rice Brain

Thank you, Robbie! I missed that.

No Problem ^-^

Alright, I'll try the eaten_hot and eaten_cold flags together.

Co-authored-by: NappingOcean <129575271+NappingOcean@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@chaosvolt chaosvolt merged commit ed1f287 into cataclysmbnteam:main Jan 19, 2024
9 checks passed
@yay855 yay855 deleted the rice_farming branch January 19, 2024 22:35
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.

6 participants