Added a new type of food, freeze-dried camping meals. (#46469)

CleverRaven · Jan 8, 2021 · 3a58cdc · 3a58cdc
1 parent 5699a9e
commit 3a58cdc
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -22,7 +22,8 @@
       { "item": "brandied_fruit", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "fish_pickled", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "sauce_red", "prob": 60, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "kompot", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }
+      { "item": "kompot", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+      { "item": "freeze_dried_meal", "prob": 10 }
     ]
   },
   {
@@ -44,7 +45,8 @@
       { "item": "salted_fish", "prob": 15 },
       { "item": "dry_beans", "prob": 40 },
       { "item": "dry_lentils", "prob": 30 },
-      { "item": "dry_rice", "prob": 40 }
+      { "item": "dry_rice", "prob": 40 },
+      { "item": "freeze_dried_meal", "prob": 10 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -597,6 +597,7 @@
       [ "bronze_medal", 3 ],
       [ "silver_medal", 2 ],
       [ "gold_medal", 1 ],
+      [ "freeze_dried_meal", 5 ],
       { "group": "tinware", "prob": 10 },
       { "item": "pen", "prob": 10, "charges": [ 0, 300 ] }
     ]
@@ -627,6 +628,7 @@
     "id": "mil_surplus",
     "items": [
       { "group": "mags_surplus", "prob": 400 },
+      [ "freeze_dried_meal", 20 ],
       [ "knife_combat", 14 ],
       [ "knife_rm42", 1 ],
       [ "kukri", 2 ],

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -1208,5 +1208,47 @@
     "charges": 4,
     "vitamins": [ [ "calcium", 4 ] ],
     "fun": 6
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "freeze_dried_meal",
+    "name": "freeze-dried meal",
+    "weight": "175 g",
+    "color": "red",
+    "spoils_in": "1461 days",
+    "container": "bag_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": -8,
+    "calories": 879,
+    "description": "A sealed plastic bag containing a full dehydrated meal.  This one contains a hearty cooked beef and egg breakfast.",
+    "price": 1200,
+    "price_postapoc": 1400,
+    "material": [ "flesh", "egg", "junk" ],
+    "volume": "250ml",
+    "flags": [ "EATEN_HOT" ],
+    "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ],
+    "fun": -2
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "freeze_dried_meal_hydrated",
+    "name": "rehydrated freeze-dried meal",
+    "weight": "675 g",
+    "color": "brown",
+    "spoils_in": "1 day",
+    "container": "bag_plastic",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 1,
+    "calories": 879,
+    "description": "This is a rehydrated meal meant for camping or hiking.",
+    "price": 1200,
+    "price_postapoc": 1400,
+    "material": [ "flesh", "egg", "junk" ],
+    "volume": "500ml",
+    "flags": [ "EATEN_HOT" ],
+    "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ],
+    "fun": 4
   }
 ]
diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json
@@ -31,5 +31,16 @@
     "qualities": [ { "id": "BOIL", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "sugar", 10 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "freeze_dried_meal_hydrated",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "time": "15 m",
+    "charges": 2,
+    "components": [ [ [ "water_clean", 1 ] ], [ [ "freeze_dried_meal", 1 ] ] ]
   }
 ]