diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 7cbdff9d2f049..d661eb8bf89eb 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -1186,9 +1186,8 @@ "type": "item_group", "id": "bread_wheat_free_bag_plastic_14", "subtype": "collection", - "//": "This group was created automatically and may contain errors.", "container-item": "bag_plastic", - "entries": [ { "item": "bread_wheat_free", "container-item": "null", "count": 14 } ] + "entries": [ { "item": "bread_wheat_free", "container-item": "null", "components": [ "flour_wheat_free" ], "count": 14 } ] }, { "type": "item_group", diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 31e647aae3394..5c74f2259f677 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -133,25 +133,6 @@ "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ], "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "flatbread_wheat_free", - "name": { "str_sp": "wheat-free flatbread" }, - "weight": "15 g", - "color": "brown", - "spoils_in": "11 days 16 hours", - "container": "bag_plastic", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 234, - "description": "Simple unleavened bread made with wheat-free flour.", - "price": "11 cent", - "price_postapoc": "50 cent", - "material": [ "veggy" ], - "volume": "60 ml", - "flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ], - "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "frybread", @@ -191,27 +172,6 @@ "fun": 1, "vitamins": [ [ "calcium", 3 ], [ "iron", 6 ], [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "bread_wheat_free", - "name": { "str_sp": "wheat-free bread" }, - "description": "A piece of bread made from wheat-free flour, one of the single most important staple foods of human civilization since the discovery of glucose intolerance.", - "material": [ "veggy" ], - "looks_like": "bread", - "weight": "56 g", - "volume": "200 ml", - "price": "23 cent", - "price_postapoc": "50 cent", - "symbol": "%", - "color": "brown", - "spoils_in": "10 days", - "container": "bag_plastic", - "comestible_type": "FOOD", - "calories": 83, - "flags": [ "EATEN_HOT" ], - "fun": 1, - "vitamins": [ [ "calcium", 1 ], [ "iron", 1 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "bread_garlic", @@ -244,16 +204,6 @@ "fun": 2, "quench": -2 }, - { - "type": "COMESTIBLE", - "id": "toast_wheat_free", - "name": { "str_sp": "wheat-free toast" }, - "copy-from": "bread_wheat_free", - "description": "A slice of wheat-free bread with heat applied to crisp it up. It's a bit dry and would likely go better with some toppings.", - "spoils_in": "14 days", - "fun": 2, - "quench": -2 - }, { "type": "COMESTIBLE", "id": "buttered_toast", @@ -265,17 +215,6 @@ "relative": { "calories": 101, "fun": 4 }, "vitamins": [ [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "buttered_toast_wheat_free", - "name": { "str_sp": "wheat-free buttered toast" }, - "copy-from": "toast_wheat_free", - "description": "A slice of wheat-free toast with butter spread on top to make it taste better.", - "material": [ "milk", "veggy" ], - "primary_material": "veggy", - "relative": { "calories": 101, "fun": 4 }, - "vitamins": [ [ "veggy_allergen", 1 ], [ "milk_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "jam_toast", @@ -288,18 +227,6 @@ "relative": { "calories": 35, "fun": 3, "quench": 2, "vitamins": [ [ "vitC", "20 mg" ] ] }, "vitamins": [ [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "jam_toast_wheat_free", - "name": { "str_sp": "wheat-free jam toast" }, - "copy-from": "toast_wheat_free", - "description": "A slice of wheat-free toast with jam added, to make it less dry and to add more flavor.", - "material": [ "fruit", "veggy" ], - "primary_material": "veggy", - "spoils_in": "7 days", - "relative": { "calories": 35, "fun": 3, "quench": 2, "vitamins": [ [ "vitC", 20 ] ] }, - "vitamins": [ [ "veggy_allergen", 1 ], [ "fruit_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "peanut_butter_toast", @@ -308,14 +235,6 @@ "description": "A slathering of peanut butter gives more heartiness and calories to a slice of toast.", "relative": { "calories": 190, "fun": 3, "quench": -2, "vitamins": [ [ "iron", 6 ] ] } }, - { - "type": "COMESTIBLE", - "id": "peanut_butter_toast_wheat_free", - "name": { "str_sp": "wheat-free peanut butter toast" }, - "copy-from": "toast_wheat_free", - "description": "A slathering of peanut butter gives more heartiness and calories to a slice of wheat-free toast.", - "relative": { "calories": 190, "fun": 3, "quench": -2, "vitamins": [ [ "iron", 6 ] ] } - }, { "type": "COMESTIBLE", "id": "toad_in_a_hole", @@ -327,17 +246,6 @@ "relative": { "calories": 207, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }, "vitamins": [ [ "wheat_allergen", 1 ], [ "egg_allergen", 1 ] ] }, - { - "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, not to be confused with the English recipe of the same name.", - "extend": { "flags": [ "EATEN_HOT", "FREEZERBURN" ] }, - "material": [ "veggy", "egg" ], - "relative": { "calories": 207, "fun": 4, "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }, - "vitamins": [ [ "veggy_allergen", 1 ], [ "egg_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "PBJ_Toast", @@ -349,17 +257,6 @@ "relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] }, "vitamins": [ [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ], [ "milk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "PBJ_Toast_wheat_free", - "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, with added butter for flavor.", - "material": [ "fruit", "milk", "veggy" ], - "primary_material": "veggy", - "relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] }, - "vitamins": [ [ "veggy_allergen", 1 ], [ "fruit_allergen", 1 ], [ "milk_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "cornbread", @@ -565,26 +462,6 @@ "fun": 3, "vitamins": [ [ "calcium", 4 ], [ "iron", 4 ], [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "brown_bread_wheat_free", - "name": { "str_sp": "wheat-free brown bread" }, - "weight": "45 g", - "color": "brown", - "spoils_in": "10 days", - "container": "can_medium", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 130, - "description": "Sweet, wheat-free bread made with molasses, with a consistency closer to cake.", - "price": "136 cent", - "price_postapoc": "1 USD", - "material": [ "veggy" ], - "volume": "48 ml", - "flags": [ "EATEN_HOT", "EATEN_COLD" ], - "fun": 3, - "vitamins": [ [ "calcium", 4 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "hallula", diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 4f0e5af299cf1..1ad01ce662258 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -1072,40 +1072,6 @@ "flags": [ "EATEN_HOT", "FREEZERBURN" ], "vitamins": [ [ "wheat_allergen", 1 ], [ "egg_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "fried_egg_sandwich_wheat_free", - "name": { "str": "wheat-free fried egg sandwich", "str_pl": "wheat-free fried egg sandwiches" }, - "copy-from": "scrambled_eggs", - "color": "yellow", - "symbol": "%", - "quench": -1, - "calories": 422, - "description": "Sunny-side up eggs fried with a runny yolk and just a bit of crisp on the edges. Made into a sandwich with wheat-free bread, just like Sunday morning.", - "price": "5 USD", - "price_postapoc": "1 USD 20 cent", - "material": [ "egg", "veggy" ], - "fun": 4, - "flags": [ "EATEN_HOT", "FREEZERBURN" ], - "vitamins": [ [ "veggy_allergen", 1 ], [ "egg_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "deluxe_fried_egg_sandwich_wheat_free", - "name": { "str": "wheat-free deluxe fried egg sandwich", "str_pl": "wheat-free deluxe fried egg sandwiches" }, - "copy-from": "scrambled_eggs", - "color": "yellow", - "symbol": "%", - "quench": -1, - "calories": 422, - "description": "Deluxe sunny-side up eggs fried with a runny yolk and just a bit of crisp on the edges. Made into a sandwich with wheat-free bread, just like Sunday morning.", - "price": "5 USD", - "price_postapoc": "1 USD 20 cent", - "material": [ "egg", "veggy" ], - "fun": 12, - "flags": [ "EATEN_HOT", "FREEZERBURN" ], - "vitamins": [ [ "veggy_allergen", 1 ], [ "egg_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "omelet", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 07f07d3c127c7..9ffdf252f0348 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -1038,34 +1038,6 @@ [ "junk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "chilidogs_wheat_free", - "name": { "str": "wheat-free chili dog" }, - "weight": "318 g", - "color": "red", - "spoils_in": "1 day", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": -1, - "calories": 353, - "description": "A hot dog on a wheat-free bun, with chili con carne on top. Yum!", - "price": "450 cent", - "price_postapoc": "75 cent", - "material": [ "flesh", "junk", "veggy" ], - "volume": "200 ml", - "flags": [ "EATEN_HOT" ], - "fun": 15, - "vitamins": [ - [ "vitC", 46 ], - [ "calcium", 14 ], - [ "iron", 21 ], - [ "meat_allergen", 1 ], - [ "veggy_allergen", 1 ], - [ "junk_allergen", 1 ] - ] - }, { "type": "COMESTIBLE", "id": "corndogs_frozen", @@ -1266,34 +1238,6 @@ [ "junk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "hotdogs_cooked_wheat_free", - "name": { "str": "cooked wheat-free hot dog" }, - "weight": "383 g", - "color": "red", - "spoils_in": "1 day", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": -1, - "calories": 407, - "description": "Surprisingly, not made from dog. Now that it's been cooked and served on a wheat-free bun, this hot dog tastes much better, but will spoil faster.", - "price": "8 USD", - "price_postapoc": "3 USD 50 cent", - "material": [ "flesh", "junk", "veggy" ], - "volume": "250 ml", - "flags": [ "EATEN_HOT" ], - "fun": 12, - "vitamins": [ - [ "vitC", 85 ], - [ "calcium", 22 ], - [ "iron", 15 ], - [ "meat_allergen", 1 ], - [ "veggy_allergen", 1 ], - [ "junk_allergen", 1 ] - ] - }, { "type": "COMESTIBLE", "id": "hotdogs_newyork", @@ -1308,20 +1252,6 @@ "fun": 18, "//": "The fun value is high to justify crafting this versus a normal hot dog." }, - { - "type": "COMESTIBLE", - "id": "hotdogs_newyork_wheat_free", - "name": { "str": "wheat-free new york wiener" }, - "copy-from": "hotdogs_cooked_wheat_free", - "weight": "568 g", - "looks_like": "hotdogs_cooked_wheat_free", - "calories": 721, - "description": "What's better than a gluten-free hot dog? A gluten-free hot dog smothered in ground meat and chopped onions, of course!", - "price_postapoc": "5 USD", - "volume": "375 ml", - "fun": 18, - "//": "The fun value is high to justify crafting this versus a normal hot dog." - }, { "type": "COMESTIBLE", "id": "maltballs", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 79688b779b03a..2c15665e52b5f 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -1311,40 +1311,6 @@ [ "milk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "cheeseburger_wheat_free", - "name": { "str": "wheat-free cheeseburger" }, - "conditional_names": [ - { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "chump %s" } }, - { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "elf %s" } }, - { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "chilling %s" } }, - { "type": "COMPONENT_ID_SUBSTRING", "condition": "egg", "name": { "str": "wheat-free breakfast cheeseburger" } } - ], - "weight": "333 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 380, - "description": "A wheat-free sandwich of minced meat and cheese with condiments. A simple favorite of the people before the Cataclysm.", - "price": "10 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "flesh", "veggy", "milk" ], - "primary_material": "processed_food", - "volume": "300 ml", - "flags": [ "EATEN_HOT", "ALLERGEN_MILK" ], - "fun": 5, - "vitamins": [ - [ "vitC", 1 ], - [ "calcium", 57 ], - [ "iron", 65 ], - [ "meat_allergen", 1 ], - [ "veggy_allergen", 1 ], - [ "milk_allergen", 1 ] - ] - }, { "type": "COMESTIBLE", "id": "deluxe_cheeseburger", @@ -1368,28 +1334,6 @@ [ "milk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "deluxe_cheeseburger_wheat_free", - "copy-from": "cheeseburger_wheat_free", - "name": { "str": "deluxe wheat-free cheeseburger" }, - "weight": "380 g", - "calories": 500, - "description": "A wheat-free cheeseburger with more vegetables and condiments. This is the apex of pre-Cataclysm culinary achievement.", - "price_postapoc": "3 USD", - "material": [ "flesh", "milk", "veggy", "tomato" ], - "primary_material": "processed_food", - "volume": "350 ml", - "fun": 7, - "vitamins": [ - [ "vitC", 30 ], - [ "calcium", 60 ], - [ "iron", 65 ], - [ "meat_allergen", 1 ], - [ "veggy_allergen", 1 ], - [ "milk_allergen", 1 ] - ] - }, { "type": "COMESTIBLE", "id": "hamburger", @@ -1416,32 +1360,6 @@ "fun": 4, "vitamins": [ [ "vitC", 1 ], [ "calcium", 57 ], [ "iron", 65 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "hamburger_wheat_free", - "name": { "str": "wheat-free hamburger" }, - "conditional_names": [ - { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str": "wheat-free bobburger" } }, - { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str": "wheat-free Moreauburger" } }, - { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "horrible %s" } }, - { "type": "COMPONENT_ID_SUBSTRING", "condition": "egg", "name": { "str": "wheat-free breakfast burger" } } - ], - "weight": "300 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 258, - "description": "A wheat-free sandwich of minced meat with condiments.", - "price": "9 USD", - "price_postapoc": "2 USD", - "material": [ "flesh", "veggy" ], - "volume": "300 ml", - "flags": [ "EATEN_HOT" ], - "fun": 4, - "vitamins": [ [ "vitC", 1 ], [ "calcium", 57 ], [ "iron", 65 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "sloppyjoe", @@ -1478,39 +1396,6 @@ [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "sloppyjoe_wheat_free", - "name": { "str": "wheat-free sloppy joe" }, - "conditional_names": [ - { - "type": "VITAMIN", - "condition": "human_flesh_vitamin", - "name": { "str": "wheat-free manwich", "str_pl": "wheat-free manwiches" } - }, - { - "type": "FLAG", - "condition": "STRICT_HUMANITARIANISM", - "name": { "str": "wheat-free manfriendwich", "str_pl": "wheat-free manfriendwiches" } - }, - { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "suspicious %s" } } - ], - "weight": "313 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 391, - "description": "A sandwich consisting of ground meat and tomato sauce served on wheat-free bread.", - "price": "9 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "flesh", "tomato", "veggy" ], - "volume": "300 ml", - "flags": [ "EATEN_HOT" ], - "fun": 4, - "vitamins": [ [ "vitC", 5 ], [ "calcium", 4 ], [ "iron", 5 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "taco", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index fb93a97b11330..b00b0f062b90b 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -1435,16 +1435,6 @@ "freezing_point": -274, "vitamins": [ [ "veggy_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "blood_pancakes_wheat_free", - "copy-from": "blood_pancakes", - "name": { "str": "wheat-free blodplättar" }, - "description": "Blodplättar is not your average pancake. It does not taste of blood at all and it tastes like a crispier black pudding. Made with wheat-free flour.", - "material": [ "veggy", "blood" ], - "primary_material": "veggy", - "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 9ce317bed1299..b7e5de369e847 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -42,27 +42,6 @@ "fun": 6, "vitamins": [ [ "calcium", 50 ], [ "iron", 12 ], [ "wheat_allergen", 1 ], [ "egg_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "sandwich_egg_salad_wheat_free", - "name": { "str": "wheat free egg salad sandwich", "str_pl": "wheat free egg salad sandwiches" }, - "weight": "156 g", - "color": "brown", - "spoils_in": "1 day 10 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 266, - "description": "A delicious egg salad sandwich on wheat-free bread.", - "price": "5 USD 50 cent", - "price_postapoc": "2 USD", - "material": [ "egg", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 6, - "vitamins": [ [ "calcium", 50 ], [ "iron", 12 ], [ "veggy_allergen", 1 ], [ "egg_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "sandwich_deluxe", @@ -361,27 +340,6 @@ [ "milk_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "sandwich_veggy_cheese_wheat_free", - "name": { "str": "gluten free vegetable sandwich with cheese", "str_pl": "gluten free vegetable sandwiches with cheese" }, - "weight": "189 g", - "color": "light_gray", - "spoils_in": "2 days", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 557, - "description": "A gluten free vegetarian combination of cheese and vegetable on bread, simple yet satisfying.", - "price": "8 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "veggy", "milk" ], - "volume": "250 ml", - "flags": [ "EATEN_COLD" ], - "fun": 1, - "vitamins": [ [ "vitC", 36 ], [ "calcium", 34 ], [ "iron", 28 ], [ "veggy_allergen", 1 ], [ "milk_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "sandwich_t", @@ -573,450 +531,6 @@ [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "sandwich_cheese_grilled_wheat_free", - "name": { "str": "wheat-free grilled cheese sandwich", "str_pl": "wheat-free grilled cheese sandwiches" }, - "weight": "156 g", - "color": "brown", - "spoils_in": "1 day 10 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 366, - "description": "A delicious grilled cheese sandwich made with wheat-free bread, because everything is better with melted cheese.", - "price": "5 USD 50 cent", - "price_postapoc": "2 USD", - "material": [ "milk", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "flags": [ "EATEN_HOT" ], - "fun": 10, - "vitamins": [ [ "calcium", 50 ], [ "iron", 12 ], [ "veggy_allergen", 1 ], [ "milk_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_deluxe_wheat_free", - "name": { "str": "wheat-free deluxe sandwich", "str_pl": "wheat-free deluxe sandwiches" }, - "conditional_names": [ - { - "type": "COMPONENT_ID_SUBSTRING", - "condition": "mutant", - "name": { "str": "wheat-free \"deluxe\" sandwich", "str_pl": "wheat-free \"deluxe\" sandwiches" } - }, - { - "type": "COMPONENT_ID_SUBSTRING", - "condition": "egg", - "name": { "str": "deluxe wheat-free breakfast sandwich", "str_pl": "deluxe wheat-free breakfast sandwiches" } - } - ], - "weight": "292 g", - "color": "brown", - "spoils_in": "1 day 8 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 449, - "description": "A sandwich of meat, vegetables, and cheese with condiments made with wheat-free bread. Tasty and nutritious!", - "price": "6 USD", - "price_postapoc": "150 cent", - "material": [ "flesh", "veggy", "milk" ], - "primary_material": "processed_food", - "volume": "125 ml", - "fun": 12, - "vitamins": [ - [ "vitC", 26 ], - [ "calcium", 8 ], - [ "iron", 49 ], - [ "meat_allergen", 1 ], - [ "veggy_allergen", 1 ], - [ "milk_allergen", 1 ] - ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_reuben_wheat_free", - "name": { "str": "wheat-free reuben sandwich", "str_pl": "wheat-free reuben sandwiches" }, - "conditional_names": [ - { - "type": "COMPONENT_ID_SUBSTRING", - "condition": "mutant", - "name": { "str": "wheat-free \"fauxben\" sandwich", "str_pl": "wheat-free \"fauxben\" sandwiches" } - } - ], - "weight": "292 g", - "color": "brown", - "spoils_in": "1 day 8 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 2, - "calories": 449, - "description": "A pre-Cataclysm classic, probably made with significant substitutions. Key components are the special sauce and sauerkraut, with wheat-free bread, meat, and cheese fried in a pan.", - "price": "6 USD", - "price_postapoc": "150 cent", - "material": [ "flesh", "veggy", "milk" ], - "primary_material": "processed_food", - "volume": "125 ml", - "fun": 14, - "vitamins": [ - [ "vitC", 26 ], - [ "calcium", 8 ], - [ "iron", 49 ], - [ "meat_allergen", 1 ], - [ "veggy_allergen", 1 ], - [ "milk_allergen", 1 ] - ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_cucumber_wheat_free", - "name": { "str": "wheat-free cucumber sandwich", "str_pl": "wheat-free cucumber sandwiches" }, - "weight": "120 g", - "color": "light_green", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 6, - "calories": 504, - "description": "A refreshing cucumber sandwich made with wheat-free bread. Not very filling, but quite tasty.", - "price": "4 USD", - "volume": "250 ml", - "material": [ "veggy" ], - "flags": [ "EATEN_COLD" ], - "fun": 8, - "vitamins": [ [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 30 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_cheese_wheat_free", - "name": { "str": "wheat-free cheese sandwich", "str_pl": "wheat-free cheese sandwiches" }, - "weight": "106 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 366, - "description": "A simple cheese sandwich made with wheat-free bread.", - "price": "5 USD", - "price_postapoc": "2 USD", - "material": [ "milk", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 8, - "vitamins": [ [ "calcium", 50 ], [ "iron", 12 ], [ "veggy_allergen", 1 ], [ "milk_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_jam_wheat_free", - "name": { "str": "wheat-free jam sandwich", "str_pl": "wheat-free jam sandwiches" }, - "weight": "140 g", - "color": "brown", - "spoils_in": "1 day 13 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 262, - "description": "A delicious jam sandwich made with wheat-free bread.", - "price": "2 USD", - "price_postapoc": "2 USD", - "material": [ "fruit", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 6, - "vitamins": [ [ "vitC", 6 ], [ "calcium", 7 ], [ "iron", 12 ], [ "veggy_allergen", 1 ], [ "fruit_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_jam_cheese_wheat_free", - "name": { "str": "wheat-free jam and cheese sandwich", "str_pl": "wheat-free jam and cheese sandwiches" }, - "weight": "140 g", - "color": "brown", - "spoils_in": "1 day 13 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 382, - "description": "A delicious jam and cheese sandwich made with wheat-free bread.", - "price": "2 USD", - "price_postapoc": "2 USD", - "material": [ "fruit", "veggy", "milk" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 6, - "vitamins": [ - [ "vitC", 6 ], - [ "calcium", 7 ], - [ "iron", 12 ], - [ "veggy_allergen", 1 ], - [ "fruit_allergen", 1 ], - [ "milk_allergen", 1 ] - ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_jam_butter_wheat_free", - "name": { "str": "wheat-free jam and butter sandwich", "str_pl": "wheat-free jam and butter sandwiches" }, - "weight": "154 g", - "color": "brown", - "spoils_in": "1 day 13 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 363, - "description": "A delicious jam and butter sandwich made with wheat-free bread.", - "price": "2 USD", - "price_postapoc": "2 USD", - "material": [ "milk", "fruit", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 15, - "vitamins": [ - [ "vitC", 6 ], - [ "calcium", 7 ], - [ "iron", 12 ], - [ "veggy_allergen", 1 ], - [ "fruit_allergen", 1 ], - [ "milk_allergen", 1 ] - ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_fairy_wheat_free", - "name": { "str_sp": "wheat-free fairy bread" }, - "weight": "56 g", - "color": "brown", - "spoils_in": "3 days", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 220, - "description": "An 'open-faced sandwich' consisting of sliced wheat-free bread, a healthy crust-to-crust slathering of butter, and sprinkles. A wheat-free alternative to a staple of birthday parties in Australia.", - "price": "85 cent", - "price_postapoc": "3 USD", - "material": [ "junk", "veggy" ], - "primary_material": "veggy", - "volume": "120 ml", - "fun": 10, - "vitamins": [ [ "veggy_allergen", 1 ], [ "junk_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_honey_wheat_free", - "name": { "str": "wheat-free honey sandwich", "str_pl": "wheat-free honey sandwiches" }, - "weight": "142 g", - "color": "brown", - "spoils_in": "10 days", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 328, - "description": "A delicious honey sandwich made with wheat-free bread.", - "price": "1 USD 75 cent", - "material": [ "honey", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 6, - "vitamins": [ [ "calcium", 10 ], [ "iron", 24 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_sauce_wheat_free", - "name": { "str": "boring wheat-free sandwich", "str_pl": "boring wheat-free sandwiches" }, - "copy-from": "cornbread", - "proportional": { "weight": 2, "calories": 2, "volume": 2 }, - "color": "brown", - "spoils_in": "1 day 22 hours", - "container": "wrapper", - "quench": 1, - "description": "A simple sauce sandwich made with wheat-free bread. Not very filling, but it beats eating just the bread.", - "price": "2 USD", - "price_postapoc": "2 USD" - }, - { - "type": "COMESTIBLE", - "id": "sandwich_veggy_wheat_free", - "name": { "str": "wheat-free vegetable sandwich", "str_pl": "wheat-free vegetable sandwiches" }, - "weight": "189 g", - "color": "light_gray", - "spoils_in": "2 days", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 1, - "calories": 202, - "description": "Wheat-free bread and vegetables, that's it.", - "price": "8 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "veggy" ], - "volume": "250 ml", - "flags": [ "EATEN_COLD" ], - "fun": 1, - "vitamins": [ [ "calcium", 14 ], [ "iron", 28 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_t_wheat_free", - "name": { "str": "wheat-free meat sandwich", "str_pl": "wheat-free meat sandwiches" }, - "conditional_names": [ - { - "type": "VITAMIN", - "condition": "human_flesh_vitamin", - "name": { "str": "wheat-free slob sandwich", "str_pl": "wheat-free slob sandwiches" } - }, - { - "type": "FLAG", - "condition": "STRICT_HUMANITARIANISM", - "name": { "str": "wheat-free satyr sandwich", "str_pl": "wheat-free satyr sandwiches" } - }, - { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "mutant %s" } } - ], - "weight": "203 g", - "color": "light_gray", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 433, - "description": "Wheat-free bread and meat, that's it.", - "price": "450 cent", - "price_postapoc": "125 cent", - "material": [ "flesh", "veggy" ], - "volume": "150 ml", - "fun": 2, - "vitamins": [ [ "vitC", 8 ], [ "calcium", 6 ], [ "iron", 47 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_pb_wheat_free", - "name": { "str": "wheat-free peanut butter sandwich", "str_pl": "wheat-free peanut butter sandwiches" }, - "weight": "204 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": -1, - "calories": 358, - "description": "Some peanut butter smothered between two pieces of wheat-free bread. Not very filling, and will stick to the roof of your mouth like glue.", - "price": "2 USD 50 cent", - "price_postapoc": "3 USD", - "material": [ "veggy" ], - "volume": "250 ml", - "fun": 3, - "vitamins": [ [ "calcium", 10 ], [ "iron", 28 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_pbj_wheat_free", - "name": { "str": "wheat-free PB&J sandwich", "str_pl": "wheat-free PB&J sandwiches" }, - "weight": "204 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 2, - "calories": 378, - "description": "A delicious peanut butter and jelly sandwich made with wheat-free bread. It reminds you of the times your mother would make you lunch.", - "price": "1 USD 75 cent", - "price_postapoc": "1 USD 75 cent", - "material": [ "fruit", "veggy" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 15, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 7 ], [ "iron", 14 ], [ "veggy_allergen", 1 ], [ "fruit_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_pbh_wheat_free", - "name": { "str": "wheat-free PB&H sandwich", "str_pl": "wheat-free PB&H sandwiches" }, - "weight": "207 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 2, - "calories": 755, - "description": "Some damned fool put honey on this peanut butter wheat-free sandwich, who in their right mind- oh wait, this is pretty good.", - "price": "1 USD 75 cent", - "price_postapoc": "1 USD 75 cent", - "material": [ "veggy", "honey" ], - "primary_material": "veggy", - "volume": "250 ml", - "fun": 10, - "vitamins": [ [ "calcium", 8 ], [ "iron", 16 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "sandwich_pbm_wheat_free", - "name": { "str": "wheat-free PB&M sandwich", "str_pl": "wheat-free PB&M sandwiches" }, - "weight": "205 g", - "color": "brown", - "spoils_in": "1 day 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 2, - "calories": 365, - "description": "Who knew you could mix maple syrup and peanut butter to create yet another tasty sandwich? This one is made with wheat-free bread.", - "price": "1 USD 75 cent", - "price_postapoc": "1 USD 75 cent", - "material": [ "veggy" ], - "volume": "250 ml", - "fun": 6, - "vitamins": [ [ "calcium", 12 ], [ "iron", 28 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "fish_sandwich_wheat_free", - "name": { "str": "wheat-free fish sandwich", "str_pl": "wheat-free fish sandwiches" }, - "weight": "201 g", - "color": "yellow", - "spoils_in": "1 day", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 481, - "description": "A delicious fish sandwich made with wheat-free bread.", - "price": "8 USD", - "price_postapoc": "2 USD 50 cent", - "material": [ "flesh", "veggy" ], - "volume": "250 ml", - "fun": 14, - "vitamins": [ [ "vitC", 5 ], [ "calcium", 19 ], [ "iron", 17 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "blt_wheat_free", - "name": { "str": "wheat-free BLT" }, - "weight": "220 g", - "color": "brown", - "spoils_in": "2 days 12 hours", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "quench": 2, - "calories": 447, - "description": "A bacon, lettuce, and tomato sandwich on toasted wheat-free bread.", - "price": "2 USD", - "price_postapoc": "125 cent", - "material": [ "flesh", "veggy", "tomato" ], - "primary_material": "processed_food", - "volume": "125 ml", - "flags": [ "EATEN_HOT" ], - "fun": 8, - "vitamins": [ [ "vitC", 10 ], [ "calcium", 7 ], [ "iron", 18 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "chicken_sandwich", @@ -1042,25 +556,5 @@ [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] - }, - { - "type": "COMESTIBLE", - "id": "chicken_sandwich_wheat_free", - "name": { "str": "wheat-free chicken sandwich", "str_pl": "wheat-free chicken sandwiches" }, - "weight": "187 g", - "color": "brown", - "spoils_in": "2 days", - "container": "wrapper", - "comestible_type": "FOOD", - "symbol": "%", - "calories": 468, - "description": "A wheat-free sandwich of crispy fried chicken topped with condiments and veggies.", - "price": 1000, - "price_postapoc": 250, - "material": [ "flesh", "veggy" ], - "volume": "250 ml", - "flags": [ "EATEN_HOT" ], - "fun": 17, - "vitamins": [ [ "calcium", "108 mg" ], [ "iron", "3 mg" ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json index 2d8befbc1360c..7d8dad9125050 100644 --- a/data/json/items/comestibles/soup.json +++ b/data/json/items/comestibles/soup.json @@ -349,31 +349,6 @@ "fun": 1, "vitamins": [ [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, - { - "type": "COMESTIBLE", - "id": "soup_blood_wheat_free", - "looks_like": "soup_blood", - "name": { "str_sp": "wheat-free blood soup" }, - "weight": "266 g", - "color": "brown", - "spoils_in": "2 days", - "container": "can_medium", - "comestible_type": "DRINK", - "symbol": "~", - "quench": 15, - "calories": 318, - "description": "A mushy, brown semi-liquid soup made from blood and wheat-free flour.", - "price": "3 USD 50 cent", - "price_postapoc": "25 cent", - "material": [ "blood", "veggy" ], - "primary_material": "blood", - "volume": "500 ml", - "phase": "liquid", - "charges": 2, - "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "fun": 1, - "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] - }, { "type": "COMESTIBLE", "id": "soup_tomato", 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 ef1c8dd91499b..205238a082c85 100644 --- a/data/json/obsoletion_and_migration_0.I/migration_items.json +++ b/data/json/obsoletion_and_migration_0.I/migration_items.json @@ -742,6 +742,216 @@ "type": "MIGRATION", "replace": "hat_ball" }, + { + "id": "flatbread_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "bread_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "brown_bread_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "buttered_toast_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "jam_toast_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "peanut_butter_toast_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "toad_in_a_hole_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "PBJ_Toast_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "toast_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_fairy_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "soup_blood_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "fried_egg_sandwich_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "deluxe_fried_egg_sandwich_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "chilidogs_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "hotdogs_newyork_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "cheeseburger_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "hamburger_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sloppyjoe_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "blood_pancakes_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_cheese_grilled_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_deluxe_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_reuben_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_cucumber_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_cheese_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_jam_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_jam_cheese_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_jam_butter_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_honey_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_veggy_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_t_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_pb_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_pbj_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_pbh_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_pbm_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "fish_sandwich_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "blt_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "chicken_sandwich_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "hotdogs_cooked_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_egg_salad_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_sauce_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "chicken_sandwich_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, + { + "id": "sandwich_veggy_cheese_wheat_free", + "type": "MIGRATION", + "replace": "bread" + }, { "id": "scrap_cap1", "type": "MIGRATION", diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index f7d74f488f937..3b67dfa2dd949 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -55,34 +55,6 @@ ], "//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges." }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "brown_bread_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 3, - "charges": 10, - "time": "1 h 30 m", - "batch_time_factors": [ 50, 5 ], - "autolearn": false, - "book_learn": [ [ "family_cookbook", 1 ], [ "baking_book", 2 ], [ "cookbook", 2 ], [ "cookbook_daintydishes", 2 ] ], - "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_baking" }, { "proficiency": "prof_baking_bread" } ], - "qualities": [ { "id": "OVEN", "level": 2 } ], - "tools": [ [ [ "surface_heat", 33, "LIST" ] ] ], - "//1": "flour: 6u, cornmeal: 25u, molasses: 2u", - "components": [ - [ [ "flour_wheat_free", 6 ] ], - [ [ "cornmeal", 5 ] ], - [ [ "molasses", 2 ] ], - [ [ "sugar", 1 ] ], - [ [ "molasses", 1 ], [ "sugar", 13 ] ], - [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "salt", 1 ] ] - ], - "//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges." - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -185,23 +157,6 @@ "proficiencies": [ { "proficiency": "prof_food_prep" } ], "components": [ [ [ "bread_toastable", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "toast_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 1, - "autolearn": true, - "charges": 1, - "time": "5 m", - "batch_time_factors": [ 50, 2 ], - "qualities": [ { "id": "COOK", "level": 1 } ], - "tools": [ [ [ "surface_heat", 1, "LIST" ] ] ], - "proficiencies": [ { "proficiency": "prof_food_prep" } ], - "components": [ [ [ "bread_toastable_wheat_free", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -216,13 +171,6 @@ "batch_time_factors": [ 20, 2 ], "components": [ [ [ "toast", 1 ] ], [ [ "butter", 1 ], [ "raw_butter", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "buttered_toast_wheat_free", - "copy-from": "buttered_toast", - "components": [ [ [ "toast_wheat_free", 1 ] ], [ [ "butter", 1 ], [ "raw_butter", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -230,13 +178,6 @@ "copy-from": "buttered_toast", "components": [ [ [ "toast", 1 ] ], [ [ "jam_fruit", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "jam_toast_wheat_free", - "copy-from": "buttered_toast", - "components": [ [ [ "toast_wheat_free", 1 ] ], [ [ "jam_fruit", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -244,13 +185,6 @@ "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": "buttered_toast", - "components": [ [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast_wheat_free", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -273,33 +207,11 @@ [ [ "any_butter_or_oil", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "toad_in_a_hole_wheat_free", - "copy-from": "toad_in_a_hole", - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "//": "bread: 1u, oil: 1u, egg: 3u", - "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_frying" } ], - "components": [ - [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], - [ [ "bread_sandwich_wheat_free", 1, "LIST" ], [ "toast_wheat_free", 1 ], [ "buttered_toast_wheat_free", 1 ] ], - [ [ "any_butter_or_oil", 1, "LIST" ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "PBJ_Toast", "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": "buttered_toast", - "components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast_wheat_free", 1 ] ] ] } ] diff --git a/data/json/recipes/food/casseroles.json b/data/json/recipes/food/casseroles.json index bf6de49f54d3e..5198f14c08398 100644 --- a/data/json/recipes/food/casseroles.json +++ b/data/json/recipes/food/casseroles.json @@ -87,7 +87,7 @@ [ "mustard_powder", 7 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], - [ [ "bread_sandwich", 1, "LIST" ], [ "bread_sandwich_wheat_free", 1, "LIST" ] ] + [ [ "bread_sandwich", 1, "LIST" ] ] ] }, { diff --git a/data/json/recipes/food/meat_dishes.json b/data/json/recipes/food/meat_dishes.json index 0f79afbb79da2..eadf6f7fd536b 100644 --- a/data/json/recipes/food/meat_dishes.json +++ b/data/json/recipes/food/meat_dishes.json @@ -243,26 +243,6 @@ ], "charges": 2 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "chicken_sandwich_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "4 m", - "autolearn": true, - "batch_time_factors": [ 80, 2 ], - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "components": [ - [ [ "chicken_fried", 1 ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "condiment", 2, "LIST" ] ], - [ [ "veggy_any_fresh_uncooked", 1, "LIST" ] ] - ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 5e6fb0cd930d5..923c139640f40 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -1785,29 +1785,6 @@ [ [ "flour", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "soup_blood_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "20 m", - "charges": 2, - "book_learn": [ [ "cookbook_bloodforgood", 2 ] ], - "batch_time_factors": [ 80, 4 ], - "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 21, "LIST" ] ] ], - "//": "fruit = 1u, flour = 1u, blood = 15u, broth = 4u", - "proficiencies": [ { "proficiency": "prof_food_prep" } ], - "components": [ - [ [ "broth", 2 ], [ "broth_bone", 2 ] ], - [ [ "edible_blood", 1, "LIST" ] ], - [ [ "dry_fruit", 1 ] ], - [ [ "flour_wheat_free", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -4122,24 +4099,6 @@ "//": "flour = 11u", "components": [ [ [ "flour", 11 ], [ "bread_flour", 11 ] ], [ [ "water_clean", 2 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "flatbread_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 1, - "time": "15 m", - "charges": 2, - "batch_time_factors": [ 50, 4 ], - "autolearn": true, - "book_learn": [ [ "cookbook_indian", 1 ], [ "cookbook", 1 ] ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], - "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_baking" } ], - "components": [ [ [ "flour_wheat_free", 11 ] ], [ [ "water_clean", 2 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -4186,29 +4145,6 @@ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_baking" }, { "proficiency": "prof_baking_bread" } ], "components": [ [ [ "flour", 22 ], [ "bread_flour", 5 ] ], [ [ "yeast", 1 ] ], [ [ "water_clean", 2 ] ], [ [ "sugar", 4 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "bread_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 2, - "charges": 10, - "time": "20 m", - "batch_time_factors": [ 50, 4 ], - "book_learn": [ - [ "family_cookbook", 1 ], - [ "baking_book", 1 ], - [ "cookbook", 2 ], - [ "cookbook_italian", 3 ], - [ "atomic_survival", 6 ] - ], - "qualities": [ { "id": "OVEN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 22, "LIST" ] ] ], - "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_baking" }, { "proficiency": "prof_baking_bread" } ], - "components": [ [ [ "flour_wheat_free", 22 ] ], [ [ "yeast", 1 ] ], [ [ "water_clean", 2 ] ], [ [ "sugar", 4 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -5251,28 +5187,6 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "boiled_egg", 1 ] ], [ [ "mayonnaise", 1 ] ], [ [ "cured_roe", 1 ] ], [ [ "bread_sandwich", 2, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "fried_egg_sandwich_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "6 m", - "autolearn": true, - "batch_time_factors": [ 80, 2 ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], - "//": "6u for the egg, 1u for the oil. no energy is spent cooking the bread, that's already done.", - "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], - [ [ "any_butter_or_oil", 2, "LIST" ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "condiment", 2, "LIST" ] ] - ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -5307,40 +5221,6 @@ ], "charges": 2 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "deluxe_fried_egg_sandwich_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "8 m", - "autolearn": true, - "batch_time_factors": [ 80, 2 ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "//": "6u for the egg, 1u for the oil, 3u for the cheese and veggy. no energy is spent cooking the bread, that's already done.", - "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], - [ [ "any_butter_or_oil", 2, "LIST" ] ], - [ - [ "mushroom", 1 ], - [ "mushroom_morel", 1 ], - [ "garlic_clove", 1 ], - [ "rehydrated_garlic", 1 ], - [ "wild_garlic", 1 ], - [ "young_leaves", 2 ], - [ "chicory_leaves", 2 ], - [ "onion", 1 ] - ], - [ [ "cheese_standard", 1, "LIST" ], [ "veggy_green", 1, "LIST" ] ], - [ [ "salt", 2 ], [ "soysauce", 2 ], [ "seasoning_salt", 2 ], [ "pepper", 4 ] ], - [ [ "condiment", 2, "LIST" ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ] - ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -5551,29 +5431,6 @@ [ [ "water_clean", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "blood_pancakes_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 3, - "time": "12 m", - "charges": 6, - "batch_time_factors": [ 50, 4 ], - "book_learn": [ [ "cookbook_bloodforgood", 2 ] ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 42, "LIST" ] ] ], - "//": "11u for flour, 1u for milk, 3u for egg, 30u for blood.", - "components": [ - [ [ "flour_wheat_free", 10 ] ], - [ [ "edible_blood", 2, "LIST" ] ], - [ [ "sugar", 1 ], [ "artificial_sweetener", 1 ] ], - [ [ "any_butter_or_oil", 1, "LIST" ] ], - [ [ "water_clean", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -6792,43 +6649,6 @@ ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "fish_sandwich_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 1, - "time": "4 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ - [ [ "fish_cooked", 1 ], [ "fish_fried", 1 ], [ "fish_scrap_cooked", 10 ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ - [ "pickle", 1 ], - [ "veggy_pickled", 1 ], - [ "onion", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "young_leaves", 2 ], - [ "chicory_leaves", 2 ], - [ "lettuce", 1 ] - ], - [ - [ "ketchup", 1 ], - [ "barbecue_sauce", 1 ], - [ "honey_mustard", 1 ], - [ "mustard", 1 ], - [ "horseradish", 1 ], - [ "mayonnaise", 1 ], - [ "bacon", 1 ], - [ "seasoning_salt", 1 ], - [ "soysauce", 1 ] - ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -6940,81 +6760,6 @@ ], "charges": 2 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_deluxe_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 2, - "time": "7 m 30 s", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ - [ [ "meat_cooked", 1, "LIST" ], [ "scrambled_eggs", 2 ], [ "boiled_egg", 2 ], [ "fried_eggs", 1 ], [ "omelet", 1 ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "cheese_standard", 2, "LIST" ] ], - [ - [ "veggy_cooked", 1 ], - [ "veggy_wild_cooked", 1 ], - [ "veggy_salted", 1 ], - [ "celery", 1 ], - [ "grape_leaves", 1 ], - [ "cabbage", 1 ], - [ "sauerkraut", 1 ], - [ "tomato", 1 ], - [ "can_tomato", 1 ], - [ "pumpkin_cut", 1 ], - [ "onion", 1 ], - [ "broccoli", 1 ], - [ "rehydrated_veggy", 1 ], - [ "rehydrated_corn_kernels", 1 ], - [ "corn_kernels", 1 ], - [ "morel_cooked", 1 ], - [ "mushroom_cooked", 1 ], - [ "sauerkraut_onions", 1 ], - [ "pickle", 1 ], - [ "veggy_canned", 1 ], - [ "salsa", 1 ], - [ "beans_cooked", 1 ], - [ "carrot", 1 ], - [ "carrot_wild", 1 ], - [ "zucchini_cut", 1 ], - [ "zucchini", 1 ], - [ "lettuce", 1 ], - [ "pine_nuts", 1 ], - [ "morel_fried", 1 ], - [ "veggy_aspic", 1 ], - [ "dahlia_baked", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], - [ "gherkin_cut", 1 ], - [ "gherkin", 1 ], - [ "veggy_pickled", 1 ], - [ "cooked_cattail_stalk", 1 ], - [ "cooked_burdock_stalk", 1 ], - [ "cooked_pumpkin", 1 ], - [ "potato_baked", 1 ], - [ "can_tomato", 1 ], - [ "dandelion_cooked", 1 ], - [ "young_leaves", 2 ], - [ "chicory_leaves", 2 ], - [ "burdock_cooked", 1 ] - ], - [ - [ "ketchup", 1 ], - [ "barbecue_sauce", 1 ], - [ "honey_mustard", 1 ], - [ "mustard", 1 ], - [ "horseradish", 1 ], - [ "mayonnaise", 1 ], - [ "seasoning_salt", 5 ], - [ "soysauce", 1 ] - ] - ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7043,38 +6788,13 @@ { "type": "recipe", "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_reuben_wheat_free", + "result": "hamburger", "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", - "difficulty": 2, - "time": "7 m 30 s", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "components": [ - [ [ "meat_red_cooked", 1, "LIST" ] ], - [ [ "cheese_standard", 2, "LIST" ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "sauerkraut", 1 ] ], - [ [ "ketchup", 1 ] ], - [ [ "onion", 1 ] ], - [ [ "horseradish", 1 ] ], - [ [ "mayonnaise", 1 ] ], - [ [ "seasoning_salt", 5 ] ], - [ [ "hot_sauce", 1 ] ] - ], - "charges": 2 - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "hamburger", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 3, - "time": "8 m", - "charges": 2, + "difficulty": 3, + "time": "8 m", + "charges": 2, "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "components": [ @@ -7104,45 +6824,6 @@ ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "hamburger_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 3, - "time": "8 m", - "charges": 2, - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "components": [ - [ [ "meat_red_cooked", 1, "LIST" ], [ "scrambled_eggs", 2 ], [ "boiled_egg", 2 ], [ "fried_eggs", 1 ], [ "omelet", 1 ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ - [ "pickle", 1 ], - [ "veggy_pickled", 1 ], - [ "onion", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "young_leaves", 2 ], - [ "chicory_leaves", 2 ], - [ "lettuce", 1 ] - ], - [ - [ "ketchup", 1 ], - [ "barbecue_sauce", 1 ], - [ "honey_mustard", 1 ], - [ "mustard", 1 ], - [ "horseradish", 1 ], - [ "mayonnaise", 1 ], - [ "bacon", 1 ], - [ "seasoning_salt", 1 ], - [ "soysauce", 1 ], - [ "sauerkraut", 1 ] - ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7244,34 +6925,6 @@ [ [ "water_clean", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "hotdogs_cooked_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 2, - "time": "8 m", - "charges": 2, - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], - "//": "about 90g meat total, which means 6u charge. the bread doesn't need heat.", - "components": [ - [ [ "hotdogs_frozen", 2 ], [ "homemade_hotdogs", 2 ], [ "bratwurst_sausage", 1 ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ - [ "ketchup", 2 ], - [ "barbecue_sauce", 2 ], - [ "honey_mustard", 2 ], - [ "mustard", 2 ], - [ "horseradish", 2 ], - [ "sauerkraut", 2 ] - ], - [ [ "water_clean", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7287,21 +6940,6 @@ "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "hotdogs_cooked", 1 ] ], [ [ "meat_fatty_cooked", 1 ], [ "meat_cooked", 1 ], [ "onion", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "hotdogs_newyork_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 2, - "time": "4 m", - "autolearn": false, - "book_learn": [ [ "cookbook", 1 ] ], - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 1 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ [ [ "hotdogs_cooked_wheat_free", 1 ] ], [ [ "meat_fatty_cooked", 1 ], [ "meat_cooked", 1 ], [ "onion", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7322,26 +6960,6 @@ ], "charges": 2 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "chilidogs_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 2, - "time": "8 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ - [ [ "hotdogs_frozen", 2 ], [ "homemade_hotdogs", 2 ], [ "bratwurst_sausage", 2 ] ], - [ [ "chili", 1 ] ], - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "mustard", 2 ], [ "horseradish", 1 ], [ "sauerkraut", 1 ], [ "onion", 1 ] ] - ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7444,24 +7062,6 @@ ], "charges": 2 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "blt_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "time": "6 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "bacon", 1 ] ], - [ [ "lettuce", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ] ], - [ [ "can_tomato", 1 ], [ "tomato", 1 ] ] - ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7482,26 +7082,6 @@ [ [ "meat_red_cooked", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sloppyjoe_wheat_free", - "charges": 2, - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "difficulty": 1, - "time": "8 m", - "book_learn": [ [ "sweets_book", 1 ], [ "mag_cooking", 1 ], [ "family_cookbook", 1 ] ], - "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "//": "4u for meat 1u for sauce = 5u", - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "sauce_red", 2 ], [ "can_tomato", 1 ], [ "tomato", 1 ] ], - [ [ "meat_red_cooked", 1, "LIST" ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7515,19 +7095,6 @@ "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ] ] ], "charges": 2 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_t_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_MEAT", - "skill_used": "cooking", - "time": "3 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ] ] ], - "charges": 2 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7539,17 +7106,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_pb_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7561,17 +7117,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_pbj_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7587,21 +7132,6 @@ [ [ "any_peanutbutter", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_pbh_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "honey_bottled", 3 ], [ "honey_glassed", 1 ] ], - [ [ "any_peanutbutter", 1, "LIST" ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7613,17 +7143,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_pbm_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -7635,17 +7154,6 @@ "book_learn": [ [ "mag_glam", 1 ] ], "components": [ [ [ "bread_sandwich", 1, "LIST" ] ], [ [ "any_butter", 1, "LIST" ] ], [ [ "sprinkles", 3 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_fairy_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "book_learn": [ [ "mag_glam", 1 ] ], - "components": [ [ [ "bread_sandwich_wheat_free", 1, "LIST" ] ], [ [ "any_butter", 1, "LIST" ] ], [ [ "sprinkles", 3 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8271,65 +7779,6 @@ ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_veggy_cheese_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "3 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "cheese_standard", 1, "LIST" ] ], - [ - [ "veggy_cooked", 1 ], - [ "veggy_wild_cooked", 1 ], - [ "veggy_salted", 1 ], - [ "celery", 1 ], - [ "grape_leaves", 1 ], - [ "cabbage", 1 ], - [ "sauerkraut", 1 ], - [ "tomato", 1 ], - [ "can_tomato", 1 ], - [ "pumpkin_cut", 1 ], - [ "onion", 1 ], - [ "broccoli", 1 ], - [ "rehydrated_veggy", 1 ], - [ "rehydrated_corn_kernels", 1 ], - [ "corn_kernels", 1 ], - [ "morel_cooked", 1 ], - [ "mushroom_cooked", 1 ], - [ "sauerkraut_onions", 1 ], - [ "pickle", 1 ], - [ "veggy_canned", 1 ], - [ "beans_cooked", 1 ], - [ "carrot", 1 ], - [ "zucchini", 1 ], - [ "zucchini_cut", 1 ], - [ "lettuce", 1 ], - [ "pine_nuts", 1 ], - [ "morel_fried", 1 ], - [ "veggy_aspic", 1 ], - [ "dahlia_baked", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], - [ "veggy_pickled", 1 ], - [ "cooked_cattail_stalk", 1 ], - [ "cooked_burdock_stalk", 1 ], - [ "cooked_pumpkin", 1 ], - [ "potato_baked", 1 ], - [ "can_tomato", 1 ], - [ "dandelion_cooked", 1 ], - [ "young_leaves", 2 ], - [ "chicory_leaves", 2 ], - [ "wild_garlic", 1 ], - [ "burdock_cooked", 1 ] - ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8390,66 +7839,6 @@ ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_veggy_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "3 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ - [ "veggy_cooked", 1 ], - [ "veggy_wild_cooked", 1 ], - [ "veggy_salted", 1 ], - [ "celery", 1 ], - [ "grape_leaves", 1 ], - [ "cabbage", 1 ], - [ "sauerkraut", 1 ], - [ "tomato", 1 ], - [ "can_tomato", 1 ], - [ "pumpkin_cut", 1 ], - [ "onion", 1 ], - [ "broccoli", 1 ], - [ "rehydrated_veggy", 1 ], - [ "rehydrated_corn_kernels", 1 ], - [ "corn_kernels", 1 ], - [ "morel_cooked", 1 ], - [ "mushroom_cooked", 1 ], - [ "sauerkraut_onions", 1 ], - [ "pickle", 1 ], - [ "veggy_canned", 1 ], - [ "salsa", 1 ], - [ "beans_cooked", 1 ], - [ "carrot_wild", 1 ], - [ "carrot", 1 ], - [ "zucchini", 1 ], - [ "zucchini_cut", 1 ], - [ "lettuce", 1 ], - [ "pine_nuts", 1 ], - [ "morel_fried", 1 ], - [ "veggy_aspic", 1 ], - [ "dahlia_baked", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], - [ "veggy_pickled", 1 ], - [ "cooked_cattail_stalk", 1 ], - [ "cooked_burdock_stalk", 1 ], - [ "cooked_pumpkin", 1 ], - [ "potato_baked", 1 ], - [ "can_tomato", 1 ], - [ "dandelion_cooked", 1 ], - [ "young_leaves", 2 ], - [ "chicory_leaves", 2 ], - [ "wild_garlic", 1 ], - [ "burdock_cooked", 1 ] - ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8466,22 +7855,6 @@ [ [ "mayonnaise", 1 ], [ "mustard", 1 ], [ "horseradish", 1 ], [ "seasoning_salt", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_cucumber_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SNACK", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "cucumber", 1 ], [ "cucumber_cut", 1 ] ], - [ [ "mayonnaise", 1 ], [ "mustard", 1 ], [ "horseradish", 1 ], [ "seasoning_salt", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8508,32 +7881,6 @@ ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_sauce_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SNACK", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "charges": 1, - "components": [ - [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ - [ "cooking_oil", 1 ], - [ "cooking_oil2", 1 ], - [ "mayonnaise", 1 ], - [ "ketchup", 1 ], - [ "barbecue_sauce", 1 ], - [ "honey_mustard", 1 ], - [ "sauce_pesto", 1 ], - [ "sauce_red", 1 ], - [ "mustard", 1 ], - [ "any_butter", 1, "LIST" ] - ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8545,17 +7892,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_jam_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8567,17 +7903,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ], [ [ "cheese_standard", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_jam_cheese_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ], [ [ "cheese_standard", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8589,17 +7914,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ], [ [ "any_butter", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_jam_butter_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_VEGGI", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "jam_fruit", 1 ] ], [ [ "any_butter", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8611,17 +7925,6 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "honey_bottled", 3 ], [ "honey_glassed", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_honey_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SNACK", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "honeycomb", 1 ], [ "honey_bottled", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8634,18 +7937,6 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_cheese_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SNACK", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "cheese_standard", 1, "LIST" ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8658,18 +7949,6 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "egg_salad", 2 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_egg_salad_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SNACK", - "skill_used": "cooking", - "time": "1 m", - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 2 } ], - "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], [ [ "egg_salad", 2 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -8684,20 +7963,6 @@ "//": "1u for each bread slice and 1u for the cheese", "components": [ [ [ "sandwich_cheese", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "sandwich_cheese_grilled_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SNACK", - "skill_used": "cooking", - "time": "5 m", - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 1 } ], - "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], - "//": "1u for each bread slice and 1u for the cheese", - "components": [ [ [ "sandwich_cheese_wheat_free", 1 ] ] ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 293b459f21af7..1917146531d0c 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -10,10 +10,8 @@ [ "bread_flour", 2 ], [ "cornmeal", 1 ], [ "flatbread", 1 ], - [ "flatbread_wheat_free", 1 ], [ "tortilla_any", 1, "LIST" ], [ "bread", 1 ], - [ "bread_wheat_free", 1 ], [ "wastebread", 1 ], [ "cornbread", 1 ], [ "biscuit", 1 ], @@ -39,12 +37,6 @@ ] ] }, - { - "id": "bread_toastable_wheat_free", - "type": "requirement", - "//": "Wheat free bread appropriate for toast.", - "components": [ [ [ "bread_wheat_free", 1 ], [ "brown_bread_wheat_free", 1 ], [ "cornbread", 1 ] ] ] - }, { "id": "bread_sandwich", "type": "requirement", @@ -60,24 +52,11 @@ ] ] }, - { - "id": "bread_sandwich_wheat_free", - "type": "requirement", - "//": "Wheat free bread appropriate for sandwiches.", - "components": [ - [ - [ "bread_toastable_wheat_free", 1, "LIST" ], - [ "flatbread_wheat_free", 1 ], - [ "tortilla_corn", 1 ], - [ "toast_wheat_free", 1 ] - ] - ] - }, { "id": "any_bread", "type": "requirement", "//": "Any type of bread", - "components": [ [ [ "bread_sandwich", 1, "LIST" ], [ "bread_sandwich_wheat_free", 1, "LIST" ] ] ] + "components": [ [ [ "bread_sandwich", 1, "LIST" ] ] ] }, { "id": "any_peanutbutter", diff --git a/data/mods/DinoMod/recipes/food_egg.json b/data/mods/DinoMod/recipes/food_egg.json index 827f23dddbbb6..6d05cdd7d7c99 100644 --- a/data/mods/DinoMod/recipes/food_egg.json +++ b/data/mods/DinoMod/recipes/food_egg.json @@ -89,28 +89,6 @@ ], "charges": 20 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "fried_egg_sandwich_wheat_free", - "id_suffix": "dinosaur", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "28 m", - "autolearn": true, - "batch_time_factors": [ 80, 2 ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ], - "components": [ - [ [ "eggs_dino", 1, "LIST" ] ], - [ [ "any_butter_or_oil", 40, "LIST" ] ], - [ [ "bread_sandwich_wheat_free", 40, "LIST" ] ], - [ [ "condiment", 40, "LIST" ] ] - ], - "charges": 20 - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -136,31 +114,6 @@ ], "charges": 20 }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "deluxe_fried_egg_sandwich_wheat_free", - "id_suffix": "dinosaur", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "38 m", - "autolearn": true, - "batch_time_factors": [ 80, 2 ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ], - "components": [ - [ [ "eggs_dino", 1, "LIST" ] ], - [ [ "any_butter_or_oil", 40, "LIST" ] ], - [ [ "mushroom", 20 ], [ "mushroom_morel", 20 ], [ "garlic_clove", 20 ], [ "onion", 20 ] ], - [ [ "cheese", 20 ], [ "cheese_hard", 20 ], [ "can_cheese", 20 ], [ "veggy_green", 20, "LIST" ] ], - [ [ "salt", 40 ], [ "soysauce", 40 ], [ "seasoning_salt", 40 ], [ "pepper", 80 ] ], - [ [ "condiment", 40, "LIST" ] ], - [ [ "bread_sandwich_wheat_free", 40, "LIST" ] ] - ], - "charges": 20 - }, { "type": "recipe", "activity_level": "NO_EXERCISE", diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 3051fc2f219ac..895f158492262 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -14,7 +14,6 @@ "soysauce", "johnnycake", "bot_gasbomb_hack", - "sandwich_reuben_wheat_free", "tailoring_pattern_set", "k_gambeson_vest_xs", "dragonskin", @@ -39,7 +38,6 @@ "light_minus_disposable_cell", "fire_piston", "broken_c4_hack", - "hotdogs_cooked_wheat_free", "oatmeal_deluxe", "demihuman_marrow", "drill_rock_primitive", @@ -195,7 +193,6 @@ "hard_plate", "waterskin", "joint_roach", - "sandwich_deluxe_wheat_free", "base_toiletries", "glass_tinted", "stomach_sealed", @@ -227,7 +224,6 @@ "water_wheel", "bleach", "36navy", - "sandwich_t_wheat_free", "escape_stone", "v_planter_item_advanced", "milk_evap", @@ -246,7 +242,6 @@ "large_stomach_sealed", "book_nonf_hard_dodge_tlwd", "joint", - "blt_wheat_free", "thermal_suit_on", "drink_gunfire", "conc_paralytic", @@ -330,7 +325,6 @@ "fun_survival", "44army", "flesh_golem_heart", - "hotdogs_newyork_wheat_free", "mycus_fruit", "k_gambeson_loose", "makeshift_crutches", @@ -435,7 +429,6 @@ "chaps_leather", "fetus", "makeshift_hose", - "cheeseburger_wheat_free", "hi_q_wax", "billet_bone", "architect_cube", @@ -461,7 +454,6 @@ "airhorn", "corpse_scorched", "mortar_adobe", - "chilidogs_wheat_free", "deviled_kidney", "v_plow_item", "wallet_travel", diff --git a/data/mods/innawood/recipes/recipe_food.json b/data/mods/innawood/recipes/recipe_food.json index 469333cce909d..7d92a422a2db6 100644 --- a/data/mods/innawood/recipes/recipe_food.json +++ b/data/mods/innawood/recipes/recipe_food.json @@ -256,26 +256,6 @@ [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "blood_pancakes_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "difficulty": 3, - "time": "12 m", - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], - "components": [ - [ [ "flour_wheat_free", 1 ] ], - [ [ "edible_blood", 2, "LIST" ] ], - [ [ "sugar", 1 ], [ "artificial_sweetener", 1 ] ], - [ [ "any_butter_or_oil", 1, "LIST" ] ], - [ [ "water", 1 ], [ "water_clean", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -297,27 +277,6 @@ [ [ "flour", 1 ] ] ] }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "soup_blood_wheat_free", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 2, - "time": "20 m", - "charges": 2, - "autolearn": true, - "batch_time_factors": [ 80, 4 ], - "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ], - "components": [ - [ [ "broth", 2 ], [ "broth_bone", 2 ] ], - [ [ "edible_blood", 1, "LIST" ] ], - [ [ "dry_fruit", 1 ] ], - [ [ "flour_wheat_free", 1 ] ] - ] - }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE",