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. --- foods-01_fix-food-materials.patch | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 foods-01_fix-food-materials.patch (limited to 'foods-01_fix-food-materials.patch') diff --git a/foods-01_fix-food-materials.patch b/foods-01_fix-food-materials.patch new file mode 100644 index 0000000..5c27629 --- /dev/null +++ b/foods-01_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 -- cgit v1.2.1