Skip to content

Commit

Permalink
Merge pull request #75185 from GuardianDll/bread
Browse files Browse the repository at this point in the history 
remove wheat-free bread items and recipes
  • Loading branch information
@Maleclypse
Maleclypse authored Jul 25, 2024
2 parents 8ffc091 + 940cfb2 commit 1d47633
Show file tree
Hide file tree
Showing 17 changed files with 217 additions and 1,851 deletions.
3 changes: 1 addition & 2 deletions data/json/itemgroups/Food/food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
123 changes: 0 additions & 123 deletions data/json/items/comestibles/bread.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
34 changes: 0 additions & 34 deletions data/json/items/comestibles/egg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
70 changes: 0 additions & 70 deletions data/json/items/comestibles/junkfood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit 1d47633

Please sign in to comment.