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.

Sign up for GitHub

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
Merged

Initial commit to add hallula bread type #46282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions data/json/items/comestibles/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,5 +303,27 @@
"flags": [ "EATEN_HOT", "EATEN_COLD" ],
"fun": 3,
"vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ]
},
{
"type": "COMESTIBLE",
"id": "hallula",
"name": { "str_sp": "hallula" },
"weight": "45 g",
"color": "brown",
"spoils_in": "10 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"healthy": 1,
"calories": 61,
"description": "This type of bread is popular in Chile and Bolivia. Prepared using animal lard or oil, it resembles a large, round scone. In the pre-Cataclysm world, it would usually be filled with savory ingredients rather than sweet ones.",
"price": "272 cent",
"price_postapoc": "4 USD",
"material": [ "wheat" ],
"volume": "48 ml",
"charges": 16,
"flags": [ "EATEN_HOT", "EATEN_COLD" ],
"fun": 4,
"vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ]
}
]
25 changes: 25 additions & 0 deletions data/json/recipes/food/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,30 @@
[ [ "salt", 1 ] ]
],
"//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges."
},
{
"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.

"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREAD",
"skill_used": "cooking",
"difficulty": 3,
"charges": 8,
"time": "30 m",
"batch_time_factors": [ 50, 5 ],
"book_learn": [ [ "family_cookbook", 1 ], [ "baking_book", 2 ], [ "cookbook", 2 ] ],
"qualities": [ { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
"components": [
[ [ "flour", 3 ] ],
[ [ "yeast", 2 ] ],
[ [ "sugar", 1 ] ],
[ [ "salt", 1 ] ],
[ [ "water", 1 ] ],
[ [ "any_butter_or_oil", 2, "LIST" ] ]
],
"//": "I'm not sure whether this should also be rewritten to use a portion of charges, or scaled up so that the smallest component in the recipe becomes a single charge.",
"//2": "Since milk is only used sparingly in the creation of hallula, to give it a glazed appearance, Cataclysm practicality suggests omitting it."
}
]