summaryrefslogtreecommitdiff
path: root/foods-01_fix-food-materials.patch
diff options
context:
space:
mode:
Diffstat (limited to 'foods-01_fix-food-materials.patch')
-rw-r--r--foods-01_fix-food-materials.patch37
1 files changed, 24 insertions, 13 deletions
diff --git a/foods-01_fix-food-materials.patch b/foods-01_fix-food-materials.patch
index 0bdff73..a43520e 100644
--- a/foods-01_fix-food-materials.patch
+++ b/foods-01_fix-food-materials.patch
@@ -1,29 +1,41 @@
+--- a/data/json/items/comestibles/bread.json
++++ b/data/json/items/comestibles/bread.json
+@@ -370,8 +370,8 @@
+ "description": "A dense and tasty fried bread treat.",
+ "price": 275,
+ "price_postapoc": 300,
+- "material": [ "wheat", "junk" ],
+- "primary_material": "wheat",
++ "material": [ "veggy", "junk" ],
++ "primary_material": "veggy",
+ "volume": "250 ml",
+ "charges": 6,
+ "flags": [ "EATEN_HOT" ],
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
-@@ -39,7 +39,8 @@
- "description": "Milk some almonds? Not quite, but blend them with water, yes! A dairy-free alternative strong in calcium! Rival to soy milk.",
+@@ -38,7 +38,8 @@
+ "description": "Wait, you can milk almonds? Not quite, but you can blend them with water! A dairy-free alternative high in calcium, and rival to soy milk.",
"price": 40,
"price_postapoc": 50,
-- "material": [ "water" ],
+- "material": [ "water", "nut" ],
+ "material": "nut",
+ "primary_material": "water",
"volume": "250 ml",
"phase": "liquid",
- "vitamins": [ [ "vitA", 2 ], [ "calcium", 11 ] ],
-@@ -62,7 +63,8 @@
- "description": "Milk some soybeans? Not quite, but blend them with water, yes! A dairy-free alternative strong in protein! Rival to almond milk.",
+ "vitamins": [ [ "calcium", 11 ] ],
+@@ -61,7 +62,8 @@
+ "description": "Wait, you can milk soybeans? Not quite, but you can blend them with water! A dairy-free alternative high in protein, and rival to almond milk.",
"price": 40,
"price_postapoc": 50,
-- "material": [ "water" ],
+- "material": [ "water", "veggy" ],
+ "material": "veggy",
+ "primary_material": "water",
"volume": "250 ml",
"phase": "liquid",
- "vitamins": [ [ "vitA", 2 ], [ "iron", 1 ], [ "calcium", 7 ] ],
-
+ "vitamins": [ [ "iron", 1 ], [ "calcium", 7 ] ],
--- a/data/json/items/comestibles/nuts.json
-+++ a/data/json/items/comestibles/nuts.json
-@@ -445,6 +445,7 @@
++++ b/data/json/items/comestibles/nuts.json
+@@ -443,6 +443,7 @@
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "jar_glass_sealed",
@@ -31,10 +43,9 @@
"primary_material": "junk",
"quench": -2,
"calories": 190,
-
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
-@@ -80,6 +80,7 @@
+@@ -79,6 +79,7 @@
"description": "A translucent hexagonal chunk of wax, filled with dense, milky, bitter and acidic-tasting jelly. Though some hold it as a panacea, it doesn't have any medical benefit. Still it is rich with the most beneficial substances the hive can produce.",
"price": 20000,
"price_postapoc": 400,