initial commit (#84432)

Author: Maleclypse

data/json/itemgroups/Food/food.json

@@ -15,10 +15,10 @@
       { "prob": 20, "group": "meat_pickled_jar_glass_sealed_2" },
       { "prob": 20, "group": "confit_meat_jar_3l_glass_sealed_12" },
       { "prob": 30, "group": "fish_pickled_jar_glass_sealed_2" },
-      { "prob": 30, "group": "lobster_canned_jar_glass_sealed_2" },
+      { "prob": 10, "group": "lobster_in_can" },
       { "prob": 20, "group": "meat_canned_jar_3l_glass_sealed_12" },
       { "prob": 40, "group": "veggy_canned_jar_3l_glass_sealed_12" },
-      { "prob": 30, "group": "apple_canned_jar_3l_glass_sealed_24" },
+      { "prob": 30, "group": "fruits_in_3l_jar" },
       { "prob": 40, "group": "can_tomato_jar_3l_glass_sealed_24" },
       { "prob": 10, "group": "meat_pickled_jar_3l_glass_sealed_12" },
       { "prob": 20, "group": "veggy_pickled_jar_3l_glass_sealed_12" },
@@ -159,27 +159,27 @@
       { "item": "milk_evap", "prob": 1 },
       { "item": "sauce_red", "prob": 1 },
       { "item": "can_peach", "prob": 1 },
-      { "item": "apple_canned", "prob": 1 },
-      { "prob": 1, "group": "can_cheese_can_food_8" },
-      { "item": "fish_canned", "prob": 1 },
-      { "item": "lobster_canned", "prob": 1 },
+      { "prob": 1, "group": "fruits_in_can" },
+      { "prob": 1, "group": "cheese_in_can" },
+      { "prob": 1, "group": "fish_in_can" },
+      { "group": "lobster_in_can", "prob": 1 },
       { "prob": 1, "group": "brown_bread_can_medium_14" },
-      { "prob": 1, "group": "can_spam_can_medium_6" },
-      { "item": "can_sardine", "prob": 1 },
-      { "prob": 1, "group": "ravioli_can_medium_2" },
-      { "prob": 1, "group": "chili_can_medium_2" },
-      { "prob": 1, "group": "pork_beans_can_medium_2" },
-      { "item": "can_tuna", "prob": 1 },
-      { "item": "can_salmon", "prob": 1 },
-      { "prob": 1, "group": "can_chicken_can_medium_2" },
+      { "prob": 1, "group": "spam_in_can" },
+      { "group": "sardine_in_can", "prob": 1 },
+      { "prob": 1, "group": "ravioli_in_can" },
+      { "prob": 1, "group": "chili_in_can" },
+      { "prob": 1, "group": "pork_beans_in_can" },
+      { "group": "tuna_in_can", "prob": 1 },
+      { "group": "clams_in_can", "prob": 1 },
+      { "prob": 1, "group": "chicken_in_can" },
       { "prob": 1, "group": "can_herring_jar_glass_sealed_2" },
       { "item": "can_clams", "prob": 1 },
-      { "prob": 1, "group": "can_chowder_can_medium_2" },
+      { "prob": 1, "group": "chowder_in_can" },
       { "item": "meat_canned", "prob": 1 },
       { "item": "confit_meat", "prob": 1 },
       { "prob": 1, "group": "pelmeni_can_medium_2" },
       { "prob": 1, "group": "canned_liver_can_food_4" },
-      { "prob": 1, "group": "can_beans_can_medium_2" },
+      { "prob": 1, "group": "beans_in_can" },
       { "item": "can_tomato", "prob": 1 },
       { "item": "broth", "prob": 1 },
       { "item": "broth_bone", "prob": 1 },
@@ -195,7 +195,7 @@
       { "item": "soup_tomato", "prob": 1 },
       { "item": "soup_dumplings", "prob": 1 },
       { "item": "soup_cullenskink", "prob": 1 },
-      { "prob": 1, "group": "can_corn_can_medium_2" },
+      { "prob": 1, "group": "corn_in_can" },
       { "item": "cooked_pumpkin", "prob": 1 },
       { "item": "veggy_canned", "prob": 1 }
     ]
