From 82134a813406aa55c95c35eda1855ef953484fdd Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Thu, 4 Apr 2024 00:23:28 +0200
Subject: [PATCH 1/2] fix and cleanup few itemgroups

---
 .../Drugs_Tobacco_Alcohol/drugs.json          |  4 +-
 data/json/itemgroups/Food/food.json           |  4 +-
 .../Locations_MapExtras/locations.json        |  2 +-
 .../locations_commercial.json                 |  4 +-
 data/json/itemgroups/SUS/alien.json           |  2 +-
 data/json/itemgroups/SUS/domestic.json        | 13 +----
 data/json/itemgroups/food_service.json        | 47 ++++++++++++-------
 data/json/itemgroups/supplies.json            |  2 +-
 data/json/items/comestibles/spice.json        |  1 -
 .../mapgen/military/mil_base/mil_base_z0.json |  2 +-
 data/json/npcs/items_generic.json             |  4 +-
 data/mods/No_Hope/Mapgen/mil_base_z0.json     |  4 +-
 12 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
index 5919a39976cdb..547f9f6136315 100644
--- a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
+++ b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
@@ -150,14 +150,14 @@
     "type": "item_group",
     "subtype": "collection",
     "container-item": "box_small",
-    "items": [ { "item": "tampon", "prob": 100, "count": 24 } ]
+    "items": [ { "item": "tampon", "prob": 100, "container-item": "null", "count": 24 } ]
   },
   {
     "id": "tampon_box_used",
     "type": "item_group",
     "subtype": "collection",
     "container-item": "box_small",
-    "items": [ { "item": "tampon", "prob": 100, "count": [ 1, 24 ] } ]
+    "items": [ { "item": "tampon", "prob": 100, "container-item": "null", "count": [ 1, 24 ] } ]
   },
   {
     "id": "menstrual_pad_box_full",
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
index 15dff392ac2ed..fb42101e97f15 100644
--- a/data/json/itemgroups/Food/food.json
+++ b/data/json/itemgroups/Food/food.json
@@ -116,7 +116,7 @@
     "subtype": "distribution",
     "entries": [
       { "prob": 50, "group": "yeast_bag_plastic_25" },
-      { "prob": 40, "group": "sugar_box_small_71" },
+      { "prob": 40, "group": "sugar_packed" },
       { "prob": 10, "group": "artificial_sweetener_box_small_71" },
       { "prob": 5, "group": "sprinkles_bottle_plastic_small_62" },
       { "prob": 40, "group": "salt_bag_plastic_100" },
@@ -258,7 +258,7 @@
       { "prob": 30, "group": "toastem2_box_small_8" },
       { "prob": 35, "group": "toastem3_box_small_8" },
       { "prob": 20, "group": "toasterpastryfrozen_box_snack_2" },
-      { "prob": 20, "group": "sugar_box_small_71" },
+      { "prob": 20, "group": "sugar_packed" },
       { "prob": 5, "group": "artificial_sweetener_box_small_71" },
       { "prob": 5, "group": "lemonade_powder_bottle_plastic_small_10" },
       { "item": "molasses", "prob": 10 },
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
index 63b3ba7508b6e..a0f1f276b853d 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -2804,7 +2804,7 @@
       [ "brew_moonshine", 5 ],
       { "prob": 35, "group": "cornbread_bag_plastic_6" },
       { "prob": 25, "group": "yeast_bag_plastic_25" },
-      { "prob": 20, "group": "sugar_box_small_71" },
+      { "prob": 20, "group": "sugar_packed" },
       [ "chem_ethanol", 5 ]
     ]
   },
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
index c8540810abee4..5e3c824f95575 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -783,8 +783,8 @@
     "items": [
       { "group": "salty_snacks", "prob": 121 },
       [ "sandwich_t", 22 ],
-      [ "tea_raw", 50 ],
-      [ "tea_green_raw", 25 ],
+      { "group": "tea_raw_bag_plastic_33", "prob": 50 },
+      { "group": "tea_green_raw_bag_plastic_33", "prob": 25 },
       [ "cookies", 25 ],
       [ "brownie", 25 ],
       [ "coffee_raw", 90 ],
diff --git a/data/json/itemgroups/SUS/alien.json b/data/json/itemgroups/SUS/alien.json
index 828d0acbce64a..3ada88d79b470 100644
--- a/data/json/itemgroups/SUS/alien.json
+++ b/data/json/itemgroups/SUS/alien.json
@@ -121,7 +121,7 @@
       {
         "collection": [
           { "item": "salt", "prob": 100 },
-          { "item": "sugar", "prob": 25 },
+          { "group": "sugar_jar_glass_sealed_10_140", "prob": 25 },
           { "item": "chem_saltpetre", "prob": 10 },
           { "item": "yeast", "prob": 30 }
         ],
diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
index efa0d1642916d..d621249d3b9df 100644
--- a/data/json/itemgroups/SUS/domestic.json
+++ b/data/json/itemgroups/SUS/domestic.json
@@ -545,7 +545,7 @@
       { "count": [ 1, 10 ], "prob": 40, "group": "tea_green_raw_bag_plastic_33" },
       { "item": "teapot", "prob": 70 },
       { "item": "kettle", "prob": 50 },
-      { "prob": 90, "sealed": false, "group": "sugar_jar_glass_sealed_10_120" },
+      { "prob": 90, "sealed": false, "group": "sugar_jar_glass_sealed_10_140" },
       {
         "distribution": [
           {
@@ -732,7 +732,7 @@
       { "group": "pepper_bag_plastic_100" },
       { "prob": 75, "group": "cinnamon_bag_plastic_100" },
       { "prob": 75, "group": "chilly-p_bag_plastic_100" },
-      { "prob": 15, "group": "sugar_box_small_71" },
+      { "prob": 15, "group": "sugar_packed" },
       { "prob": 5, "group": "artificial_sweetener_box_small_71" },
       { "prob": 25, "group": "curry_powder_bag_plastic_100" },
       { "prob": 25, "group": "garlic_powder_bag_plastic_100" },
@@ -1126,15 +1126,6 @@
     "container-item": "bottle_plastic_pill_prescription",
     "entries": [ { "item": "weak_antibiotic", "container-item": "null" } ]
   },
-  {
-    "type": "item_group",
-    "id": "sugar_jar_glass_sealed_10_120",
-    "subtype": "collection",
-    "//": "This group was created automatically and may contain errors.",
-    "container-item": "jar_glass_sealed",
-    "on_overflow": "spill",
-    "entries": [ { "item": "sugar", "container-item": "null", "count": [ 10, 120 ] } ]
-  },
   {
     "type": "item_group",
     "id": "garlic_powder_bag_plastic_100",
diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
index 0052b127dbc46..ab4b8ffb87c69 100644
--- a/data/json/itemgroups/food_service.json
+++ b/data/json/itemgroups/food_service.json
@@ -134,7 +134,7 @@
       { "prob": 10, "group": "raw_dandelion_jar_glass_sealed_1_inf" },
       { "prob": 30, "group": "milk_powder_jar_glass_sealed_1_8" },
       { "prob": 20, "group": "cinnamon_jar_glass_sealed_1_inf" },
-      { "prob": 40, "group": "sugar_jar_glass_sealed_10_142" }
+      { "prob": 40, "group": "sugar_jar_glass_sealed_10_140" }
     ]
   },
   {
@@ -145,7 +145,13 @@
   {
     "id": "teashop_kitchen_counter",
     "type": "item_group",
-    "items": [ [ "sugar", 30 ], [ "tea_raw", 40 ], [ "tea_green_raw", 20 ], [ "teapot", 20 ], [ "spoon", 20 ] ]
+    "items": [
+      { "group": "sugar_jar_glass_sealed_10_140", "prob": 30 },
+      { "group": "tea_raw_bag_plastic_33", "prob": 40 },
+      { "group": "tea_green_raw_bag_plastic_33", "prob": 20 },
+      [ "teapot", 20 ],
+      [ "spoon", 20 ]
+    ]
   },
   {
     "id": "bar_alcohol",
@@ -292,7 +298,7 @@
       { "prob": 13, "group": "seasoning_salt_bag_plastic_100" },
       { "prob": 5, "group": "pepper_bag_plastic_100" },
       { "prob": 10, "group": "yeast_bag_plastic_25" },
-      { "prob": 9, "group": "sugar_box_small_71" },
+      { "prob": 9, "group": "sugar_packed" },
       [ "cornmeal", 8 ],
       { "prob": 5, "group": "flour_bag_paper_powder_1_70" },
       { "prob": 20, "group": "flour_bag_plastic_1_175" },
@@ -430,7 +436,7 @@
       { "item": "milk", "prob": 10 },
       { "prob": 65, "group": "milk_powder_bag_plastic_4" },
       { "prob": 15, "group": "salt_bag_plastic_100" },
-      { "prob": 70, "group": "sugar_box_small_71" },
+      { "prob": 70, "group": "sugar_packed" },
       { "prob": 15, "group": "artificial_sweetener_box_small_71" },
       { "prob": 15, "group": "tea_raw_bag_plastic_33" },
       { "prob": 10, "group": "tea_green_raw_bag_plastic_33" },
@@ -591,7 +597,7 @@
       { "prob": 50, "group": "seasoning_salt_bag_plastic_100" },
       { "prob": 50, "group": "seasoning_italian_bag_plastic_100" },
       { "prob": 30, "group": "can_chicken_can_medium_2" },
-      { "prob": 40, "group": "sugar_box_small_71" },
+      { "prob": 40, "group": "sugar_packed" },
       { "prob": 10, "group": "artificial_sweetener_box_small_71" },
       { "item": "soysauce", "prob": 10 },
       { "item": "hot_sauce", "prob": 10 },
@@ -756,7 +762,7 @@
       { "prob": 50, "group": "salt_bag_plastic_100" },
       { "item": "soysauce", "prob": 25 },
       { "item": "hot_sauce", "prob": 25 },
-      { "prob": 60, "group": "sugar_box_small_71" },
+      { "prob": 60, "group": "sugar_packed" },
       { "prob": 15, "group": "artificial_sweetener_box_small_71" },
       { "prob": 65, "group": "dry_rice_bag_plastic_3" },
       { "prob": 5, "group": "dry_wild_rice_bag_plastic_3" },
@@ -1063,7 +1069,7 @@
       [ "ghee", 15 ],
       { "prob": 15, "group": "pepper_bag_plastic_100" },
       { "prob": 20, "group": "salt_bag_plastic_100" },
-      { "prob": 5, "group": "sugar_box_small_71" },
+      { "prob": 5, "group": "sugar_packed" },
       { "prob": 4, "group": "flour_bag_paper_powder_1_70" },
       { "prob": 13, "group": "flour_bag_plastic_1_175" },
       [ "soysauce", 25 ],
@@ -1103,7 +1109,7 @@
       [ "ghee", 15 ],
       { "prob": 15, "group": "pepper_bag_plastic_100" },
       { "prob": 20, "group": "salt_bag_plastic_100" },
-      { "prob": 5, "group": "sugar_box_small_71" },
+      { "prob": 5, "group": "sugar_packed" },
       { "prob": 4, "group": "flour_bag_paper_powder_1_70" },
       { "prob": 13, "group": "flour_bag_plastic_1_175" },
       [ "soysauce", 25 ],
@@ -1586,17 +1592,17 @@
     "type": "item_group",
     "id": "tea_raw_bag_plastic_33",
     "subtype": "collection",
-    "//": "This group was created automatically and may contain errors.",
+    "//": "100 g of tea",
     "container-item": "bag_plastic",
-    "entries": [ { "item": "tea_raw", "container-item": "null", "count": 33 } ]
+    "entries": [ { "item": "tea_raw", "container-item": "null", "count-min": 2, "count-max": 33 } ]
   },
   {
     "type": "item_group",
     "id": "tea_green_raw_bag_plastic_33",
     "subtype": "collection",
-    "//": "This group was created automatically and may contain errors.",
+    "//": "100 g of tea",
     "container-item": "bag_plastic",
-    "entries": [ { "item": "tea_green_raw", "container-item": "null", "count": 33 } ]
+    "entries": [ { "item": "tea_green_raw", "container-item": "null", "count-min": 2, "count": 33 } ]
   },
   {
     "type": "item_group",
@@ -1672,12 +1678,19 @@
   },
   {
     "type": "item_group",
-    "id": "sugar_jar_glass_sealed_10_142",
+    "id": "sugar_jar_glass_sealed_10_140",
     "subtype": "collection",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "jar_glass_sealed",
     "on_overflow": "spill",
-    "entries": [ { "item": "sugar", "container-item": "null", "count-min": 10, "count-max": 142 } ]
+    "entries": [ { "item": "sugar", "container-item": "null", "count-min": 10, "count-max": 140 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "sugar_packed",
+    "subtype": "collection",
+    "container-item": "bag_paper_powder",
+    "entries": [ { "item": "sugar", "count-min": 10, "count-max": 90 } ]
   },
   {
     "type": "item_group",
@@ -1799,10 +1812,10 @@
   },
   {
     "type": "item_group",
-    "id": "sugar_box_small_71",
+    "id": "sugar_packed",
     "subtype": "collection",
-    "//": "This group was created automatically and may contain errors.",
-    "container-item": "box_small",
+    "//": "one pound of sugar in a paper bag.",
+    "container-item": "bag_paper_powder",
     "entries": [ { "item": "sugar", "container-item": "null", "count": 71 } ]
   },
   {
diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
index 22717260b5308..ff1af58f32b75 100644
--- a/data/json/itemgroups/supplies.json
+++ b/data/json/itemgroups/supplies.json
@@ -499,7 +499,7 @@
       { "item": "hydrogen_tank", "prob": 8, "charges": [ 12, 24 ] },
       { "item": "polycarbonate_sheet", "prob": 7, "count": [ 1, 30 ] },
       { "prob": 10, "group": "salt_bag_plastic_100" },
-      { "prob": 10, "group": "sugar_box_small_71" },
+      { "prob": 10, "group": "sugar_packed" },
       { "item": "chem_ethanol", "prob": 10, "charges-min": 250 },
       [ "oxygen_cylinder", 8 ],
       { "prob": 16, "group": "chem_citric_acid_bottle_glass_100_inf" },
diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json
index e64ead9262500..7239171ca09ce 100644
--- a/data/json/items/comestibles/spice.json
+++ b/data/json/items/comestibles/spice.json
@@ -92,7 +92,6 @@
     "name": { "str_sp": "sugar" },
     "weight": "5 g",
     "color": "white",
-    "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",
     "description": "Sweet, sweet sugar.  Bad for your teeth and surprisingly not very tasty on its own.",
diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json
index 1c9afcde9f8a2..8ca69229e44ed 100644
--- a/data/json/mapgen/military/mil_base/mil_base_z0.json
+++ b/data/json/mapgen/military/mil_base/mil_base_z0.json
@@ -539,7 +539,7 @@
         { "group": "cornmeal_box_small_10", "x": [ 41, 42 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "group": "coffee_raw_bag_plastic_20", "x": 40, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "group": "tea_raw_bag_plastic_33", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
-        { "group": "sugar_box_small_71", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
+        { "group": "sugar_packed", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "group": "salt_bag_plastic_100", "x": 37, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "cooking_oil", "x": 36, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "meat_salted", "x": [ 45, 46 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] },
diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
index fe35bb5f33490..933265881c620 100644
--- a/data/json/npcs/items_generic.json
+++ b/data/json/npcs/items_generic.json
@@ -1056,8 +1056,8 @@
       [ "talking_doll", 3 ],
       [ "tall_tales", 1 ],
       [ "tazer", 5 ],
-      [ "tea_raw", 8 ],
-      [ "tea_green_raw", 4 ],
+      { "group": "tea_raw_bag_plastic_33", "prob": 8 },
+      { "group": "tea_green_raw_bag_plastic_33", "prob": 4 },
       [ "teapot", 8 ],
       [ "teleumbrella", 4 ],
       [ "tent_kit", 6 ],
diff --git a/data/mods/No_Hope/Mapgen/mil_base_z0.json b/data/mods/No_Hope/Mapgen/mil_base_z0.json
index 68f35d7c11c46..2fd2a2640660e 100644
--- a/data/mods/No_Hope/Mapgen/mil_base_z0.json
+++ b/data/mods/No_Hope/Mapgen/mil_base_z0.json
@@ -531,8 +531,8 @@
         { "item": "flour", "x": [ 43, 44 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "cornmeal", "x": [ 41, 42 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "coffee_raw", "x": 40, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
-        { "item": "tea_raw", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
-        { "item": "sugar", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
+        { "group": "tea_raw_bag_plastic_33", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, 
+        { "group": "sugar_packed", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "salt", "x": 37, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "cooking_oil", "x": 36, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "meat_salted", "x": [ 45, 46 ], "y": 48, "chance": 75, "repeat": [ 50, 150 ] },

From 48611bbbc6aebd9aab7a40ba14f03f636f3e33fe Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Thu, 4 Apr 2024 07:39:18 +0200
Subject: [PATCH 2/2] Update data/mods/No_Hope/Mapgen/mil_base_z0.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/mods/No_Hope/Mapgen/mil_base_z0.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/No_Hope/Mapgen/mil_base_z0.json b/data/mods/No_Hope/Mapgen/mil_base_z0.json
index 2fd2a2640660e..b8b18ce962915 100644
--- a/data/mods/No_Hope/Mapgen/mil_base_z0.json
+++ b/data/mods/No_Hope/Mapgen/mil_base_z0.json
@@ -531,7 +531,7 @@
         { "item": "flour", "x": [ 43, 44 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "cornmeal", "x": [ 41, 42 ], "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "coffee_raw", "x": 40, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
-        { "group": "tea_raw_bag_plastic_33", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] }, 
+        { "group": "tea_raw_bag_plastic_33", "x": 39, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "group": "sugar_packed", "x": 38, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "salt", "x": 37, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "cooking_oil", "x": 36, "y": 53, "chance": 75, "repeat": [ 50, 150 ] },