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

Added bread flour and brown bread to more recipes #53704

Merged
merged 13 commits into from
Jan 30, 2022

Conversation

TheDarkMaster13
Copy link
Contributor

Summary

Balance "Add bread flour as an alternative to flour to most bread recipes and allowed brown bread to be used for sandwiches"

Purpose of change

The existing bread flour item is only used to make brown bread and said brown bread cannot be used for anything. This change makes it so that bread flour can be used for most bread recipes and brown bread can be used for sandwiches.

Describe the solution

Bread flour can now be used in place of flour in many bread recipes, including waffles and pancakes. The bread flour recipe was also altered to use the same recipe times as normal quern made flour and so it produces the same amount of flour overall.

Describe alternatives you've considered

Testing

Tested on most recent experimental. Game ran and recipes all show the correct substitution options. Bread, flatbread, wastebread, and others can now be made with bread flour. Brown bread is now a valid option for sandwiches.

Additional context

@wapcaplet
Copy link
Contributor

Thanks for working on this. It will be nice to have better bread options.

It appears you used the same branch (your fork's master) for both this and your other PR #53381. Luckily since this is your only open pull request at the moment, and all your previous changes were already merged into master, it may still merge cleanly. However I would suggest creating a new branch in your fork for each future pull request - this keeps the changes from each PR isolated (and allows you to keep your master branch unpolluted, and in sync with the upstream master branch).

You could perhaps still tidy it up and move these changes to a new branch per instructions like this but I think you would need to open a new PR in that case.

@zlsalmon
Copy link

Worth mentioning that the food referred to as "brown bread" in CDDA is a sweet, dense product resembling pound cake and packaged in cans; I wouldn't necessarily think of it as an appropriate medium for sandwiches and the like, but then I would have said that about crackers too.

@wapcaplet
Copy link
Contributor

wapcaplet commented Dec 23, 2021

Worth mentioning that the food referred to as "brown bread" in CDDA is a sweet, dense product resembling pound cake and packaged in cans; I wouldn't necessarily think of it as an appropriate medium for sandwiches and the like, but then I would have said that about crackers too.

This came up on the development discord too, a product I was not aware of when I told @TheDarkMaster13 that it seemed like a good sandwich bread based on the ingredients. I see now that the original PR that added it #45576 does indeed refer to the canned bread product - it's unfortunate that the item description says nothing about that.

On discord, I proposed a change to the brown bread item description, something like "A rustic, slightly sweet and tender wheat bread, suitable for toasting or making a PB&J sandwich. Molasses gives the interior of the bread a light brown color." I think that captures the seemingly generic nature of the recipe we have.

On the other hand, if this item should really represent a famous New England canned bread product made by the B&M bean company, then it should aboslutely not be something the player can craft.

@wapcaplet wapcaplet added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [JSON] Changes (can be) made in JSON labels Dec 24, 2021
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Dec 30, 2021
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jan 2, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 6, 2022
@kevingranade kevingranade merged commit be6270b into CleverRaven:master Jan 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Crafting / Construction / Recipes Includes: Uncrafting / Disassembling [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants