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

Toast and toad in a hole Fix #57722

Merged
merged 9 commits into from
May 30, 2022
Merged

Toast and toad in a hole Fix #57722

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d43453e
Fix/Update Toast and toad_in_a_hole
SamGondra May 15, 2022
4070c26
adjust toad-inthe-hole
SamGondra May 15, 2022
7ce0ed2
Set Materials
SamGondra May 15, 2022
d53b4fb
add "milk" because these toastt based PBJ somehow also fit butter on …
SamGondra May 15, 2022
f95c674
update description of the toad in a hole
SamGondra May 19, 2022
0f429da
correct description
SamGondra May 27, 2022
b30e8ee
test correction (relative kcal and vit removed)
SamGondra May 27, 2022
e901568
Revert "test correction (relative kcal and vit removed)"
SamGondra May 27, 2022
a75b8fb
pushing relative kcal up by Oil kcal
SamGondra May 28, 2022
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
24 changes: 20 additions & 4 deletions data/json/items/comestibles/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@
"name": { "str_sp": "buttered toast" },
"copy-from": "toast",
"description": "Toast with butter spread on top to make it taste better.",
"material": [ "milk", "wheat" ],
"primary_material": "wheat",
"relative": { "calories": 101, "fun": 4 }
},
{
Expand All @@ -248,6 +250,8 @@
"name": { "str_sp": "wheat-free buttered toast" },
"copy-from": "toast_wheat_free",
"description": "Wheat-free toast with butter spread on top to make it taste better.",
"material": [ "milk", "veggy" ],
"primary_material": "veggy",
"relative": { "calories": 101, "fun": 4 }
},
{
Expand All @@ -256,6 +260,8 @@
"name": { "str_sp": "jam toast" },
"copy-from": "toast",
"description": "A bit of jam on toast to make it less dry and to add more flavor to this breakfast staple.",
"material": [ "fruit", "wheat" ],
"primary_material": "wheat",
"spoils_in": "7 days",
"relative": { "calories": 35, "fun": 3, "quench": 2, "vitamins": [ [ "vitC", 20 ] ] }
},
Expand All @@ -265,6 +271,8 @@
"name": { "str_sp": "wheat-free jam toast" },
"copy-from": "toast_wheat_free",
"description": "A bit of jam on wheat-free toast to make it less dry and to add more flavor to this breakfast staple.",
"material": [ "fruit", "veggy" ],
"primary_material": "veggy",
"spoils_in": "7 days",
"relative": { "calories": 35, "fun": 3, "quench": 2, "vitamins": [ [ "vitC", 20 ] ] }
},
Expand All @@ -289,23 +297,29 @@
"id": "toad_in_a_hole",
"name": { "str_sp": "toad in a hole" },
"copy-from": "toast",
"description": "A cooked egg served inside a piece of toast.",
"description": "A cooked egg served inside a piece of toast, not to be confused with the english recipe of the same name.",
"extend": { "flags": [ "EATEN_HOT", "FREEZERBURN" ] },
"material": [ "wheat", "egg" ],
"relative": { "calories": 80, "fun": 4, "flags": [ "FREEZERBURN" ], "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }
},
{
"type": "COMESTIBLE",
"id": "toad_in_a_hole_wheat_free",
"name": { "str_sp": "wheat-free toad in a hole" },
"copy-from": "toast_wheat_free",
"description": "A cooked egg served inside a piece of wheat-free toast.",
"relative": { "calories": 80, "fun": 4, "flags": [ "FREEZERBURN" ], "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }
"description": "A cooked egg served inside a piece of wheat-free toast, , not to be confused with the english recipe of the same name.",
"extend": { "flags": [ "EATEN_HOT", "FREEZERBURN" ] },
"material": [ "veggy", "egg" ],
"relative": { "calories": 80, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }
},
{
"type": "COMESTIBLE",
"id": "PBJ_Toast",
"name": { "str_sp": "PBJ Toast" },
"copy-from": "toast_wheat_free",
"copy-from": "toast",
"description": "A slice of toast with peanut butter and jelly on top of it with added butter for flavor.",
"material": [ "fruit", "milk", "wheat" ],
"primary_material": "wheat",
"relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] }
},
{
Expand All @@ -314,6 +328,8 @@
"name": { "str_sp": "wheat-free PBJ Toast" },
"copy-from": "toast_wheat_free",
"description": "A slice of wheat-free toast with peanut butter and jelly on top of it with added butter for flavor.",
"material": [ "fruit", "milk", "veggy" ],
"primary_material": "veggy",
"relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] }
},
{
Expand Down
68 changes: 48 additions & 20 deletions data/json/recipes/food/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
"batch_time_factors": [ 50, 2 ],
"qualities": [ { "id": "COOK", "level": 1 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"proficiencies": [ { "proficiency": "prof_food_prep" } ],
"components": [ [ [ "bread_sandwich", 1, "LIST" ] ] ]
},
{
Expand All @@ -187,78 +188,105 @@
"batch_time_factors": [ 50, 2 ],
"qualities": [ { "id": "COOK", "level": 1 } ],
"tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [ [ [ "bread_wheat_free", 1 ] ] ]
"proficiencies": [ { "proficiency": "prof_food_prep" } ],
"components": [ [ [ "bread_sandwich_wheat_free", 1, "LIST" ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "buttered_toast",
"copy-from": "toast",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREAD",
"skill_used": "cooking",
"difficulty": 1,
"autolearn": true,
"charges": 1,
"time": "1 m",
"batch_time_factors": [ 20, 2 ],
"components": [ [ [ "toast", 1 ] ], [ [ "butter", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "buttered_toast_wheat_free",
"copy-from": "toast_wheat_free",
"components": [ [ [ "bread_wheat_free", 1 ] ], [ [ "butter", 1 ] ] ]
"copy-from": "buttered_toast",
"components": [ [ [ "toast_wheat_free", 1 ] ], [ [ "butter", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "jam_toast",
"copy-from": "toast",
"copy-from": "buttered_toast",
"components": [ [ [ "toast", 1 ] ], [ [ "jam_fruit", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "jam_toast_wheat_free",
"copy-from": "toast_wheat_free",
"components": [ [ [ "bread_wheat_free", 1 ] ], [ [ "jam_fruit", 1 ] ] ]
"copy-from": "buttered_toast",
"components": [ [ [ "toast_wheat_free", 1 ] ], [ [ "jam_fruit", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "peanut_butter_toast",
"copy-from": "toast",
"components": [ [ [ "peanutbutter", 1 ] ], [ [ "toast", 1 ] ] ]
"copy-from": "buttered_toast",
"components": [ [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "peanut_butter_toast_wheat_free",
"copy-from": "toast_wheat_free",
"components": [ [ [ "peanutbutter", 1 ] ], [ [ "bread_wheat_free", 1 ] ] ]
"copy-from": "buttered_toast",
"components": [ [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast_wheat_free", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "toad_in_a_hole",
"copy-from": "toast",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_BREAD",
"skill_used": "cooking",
"difficulty": 1,
"autolearn": true,
"charges": 1,
"time": "10m",
"components": [ [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], [ [ "bread_sandwich", 1, "LIST" ] ] ]
"batch_time_factors": [ 80, 2 ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 4, "LIST" ] ] ],
"proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_frying" } ],
"components": [
[ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ],
[ [ "bread_sandwich", 1, "LIST" ] ],
[ [ "any_butter_or_oil", 1, "LIST" ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "toad_in_a_hole_wheat_free",
"copy-from": "toast_wheat_free",
"time": "10m",
"components": [ [ [ "egg_bird", 1 ] ], [ [ "bread_wheat_free", 1 ] ] ]
"copy-from": "toad_in_a_hole",
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 4, "LIST" ] ] ],
"proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_frying" } ],
"components": [
[ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ],
[ [ "bread_sandwich_wheat_free", 1, "LIST" ] ],
[ [ "any_butter_or_oil", 1, "LIST" ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "PBJ_Toast",
"copy-from": "toast",
"components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "peanutbutter", 1 ] ], [ [ "bread", 1 ] ] ]
"copy-from": "buttered_toast",
"components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "PBJ_Toast_wheat_free",
"copy-from": "toast_wheat_free",
"components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "peanutbutter", 1 ] ], [ [ "bread_wheat_free", 1 ] ] ]
"copy-from": "buttered_toast",
"components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast_wheat_free", 1 ] ] ]
}
]