From d43453e4340fdc3101bc3b3b2907ba6fcd554b3f Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Sun, 15 May 2022 12:17:09 +0200 Subject: [PATCH 1/9] Fix/Update Toast and toad_in_a_hole --- data/json/recipes/food/bread.json | 68 ++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 43f5a836620a9..1b3190ddf9e4d 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -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" ] ] ] }, { @@ -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 ] ] ] } ] From 4070c2645340c452f482418cab138141fc07002e Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Sun, 15 May 2022 12:28:42 +0200 Subject: [PATCH 2/9] adjust toad-inthe-hole --- data/json/items/comestibles/bread.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index c4b8ad22a448f..3af353c09ce47 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -290,6 +290,8 @@ "name": { "str_sp": "toad in a hole" }, "copy-from": "toast", "description": "A cooked egg served inside a piece of toast.", + "extend": { "flags": [ "EATEN_HOT", "FREEZERBURN" ] }, + "material": [ "wheat", "egg" ], "relative": { "calories": 80, "fun": 4, "flags": [ "FREEZERBURN" ], "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] } }, { @@ -298,7 +300,9 @@ "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 ] ] } + "extend": { "flags": [ "EATEN_HOT", "FREEZERBURN" ] }, + "material": [ "veggy", "egg" ], + "relative": { "calories": 80, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] } }, { "type": "COMESTIBLE", From 7ce0ed2769e1d26064a76fa6776acc092e58c941 Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Sun, 15 May 2022 13:36:46 +0200 Subject: [PATCH 3/9] Set Materials --- data/json/items/comestibles/bread.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 3af353c09ce47..ba65686d1469b 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -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 } }, { @@ -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 } }, { @@ -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 ] ] } }, @@ -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 ] ] } }, @@ -308,8 +316,10 @@ "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", "wheat" ], + "primary_material": "wheat", "relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] } }, { @@ -318,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", "veggy" ], + "primary_material": "veggy", "relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] } }, { From d53b4fb265b59baffa478d8afd240e6fb4cf4212 Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Sun, 15 May 2022 13:42:11 +0200 Subject: [PATCH 4/9] add "milk" because these toastt based PBJ somehow also fit butter on them... --- data/json/items/comestibles/bread.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index ba65686d1469b..726efb6fb7837 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -318,7 +318,7 @@ "name": { "str_sp": "PBJ Toast" }, "copy-from": "toast", "description": "A slice of toast with peanut butter and jelly on top of it with added butter for flavor.", - "material": [ "fruit", "wheat" ], + "material": [ "fruit", "milk", "wheat" ], "primary_material": "wheat", "relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] } }, @@ -328,7 +328,7 @@ "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", "veggy" ], + "material": [ "fruit", "milk", "veggy" ], "primary_material": "veggy", "relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] } }, From f95c674c6be5bedaeaf6a21ad61c18631e067be7 Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Thu, 19 May 2022 09:20:40 +0200 Subject: [PATCH 5/9] update description of the toad in a hole --- data/json/items/comestibles/bread.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 726efb6fb7837..4bf72ec58449a 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -297,7 +297,7 @@ "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 ] ] } @@ -307,7 +307,7 @@ "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.", + "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 ] ] } From 0f429dad0654ba6cb72fff00324f0f76a2c1e7f5 Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Fri, 27 May 2022 15:09:06 +0200 Subject: [PATCH 6/9] correct description Co-authored-by: Perry --- data/json/items/comestibles/bread.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 4bf72ec58449a..7c889a320ca55 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -307,7 +307,7 @@ "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, , not to be confused with the english recipe of the same name.", + "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 ] ] } From b30e8eeedf0597f807f388ebe6f6e8aea4f5750a Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Fri, 27 May 2022 16:52:40 +0200 Subject: [PATCH 7/9] test correction (relative kcal and vit removed) --- data/json/items/comestibles/bread.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 7c889a320ca55..5f52d73344200 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -300,7 +300,7 @@ "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 ] ] } + "relative": { "fun": 4 } }, { "type": "COMESTIBLE", @@ -310,7 +310,7 @@ "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 ] ] } + "relative": { "fun": 4 } }, { "type": "COMESTIBLE", From e90156872bca002f23757e3ce82e804f61b50e49 Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Fri, 27 May 2022 17:26:05 +0200 Subject: [PATCH 8/9] Revert "test correction (relative kcal and vit removed)" This reverts commit b30e8eeedf0597f807f388ebe6f6e8aea4f5750a. --- data/json/items/comestibles/bread.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 5f52d73344200..7c889a320ca55 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -300,7 +300,7 @@ "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": { "fun": 4 } + "relative": { "calories": 80, "fun": 4, "flags": [ "FREEZERBURN" ], "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] } }, { "type": "COMESTIBLE", @@ -310,7 +310,7 @@ "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": { "fun": 4 } + "relative": { "calories": 80, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] } }, { "type": "COMESTIBLE", From a75b8fbccca2e099e8733b7ed86ec16b7e763236 Mon Sep 17 00:00:00 2001 From: SamGondra <101570967+SamGondra@users.noreply.github.com> Date: Sat, 28 May 2022 12:42:11 +0200 Subject: [PATCH 9/9] pushing relative kcal up by Oil kcal --- data/json/items/comestibles/bread.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 7c889a320ca55..70f1b263569ad 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -300,7 +300,7 @@ "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 ] ] } + "relative": { "calories": 207, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] } }, { "type": "COMESTIBLE", @@ -310,7 +310,7 @@ "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 ] ] } + "relative": { "calories": 207, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] } }, { "type": "COMESTIBLE",