diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-10-07 09:15:54 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-10-07 09:15:54 -0700 |
| commit | 87d516615c70689c366caddafaac75dfdb9f6ec1 (patch) | |
| tree | e808106846a7dac4c462197e94440123f7d14249 /0028-fix-food-materials.patch | |
| parent | Uppdated to 2021-10-04-1824 (diff) | |
| download | cataclysm-bn-87d516615c70689c366caddafaac75dfdb9f6ec1.tar.xz | |
Fix more foods listed as incorrect materials.
Fix vampire patch to reject alcohol and foodplace foodstuff.
Fix vampire patch to properly reject 0 nutrition foods.
Diffstat (limited to '0028-fix-food-materials.patch')
| -rw-r--r-- | 0028-fix-food-materials.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/0028-fix-food-materials.patch b/0028-fix-food-materials.patch new file mode 100644 index 0000000..5c27629 --- /dev/null +++ b/0028-fix-food-materials.patch @@ -0,0 +1,42 @@ +--- 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 @@ + "volume": "250 ml", + "comestible_type": "DRINK", + "container": "jar_glass_sealed", ++ "material": [ "nut", "junk" ], + "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 @@ + "description": "A translucent hexagonal chunk of wax, filled with dense, milky jelly. Though some hold it as a panacea, it doesn't have any medical benefit. Still, it is delicious, and rich with the most beneficial substances the hive can produce.", + "price": 20000, + "price_postapoc": 4000, ++ "material": "honey", + "volume": "250 ml", + "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ], + "fun": 7 |