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

Butter from raw milk and butter churn #34854

Merged
merged 51 commits into from
Dec 3, 2019

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented Oct 19, 2019

Summary

SUMMARY: Content "Butter recipe and butter churn"

Purpose of change

Currently as butter is not a craftable item there comes a time when there is no butter left in the world. With the advent of tameable cows and an abundance of raw milk I felt that this was an appropriate time to add this process that has existed for hundreds of years.

Describe the solution

Adds recipe for butter, adds recipe for butter churn, adds tool quality "CHURN", makes the churn created a piece of deployable furniture.

Describe alternatives you've considered

Giving up on creating wondrous buttery food items after a year of survival.

Testing

I used Experimental 9766 as a test bed. There were a couple of of errors that came up that were in sections that I never touched so I'm hoping that they don't have anything to do with my changes.

Additional context

I'm going to be without internet for a week starting tomorrow morning. Hopefully this won't require any changes but if it does I'll make them when I get back.

@KorGgenT
Copy link
Member

your summary line is invalid. please check out the example in the template. additionally, you need to lint your changes.

data/json/items/tool/deployable.json Outdated Show resolved Hide resolved
data/json/items/tools.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture.json Outdated Show resolved Hide resolved
data/json/tool_qualities.json Outdated Show resolved Hide resolved
Maleclypse and others added 3 commits October 18, 2019 23:50
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
@Maleclypse
Copy link
Member Author

your summary line is invalid. please check out the example in the template. additionally, you need to lint your changes.

I've made it match this in look, but I'm still failing? SUMMARY: Content "Made Sledge Hammer a two-handed weapon"

@Qrox
Copy link
Contributor

Qrox commented Oct 19, 2019

Your summary has an extra colon after Content.

@tenmillimaster
Copy link
Member

tenmillimaster commented Oct 19, 2019

Could you explain what's going on with the milk cream jar? I don't see it in your PR, but I do see the rising version.

I was expecting to find a recipe for butter made from cream, not directly from raw milk, and it'd produce unpasteurized milk as a byproduct.

From wikipedia:

Dairy products are often pasteurized during production to kill pathogenic bacteria and other microbes. Butter made from pasteurized fresh cream is called sweet cream butter. [...] Butter made from fresh or cultured unpasteurized cream is called raw cream butter. While butter made from pasteurized cream may keep for several months, raw cream butter has a shelf life of roughly ten days.

The butter in game is the pasteurized sweet cream butter.

@ZhilkinSerg ZhilkinSerg added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON labels Oct 19, 2019
@Maleclypse Maleclypse changed the title WIP Butter from raw milk and butter churn Butter from raw milk and butter churn Nov 23, 2019
@Maleclypse
Copy link
Member Author

No errors when I test and the CI test doesn't have any errors that I can find related to my files. Thank you to everyone for the suggestions and advice on this.

@Maleclypse
Copy link
Member Author

Could you explain what's going on with the milk cream jar? I don't see it in your PR, but I do see the rising version.

I was expecting to find a recipe for butter made from cream, not directly from raw milk, and it'd produce unpasteurized milk as a byproduct.

From wikipedia:

Dairy products are often pasteurized during production to kill pathogenic bacteria and other microbes. Butter made from pasteurized fresh cream is called sweet cream butter. [...] Butter made from fresh or cultured unpasteurized cream is called raw cream butter. While butter made from pasteurized cream may keep for several months, raw cream butter has a shelf life of roughly ten days.

The butter in game is the pasteurized sweet cream butter.

Somehow I missed the reasoning behind why you wanted a difference between the butters. I've found some references for raw cream butter and I'll see if I can find a calorie value for it, then once I've got that I can make a separate butter and change the butter type created. Then I guess I'll need to go and find every instance of butter in a recipe and make it have an alternate component of the raw butter. I'm currently thinking I'll do the component addition as a separate PR.

data/json/items/tool/deployable.json Outdated Show resolved Hide resolved
data/json/items/tools.json Outdated Show resolved Hide resolved
data/json/items/comestibles/dairy.json Outdated Show resolved Hide resolved
data/json/items/tools.json Outdated Show resolved Hide resolved
data/json/recipes/food/dairy_products.json Show resolved Hide resolved
@tenmillimaster tenmillimaster removed their request for review December 2, 2019 09:31
Maleclypse and others added 6 commits December 2, 2019 08:08
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
Copy link
Contributor

@Davi-DeGanne Davi-DeGanne left a comment

Choose a reason for hiding this comment

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

Looks good!

Regarding this:

Then I guess I'll need to go and find every instance of butter in a recipe and make it have an alternate component of the raw butter. I'm currently thinking I'll do the component addition as a separate PR.

There's only 5 appearances of butter in recipes, I don't think that really needs a separate PR.

Either way, I recommend creating a component list in cooking_components.json (e.g. "any_butter") and use that, it will make it easier for anyone adding butter alternatives in the future. It will also make it less likely that someone will fail to include raw butter when adding butter to a recipe.

@Maleclypse
Copy link
Member Author

Looks good!

Regarding this:

Then I guess I'll need to go and find every instance of butter in a recipe and make it have an alternate component of the raw butter. I'm currently thinking I'll do the component addition as a separate PR.

There's only 5 appearances of butter in recipes, I don't think that really needs a separate PR.

Either way, I recommend creating a component list in cooking_components.json (e.g. "any_butter") and use that, it will make it easier for anyone adding butter alternatives in the future. It will also make it less likely that someone will fail to include raw butter when adding butter to a recipe.

OK, it looks like I've got all the merge conflicts fixed now, from creating the list. Thanks for the advice!

@Davi-DeGanne
Copy link
Contributor

Looks great! Nice catch adding ghee to the list as well.

@ZhilkinSerg ZhilkinSerg merged commit 6b32e99 into CleverRaven:master Dec 3, 2019
@Maleclypse Maleclypse deleted the Butter-from-raw-milk branch February 11, 2021 04:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants