From 444181f77cb649760c3099d9b96c8f863a8f8ddf Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 29 Oct 2021 18:01:32 -0700 Subject: Updated to 2021-10-29-1727 Reorganize patches into categories. Add patch to allow followers to eat from the basecamp stocks from farther away. -Reduces NPCs being prone to starve on large camps. Temporarily revert the book changes commit. --- 0028-fix-food-materials.patch | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 0028-fix-food-materials.patch (limited to '0028-fix-food-materials.patch') diff --git a/0028-fix-food-materials.patch b/0028-fix-food-materials.patch deleted file mode 100644 index 5c27629..0000000 --- a/0028-fix-food-materials.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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 -- cgit v1.2.1