diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 0aa78ee49ea70..e13ef63df3e1d 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", @@ -460,8 +460,33 @@ "symbol": "~", "color": "brown", "spoils_in": "180 days", - "name": { "str_sp": "peanut butter" }, + "name": { "str_sp": "nut butter" }, + "conditional_names": [ + { "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_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", + "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.", @@ -479,14 +504,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", 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 0007ca30afe0f..a2fe4bc62b159 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -2154,5 +2154,10 @@ "id": "ammo_box_army_20_338", "type": "MIGRATION", "replace": "ammo_box_4" + }, + { + "id": "peanutbutter_imitation", + "type": "MIGRATION", + "replace": "peanutbutter" } ] 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 ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 554ab32f0e447..43696049cb644 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,38 +9029,7 @@ "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": [ - [ - [ "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 ] - ], - [ [ "sugar_standard", 2, "LIST" ] ] - ] + "components": [ [ [ "any_nut", 3, "LIST" ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 60fc11905cc86..7b3982c40ac5b 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -62,7 +62,40 @@ "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": "any_nut", + "type": "requirement", + "//": "Any type of prepared culinary nut besides coconuts", + "components": [ + [ + [ "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 ], + [ "acorns_blanched", 1 ], + [ "soy_nuts", 1 ] + ] + ] }, { "id": "eggs_bird", diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp index 7b13279d7d1c1..dd069b6d32d5c 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" ); } }