From ff45cd577a578d3989b939fee075d5bbac3fa725 Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Sat, 9 May 2020 10:05:19 +0200
Subject: [PATCH] Give Foodperson more approriate snacks to carry

---
 data/json/itemgroups/Food/food.json    |  1 +
 data/json/items/comestibles/other.json | 19 +++++++++++++++++++
 data/json/npcs/NC_TRUE_FOODPERSON.json |  5 +++--
 data/json/professions.json             |  5 ++---
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
index 6ae9338b06500..6f8f5e491bf1a 100644
--- 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
index 36c7cdc499b5e..cf3a9b97c4a34 100644
--- 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
index 33a63f63b7a5d..e38f3cab353ed 100644
--- 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
index 528c1c748e332..cc100dab88719 100644
--- 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" ] }
         ]
       }