Added Gelatin and Several Gelatin Based Recipes

data/json/itemgroups/Food/food.json

@@ -46,7 +46,10 @@
       { "item": "dry_beans", "prob": 40 },
       { "item": "dry_lentils", "prob": 30 },
       { "item": "dry_rice", "prob": 40 },
-      { "item": "freeze_dried_meal", "prob": 10 }
+      { "item": "freeze_dried_meal", "prob": 10 },
+      { "item": "gelatin_powder", "prob": 40 },
+      { "item": "chem_agar", "prob": 15 },
+      { "item": "gelatin_dessert_powder", "prob": 40 }
     ]
   },
   {
@@ -426,6 +429,7 @@
       { "item": "candy", "prob": 70 },
       { "item": "candy2", "prob": 70 },
       { "item": "candy3", "prob": 70 },
+      { "item": "candy4", "prob": 70 },
       { "item": "cow_candy", "prob": 20 },
       { "item": "maltballs", "prob": 60 },
       { "item": "mintpatties", "prob": 60 },
@@ -553,7 +557,8 @@
       { "item": "pie", "prob": 20 },
       { "item": "pie_veggy", "prob": 18 },
       { "item": "pie_meat", "prob": 18 },
-      { "item": "pie_maple", "prob": 9 }
+      { "item": "pie_maple", "prob": 9 },
+      { "item": "gelatin_dessert_processed", "prob": 40 }
     ]
   },
   {

data/json/itemgroups/SUS/fridges.json

@@ -39,6 +39,8 @@
       { "item": "yoghurt", "prob": 80 },
       { "item": "butter", "prob": 80 },
       { "item": "pudding", "prob": 30 },
+      { "item": "gelatin_dessert_processed", "prob": 20 },
+      { "item": "egg_bird_unfert", "prob": 85, "count-min": 1, "count-max": 12 },
       { "item": "egg_bird_unfert", "prob": 85, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
       { "item": "bacon", "prob": 25 },
       {
@@ -520,6 +522,8 @@
       { "item": "onion_rings", "charges-min": 1, "prob": 10 },
       { "item": "pizza_veggy", "charges-min": 1, "prob": 20 },
       { "item": "nachosv", "charges-min": 1, "prob": 20 },
+      { "item": "gelatin_dessert_vegan", "prob": 30 },
+      { "item": "gelatin_dessert_vegan_fruit", "prob": 30 },
       {
         "distribution": [
           {
@@ -623,6 +627,8 @@
       { "item": "yoghurt", "prob": 20 },
       { "item": "butter", "prob": 20 },
       { "item": "pudding", "prob": 20 },
+      { "item": "gelatin_dessert_processed", "prob": 10 },
+      { "item": "egg_bird_unfert", "prob": 20, "count-min": 1, "count-max": 12 },
       { "item": "egg_bird_unfert", "prob": 20, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
       { "item": "bacon", "prob": 25 },
       {
@@ -880,6 +886,7 @@
       { "item": "yoghurt", "count": [ 1, 3 ], "prob": 75 },
       { "item": "butter", "prob": 50 },
       { "item": "pudding", "prob": 30 },
+      { "item": "gelatin_dessert_processed", "prob": 10 },
       { "item": "veggy_salad", "charges-min": 1, "prob": 19 },
       { "item": "blt", "charges-min": 1, "prob": 13 },
       { "item": "protein_shake", "charges-min": 1, "prob": 6 },

data/json/itemgroups/collections_domestic.json

@@ -564,6 +564,7 @@
       { "item": "noodles_fast", "prob": 30 },
       { "item": "ravioli", "prob": 25 },
       { "item": "sauce_red", "prob": 20 },
+      { "item": "gelatin_dessert_powder", "prob": 20 },
       { "item": "sauce_pesto", "prob": 15 },
       { "item": "bread", "prob": 14 },
       { "item": "cornbread", "prob": 7 },
@@ -579,6 +580,7 @@
       { "item": "can_cheese", "prob": 8 },
       { "item": "yoghurt", "prob": 8 },
       { "item": "pudding", "prob": 10 },
+      { "item": "gelatin_dessert_processed", "prob": 10 },
       { "item": "veggy_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
       { "item": "sauerkraut", "prob": 5, "charges": 4, "container-item": "jar_glass_sealed" },
       { "item": "meat_pickled", "prob": 4, "charges": 2, "container-item": "jar_glass_sealed" },

data/json/items/comestibles/junkfood.json

@@ -316,6 +316,48 @@
     "charges": 3,
     "fun": 3
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "candy4",
+    "name": { "str_sp": "gummy candy" },
+    "weight": "46 g",
+    "color": "yellow",
+    "spoils_in": "360 days",
+    "container": "bag_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": -1,
+    "calories": 85,
+    "description": "A handful of colorful fruit and soda pop flavored gummy candies.",
+    "price": 180,
+    "price_postapoc": 200,
+    "material": [ "junk", "flesh" ],
+    "volume": "90 ml",
+    "flags": [ "EDIBLE_FROZEN" ],
+    "charges": 3,
+    "fun": 5
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "candy5",
+    "name": { "str_sp": "gummy candy" },
+    "weight": "46 g",
+    "color": "light_green",
+    "spoils_in": "360 days",
+    "container": "bag_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": -1,
+    "calories": 85,
+    "description": "A handful of colorful fruit and soda pop flavored vegan gummy candies made from agar.  They have kind of a strange texture, but they're still tasty.",
+    "price": 180,
+    "price_postapoc": 200,
+    "material": [ "junk", "veggy" ],
+    "volume": "90 ml",
+    "flags": [ "EDIBLE_FROZEN" ],
+    "charges": 3,
+    "fun": 4
+  },
   {
     "type": "COMESTIBLE",
     "id": "candy3gator",
@@ -1288,5 +1330,92 @@
     "flags": [ "EATEN_HOT" ],
     "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ],
     "fun": 4
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_powder",
+    "name": "gelatin dessert powder",
+    "weight": "175 g",
+    "color": "white",
+    "spoils_in": "1461 days",
+    "container": "box_small",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": -8,
+    "calories": 400,
+    "description": "A small box of gelatin dessert powder.  Just add water and set.  Comes in a variety of flavors.",
+    "price": 5,
+    "price_postapoc": 10,
+    "material": [ "flesh", "junk" ],
+    "volume": "250ml",
+    "flags": [ "EATEN_COLD" ],
+    "fun": -2
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_base",
+    "name": "unflavored gelatin dessert",
+    "weight": "232 g",
+    "color": "white",
+    "spoils_in": "7 days 12 hours",
+    "container": "cup_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 100,
+    "description": "An unflavored jiggly, sugary treat made from gelatin and sugar.  This would taste better with some flavor.",
+    "price": 210,
+    "price_postapoc": 250,
+    "material": [ "flesh", "junk" ],
+    "volume": "250 ml",
+    "phase": "solid",
+    "fun": 5
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_processed",
+    "name": "processed gelatin dessert",
+    "description": "A jiggly, sugary treat made from gelatin and sugar.  Comes in a variety of flavors.  A kid favorite pre-Cataclysm.",
+    "fun": 20,
+    "copy-from": "gelatin_dessert_base"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_homemade",
+    "name": "homemade gelatin dessert",
+    "color": "light_red",
+    "description": "A homemade jiggly, sugary treat made from gelatin and sugar flavored with fruit juice.  A kid favorite pre-Cataclysm.",
+    "fun": 25,
+    "copy-from": "gelatin_dessert_base"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_fruit",
+    "name": "fruit filled gelatin dessert",
+    "color": "light_red",
+    "description": "A jiggly, sugary treat made from gelatin and sugar flavored with fruit juice and set with fruit.  A kid favorite pre-Cataclysm and a healthy treat",
+    "fun": 20,
+    "healthy": 1,
+    "copy-from": "gelatin_dessert_base"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_vegan",
+    "name": "vegan gelatin dessert",
+    "color": "light_green",
+    "description": "A vegan friendly homemade jiggly, sugary treat made from agar and sugar flavored with fruit juice.  A kid favorite pre-Cataclysm.  They'll never know the difference.",
+    "fun": 20,
+    "material": [ "veggy", "junk" ],
+    "copy-from": "gelatin_dessert_base"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_vegan_fruit",
+    "name": "fruit filled vegan gelatin dessert",
+    "color": "light_green",
+    "description": "A vegan friendly jiggly, sugary treat made from agar and sugar flavored with fruit juice and set with fruit.  A kid favorite pre-Cataclysm and a healthy treat",
+    "fun": 15,
+    "material": [ "veggy", "junk" ],
+    "healthy": 1,
+    "copy-from": "gelatin_dessert_base"
   }
 ]

data/json/items/comestibles/other.json

@@ -188,6 +188,50 @@
     "charges": 4,
     "fun": -10
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_powder",
+    "name": { "str_sp": "powdered gelatin" },
+    "weight": "11 g",
+    "color": "yellow",
+    "container": "bag_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": -1,
+    "calories": 6,
+    "description": "Dried and powdered gelatin, used as a gelling agent when mixed with water.",
+    "price": 150,
+    "price_postapoc": 50,
+    "material": "powder",
+    "volume": "250 ml",
+    "flags": [ "EDIBLE_FROZEN" ],
+    "charges": 25,
+    "fun": -10
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_fresh",
+    "name": { "str_sp": "fresh gelatin" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "abomination %s" } },
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "amoral %s" } },
+      { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "Orwell's %s" } }
+    ],
+    "weight": "25 g",
+    "color": "yellow",
+    "spoils_in": "7 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "calories": 6,
+    "//": "Same as the meat it's been made from.  It's additional ingredient compared to smoking, jerking, and dehydrating, so there's no incentive otherwise.",
+    "description": "Fresh ",
+    "price": 150,
+    "price_postapoc": 50,
+    "material": [ "flesh" ],
+    "volume": "250 ml",
+    "vitamins": [ [ "vitA", 10 ], [ "vitC", 15 ], [ "calcium", 2 ], [ "iron", 8 ] ],
+    "flags": [ "EATEN_COLD", "FREEZERBURN" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "meal_bone_tainted",
@@ -866,5 +910,44 @@
     "price_postapoc": 200,
     "freezing_point": -459,
     "description": "A small packet of commercial instant coffee powder.  No creamer or sweetener added."
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "acid_soaked_hide",
+    "name": "acid soaked hide",
+    "description": "Raw hide soaking in a dilute acid solution to extract collagen.  After 24 hours the solution can be strained to extract fresh gelatin.",
+    "weight": "500 g",
+    "color": "yellow",
+    "sealed": false,
+    "symbol": "~",
+    "calories": 9,
+    "quench": 6,
+    "fun": -10,
+    "price": 0,
+    "volume": "10L",
+    "price_postapoc": 10,
+    "phase": "liquid",
+    "comestible_type": "DRINK",
+    "flags": [ "NUTRIENT_OVERRIDE" ],
+    "brewable": { "time": "24 hours", "results": [ "gelatin_extracted" ] }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_extracted",
+    "name": "extracted gelatin",
+    "description": "Freshly extracted gelatin in a dilute acid solution.  It needs to be strained to separate the gelatin from the acid.",
+    "weight": "500 g",
+    "color": "yellow",
+    "sealed": false,
+    "symbol": "~",
+    "calories": 9,
+    "quench": 6,
+    "fun": -10,
+    "price": 0,
+    "volume": "10L",
+    "price_postapoc": 10,
+    "phase": "liquid",
+    "comestible_type": "DRINK",
+    "flags": [ "NUTRIENT_OVERRIDE" ]
   }
 ]

data/json/recipes/food/dry.json

@@ -396,5 +396,19 @@
     "batch_time_factors": [ 67, 5 ],
     "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ], [ [ "surface_heat", 5, "LIST" ] ] ],
     "components": [ [ [ "raw_lentils", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "gelatin_powder",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DRY",
+    "skill_used": "cooking",
+    "difficulty": 2,
+    "time": "18 m",
+    "autolearn": true,
+    "batch_time_factors": [ 67, 5 ],
+    "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ],
+    "components": [ [ [ "gelatin_fresh", 1 ] ] ]
   }
 ]