From 72d6631a1e03bdd303dff703aeb617a17b62c1a7 Mon Sep 17 00:00:00 2001
From: bombasticSlacks <dillon.matchett@gmail.com>
Date: Mon, 25 Jan 2021 12:17:46 -0400
Subject: [PATCH 1/2] Added Egg Cartons

---
 .../locations_commercial.json                 |  2 +-
 data/json/itemgroups/SUS/fridges.json         |  6 ++---
 .../json/itemgroups/collections_domestic.json |  2 +-
 data/json/itemgroups/food_service.json        |  2 +-
 data/json/items/containers.json               | 26 +++++++++++++++++++
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
index 9e7ca40ac3258..2eed1f6e573b1 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -1167,7 +1167,7 @@
       [ "flour", 30 ],
       [ "milk_powder", 30 ],
       [ "powder_eggs", 10 ],
-      [ "egg_bird_unfert", 10 ],
+      { "item": "egg_bird_unfert", "charges": 10, "container-item": "carton_egg" },
       [ "cooking_oil", 20 ],
       [ "irradiated_apple", 5 ],
       [ "irradiated_banana", 5 ],
diff --git a/data/json/itemgroups/SUS/fridges.json b/data/json/itemgroups/SUS/fridges.json
index 21f6f7e79d02a..d99955ed69801 100644
--- a/data/json/itemgroups/SUS/fridges.json
+++ b/data/json/itemgroups/SUS/fridges.json
@@ -39,7 +39,7 @@
       { "item": "yoghurt", "prob": 80 },
       { "item": "butter", "prob": 80 },
       { "item": "pudding", "prob": 30 },
-      { "item": "egg_bird_unfert", "prob": 85, "count-min": 1, "count-max": 12 },
+      { "item": "egg_bird_unfert", "prob": 85, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
       { "item": "bacon", "prob": 25 },
       {
         "distribution": [ { "item": "lunchmeat", "prob": 60 }, { "item": "bologna", "prob": 40 }, { "item": "tofu", "prob": 30 } ],
@@ -312,7 +312,7 @@
       { "item": "yoghurt", "prob": 20 },
       { "item": "butter", "prob": 30 },
       { "item": "pudding", "prob": 10 },
-      { "item": "egg_bird_unfert", "prob": 55, "count-min": 1, "count-max": 2 },
+      { "item": "egg_bird_unfert", "prob": 55, "charges-min": 1, "charges-max": 2, "container-item": "carton_egg" },
       { "item": "bacon", "prob": 65 },
       {
         "distribution": [
@@ -623,7 +623,7 @@
       { "item": "yoghurt", "prob": 20 },
       { "item": "butter", "prob": 20 },
       { "item": "pudding", "prob": 20 },
-      { "item": "egg_bird_unfert", "prob": 20, "count-min": 1, "count-max": 12 },
+      { "item": "egg_bird_unfert", "prob": 20, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
       { "item": "bacon", "prob": 25 },
       {
         "distribution": [ { "item": "lunchmeat", "prob": 60 }, { "item": "bologna", "prob": 40 }, { "item": "tofu", "prob": 30 } ],
diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
index b07dbf6f71ea9..461c837b0f675 100644
--- a/data/json/itemgroups/collections_domestic.json
+++ b/data/json/itemgroups/collections_domestic.json
@@ -653,7 +653,7 @@
         "container-item": "jar_glass_sealed",
         "sealed": false
       },
-      { "item": "egg_bird_unfert", "prob": 65, "count-min": 1, "count-max": 12 },
+      { "item": "egg_bird_unfert", "prob": 65, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" },
       { "item": "yoghurt", "prob": 50 },
       { "item": "pudding", "prob": 60 },
       { "item": "veggy_salad", "prob": 25 },
diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
index 9731c410e42ea..93163b20d7d59 100644
--- a/data/json/itemgroups/food_service.json
+++ b/data/json/itemgroups/food_service.json
@@ -845,7 +845,7 @@
     "type": "item_group",
     "subtype": "distribution",
     "entries": [
-      { "item": "egg_bird_unfert", "prob": 65, "count-min": 6, "count-max": 12 },
+      { "item": "egg_bird_unfert", "prob": 65, "charges-min": 6, "charges-max": 12, "container-item": "carton_egg" },
       { "item": "milk", "prob": 80 },
       { "item": "milk_raw", "prob": 5 },
       { "item": "milk_raw", "prob": 5 },
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index 9066c4e9920ef..7b4c020a69478 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -638,6 +638,32 @@
       }
     ]
   },
+  {
+    "id": "carton_egg",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "egg carton" },
+    "looks_like": "box_small",
+    "description": "A cardboard container with 12 individual cavities for storing eggs.",
+    "weight": "28 g",
+    "volume": "620 ml",
+    "price": 0,
+    "price_postapoc": 0,
+    "to_hit": 1,
+    "material": [ "paper" ],
+    "symbol": ")",
+    "color": "brown",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "watertight": false,
+        "max_contains_volume": "600 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "45 mm"
+      }
+    ]
+  },
   {
     "id": "plastic_bag_vac",
     "type": "GENERIC",

From c1a663662358ebd06ce3533571060dfa126d5b84 Mon Sep 17 00:00:00 2001
From: bombasticSlacks <dillon.matchett@gmail.com>
Date: Mon, 25 Jan 2021 12:30:31 -0400
Subject: [PATCH 2/2] Changed to cardboard material

---
 data/json/items/containers.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index 7b4c020a69478..36bb67d84cf52 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -650,7 +650,7 @@
     "price": 0,
     "price_postapoc": 0,
     "to_hit": 1,
-    "material": [ "paper" ],
+    "material": [ "cardboard" ],
     "symbol": ")",
     "color": "brown",
     "pocket_data": [