@@ -205,22 +205,22 @@
     "id": "cannedfood",
     "subtype": "distribution",
     "entries": [
-      { "prob": 40, "group": "can_beans_can_medium_2" },
-      { "prob": 40, "group": "pork_beans_can_medium_2" },
+      { "prob": 40, "group": "beans_in_can" },
+      { "prob": 40, "group": "pork_beans_in_can" },
       { "item": "can_tomato", "prob": 40 },
-      { "prob": 35, "group": "can_corn_can_medium_2" },
+      { "prob": 35, "group": "corn_in_can" },
       { "item": "cooked_pumpkin", "prob": 25 },
       { "item": "con_milk", "prob": 30 },
-      { "prob": 30, "group": "can_spam_can_medium_6" },
-      { "prob": 30, "group": "can_pineapple_can_medium_2" },
+      { "prob": 30, "group": "spam_in_can" },
+      { "prob": 30, "group": "pineapple_in_can" },
       { "item": "can_peach", "prob": 30 },
       { "item": "can_coconut", "prob": 10 },
       { "item": "can_sardine", "prob": 14 },
-      { "item": "can_tuna", "prob": 35 },
-      { "item": "can_salmon", "prob": 25 },
-      { "prob": 35, "group": "can_chowder_can_medium_2" },
+      { "group": "tuna_in_can", "prob": 35 },
+      { "group": "clams_in_can", "prob": 25 },
+      { "prob": 35, "group": "chowder_in_can" },
       { "prob": 30, "group": "can_herring_jar_glass_sealed_2" },
-      { "prob": 40, "group": "can_chicken_can_medium_2" },
+      { "prob": 40, "group": "chicken_in_can" },
       { "prob": 20, "group": "brown_bread_can_medium_14" },
       { "item": "broth", "prob": 15 },
       { "prob": 10, "item": "crackers", "count": -1 },
@@ -262,7 +262,7 @@
       { "prob": 5, "group": "artificial_sweetener_box_small_71" },
       { "prob": 5, "group": "lemonade_powder_bottle_plastic_small_10" },
       { "item": "molasses", "charges": -1, "prob": 10 },
-      { "prob": 40, "group": "can_cheese_can_food_8" },
+      { "prob": 40, "group": "cheese_in_can" },
       { "prob": 5, "group": "cheese_hard_wrapper_8" },
       { "prob": 20, "group": "salt_various" },
       { "prob": 20, "group": "pepper_various" },
@@ -316,7 +316,7 @@
     "subtype": "distribution",
     "entries": [
       { "group": "groce_pasta", "prob": 200 },
-      { "prob": 25, "group": "ravioli_can_medium_2" },
+      { "prob": 25, "group": "ravioli_in_can" },
       { "item": "sauce_red", "prob": 20 },
       { "item": "sauce_pesto", "prob": 15 },
       { "prob": 14, "group": "bread_bag_plastic_14" },
@@ -911,7 +911,7 @@
       { "prob": 12, "group": "hotdogs_frozen_bag_plastic_10" },
       { "item": "hotdogs_cooked", "prob": 35 },
       { "prob": 8, "group": "foodplace_food_box_small_4" },
-      { "prob": 20, "group": "chili_can_medium_2" },
+      { "prob": 20, "group": "chili_in_can" },
       { "prob": 20, "group": "chilidogs_wrapper_2" },
       { "item": "hotdogs_newyork", "prob": 15 },
       { "item": "fries", "prob": 80 },
@@ -1021,7 +1021,7 @@
     "subtype": "collection",
     "entries": [
       { "prob": 15, "group": "fish_pickled_jar_glass_sealed_2" },
-      { "prob": 10, "group": "lobster_canned_jar_glass_sealed_2" },
+      { "prob": 10, "group": "lobster_in_can" },
       { "prob": 25, "item": "soup_fish" },
       { "prob": 10, "item": "salted_fish" },
       { "prob": 10, "item": "salted_mollusk" },
@@ -1127,14 +1127,6 @@
     "container-item": "jar_3l_glass_sealed",
     "entries": [ { "item": "confit_meat", "container-item": "null", "count": 12 } ]
   },
-  {
-    "type": "item_group",
-    "id": "lobster_canned_jar_glass_sealed_2",
-    "subtype": "collection",
-    "//": "This group was created automatically and may contain errors.",
-    "container-item": "jar_glass_sealed",
-    "entries": [ { "item": "lobster_canned", "container-item": "null", "count": 2 } ]
-  },
   {
     "type": "item_group",
     "id": "fruit_leather_bag_plastic_full",

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -2432,8 +2432,8 @@
       { "group": "milk_in_container", "prob": 10 },
       { "prob": 20, "group": "melatonin_tablet_bottle_plastic_pill_supplement_1_10" },
       [ "can_spam", 30 ],
-      [ "can_tuna", 35 ],
-      [ "can_salmon", 25 ],
+      { "group": "tuna_in_can", "prob": 35 },
+      { "group": "clams_in_can", "prob": 25 },
       [ "can_chowder", 35 ],
       [ "can_chicken", 40 ],
       [ "neccowafers", 40 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -155,7 +155,7 @@
       [ "can_beans", 20 ],
       [ "can_spam", 20 ],
       [ "can_pineapple", 20 ],
-      [ "can_tuna", 20 ],
+      { "group": "tuna_in_can", "prob": 20 },
       [ "can_cheese", 20 ],
       { "group": "peanutbutter_jar_sealed", "prob": 20 },
       { "group": "jam_fruit_jar_sealed", "prob": 20 },
@@ -1333,7 +1333,7 @@
       { "item": "salt_water", "prob": 3, "container-item": "aquarium_large" },
       { "item": "water", "prob": 3, "container-item": "aquarium_large" },
       { "prob": 15, "item": "birdfood", "count": -1, "container-item": "bag_plastic_small" },
-      [ "can_tuna", 15 ],
+      { "group": "tuna_in_can", "prob": 15 },
       [ "can_chicken", 15 ],
       [ "aquarium_medium", 10 ],
       [ "aquarium_small", 10 ],

data/json/itemgroups/SUS/supermarket.json

@@ -115,7 +115,7 @@
     "id": "commercial_canned_vegetables",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [ [ "can_beans", 1 ], [ "can_tomato", 1 ], [ "can_corn", 1 ] ]
+    "entries": [ { "prob": 1, "group": "corn_in_can" }, { "prob": 1, "group": "tomatoes_in_can" } ]
   },
   {
     "id": "SUS_shelf_commercial_canned_vegetables",
@@ -128,7 +128,7 @@
     "id": "commercial_canned_fruits",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [ [ "can_pineapple", 1 ], [ "apple_canned", 1 ] ]
+    "entries": [ { "prob": 1, "group": "pineapple_in_can" }, { "prob": 1, "group": "fruits_in_can" } ]
   },
   {
     "id": "SUS_shelf_commercial_canned_fruits",
@@ -141,18 +141,15 @@
     "id": "commercial_canned_meat",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [
-      [ "fish_canned", 1 ],
-      [ "lobster_canned", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_sardine", 1 ],
-      [ "can_tuna", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_salmon", 1 ],
-      [ "can_chicken", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_clams", 1 ],
-      [ "meat_canned", 1 ]
+    "entries": [
+      { "prob": 1, "group": "fish_in_can" },
+      { "prob": 1, "group": "lobster_in_can" },
+      { "prob": 1, "group": "sardine_in_can" },
+      { "prob": 1, "group": "tuna_in_can" },
+      { "prob": 1, "group": "salmon_in_can" },
+      { "prob": 1, "group": "chicken_in_can" },
+      { "prob": 1, "group": "spam_in_can" },
+      { "prob": 1, "group": "clams_in_can" }
     ]
   },
   {
@@ -164,21 +161,15 @@
   },
   {
     "id": "commercial_canned_meals",
-    "//": "No canned meal in the game, placeholder copy from canned meat. TODO fix.",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [
-      [ "fish_canned", 1 ],
-      [ "lobster_canned", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_sardine", 1 ],
-      [ "can_tuna", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_salmon", 1 ],
-      [ "can_chicken", 1 ],
-      [ "can_spam", 1 ],
-      [ "can_clams", 1 ],
-      [ "meat_canned", 1 ]
+    "entries": [
+      { "prob": 1, "group": "pork_beans_in_can" },
+      { "prob": 1, "group": "beans_in_can" },
+      { "prob": 1, "group": "chowder_in_can" },
+      { "prob": 1, "group": "ravioli_in_can" },
+      { "prob": 1, "group": "cheese_in_can" },
+      { "prob": 1, "group": "chili_in_can" }
     ]
   },
   {