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

Content: bread in a can #45680

Merged
merged 16 commits into from
Feb 18, 2021
Merged

Content: bread in a can #45680

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d4bf0c9
Canned bread yay
Xaleth Nov 28, 2020
ee6893c
Minor fix
Xaleth Nov 28, 2020
ff6c3f8
Fix based on feedback
Xaleth Nov 29, 2020
fc052cd
More adjustments
Xaleth Nov 29, 2020
c6df65c
Adjust canned bread (still WIP!)
Xaleth Nov 29, 2020
25fb27d
Revamp the PR
Xaleth Nov 30, 2020
23b02be
whoops
Xaleth Nov 30, 2020
4bc7e33
another whoops
Xaleth Nov 30, 2020
e80628f
Fix the calorie balance in the recipe (hopefully)
Xaleth Nov 30, 2020
b502b94
calorie balance, take 2
Xaleth Dec 1, 2020
f69d974
Little recipe bit
Xaleth Dec 2, 2020
1c542e9
Calorie fix, take 3
Xaleth Dec 4, 2020
9e7911a
FINAL CALORIE FIX, LET'S GOOOO :D
Xaleth Dec 4, 2020
e726c97
Update from feedback
Xaleth Jan 23, 2021
4aa0f96
Update data/json/items/comestibles/wheat.json
Xaleth Jan 24, 2021
adf7118
Merge branch '0.F-dev' into canned_bread
ZhilkinSerg Feb 18, 2021
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
2 changes: 2 additions & 0 deletions data/json/itemgroups/Food/food.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
{ "item": "apple_canned", "prob": 1 },
{ "item": "can_cheese", "prob": 1 },
{ "item": "fish_canned", "prob": 1 },
{ "item": "brown_bread", "prob": 1 },
{ "item": "can_spam", "prob": 1 },
{ "item": "can_sardine", "prob": 1 },
{ "item": "ravioli", "prob": 1 },
Expand Down Expand Up @@ -183,6 +184,7 @@
{ "item": "can_chowder", "prob": 35 },
{ "item": "can_herring", "prob": 30 },
{ "item": "can_chicken", "prob": 40 },
{ "item": "brown_bread", "prob": 20 },
{ "item": "broth", "prob": 15 },
{ "item": "crackers", "prob": 10 },
{ "item": "grahmcrackers", "prob": 10 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/food_service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
"subtype": "distribution",
"entries": [
{ "item": "bread", "prob": 65 },
{ "item": "brown_bread", "prob": 50 },
{ "item": "brown_bread", "prob": 50, "container-item": "bag_plastic" },
{ "item": "cake2", "prob": 10 },
{ "item": "cake3", "prob": 10 },
{ "item": "cornbread", "prob": 35 },
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/comestibles/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,19 +289,19 @@
"weight": "45 g",
"color": "brown",
"spoils_in": "10 days",
"container": "bag_plastic",
"container": "can_medium",
"comestible_type": "FOOD",
"symbol": "%",
"healthy": 1,
"calories": 74,
"calories": 130,
"description": "A sweet bread, like cake.",
"price": "272 cent",
"price_postapoc": "4 USD",
"price_postapoc": "2 USD",
"material": [ "wheat" ],
"volume": "48 ml",
"volume": "480 ml",
"charges": 10,
"flags": [ "EATEN_HOT", "EATEN_COLD" ],
"fun": 3,
"vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ]
"vitamins": [ [ "calcium", 4 ], [ "iron", 4 ] ]
}
]
4 changes: 2 additions & 2 deletions data/json/items/comestibles/wheat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"type": "COMESTIBLE",
"id": "bread_flour",
"name": { "str_sp": "bread flour" },
"weight": "13 g",
"weight": "60 g",
"color": "white",
"spoils_in": "360 days",
"container": "bag_paper_powder_small",
Xaleth marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -159,7 +159,7 @@
"price": "200 cent",
"price_postapoc": "95 cent",
"material": [ "wheat", "powder" ],
"volume": "250 ml",
"volume": "2400 ml",
"flags": [ "EDIBLE_FROZEN", "RAW" ],
"charges": 20,
"vitamins": [ [ "iron", 4 ] ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
{
"pocket_type": "CONTAINER",
"watertight": false,
"max_contains_volume": "2 L",
"max_contains_volume": "2500 ml",
Copy link
Member

Choose a reason for hiding this comment

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

The can that bread comes in is larger than a two liter of coca cola?

Copy link
Contributor

@actual-nh actual-nh Jan 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Well, let's see... something like 4.25 inches tall (8 slices of 1/2-inch-thick bread), I'm estimating a diameter of 2 inches... call it 875 mL, at least for cans from the original company.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the powder bag for bread flour. I guess I should rename it to bag_paper_powder instead of bag_paper_powder_small...

"max_contains_weight": "2 kg",
"moves": 200
}
Expand Down
11 changes: 6 additions & 5 deletions data/json/recipes/food/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,18 @@
"skill_used": "cooking",
"difficulty": 3,
"charges": 10,
"time": "30 m",
"time": "1 h 30 m",
"batch_time_factors": [ 50, 5 ],
"autolearn": false,
"book_learn": [ [ "family_cookbook", 1 ], [ "baking_book", 2 ], [ "cookbook", 2 ], [ "cookbook_daintydishes", 2 ] ],
"qualities": [ { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
"components": [
[ [ "bread_flour", 1 ] ],
[ [ "flour", 1 ] ],
[ [ "cornmeal", 1 ] ],
[ [ "molasses", 1 ] ],
[ [ "water", 1 ] ],
[ [ "flour", 5 ] ],
[ [ "cornmeal", 5 ] ],
[ [ "molasses", 2 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ],
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "water_clean", 1 ] ],

I'm wondering if unclean water should ever be used for baking bread? Someone who knows more should definitely weigh in on this question.

Copy link
Contributor

@actual-nh actual-nh Jan 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This is a recipe not using yeast (and thus strictly speaking requiring baking soda - see comment below - for leavening). It would really depend on exactly how unclean the water is. If it's just stuff that would be killed by heat, you'd be fine. If there were things floating in it, that'd be another matter entirely.

If you're using yeast, you'd need clean water - unclean may well grow something other than the yeast you meant to cultivate...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah this would go back into that issue put up by kevingranade talking about water purity. Personally, I think it's good as it is until we do a full revamp of determining how clean water is.

[ [ "salt", 1 ] ]
],
"//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges."
Expand Down