Merge pull request #40378 from Fris0uman/foodpockets

Give Foodperson approriate snacks™ to carry
CleverRaven · May 9, 2020 · c9295dc · c9295dc
2 parents 2d7409c + ff45cd5
commit c9295dc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -448,6 +448,7 @@
     "entries": [
       { "group": "candy_chocolate", "prob": 620 },
       { "group": "salty_snacks", "prob": 595 },
+      { "item": "foodplace_snack_bar", "prob": 5 },
       { "item": "pemmican", "prob": 5 },
       { "item": "granola", "prob": 10 },
       { "item": "cookies", "prob": 80 },

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -467,6 +467,25 @@
     "charges": 4,
     "fun": 2
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "foodplace_snack_bar",
+    "name": { "str_sp": "Foodplace's appropriate snack™" },
+    "weight": "12g",
+    "color": "magenta",
+    "comestible_type": "FOOD",
+    "container": "wrapper",
+    "symbol": "f",
+    "calories": 12,
+    "description": "Real foodstuff now in a pocket size format!",
+    "price": 50,
+    "price_postapoc": 500,
+    "material": "foodplace_foodstuff",
+    "volume": "12 ml",
+    "flags": [ "EDIBLE_FROZEN", "IRREPLACEABLE_CONSUMABLE" ],
+    "addiction_potential": 1,
+    "fun": 1
+  },
   {
     "type": "COMESTIBLE",
     "id": "lentils_cooked",

diff --git a/data/json/npcs/NC_TRUE_FOODPERSON.json b/data/json/npcs/NC_TRUE_FOODPERSON.json
@@ -11,6 +11,7 @@
       { "item": "dress_shirt" },
       { "item": "chestguard_hard" },
       { "item": "cape_fp" },
+      { "item": "fanny" },
       { "item": "armguard_hard" },
       { "item": "legguard_hard" },
       { "item": "gloves_rubber" },
@@ -29,8 +30,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "medium_disposable_cell", "prob": 90 },
-      { "group": "snacks_fancy", "prob": 30, "charges": 2 },
-      { "group": "snacks", "prob": 20, "charges": 2 }
+      { "item": "foodplace_snack_bar", "container-item": "fanny" },
+      { "item": "foodplace_snack_bar" }
     ]
   }
 ]
diff --git a/data/json/professions.json b/data/json/professions.json
@@ -692,14 +692,13 @@
           "legguard_hard",
           "gloves_rubber",
           "socks",
-          "mbag",
           "chestguard_hard",
           "boots_rubber"
         ],
         "entries": [
           { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" },
-          { "group": "snacks_fancy" },
-          { "group": "snacks" },
+          { "item": "foodplace_snack_bar", "container-item": "fanny" },
+          { "item": "foodplace_snack_bar" },
           { "item": "bat", "custom-flags": [ "auto_wield" ] }
         ]
       }