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

Add butter to pie recipes. #38449

Closed

Conversation

sharkfinsouperman
Copy link

@sharkfinsouperman sharkfinsouperman commented Feb 29, 2020

Summary

SUMMARY: Features "Add butter to pie recipes."

Purpose of change

Resolves issue #37471

Describe the solution

Added the equivalent of 1 stick ( 8 tbsp ) of "any-butter" and "lard" to the following recipes:

  • Fruit Pie
  • Veggie Pie
  • Meat Pie
  • Maple Pie
  • Humble Pie

Update: Lard units of 250ml are too big for use, so they've been removed from the recipe unless more reasonable units become available.

Describe alternatives you've considered

Leaving it as is.

Testing

Compiled locally and made pies.

@pjf
Copy link
Contributor

pjf commented Feb 29, 2020

@sharkfinsouperman : Oh hey! Welcome to github and CDDA! And thank you for saving us from terrible crusts! :)

The auto-checking bots are pretty picky about JSON styling. However if you've got a local build environment set up, you can run make style-json and it will adjust the formatting for you. Then it's just a quick commit and push.

Thanks again for the tasty PR! 🥧

@sharkfinsouperman
Copy link
Author

It seems Notepad++ and its JSON plugin likes to use tabs on newlines when it formats.

I'll run make style-json and try another push.

@sharkfinsouperman
Copy link
Author

Its the hidden tabs. make style-json didn't detect and fix them, so I'll do it by hand.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling labels Feb 29, 2020
Added calories to generated pies.
@sharkfinsouperman
Copy link
Author

Ugh, forgot to update the calories in game generated pies.

Used lard instead of butter because these are mass produced pies.

@pjf
Copy link
Contributor

pjf commented Mar 1, 2020

I've applied this to my local branch, and can't way to make tasty pies. Thank you! :)

(I don't have permission to merge to master, but I do like welcoming first-time contributors!)

@sharkfinsouperman
Copy link
Author

Thank you for the greet. I was feeling a little stressed and grumping when I made the PR because this old dog had to learn and relearn a lot during the process, so I apologize for not responding directly until now.

@pjf
Copy link
Contributor

pjf commented Mar 1, 2020

I haven't checked the JSON files to see how much a unit of lard is, but having just made a pie with 2,600 calories per slice, I think that 8 lard might be a bit much. :)

@sharkfinsouperman
Copy link
Author

sharkfinsouperman commented Mar 1, 2020

Thank you for testing. I only tried butter and neglected to try lard in my own trial.

The problem is I mistakenly assumed butter and lard/tallow shared the same unit volume. While butter is 15ml or 1tbsp per unit, lard inherits its values from tallow, which is 150ml or 1/2cup 250ml or 1cup per unit.

I'll make the necessary changes to hopefully correct this oversight.

Ugh, I feel oils, butter, lard and tallow should share the same unit volume in the JSONs as they're all interchangeable in many cases involving cooking, and not being able to use less than 1/2 1cup of lard/tallow could be restrictive in some cases now that nutrition has been improved and acts more finicky. Standardization would also make recipes simpler to write and add without the need to worry about differing unit volumes.

Out of curiosity, how would changing tallow/lard unit volume from 150ml 250ml to 15ml and adjusting all related recipes affect games in progress that update?

@sharkfinsouperman
Copy link
Author

After reviewing the JSONs, I had to remove lard. :(
Unit size of 250ml is too large for this recipe and unreasonable to work with in a kitchen. >:(

@sharkfinsouperman sharkfinsouperman changed the title Add butter and lard to pie recipes. Add butter to pie recipes. Mar 1, 2020
@sharkfinsouperman
Copy link
Author

I just finished testing the failed recipes and they were within expected and acceptable caloric limits.

I also don't understand why the bot passed with the lard pies of doom, but it won't pass now that they've been removed.

@CSHague
Copy link
Contributor

CSHague commented Mar 7, 2020

If you remove ingredients it changes the average so you have to change the calorie values of the default pie so it falls within the acceptable range. I found this out when I fiddled with the canned fruit calories.

@pjf pjf mentioned this pull request Apr 2, 2020
@stale
Copy link

stale bot commented Apr 6, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@stale stale bot added the stale Closed for lack of activity, but still valid. label Apr 6, 2020
@ZhilkinSerg ZhilkinSerg removed the stale Closed for lack of activity, but still valid. label Apr 7, 2020
@kevingranade
Copy link
Member

Feel fee to reopen if you can sort out the nutrition test issue, that is indicating that something is inconsistent.

@sharkfinsouperman sharkfinsouperman deleted the sharkfinpieman branch August 14, 2020 04:15
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 [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants