From bb151cbeaac2130bb4fafcfa7b3f3436ae38793c Mon Sep 17 00:00:00 2001 From: Benjamin Mauer Date: Mon, 21 Oct 2024 20:37:38 -0400 Subject: [PATCH 1/5] Update dairy_products.json Adjusts the recipes for creating raw milk to correct abnormal calorie outputs of raw butter, also adds salt to the recipe. --- data/json/recipes/food/dairy_products.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/food/dairy_products.json b/data/json/recipes/food/dairy_products.json index 5723029bc5c6a..4067405fc1561 100644 --- a/data/json/recipes/food/dairy_products.json +++ b/data/json/recipes/food/dairy_products.json @@ -12,8 +12,8 @@ "qualities": [ { "id": "CHURN", "level": 1 } ], "book_learn": [ [ "dairy_book", 3 ] ], "//": "Book Things to do with milk. Add curdled milk and cheese recipes to the book. Also consider adding to brewing json Airag from this book.", - "components": [ [ [ "milk_cream", 5 ] ] ], - "charges": 99 + "components": [ [ [ "milk_cream", 5 ] ], [ [ "salt", 1 ] ] ], + "charges": 22 }, { "type": "recipe", @@ -29,8 +29,8 @@ "book_learn": [ [ "dairy_book", 3 ] ], "//": "Book Things to do with milk. Add curdled milk and cheese recipes to the book. Also consider adding to brewing json Airag from this book.", "tools": [ [ [ "jar_glass_sealed", -1 ] ] ], - "components": [ [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ] ], - "charges": 33 + "components": [ [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ], [ [ "salt", 1 ] ] ], + "charges": 9 }, { "type": "recipe", From 6676c55b4ce2215c0472272c3305c4a7e9b0cf88 Mon Sep 17 00:00:00 2001 From: Benjamin Mauer Date: Mon, 21 Oct 2024 20:57:13 -0400 Subject: [PATCH 2/5] Add raw butter to recipes that use butter Changed the recipes for: "condiment", Shillelagh, PBJ Toast, and Lobster Roll to allow for using raw butter as well as regular butter. It seemed like oversight that these recipes lacked this option. --- data/json/recipes/food/bread.json | 2 +- data/json/recipes/recipe_food.json | 3 ++- data/json/recipes/weapon/bashing.json | 2 +- data/json/requirements/cooking_components.json | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index b641053d31474..2f3dc5cd8b6aa 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -227,6 +227,6 @@ "activity_level": "LIGHT_EXERCISE", "result": "PBJ_Toast", "copy-from": "buttered_toast", - "components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast", 1 ] ] ] + "components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ], [ "raw_butter", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast", 1 ] ] ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 39611a2891fe1..44161d8806790 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -6730,6 +6730,7 @@ [ "honey_mustard", 1 ], [ "mustard", 1 ], [ "butter", 1 ], + [ "raw_butter"], [ "horseradish", 1 ], [ "mayonnaise", 1 ], [ "bacon", 1 ], @@ -9677,7 +9678,7 @@ [ "wild_garlic", 1 ], [ "garlic_powder", 1 ] ], - [ [ "butter", 1 ] ], + [ [ "butter", 1 ], [ "raw_butter", 1 ] ], [ [ "wild_herbs", 6 ] ] ], "charges": 6 diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index f1d251d4d6b54..07ca36b49af4c 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -43,7 +43,7 @@ "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_carving" } ], "tools": [ [ [ "char_smoker", 100 ] ] ], - "components": [ [ [ "log", 1 ] ], [ [ "butter", 30 ], [ "edible_lard", 4, "LIST" ] ] ] + "components": [ [ [ "log", 1 ] ], [ [ "butter", 30 ], [ "raw_butter", 30 ], [ "edible_lard", 4, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index cf7ce1bf1cd72..e28e38845c398 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1034,7 +1034,8 @@ [ "honey_mustard", 1 ], [ "horseradish", 1 ], [ "sauerkraut", 1 ], - [ "butter", 1 ] + [ "butter", 1 ], + [ "raw_butter"] ] ] }, From 898184152a6fd5dd8aacb03f233c8f3baa6ad378 Mon Sep 17 00:00:00 2001 From: Benjamin Mauer Date: Mon, 21 Oct 2024 21:00:34 -0400 Subject: [PATCH 3/5] Lint Changes Whoops, forgot to lint, this commit fixes that. --- data/json/recipes/recipe_food.json | 2 +- data/json/requirements/cooking_components.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 44161d8806790..cc38560c283b1 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -6730,7 +6730,7 @@ [ "honey_mustard", 1 ], [ "mustard", 1 ], [ "butter", 1 ], - [ "raw_butter"], + [ "raw_butter" ], [ "horseradish", 1 ], [ "mayonnaise", 1 ], [ "bacon", 1 ], diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index e28e38845c398..8d1c4c1828df2 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1035,7 +1035,7 @@ [ "horseradish", 1 ], [ "sauerkraut", 1 ], [ "butter", 1 ], - [ "raw_butter"] + [ "raw_butter" ] ] ] }, From eb4fa91408952a52899576f0bd1d9a38fd51d434 Mon Sep 17 00:00:00 2001 From: Benjamin Mauer Date: Mon, 21 Oct 2024 21:26:42 -0400 Subject: [PATCH 4/5] Fix Array Errors Game was throwing array errors because I wasn't formatting the recipes correctly, this fixes that. --- data/json/recipes/recipe_food.json | 2 +- data/json/requirements/cooking_components.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index cc38560c283b1..b3108fab44c7b 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -6730,7 +6730,7 @@ [ "honey_mustard", 1 ], [ "mustard", 1 ], [ "butter", 1 ], - [ "raw_butter" ], + [ "raw_butter", 1 ], [ "horseradish", 1 ], [ "mayonnaise", 1 ], [ "bacon", 1 ], diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 8d1c4c1828df2..3363eb51f9908 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1035,7 +1035,7 @@ [ "horseradish", 1 ], [ "sauerkraut", 1 ], [ "butter", 1 ], - [ "raw_butter" ] + [ "raw_butter", 1 ] ] ] }, From 767baa40b5d9852225b94ec5272ca2a182905053 Mon Sep 17 00:00:00 2001 From: Benjamin Mauer Date: Mon, 21 Oct 2024 21:44:46 -0400 Subject: [PATCH 5/5] Adjust Shake recipe for Raw butter to correct the output calories Turns out food byproducts aren't counted when comparing recipe input vs output, or they are in the cases of making lard, and making raw butter. This changes the recipe to magically make more butter, but at least it's within 2% of the nominal calories of raw butter now. --- data/json/recipes/food/dairy_products.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/dairy_products.json b/data/json/recipes/food/dairy_products.json index 4067405fc1561..ecbb10544144a 100644 --- a/data/json/recipes/food/dairy_products.json +++ b/data/json/recipes/food/dairy_products.json @@ -30,7 +30,7 @@ "//": "Book Things to do with milk. Add curdled milk and cheese recipes to the book. Also consider adding to brewing json Airag from this book.", "tools": [ [ [ "jar_glass_sealed", -1 ] ] ], "components": [ [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ], [ [ "salt", 1 ] ] ], - "charges": 9 + "charges": 13 }, { "type": "recipe",