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

Change food recipes in minor ways to improve utelization of ingredients #37604

Merged
merged 22 commits into from
Feb 12, 2020

Conversation

ashGlaw
Copy link
Contributor

@ashGlaw ashGlaw commented Jan 31, 2020

Summary

SUMMARY: Content "Recipe Realism"

Purpose of change

As things are added to the game it's useful to go through the recipes and make sure that newer ingredients are as well implemented as they could be in the current recipes

Describe the solution

I've gone through the recipes, cooking tools, and cooking requirements and increased access to butter across many recipes where it made sense. I added boiled fiddleheads and roasted salsify to veggy_any, so they could be usable in many more recipes.

Describe alternatives you've considered

I've been thinking of ways to expand and improve upon the cooking system. These small edits are minor but working with them has prepared me for more ambitious goals. Perhaps a baking system with ovens that work a lot like smoking racks. It'd take redoing many of the recipes, but it's an alternative I've considered

Testing

I've tested each change. Every recipe works with the new ingredients.

Additional context

I find myself wondering if sauteed fiddleheads would be a decent addition to veggy_any, or if the inherited fat calories be inappropriate?

ashGlaw added 4 commits January 30, 2020 23:43
Fiddleheads should be more well integrated into the game. I've added them to any_veggy and removed the ability to boil fiddleheads in broth to avoid recursion errors
Added a requirement list including cooking oils and butter, because many recipes should work fine with any of them
So I can test the "any_butter_or_oil" requirement I swapped out the cooking oils for it
@KorGgenT
Copy link
Member

notes for mergers: if travis fails make sure the recipe permutation test isn't the reason.

@ifreund ifreund added <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling labels Feb 1, 2020
@ifreund ifreund changed the title [WIP]Recipe realism [WIP] Add boiled fiddleheads and butter to relevant recipes Feb 1, 2020
ashGlaw added 4 commits February 10, 2020 00:39
I ran a simple test, seeing if I could craft pancakes with butter. Worked fine.

I'm gonna edit recipe_food.json next. Tests to follow
@KorGgenT
Copy link
Member

it looks like you've done something to the tileset config.

ashGlaw added 4 commits February 10, 2020 02:12
For when you want the food to absorb some of the fat it's being deep fried in. Potato chips and French fries both use fry_oil, which contains cooking_oil, cooking_oil2, and ghee. All tested. Works properly for me
Changed a bunch of recipes to use any_butter_or_oil. Tested each one. Seems to work fine
@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 10, 2020

Lots of additions. Everything seems good to me. I've tested every recipe I've changed.

@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 10, 2020

it looks like you've done something to the tileset config.

I'm not sure how things keep changing that I'm not editing. I'm not even sure what files those are in. Is it still an issue? I may have taken care of it

@KorGgenT
Copy link
Member

image
yeah it's still an issue

@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 10, 2020

Thanks for looking. I have no idea at all how that got changed. I have never opened the folder that's in, let alone the file. Bizarre

@AMurkin
Copy link
Contributor

AMurkin commented Feb 10, 2020

Commited in the be9bbc4. Probably changed by json linter.

ashGlaw added 3 commits February 10, 2020 17:22
I made fried liver and fried tripe use fry_oil
Canged some pan frying oils to any_butter_or_oil
Added boiled and sauteed fiddleheads to salad recipe
Added salsify_baked to any_veggie
@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 11, 2020

I hope I took care of the differences in the tile_config file

@ashGlaw ashGlaw marked this pull request as ready for review February 11, 2020 01:06
@ashGlaw ashGlaw changed the title [WIP] Add boiled fiddleheads and butter to relevant recipes Change food recipes in minor ways to improve utelization of ingredients Feb 11, 2020
@ashGlaw ashGlaw mentioned this pull request Feb 11, 2020
@I-am-Erk
Copy link
Member

fiddlehead_boiled is producing a calorie error in travis. I think this is because you removed broth from the possible ingredients, which would slightly reduce the average calorie count for the dish. You can probably resolve this by changing the calories attribute of the fiddlehead_boiled item by about 10 kcal. I think. Those tests are really finicky.

@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 11, 2020

Thanks for explaining that to me. I had no idea what it was talking about. On it!

@I-am-Erk
Copy link
Member

Tweaked it further trying to beat this dang thing.

@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 12, 2020

Is there anything left that needs done here?

@I-am-Erk
Copy link
Member

I was just waiting for the CI tests to pass. It looks like they passed on the last version - if the CI tests are all good and there's no conflict I don't recommend updating your branch with upstream, as it just resets the CI tests.

@I-am-Erk I-am-Erk merged commit 36d1aa4 into CleverRaven:master Feb 12, 2020
@ashGlaw
Copy link
Contributor Author

ashGlaw commented Feb 12, 2020

Thanks for the tip, and the merge. Much obliged

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 <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants