From 3c000509bb75e09dfef10e9ceb8f35a34cee6c15 Mon Sep 17 00:00:00 2001
From: Xaleth <countolaf17@gmail.com>
Date: Thu, 18 Feb 2021 01:50:42 -0600
Subject: [PATCH] Content: bread in a can (#45680)

---
 data/json/itemgroups/Food/food.json    |  2 ++
 data/json/itemgroups/food_service.json |  2 +-
 data/json/items/comestibles/bread.json | 10 +++++-----
 data/json/items/comestibles/wheat.json |  6 +++---
 data/json/items/containers.json        |  4 ++--
 data/json/recipes/food/bread.json      | 11 ++++++-----
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
index 36907f2b44318..1006ba4588505 100644
--- a/data/json/itemgroups/Food/food.json
+++ b/data/json/itemgroups/Food/food.json
@@ -134,6 +134,7 @@
       { "item": "apple_canned", "prob": 1 },
       { "item": "can_cheese", "prob": 1 },
       { "item": "fish_canned", "prob": 1 },
+      { "item": "brown_bread", "prob": 1 },
       { "item": "can_spam", "prob": 1 },
       { "item": "can_sardine", "prob": 1 },
       { "item": "ravioli", "prob": 1 },
@@ -189,6 +190,7 @@
       { "item": "can_chowder", "prob": 35 },
       { "item": "can_herring", "prob": 30 },
       { "item": "can_chicken", "prob": 40 },
+      { "item": "brown_bread", "prob": 20 },
       { "item": "broth", "prob": 15 },
       { "item": "crackers", "prob": 10 },
       { "item": "oyster_crackers", "prob": 10 },
diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
index 6c53e003c029d..97a77205dea06 100644
--- a/data/json/itemgroups/food_service.json
+++ b/data/json/itemgroups/food_service.json
@@ -661,7 +661,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "bread", "prob": 65 },
-      { "item": "brown_bread", "prob": 50 },
+      { "item": "brown_bread", "prob": 50, "container-item": "bag_plastic" },
       { "item": "cake2", "prob": 10 },
       { "item": "cake3", "prob": 10 },
       { "item": "cornbread", "prob": 35 },
diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
index d7f66d42cba2d..89e5844a82cd0 100644
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -290,20 +290,20 @@
     "weight": "45 g",
     "color": "brown",
     "spoils_in": "10 days",
-    "container": "bag_plastic",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
-    "calories": 74,
+    "calories": 130,
     "description": "A sweet bread, like cake.",
     "price": "272 cent",
-    "price_postapoc": "4 USD",
+    "price_postapoc": "2 USD",
     "material": [ "wheat" ],
-    "volume": "48 ml",
+    "volume": "480 ml",
     "charges": 10,
     "flags": [ "EATEN_HOT", "EATEN_COLD" ],
     "fun": 3,
-    "vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ]
+    "vitamins": [ [ "calcium", 4 ], [ "iron", 4 ] ]
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
index db88bd2b7d909..5e3af87f6e18a 100644
--- a/data/json/items/comestibles/wheat.json
+++ b/data/json/items/comestibles/wheat.json
@@ -147,10 +147,10 @@
     "type": "COMESTIBLE",
     "id": "bread_flour",
     "name": { "str_sp": "bread flour" },
-    "weight": "13 g",
+    "weight": "60 g",
     "color": "white",
     "spoils_in": "360 days",
-    "container": "bag_paper_powder_small",
+    "container": "bag_paper_powder",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -1,
@@ -159,7 +159,7 @@
     "price": "200 cent",
     "price_postapoc": "95 cent",
     "material": [ "wheat", "powder" ],
-    "volume": "250 ml",
+    "volume": "2400 ml",
     "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "charges": 20,
     "vitamins": [ [ "iron", 4 ] ],
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index 386e968bb0f87..6e7b00783a66d 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -162,7 +162,7 @@
     "flags": [ "TRADER_AVOID" ]
   },
   {
-    "id": "bag_paper_powder_small",
+    "id": "bag_paper_powder",
     "type": "GENERIC",
     "category": "container",
     "name": { "str": "small powder paper bag" },
@@ -177,7 +177,7 @@
       {
         "pocket_type": "CONTAINER",
         "watertight": false,
-        "max_contains_volume": "2 L",
+        "max_contains_volume": "2500 ml",
         "max_contains_weight": "2 kg",
         "moves": 200
       }
diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json
index c9996e42485f4..77e84cf6bf0eb 100644
--- a/data/json/recipes/food/bread.json
+++ b/data/json/recipes/food/bread.json
@@ -33,17 +33,18 @@
     "skill_used": "cooking",
     "difficulty": 3,
     "charges": 10,
-    "time": "30 m",
+    "time": "1 h 30 m",
     "batch_time_factors": [ 50, 5 ],
+    "autolearn": false,
     "book_learn": [ [ "family_cookbook", 1 ], [ "baking_book", 2 ], [ "cookbook", 2 ], [ "cookbook_daintydishes", 2 ] ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
     "components": [
       [ [ "bread_flour", 1 ] ],
-      [ [ "flour", 1 ] ],
-      [ [ "cornmeal", 1 ] ],
-      [ [ "molasses", 1 ] ],
-      [ [ "water", 1 ] ],
+      [ [ "flour", 5 ] ],
+      [ [ "cornmeal", 5 ] ],
+      [ [ "molasses", 2 ] ],
+      [ [ "water", 1 ], [ "water_clean", 1 ] ],
       [ [ "salt", 1 ] ]
     ],
     "//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges."