From b16fed0bff186d33514b981a74f78fa0201fd452 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 04:58:11 -0600 Subject: [PATCH 01/19] beechnuts name Renamed beech nuts to beechnuts --- data/json/items/comestibles/nuts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 0aa78ee49ea70..090cbc51dc299 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -208,7 +208,7 @@ { "type": "COMESTIBLE", "id": "beech_nuts", - "name": { "str_sp": "beech nuts" }, + "name": { "str_sp": "beechnuts" }, "weight": "30 g", "color": "brown", "spoils_in": "90 days", From 9beab53aa4a0039e77e917e678e37f8e455433bb Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:03:20 -0600 Subject: [PATCH 02/19] nut butter Combined "peanut butter" and "imitation peanutbutter" together as a generic "nut butter" with conditional names --- data/json/items/comestibles/nuts.json | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 090cbc51dc299..914ca906bd277 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -460,7 +460,22 @@ "symbol": "~", "color": "brown", "spoils_in": "180 days", - "name": { "str_sp": "peanut butter" }, + "name": { "str_sp": "nut butter" }, + "conditional_names": [ + { "type": "COMPONENT_ID", "condition": "peanut_shelled", "name": { "str_sp": "peanut butter" } }, + { "type": "COMPONENT_ID", "condition": "pine_nuts", "name": { "str_sp": "pine nut butter" } }, + { "type": "COMPONENT_ID", "condition": "pecan_shelled", "name": { "str_sp": "pecan butter" } }, + { "type": "COMPONENT_ID", "condition": "cashews", "name": { "str_sp": "cashew butter" } }, + { "type": "COMPONENT_ID", "condition": "pistachio_shelled", "name": { "str_sp": "pistachio butter" } }, + { "type": "COMPONENT_ID", "condition": "almond_shelled", "name": { "str_sp": "almond butter" } }, + { "type": "COMPONENT_ID", "condition": "beech_nuts", "name": { "str_sp": "beechnut butter" } }, + { "type": "COMPONENT_ID", "condition": "hickory_nut_shelled", "name": { "str_sp": "hickory nut butter" } }, + { "type": "COMPONENT_ID", "condition": "chestnut_shelled", "name": { "str_sp": "chestnut butter" } }, + { "type": "COMPONENT_ID", "condition": "hazelnut_shelled", "name": { "str_sp": "hazelnut butter" } }, + { "type": "COMPONENT_ID", "condition": "walnut_shelled", "name": { "str_sp": "walnut butter" } }, + { "type": "COMPONENT_ID", "condition": "butternut_shelled", "name": { "str_sp": "butternut butter" } }, + { "type": "COMPONENT_ID", "condition": "acorns", "name": { "str_sp": "acorn butter" } } + ], "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", "price": "1 USD 95 cent", "price_postapoc": "10 USD", @@ -479,14 +494,6 @@ "vitamins": [ [ "iron", 6 ], [ "junk_allergen", 1 ], [ "nut_allergen", 1 ] ], "fun": 2 }, - { - "id": "peanutbutter_imitation", - "type": "COMESTIBLE", - "name": { "str_sp": "imitation peanutbutter" }, - "description": "A thick, nutty brown paste so that the peanut-allergic can enjoy PB&Js too.", - "copy-from": "peanutbutter", - "calories": 400 - }, { "id": "spread_peanutbutter", "type": "COMESTIBLE", From 677c8cb81cfa82fed8562c14cb81e0702a8b7f9f Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:18:51 -0600 Subject: [PATCH 03/19] removed imitation peanutbutter Removed "peanutbutter_imitation" from "any_peanutbutter" --- data/json/requirements/cooking_components.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 223530dba8a0c..41024cbf67058 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -62,7 +62,7 @@ "id": "any_peanutbutter", "type": "requirement", "//": "Peanut butter of all types and other peanut butter substitutes", - "components": [ [ [ "peanutbutter", 1 ], [ "spread_peanutbutter", 1 ], [ "peanutbutter_imitation", 1 ] ] ] + "components": [ [ [ "peanutbutter", 1 ], [ "spread_peanutbutter", 1 ] ] ] }, { "id": "eggs_bird", From c247b4237c54db82f27b95f47db80870a5dd739f Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:28:27 -0600 Subject: [PATCH 04/19] Removal of imitation peanutbutter Merged "peanutbutter_imitation" recipe into "peanutbutter" recipe and removed "peanutbutter_imitation" from recipe ingredients --- data/json/recipes/recipe_food.json | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 554ab32f0e447..82962a300438d 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -5719,7 +5719,6 @@ [ [ "sugar_standard", 2, "LIST" ], [ "peanutbutter", 4 ], - [ "peanutbutter_imitation", 4 ], [ "coffee_syrup", 1 ], [ "con_milk", 1 ], [ "can_coconut", 1 ], @@ -9030,23 +9029,9 @@ "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "food_processor", 40 ] ] ], - "components": [ [ [ "peanut_shelled", 3 ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "peanutbutter_imitation", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 1, - "charges": 3, - "time": "10 m", - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 1 } ], - "tools": [ [ [ "food_processor", 40 ] ] ], "components": [ [ + [ "peanut_shelled", 3], [ "pine_nuts", 5 ], [ "pecan_shelled", 5 ], [ "cashews", 5 ], From 9449421e4a9a8647eaff387fd14af0056e946d2d Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:36:34 -0600 Subject: [PATCH 05/19] "peanutbutter" component amounts Standardized component costs based on volume/weight --- data/json/recipes/recipe_food.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 82962a300438d..39fbab62e012b 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -9032,18 +9032,18 @@ "components": [ [ [ "peanut_shelled", 3], - [ "pine_nuts", 5 ], - [ "pecan_shelled", 5 ], - [ "cashews", 5 ], - [ "pistachio_shelled", 5 ], - [ "almond_shelled", 5 ], - [ "beech_nuts", 5 ], - [ "hickory_nut_shelled", 5 ], - [ "chestnut_shelled", 5 ], - [ "hazelnut_shelled", 5 ], - [ "walnut_shelled", 5 ], - [ "butternut_shelled", 5 ], - [ "acorns", 5 ] + [ "pine_nuts", 6 ], + [ "pecan_shelled", 3 ], + [ "cashews", 3 ], + [ "pistachio_shelled", 3 ], + [ "almond_shelled", 3 ], + [ "beech_nuts", 3 ], + [ "hickory_nut_shelled", 3 ], + [ "chestnut_shelled", 3 ], + [ "hazelnut_shelled", 3 ], + [ "walnut_shelled", 3 ], + [ "butternut_shelled", 3 ], + [ "acorns", 3 ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] From b48dbfdc361ab907bae42c4a8aa92edf654cbce3 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:39:06 -0600 Subject: [PATCH 06/19] soy nut butter Added soy nuts as possible component for "peanutbutter" recipe --- data/json/recipes/recipe_food.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 39fbab62e012b..d6b252ddd823b 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -9043,7 +9043,8 @@ [ "hazelnut_shelled", 3 ], [ "walnut_shelled", 3 ], [ "butternut_shelled", 3 ], - [ "acorns", 3 ] + [ "acorns", 3 ], + [ "soy_nuts", 3 ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] From c729dbe75e52660f1c4dbb3af04013cbc3b322df Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:40:56 -0600 Subject: [PATCH 07/19] soy nut butter Added conditional name for soy nut butter --- data/json/items/comestibles/nuts.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 914ca906bd277..f14bce7a8ffb1 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -474,7 +474,8 @@ { "type": "COMPONENT_ID", "condition": "hazelnut_shelled", "name": { "str_sp": "hazelnut butter" } }, { "type": "COMPONENT_ID", "condition": "walnut_shelled", "name": { "str_sp": "walnut butter" } }, { "type": "COMPONENT_ID", "condition": "butternut_shelled", "name": { "str_sp": "butternut butter" } }, - { "type": "COMPONENT_ID", "condition": "acorns", "name": { "str_sp": "acorn butter" } } + { "type": "COMPONENT_ID", "condition": "acorns", "name": { "str_sp": "acorn butter" } }, + { "type": "COMPONENT_ID", "condition": "soy_nuts", "name": { "str_sp": "soy nut butter" } } ], "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", "price": "1 USD 95 cent", From d53c5412469e2091b645d66e18f3e18dd27b2402 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 05:43:15 -0600 Subject: [PATCH 08/19] Removed imitation peanutbutter Removed "peanutbutter_imitation" from recipes --- data/json/recipes/food/frozen.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/data/json/recipes/food/frozen.json b/data/json/recipes/food/frozen.json index 2b57a45e6127f..708a717f089d0 100644 --- a/data/json/recipes/food/frozen.json +++ b/data/json/recipes/food/frozen.json @@ -22,7 +22,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 2 ], - [ "peanutbutter_imitation", 2 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], @@ -51,7 +50,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 2 ], - [ "peanutbutter_imitation", 2 ], [ "candy", 1 ], [ "candy2", 1 ], [ "candy3", 1 ], @@ -85,7 +83,6 @@ [ [ "chocolate", 2 ], [ "peanutbutter", 2 ], - [ "peanutbutter_imitation", 2 ], [ "syrup", 1 ], [ "candy", 2 ], [ "candy2", 2 ], @@ -115,7 +112,6 @@ [ [ "chocolate", 2 ], [ "peanutbutter", 2 ], - [ "peanutbutter_imitation", 2 ], [ "syrup", 1 ], [ "candy", 2 ], [ "candy2", 2 ], @@ -298,7 +294,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 1 ], - [ "peanutbutter_imitation", 1 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], @@ -332,7 +327,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 1 ], - [ "peanutbutter_imitation", 1 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], @@ -373,7 +367,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 1 ], - [ "peanutbutter_imitation", 1 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], @@ -410,7 +403,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 1 ], - [ "peanutbutter_imitation", 1 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], @@ -491,7 +483,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 1 ], - [ "peanutbutter_imitation", 1 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], @@ -563,7 +554,6 @@ [ [ "chocolate", 1 ], [ "peanutbutter", 1 ], - [ "peanutbutter_imitation", 1 ], [ "syrup", 1 ], [ "candy", 1 ], [ "candy2", 1 ], From 2a9188cc19d8274214d272b6995321b81f690e32 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:33:48 -0600 Subject: [PATCH 09/19] Added "any_nut" Created "any_nut" requirement which includes anything you would traditionally use as a nut when cooking --- .../json/requirements/cooking_components.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 41024cbf67058..73ca01d34f542 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -64,6 +64,30 @@ "//": "Peanut butter of all types and other peanut butter substitutes", "components": [ [ [ "peanutbutter", 1 ], [ "spread_peanutbutter", 1 ] ] ] }, + { + "id": "any_nut", + "type": "requirement", + "//": "Any type of prepared culinary nut besides coconuts", + "components": [ + [ + [ "peanut_shelled", 1 ], + [ "pine_nuts", 2 ], + [ "pecan_shelled", 1 ], + [ "cashews", 1 ], + [ "pistachio_shelled", 1 ], + [ "almond_shelled", 1 ], + [ "beech_nuts", 1 ], + [ "hickory_nut_shelled", 1 ], + [ "chestnut_shelled", 1 ], + [ "hazelnut_shelled", 1 ], + [ "walnut_shelled", 1 ], + [ "butternut_shelled", 1 ], + [ "acorns_cooked", 1 ], + [ "acorn_roasted", 1 ], + [ "soy_nuts", 1 ] + ] + ] + }, { "id": "eggs_bird", "type": "requirement", From c64a4fce1e3bb6247ddb1206db81d5a07adb8afa Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:41:58 -0600 Subject: [PATCH 10/19] "peanutbutter" recipe change Implemented new "any_nut" requirement into "peanutbutter" recipe --- data/json/recipes/recipe_food.json | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index d6b252ddd823b..edbd9e97ffa6d 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -9030,22 +9030,7 @@ "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "food_processor", 40 ] ] ], "components": [ - [ - [ "peanut_shelled", 3], - [ "pine_nuts", 6 ], - [ "pecan_shelled", 3 ], - [ "cashews", 3 ], - [ "pistachio_shelled", 3 ], - [ "almond_shelled", 3 ], - [ "beech_nuts", 3 ], - [ "hickory_nut_shelled", 3 ], - [ "chestnut_shelled", 3 ], - [ "hazelnut_shelled", 3 ], - [ "walnut_shelled", 3 ], - [ "butternut_shelled", 3 ], - [ "acorns", 3 ], - [ "soy_nuts", 3 ] - ], + [ [ "any_nut", 3, "LIST" ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] }, From b7a66323b507c5bad8c95ff3047c6f0bf7ce5638 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:46:00 -0600 Subject: [PATCH 11/19] conditional name fix --- data/json/items/comestibles/nuts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index f14bce7a8ffb1..cc3587e234cf3 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -474,7 +474,7 @@ { "type": "COMPONENT_ID", "condition": "hazelnut_shelled", "name": { "str_sp": "hazelnut butter" } }, { "type": "COMPONENT_ID", "condition": "walnut_shelled", "name": { "str_sp": "walnut butter" } }, { "type": "COMPONENT_ID", "condition": "butternut_shelled", "name": { "str_sp": "butternut butter" } }, - { "type": "COMPONENT_ID", "condition": "acorns", "name": { "str_sp": "acorn butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "acorn", "name": { "str_sp": "acorn butter" } }, { "type": "COMPONENT_ID", "condition": "soy_nuts", "name": { "str_sp": "soy nut butter" } } ], "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", From 0a99f063c078445ae21ae588ee3ffa8ccb9a37d8 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:57:53 -0600 Subject: [PATCH 12/19] Added variant Add variant so "peanut butter" spawns in loot rather than "nut butter" --- data/json/items/comestibles/nuts.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index cc3587e234cf3..1ea7eb7b076ed 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -478,6 +478,15 @@ { "type": "COMPONENT_ID", "condition": "soy_nuts", "name": { "str_sp": "soy nut butter" } } ], "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", + "variant_type": "generic", + "variants": [ + { + "id": "peanutbutter_preapoc", + "name": { "str_sp:" "peanut butter" }, + "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", + "weight": 1 + } + ], "price": "1 USD 95 cent", "price_postapoc": "10 USD", "//": "Two tablespoons per charge.", From 8e5e403a5d1744bb189aba0bc51e0b3255f5f6fc Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:33:57 -0600 Subject: [PATCH 13/19] Added to "any_nut" --- data/json/requirements/cooking_components.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 73ca01d34f542..24e9ceaea63ac 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -73,15 +73,23 @@ [ "peanut_shelled", 1 ], [ "pine_nuts", 2 ], [ "pecan_shelled", 1 ], + [ "pecan_roasted", 1 ], [ "cashews", 1 ], [ "pistachio_shelled", 1 ], + [ "pistachio_roasted", 1 ], [ "almond_shelled", 1 ], + [ "almond_roasted", 1 ], [ "beech_nuts", 1 ], [ "hickory_nut_shelled", 1 ], + [ "hickory_nut_roasted", 1 ], [ "chestnut_shelled", 1 ], + [ "chestnut_roasted", 1 ], [ "hazelnut_shelled", 1 ], + [ "hazelnut_roasted", 1 ], [ "walnut_shelled", 1 ], + [ "walnut_roasted", 1 ], [ "butternut_shelled", 1 ], + [ "butternut_roasted", 1 ], [ "acorns_cooked", 1 ], [ "acorn_roasted", 1 ], [ "soy_nuts", 1 ] From b70548ed90e1ea0b21d77fad1cf5a1023b568a40 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:37:43 -0600 Subject: [PATCH 14/19] Blanched acorns --- data/json/requirements/cooking_components.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 24e9ceaea63ac..62be265920d54 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -92,6 +92,7 @@ [ "butternut_roasted", 1 ], [ "acorns_cooked", 1 ], [ "acorn_roasted", 1 ], + [ "acorns_blanched", 1 ], [ "soy_nuts", 1 ] ] ] From 3d2372d29dbfb3e2346f7d4a9b5fe88f5587c42d Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:44:42 -0600 Subject: [PATCH 15/19] conditional names fix --- data/json/items/comestibles/nuts.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 1ea7eb7b076ed..1a0fe0919e828 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -462,20 +462,20 @@ "spoils_in": "180 days", "name": { "str_sp": "nut butter" }, "conditional_names": [ - { "type": "COMPONENT_ID", "condition": "peanut_shelled", "name": { "str_sp": "peanut butter" } }, - { "type": "COMPONENT_ID", "condition": "pine_nuts", "name": { "str_sp": "pine nut butter" } }, - { "type": "COMPONENT_ID", "condition": "pecan_shelled", "name": { "str_sp": "pecan butter" } }, - { "type": "COMPONENT_ID", "condition": "cashews", "name": { "str_sp": "cashew butter" } }, - { "type": "COMPONENT_ID", "condition": "pistachio_shelled", "name": { "str_sp": "pistachio butter" } }, - { "type": "COMPONENT_ID", "condition": "almond_shelled", "name": { "str_sp": "almond butter" } }, - { "type": "COMPONENT_ID", "condition": "beech_nuts", "name": { "str_sp": "beechnut butter" } }, - { "type": "COMPONENT_ID", "condition": "hickory_nut_shelled", "name": { "str_sp": "hickory nut butter" } }, - { "type": "COMPONENT_ID", "condition": "chestnut_shelled", "name": { "str_sp": "chestnut butter" } }, - { "type": "COMPONENT_ID", "condition": "hazelnut_shelled", "name": { "str_sp": "hazelnut butter" } }, - { "type": "COMPONENT_ID", "condition": "walnut_shelled", "name": { "str_sp": "walnut butter" } }, - { "type": "COMPONENT_ID", "condition": "butternut_shelled", "name": { "str_sp": "butternut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "peanut", "name": { "str_sp": "peanut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "pine", "name": { "str_sp": "pine nut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "pecan", "name": { "str_sp": "pecan butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "cashew", "name": { "str_sp": "cashew butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "pistachio", "name": { "str_sp": "pistachio butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "almond", "name": { "str_sp": "almond butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "beech", "name": { "str_sp": "beechnut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "hickory", "name": { "str_sp": "hickory nut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "chestnut", "name": { "str_sp": "chestnut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "hazelnut", "name": { "str_sp": "hazelnut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "walnut", "name": { "str_sp": "walnut butter" } }, + { "type": "COMPONENT_ID_SUBSTRING", "condition": "butternut", "name": { "str_sp": "butternut butter" } }, { "type": "COMPONENT_ID_SUBSTRING", "condition": "acorn", "name": { "str_sp": "acorn butter" } }, - { "type": "COMPONENT_ID", "condition": "soy_nuts", "name": { "str_sp": "soy nut butter" } } + { "type": "COMPONENT_ID_SUBSTRING", "condition": "soy", "name": { "str_sp": "soy nut butter" } } ], "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", "variant_type": "generic", From f416e5346b5f149f6aa1feb941cdc4ae04515248 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:53:43 -0600 Subject: [PATCH 16/19] misplaced colon --- data/json/items/comestibles/nuts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 1a0fe0919e828..e13ef63df3e1d 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -482,7 +482,7 @@ "variants": [ { "id": "peanutbutter_preapoc", - "name": { "str_sp:" "peanut butter" }, + "name": { "str_sp": "peanut butter" }, "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", "weight": 1 } From e4f5ad628025d428ff56e584ce5a2b29bcba963b Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:41:49 -0600 Subject: [PATCH 17/19] Update recipe_food.json --- data/json/recipes/recipe_food.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index edbd9e97ffa6d..43696049cb644 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -9029,10 +9029,7 @@ "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "food_processor", 40 ] ] ], - "components": [ - [ [ "any_nut", 3, "LIST" ] ], - [ [ "sugar_standard", 2, "LIST" ] ] - ] + "components": [ [ [ "any_nut", 3, "LIST" ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] }, { "type": "recipe", From 16a579ba4e8b552535fa504a5306bf63fa34fff8 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Tue, 3 Dec 2024 01:18:40 -0600 Subject: [PATCH 18/19] migration for imitation peanutbutter --- data/json/obsoletion_and_migration_0.I/migration_items.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json index f1cf3b8b5a81d..bce098642daad 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -2124,5 +2124,10 @@ "id": "ammo_box_army_20_338", "type": "MIGRATION", "replace": "ammo_box_4" + }, + { + "id": "peanutbutter_imitation", + "type": "MIGRATION", + "replace": "peanutbutter" } ] From 0432f9a1b710d429325574ba1e79b2f65558de44 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:37:58 -0600 Subject: [PATCH 19/19] updated calorie and vitamin ranges for ice cream --- tests/iteminfo_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp index 90f1479740bdc..0a63e8f5e7860 100644 --- a/tests/iteminfo_test.cpp +++ b/tests/iteminfo_test.cpp @@ -1994,13 +1994,13 @@ TEST_CASE( "nutrients_in_food", "[iteminfo][food]" ) "--\n" "Nutrition will vary with chosen ingredients.\n" "Calories (kcal):" - " 56-532" + " 53-470" " Quench: 0\n" ); // Values end up rounded slightly CHECK( item_info_str( ice_cream, { iteminfo_parts::FOOD_VITAMINS } ) == "--\n" "Nutrition will vary with chosen ingredients.\n" - "Vitamins (RDA): 63-354 mg Calcium (6-35%), 0-23 mg Iron (0-128%)," + "Vitamins (RDA): 63-323 mg Calcium (6-32%), 0-20 mg Iron (0-109%)," " and 0-45 mg Vitamin C (0-50%)\n" ); } }