From 699fa45fbb610380966bb9d9503e12094d17b0dc Mon Sep 17 00:00:00 2001
From: Miner239 <siputgila@gmail.com>
Date: Fri, 10 Dec 2021 04:29:53 +0700
Subject: [PATCH] Update flour spawns (#53280)

---
 data/json/itemgroups/Food/food.json    |  6 ++++--
 data/json/itemgroups/food_service.json | 12 ++++++++----
 data/json/items/comestibles/wheat.json |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
index b45a370af93e5..413d1c98df2ef 100644
--- a/data/json/itemgroups/Food/food.json
+++ b/data/json/itemgroups/Food/food.json
@@ -33,7 +33,8 @@
     "magazine": 100,
     "subtype": "distribution",
     "entries": [
-      { "item": "flour", "prob": 50 },
+      { "item": "flour", "charges": [ 1, 70 ], "prob": 40 },
+      { "item": "flour", "charges": [ 1, 175 ], "prob": 10, "container-item": "bag_plastic" },
       { "item": "yeast", "prob": 50 },
       { "item": "cornmeal", "prob": 40 },
       { "item": "dry_meat", "prob": 10 },
@@ -209,7 +210,8 @@
       { "item": "soup_dumplings", "prob": 15 },
       { "item": "curry_veggy", "prob": 15 },
       { "item": "curry_meat", "prob": 15 },
-      { "item": "flour", "prob": 30 },
+      { "item": "flour", "charges": [ 1, 70 ], "prob": 25 },
+      { "item": "flour", "charges": [ 1, 175 ], "prob": 5, "container-item": "bag_plastic" },
       { "item": "milk_powder", "prob": 20 },
       { "item": "cornmeal", "prob": 30 },
       { "item": "powder_eggs", "prob": 20 },
diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
index 8d286b55f075f..94617660f024c 100644
--- a/data/json/itemgroups/food_service.json
+++ b/data/json/itemgroups/food_service.json
@@ -307,7 +307,8 @@
       [ "yeast", 10 ],
       [ "sugar", 9 ],
       [ "cornmeal", 8 ],
-      [ "flour", 25 ],
+      { "item": "flour", "charges": [ 1, 70 ], "prob": 5 },
+      { "item": "flour", "charges": [ 1, 175 ], "prob": 20, "container-item": "bag_plastic" },
       [ "cookbook", 3 ],
       [ "cookbook_italian", 2 ]
     ]
@@ -598,7 +599,8 @@
       { "item": "artificial_sweetener", "prob": 10 },
       { "item": "soysauce", "prob": 10 },
       { "item": "hot_sauce", "prob": 10 },
-      { "item": "flour", "prob": 40 },
+      { "item": "flour", "charges": [ 1, 70 ], "prob": 8 },
+      { "item": "flour", "charges": [ 1, 175 ], "prob": 32, "container-item": "bag_plastic" },
       { "item": "curry_powder", "prob": 40 },
       { "item": "cornmeal", "prob": 52 },
       { "item": "oyster_crackers", "charges-min": 1, "prob": 35 }
@@ -740,7 +742,8 @@
     "type": "item_group",
     "subtype": "distribution",
     "entries": [
-      { "item": "flour", "prob": 65 },
+      { "item": "flour", "charges": 70, "prob": 40 },
+      { "item": "flour", "charges": 175, "prob": 25, "container-item": "bag_plastic" },
       { "item": "bread_flour", "prob": 35 },
       { "item": "cornmeal", "prob": 50 },
       { "item": "yeast", "prob": 40 },
@@ -963,7 +966,8 @@
       [ "pepper", 15 ],
       [ "salt", 20 ],
       [ "sugar", 5 ],
-      [ "flour", 17 ],
+      { "item": "flour", "charges": [ 1, 70 ], "prob": 4 },
+      { "item": "flour", "charges": [ 1, 175 ], "prob": 13, "container-item": "bag_plastic" },
       [ "soysauce", 25 ],
       [ "hot_sauce", 25 ],
       [ "cooking_oil", 20 ],
diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
index 36e9c83293a2a..673f635c08ccf 100644
--- a/data/json/items/comestibles/wheat.json
+++ b/data/json/items/comestibles/wheat.json
@@ -128,7 +128,7 @@
     "weight": "13 g",
     "color": "white",
     "spoils_in": "360 days",
-    "container": "box_small",
+    "container": "bag_paper_powder",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -1,