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

Canning apple cider and other juices #36747

Merged

Conversation

Maleclypse
Copy link
Member

Summary

SUMMARY: Content "Updated Canning Recipes to include the juices"

Purpose of change

Almost no fruit juices could be canned despite almost all fruit juices are able to be canned and saved. Here is one of several websites I checked out about canning fruit juice. https://inhabitat.com/how-to-can-fruit-and-veggie-juices-to-preserve-summers-sweetness/

Describe the solution

I added canning recipes and fixed missing byproducts in some juice production.

Describe alternatives you've considered

Selling the cherry orchard to an industrialist and leaving Vanya behind forgotten.

Testing

TBD

Additional context

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks labels Jan 8, 2020
@Maleclypse Maleclypse changed the title WIP Canning apple cider and other juices Canning apple cider and other juices Jan 10, 2020
@Maleclypse
Copy link
Member Author

The calorie generation tests are either failing due to randomness or something I have no control over. The recipes are correct.

@Maleclypse
Copy link
Member Author

@anothersimulacrum I've tried shrinking the component calories and that didn't make it work, I've doubled from the original calorie components and that at least reduced the number of failed tests. I'm at a loss here and I'm not sure if the calories listed in the apple cider, oj and cranberry juice json entries are calorie overrides and that's causing the issue? because they certainly don't match up with when you actually make the item ingame.

@Maleclypse
Copy link
Member Author

tincan apple
tincan cran
tincan fruit
tincan OJ
3L apple
3L cran
3L fruit
3L OJ
base apple
base cran
base fruit juice
Base OJ recipe
glassjar apple
glassjar cran
glassjar fruit
glassjar OJ
noncanned juice
sealed 3L pineapple

@Maleclypse
Copy link
Member Author

Despite failed C/travis tests, everything creates fine. There are inexplicable calorie differences between various recipes, however they tend to be around 10 kcal's except the water/fruit fruit juice recipe comes in at double the calories of pure fruit juice.

@I-am-Erk
Copy link
Member

Move these from autolearn to a book on canning and I'll merge em

@anothersimulacrum
Copy link
Member

@Maleclypse Oh shoot, I missed your earlier comment. I'll have a poke at these and see what I can do to get the tests passing later.

@Maleclypse
Copy link
Member Author

Move these from autolearn to a book on canning and I'll merge em

I'll make this a separate book from the rest of the canning recipes, that I'm going to probably include as a canning pot and can sealer instruction booklets in PR #37263. This will both match how I'm finding canning books related to storing juice products online and also prevent any merge conflicts between the two PRs. I'll also give anothersimulacrum some time to look through and see if there's anything I need to do on his end of things. :) Thank you both!

@Maleclypse Maleclypse changed the title Canning apple cider and other juices WIP Canning apple cider and other juices Jan 21, 2020
Copy link
Member

@anothersimulacrum anothersimulacrum left a comment

Choose a reason for hiding this comment

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

Also, change the calories of orange juice to 108, and tests'll be done.

data/json/recipes/food/canned.json Outdated Show resolved Hide resolved
@Maleclypse
Copy link
Member Author

@I-am-Erk I think the failed C++ test is not due to anything in this PR. But I'm going to wait until you tell me this is good before I remove WIP.

@Maleclypse Maleclypse changed the title WIP Canning apple cider and other juices Canning apple cider and other juices Jan 27, 2020
@ZhilkinSerg
Copy link
Contributor

Need conflict resolution.

@Maleclypse
Copy link
Member Author

Maleclypse commented Jan 30, 2020

Need conflict resolution.

Cool,now it's matched it to the books itemgroup updates from yesterday.

@ZhilkinSerg ZhilkinSerg merged commit bab7781 into CleverRaven:master Jan 30, 2020
@Maleclypse Maleclypse deleted the Canning-Apple-Cider-and-other-juices branch April 13, 2020 16:12
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.

4 participants