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

Initial commit to add hallula bread type #46282

Merged
merged 1 commit into from
Feb 18, 2021

Conversation

ToxiClay
Copy link
Contributor

@ToxiClay ToxiClay commented Dec 23, 2020

Summary

SUMMARY: Features "Adding hallula, a bread type common in Chile and Bolivia"

Purpose of change

A brief discussion on Discord posited the addition of a new bread type that would serve as an alternate use for the literal gallons of cooking oil survivors probably have.

image

Thanks to Svankensen for the suggestion!

Describe the solution

I updated the two JSON files the game appears to pull from: ./data/json/items/comestibles/bread.json to set the item in the world, and ./data/json/items/recipes/bread.json to add it to the list the player can cook.

The information was largely copied from the data for brown_bread, as I didn't know what data would fit better.

Describe alternatives you've considered

Testing

JSON linting performed. Because this was a JSON change, it did not require a game rebuild to integration-test it. Further work may be required to populate this item in the world, unless my data-copying caused it to inherit from its parent item.

Additional context

image
image

The recipe I drew from, for the record.

@anothersimulacrum
Copy link
Member

Fixes #46279

@anothersimulacrum anothersimulacrum added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Food / Vitamins Comestibles and drinks labels Dec 23, 2020
@Svankensen
Copy link

Svankensen commented Dec 23, 2020

Thanks! Worth mentioning that milk is optional? It is only used for "glazing"and making the bread look brown. Given that in the cataclysm milk can only be gotten from livestock, it may be a good idea to do without it.

EDIT: I see your recipe uses half milk instead of water. Most common ones don't.

https://www.enmicocinahoy.cl/un-clasico-pan-chileno-hallullas-a-chilean-bread/

@ToxiClay
Copy link
Contributor Author

Thanks! Worth mentioning that milk is optional? It is only used for "glazing"and making the bread look brown. Given that in the cataclysm milk can only be gotten from livestock, it may be a good idea to do without it.

EDIT: I see your recipe uses half milk instead of water. Most common ones don't.

https://www.enmicocinahoy.cl/un-clasico-pan-chileno-hallullas-a-chilean-bread/

I can always make another commit to remove the milk, if it's more true to life. You're the subject matter expert; your call.

@Svankensen
Copy link

Thanks! Worth mentioning that milk is optional? It is only used for "glazing"and making the bread look brown. Given that in the cataclysm milk can only be gotten from livestock, it may be a good idea to do without it.
EDIT: I see your recipe uses half milk instead of water. Most common ones don't.
https://www.enmicocinahoy.cl/un-clasico-pan-chileno-hallullas-a-chilean-bread/

I can always make another commit to remove the milk, if it's more true to life. You're the subject matter expert; your call.

I'm no baker, but I did ask my baker friend. It depends and it's an option either way. Both I guess? I wouldn't pressume to impose on you, you are doing the work. But if you want to differentiate, found this recipe for "european rustic lard bread" that is just lard, water, yeast, flour, salt and sugar.

http://www.2pots2cook.com/2020/04/16/rustic-lard-bread/

@ToxiClay
Copy link
Contributor Author

There's probably a much simpler way to do this, but I just split hallula into two recipes, with the same name but different internal IDs. This surely won't snap anything in half.

@emptytriangle
Copy link

emptytriangle commented Dec 29, 2020

There's probably a much simpler way to do this, but I just split hallula into two recipes, with the same name but different internal IDs. This surely won't snap anything in half.

I think you want your "omitting milk from the recipe" patch but instead of

[ [ "milk_standard_raw", 1, "LIST" ] ],

you want

[ [ "milk_standard_raw", 1, "LIST" ], [ "water", 1 ] ],

That should let you choose whether to use 1 water or 1 milk for that line of the recipe. I don't know if this will work because you also have 1 water required on the next line. So, I do not know if the code will handle (1 milk, 1 water) vs (2 water). I know that it would handle (2 milk) vs (2 water) if water wasn't also on the next line.

I suspect if you did use 100% milk instead of water when making hallullas they would turn out just fine.

