summaryrefslogtreecommitdiff
path: root/foods-01_fix-food-materials.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2023-03-31 15:24:27 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2023-03-31 15:24:27 -0700
commitdfba5ebe5b6e93c54964b757419779d8b89e4322 (patch)
tree8f95344c4651b57a11796bf06cef0fb587b81017 /foods-01_fix-food-materials.patch
parentMore npc dialogue fixes. (diff)
downloadcataclysm-bn-dfba5ebe5b6e93c54964b757419779d8b89e4322.tar.xz
Updated to 2023-03-31-1439
Add v29 copy-from fix. Add more reverts.
Diffstat (limited to 'foods-01_fix-food-materials.patch')
-rw-r--r--foods-01_fix-food-materials.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/foods-01_fix-food-materials.patch b/foods-01_fix-food-materials.patch
index eb0aabb..6351fef 100644
--- a/foods-01_fix-food-materials.patch
+++ b/foods-01_fix-food-materials.patch
@@ -9,28 +9,6 @@
"primary_material": "wheat",
"volume": "250 ml",
"charges": 6,
---- 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.",
- "price": 40,
- "price_postapoc": 50,
-- "material": "water",
-+ "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.",
- "price": 40,
- "price_postapoc": 50,
-- "material": "water",
-+ "material": "veggy",
-+ "primary_material": "water",
- "volume": "250 ml",
- "phase": "liquid",
- "vitamins": [ [ "vitA", 2 ], [ "iron", 1 ], [ "calcium", 7 ] ],
--- a/data/json/items/comestibles/drink_other.json
+++ a/data/json/items/comestibles/drink_other.json
@@ -146,6 +146,7 @@