@jbytheway
Copy link
Contributor

Using something like (1 milk, 1 water) vs (2 water) should now work; I added support for such requirements a few months ago (#36657).

@ToxiClay
Copy link
Contributor Author

Is there a way to tie not using milk in the recipe to producing the hallula_without_milk item?

@jbytheway
Copy link
Contributor

No, if you want different products you'll need separate recipes. We could move to make milk behave more like toxins, where the content of the product depends on the content of the ingredients, but that would be a larger change.

@emptytriangle
Copy link

what is the purpose of a hallula_without_milk item? There is no need for it. Just make one hallula item that can be cooked with either milk or water. The caloric content and vitamin content of the output will be based on the items used to cook it. There is no reason for it to be a different product just because you used milk instead of water.

@ToxiClay
Copy link
Contributor Author

what is the purpose of a hallula_without_milk item? There is no need for it.

The purpose is to distinguish between the two. Refer up-thread to Svan mentioning how the milk browns the end product, and then refer to my changes where I mention that difference in the items.

@emptytriangle
Copy link

seems unnecessary to modify the description of the item just to say it's slightly brown when it causes such complication

@Maleclypse
Copy link
Member

Sweet it looks like this only has one calorie test failure now so I think you should be able to make the same charges change to the other recipe and that will fix that :)

@ToxiClay
Copy link
Contributor Author

Sweet it looks like this only has one calorie test failure now so I think you should be able to make the same charges change to the other recipe and that will fix that :)

Why did that cause the system to bug out and fail testing? I drew from the recipe I found online, so why does the compiler hate it?

@ToxiClay
Copy link
Contributor Author

../tests/explosion_balance_test.cpp:95: FAILED:

Um. My bread should not be exploding.

Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

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

Thanks i'd say the explosion error is unrelated unless I'm super confused.

{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "hallula",
Copy link
Member

Choose a reason for hiding this comment

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

Am I missing something here? These two recipes look identical - the one that supposedly contains milk does not include milk in its components.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can't remember why I left this comment justifying the change.

"//2": "Since milk is only used sparingly in the creation of hallula, to give it a glazed appearance, Cataclysm practicality suggests omitting it."

I think I did this specifically to make a cosmetic distinction between the two, but since I can't for my life understand why I did that, I'll just kill the without_milk one.

@ZhilkinSerg ZhilkinSerg changed the base branch from master to 0.F-dev February 18, 2021 07:36
@ZhilkinSerg ZhilkinSerg merged commit d5f59af into CleverRaven:0.F-dev Feb 18, 2021
@ZhilkinSerg ZhilkinSerg mentioned this pull request Feb 18, 2021
14 tasks
ZhilkinSerg pushed a commit that referenced this pull request Mar 31, 2021
ZhilkinSerg pushed a commit that referenced this pull request Mar 31, 2021
BrettDong pushed a commit that referenced this pull request Apr 5, 2021
ZhilkinSerg pushed a commit that referenced this pull request Apr 7, 2021
ZhilkinSerg pushed a commit that referenced this pull request Apr 9, 2021
ZhilkinSerg pushed a commit that referenced this pull request Apr 20, 2021
ZhilkinSerg pushed a commit that referenced this pull request Apr 20, 2021
@Maleclypse Maleclypse mentioned this pull request May 1, 2021
ZhilkinSerg pushed a commit that referenced this pull request May 28, 2021
ZhilkinSerg pushed a commit that referenced this pull request May 28, 2021
ZhilkinSerg pushed a commit that referenced this pull request May 31, 2021
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021
ZhilkinSerg pushed a commit that referenced this pull request Jun 21, 2021
ZhilkinSerg pushed a commit that referenced this pull request Jul 3, 2021
anothersimulacrum pushed a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 3, 2021
KorGgenT pushed a commit to KorGgenT/Cataclysm-DDA that referenced this pull request Jul 4, 2021
@ToxiClay ToxiClay deleted the add-hallula branch July 11, 2021 14: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 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.

9 participants