fix broken item spawn

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -1607,7 +1607,7 @@
       [ "bullwhip", 1 ],
       [ "10gal_hat", 3 ],
       [ "glasses_monocle", 2 ],
-      [ "duct_tape", 60 ],
+      { "group": "duct_tape", "prob": 60 },
       [ "superglue", 20 ],
       [ "firecracker_pack", 5 ],
       [ "firecracker", 5 ],

data/json/itemgroups/Clothing_Gear/gear.json

@@ -73,7 +73,7 @@
       { "group": "tools_survival", "prob": 100 },
       { "group": "tools_tailor", "prob": 20 },
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      [ "duct_tape", 10 ],
+      { "group": "duct_tape", "prob": 10 },
       [ "superglue", 5 ],
       [ "plastichoboreel", 5 ],
       [ "survivormap", 5 ],

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -290,7 +290,7 @@
       { "item": "bandages", "prob": 15, "count": [ 1, 3 ] },
       { "item": "liq_bandage_spray", "prob": 5, "charges-min": 1 },
       { "group": "adhesive_bandages_box_used", "prob": 15 },
-      { "item": "duct_tape", "prob": 20, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 20 },
       { "item": "superglue", "prob": 10 },
       { "item": "sewing_kit", "prob": 10, "charges-min": 0 },
       { "item": "mouthpiece", "prob": 10 },
@@ -1674,7 +1674,7 @@
       { "prob": 30, "group": "cig_box_cigarette_0_10" },
       { "item": "rope_6", "prob": 5 },
       { "item": "rope_30", "prob": 2 },
-      { "item": "duct_tape", "prob": 10, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 10 },
       { "group": "ammo_pocket_batteries_full", "prob": 15 },
       { "item": "matches", "prob": 10, "charges": [ 0, 20 ] },
       { "item": "ref_matches", "prob": 10, "charges": [ 0, 32 ] },
@@ -2468,7 +2468,7 @@
       { "item": "dayquil", "prob": 70, "charges": [ 1, 5 ] },
       [ "screwdriver", 40 ],
       [ "screwdriver_set", 10 ],
-      { "item": "duct_tape", "prob": 10, "charges": [ 25, 400 ] },
+      { "group": "duct_tape", "prob": 10, "count": [ 1, 2 ] },
       { "item": "superglue", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_winter", 60 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -98,7 +98,7 @@
       [ "string_36", 25 ],
       [ "toilet_paper", 10 ],
       { "item": "handflare", "prob": 15, "charges": 300 },
-      [ "duct_tape", 25 ],
+      { "group": "duct_tape", "prob": 25 },
       [ "superglue", 20 ],
       { "item": "flashlight", "prob": 25, "charges": [ 0, 300 ] },
       [ "thread", 20 ],
@@ -1208,7 +1208,7 @@
       { "item": "mask_dust", "prob": 15 },
       { "item": "manual_mechanics", "prob": 35 },
       { "item": "manual_fabrication", "prob": 20 },
-      { "item": "duct_tape", "prob": 70, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 70 },
       { "item": "superglue", "prob": 25 },
       { "item": "misc_repairkit", "prob": 15, "charges-min": 0 },
       { "group": "tools_toolbox", "prob": 2 }
@@ -1269,7 +1269,7 @@
           { "item": "multitool", "prob": 30 },
           { "item": "screwdriver_set", "prob": 20 },
           { "item": "socket_screwdriver_set", "prob": 20 },
-          { "item": "duct_tape", "prob": 50 },
+          { "group": "duct_tape", "prob": 50 },
           { "item": "superglue", "prob": 10 },
           { "item": "misc_repairkit", "prob": 25, "charges": 200 },
           { "group": "tools_toolbox", "prob": 2 }
@@ -2101,7 +2101,7 @@
       [ "thread", 15 ],
       [ "yarn", 15 ],
       [ "sinew", 15 ],
-      [ "duct_tape", 15 ],
+      { "group": "duct_tape", "prob": 15 },
       [ "superglue", 5 ],
       [ "feather", 15 ],
       [ "mag_animecon", 15 ],

data/json/itemgroups/SUS/domestic.json

@@ -118,7 +118,7 @@
       { "item": "string_36", "count": [ 1, 4 ], "prob": 80 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 50 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 20 },
-      { "item": "duct_tape", "prob": 40, "charges": [ 25, 400 ] },
+      { "group": "duct_tape", "prob": 40 },
       { "item": "superglue", "prob": 30 },
       { "item": "plastic_straw", "prob": 70, "count": [ 1, 6 ] },
       { "item": "plastic_straw", "prob": 40, "count": [ 1, 6 ] },
@@ -264,7 +264,7 @@
       { "item": "solder_wire", "prob": 40 },
       { "item": "superglue", "prob": 40 },
       { "item": "knitting_needles", "prob": 40 },
-      { "item": "duct_tape", "prob": 40, "charges": [ 5, 160 ] },
+      { "group": "duct_tape", "prob": 40 },
       { "item": "wax_paraffin", "prob": 10 },
       { "item": "zipper_short_plastic", "prob": 35 },
       { "item": "zipper_short_plastic", "prob": 15 },
@@ -304,7 +304,7 @@
       { "group": "tools_common", "count": 2 },
       { "item": "superglue", "prob": 90 },
       { "item": "boxcutter", "prob": 85 },
-      { "item": "duct_tape", "prob": 85, "charges": [ 5, 200 ] },
+      { "group": "duct_tape", "prob": 85 },
       { "item": "flashlight", "prob": 80, "ammo-item": "light_disposable_cell", "charges": [ 100, 300 ] },
       { "item": "toothbrush_plain", "custom-flags": [ "FILTHY" ], "prob": 80 },
       { "item": "bottle_opener", "prob": 75 },
@@ -369,7 +369,7 @@
       { "item": "candle", "count": [ 1, 2 ], "prob": 75, "charges-min": 70 },
       { "item": "corkscrew", "prob": 70 },
       { "group": "adhesive_bandages_box_used", "prob": 60 },
-      { "item": "duct_tape", "prob": 40, "charges": [ 100, 400 ] },
+      { "group": "duct_tape", "prob": 40 },
       { "item": "superglue", "prob": 30 },
       { "item": "light_battery_cell", "count": 4, "prob": 50, "charges": 100 },
       { "item": "deck_of_cards", "prob": 50 },

data/json/itemgroups/collections_domestic.json

@@ -151,7 +151,7 @@
       { "item": "bubblewrap", "prob": 50 },
       { "item": "binoculars", "prob": 20 },
       { "item": "roller_blades", "prob": 20 },
-      { "item": "duct_tape", "prob": 100, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 100 },
       { "item": "superglue", "prob": 60 },
       { "item": "lawnmower", "prob": 25 },
       { "item": "lawn_dart", "prob": 10 },
@@ -1442,7 +1442,7 @@
           { "item": "paint_brush", "prob": 33 },
           { "item": "xacto", "prob": 10 },
           { "item": "screwdriver", "prob": 10 },
-          { "item": "duct_tape", "prob": 5, "charges": [ 25, 100 ] },
+          { "group": "duct_tape", "prob": 5 },
           { "item": "superglue", "prob": 10 },
           { "item": "splinter", "prob": 10, "count": [ 2, 3 ] },
           { "item": "toolbox_empty", "prob": 100 }

data/json/itemgroups/mail.json

@@ -30,7 +30,7 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "item": "duct_tape", "prob": 25 },
+      { "group": "duct_tape", "prob": 25 },
       { "item": "bubblewrap", "prob": 33 },
       { "item": "cardboard", "count": [ 10, 40 ], "prob": 33 },
       { "item": "box_small", "count": [ 1, 2 ], "prob": 50 },

data/json/itemgroups/supplies.json

@@ -41,6 +41,12 @@
       [ "vac_mold", 3 ]
     ]
   },
+  {
+    "id": "duct_tape",
+    "type": "item_group",
+    "container-item": "cardboard_roll",
+    "items": [ { "item": "duct_tape", "prob": 100, "charges": [ 20, 200 ] } ]
+  },
   {
     "id": "tailoring_fabric",
     "type": "item_group",
@@ -234,7 +240,7 @@
       [ "wire", 10 ],
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "pilot_light", 50 ],
-      { "item": "duct_tape", "prob": 200, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 200 },
       [ "superglue", 100 ],
       [ "string_6", 100 ],
       [ "string_36", 100 ],
@@ -392,7 +398,7 @@
       [ "wood_panel", 10 ],
       { "item": "wire", "prob": 50, "count": [ 1, 10 ] },
       { "item": "wire_barbed", "prob": 20, "count": [ 1, 10 ] },
-      [ "duct_tape", 60 ],
+      { "group": "duct_tape", "prob": 60 },
       [ "compressor", 5 ],
       [ "foot_crank", 10 ],
       [ "spray_can", 50 ],
@@ -747,7 +753,7 @@
       [ "rubber_band", 5 ],
       { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 18, "charges-min": 0 },
-      { "item": "duct_tape", "prob": 5, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 5 },
       { "item": "superglue", "prob": 5 },
       { "group": "ammo_pocket_batteries", "prob": 5 },
       { "item": "flashlight", "prob": 10, "charges": [ 0, 300 ] },
@@ -786,7 +792,7 @@
       [ "paper", 100 ],
       { "group": "writing_utensils", "prob": 35 },
       [ "file", 15 ],
-      { "item": "duct_tape", "prob": 15, "charges": [ 50, 200 ] },
+      { "group": "duct_tape", "prob": 15 },
       { "item": "superglue", "prob": 15 },
       [ "file", 15 ],
       [ "office_holepunch", 15 ],

data/json/itemgroups/tools.json

@@ -136,7 +136,7 @@
       [ "screwdriver", 100 ],
       [ "screwdriver_set", 50 ],
       [ "socket_screwdriver_set", 10 ],
-      [ "duct_tape", 10 ],
+      { "group": "duct_tape", "prob": 10 },
       [ "superglue", 10 ],
       [ "tin_snips", 10 ],
       [ "wrench", 20 ],
@@ -860,7 +860,7 @@
       [ "glasses_safety", 20 ],
       [ "vac_mold", 10 ],
       [ "polycarbonate_sheet", 50 ],
-      [ "duct_tape", 8 ],
+      { "group": "duct_tape", "prob": 8 },
       { "item": "misc_repairkit", "prob": 15, "charges-min": 0 },
       { "item": "welder", "prob": 10 },
       { "item": "welding_blanket", "prob": 10, "count": [ 0, 1 ] },

data/json/itemgroups/vehicles_fuel_related.json

@@ -84,7 +84,7 @@
         ],
         "prob": 80
       },
-      { "item": "duct_tape", "charges": [ 20, 200 ], "prob": 30 },
+      { "group": "duct_tape", "prob": 30 },
       { "item": "superglue", "prob": 20 },
       { "distribution": [ { "item": "pockknife" }, { "item": "boxcutter" } ], "prob": 60 },
       { "item": "glowstick", "count": [ 0, 2 ], "charges": 1400, "prob": 30 },

data/json/items/ammo.json

@@ -394,7 +394,6 @@
     "count": 200,
     "//1": "200 charges - one roll is 20 yards. One charge = 0.1 yard.",
     "flags": [ "UNRECOVERABLE" ],
-    "container": "cardboard_roll",
     "//2": "Based on https://www.amazon.com/dp/B097HKH3G4, with the assumption that the tape is 1mm thick for volume calculation"
   },
   {

data/json/npcs/NC_JUNK_SHOPKEEP.json

@@ -171,7 +171,7 @@
       { "item": "bubblewrap", "prob": 50 },
       { "item": "binoculars", "prob": 20 },
       { "item": "roller_blades", "prob": 20 },
-      { "item": "duct_tape", "prob": 70 },
+      { "group": "duct_tape", "prob": 70 },
       { "item": "char_smoker", "prob": 25 },
       { "item": "lawn_dart", "prob": 10 },
       { "item": "dehydrator", "prob": 15 },

data/json/npcs/campus/great_library_librarian_goods.json

@@ -21,7 +21,7 @@
     "id": "GREAT_LIBRARY_Shop_Supplies",
     "subtype": "distribution",
     "items": [
-      { "item": "duct_tape", "charges": [ 35, 50 ] },
+      { "group": "duct_tape" },
       { "item": "superglue", "count": [ 0, 1 ] },
       { "item": "paper", "count": [ 150, 200 ] },
       { "item": "cardboard", "count": [ 10, 20 ] }

data/json/npcs/godco/classes.json

@@ -1139,7 +1139,7 @@
     "subtype": "collection",
     "entries": [
       { "item": "screwdriver" },
-      { "item": "duct_tape" },
+      { "group": "duct_tape" },
       { "item": "welder" },
       { "item": "goggles_welding" },
       { "item": "solar_cell" }
@@ -1167,7 +1167,7 @@
     "type": "item_group",
     "id": "GODCO_olwen_carried",
     "subtype": "collection",
-    "entries": [ { "item": "laptop" }, { "item": "duct_tape" }, { "item": "lemonlime" } ]
+    "entries": [ { "item": "laptop" }, { "group": "duct_tape" }, { "item": "lemonlime" } ]
   },
   {
     "type": "item_group",

data/json/npcs/items_generic.json

@@ -532,7 +532,7 @@
       [ "dry_meat", 3 ],
       [ "dry_rice", 8 ],
       [ "dry_veggy", 5 ],
-      [ "duct_tape", 20 ],
+      { "group": "duct_tape", "prob": 20 },
       [ "dynamite", 3 ],
       [ "e_tool", 1 ],
       [ "ear_plugs", 1 ],

data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json

@@ -57,7 +57,7 @@
     "type": "item_group",
     "id": "REFUGEE_Garry_carried",
     "subtype": "collection",
-    "entries": [ { "item": "duct_tape" }, { "item": "superglue" } ]
+    "entries": [ { "group": "duct_tape" }, { "item": "superglue" } ]
   },
   {
     "type": "item_group",

data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json

@@ -39,7 +39,7 @@
       { "item": "solder_wire", "charges": [ 75, 90 ] },
       { "item": "thread", "charges": [ 100, 240 ] },
       { "item": "nail", "charges": [ 80, 100 ] },
-      { "item": "duct_tape", "charges": [ 35, 50 ] },
+      { "group": "duct_tape" },
       { "item": "superglue", "count": [ 0, 1 ] },
       { "item": "glass_shard", "count": [ 150, 200 ] },
       { "item": "clay_lump", "count": [ 2, 3 ] },

data/json/professions.json

@@ -920,7 +920,7 @@
           { "item": "jeans" },
           { "item": "socks" },
           { "item": "boots_steel" },
-          { "item": "duct_tape" },
+          { "group": "duct_tape" },
           { "item": "screwdriver" },
           { "item": "wristwatch" },
           { "item": "mag_cars" },

data/json/vehicles/helicopters.json

@@ -193,7 +193,7 @@
     ],
     "items": [
       { "x": 0, "y": 0, "chance": 100, "items": [ "lighter" ] },
-      { "x": 0, "y": 0, "chance": 100, "items": [ "duct_tape" ] },
+      { "x": 0, "y": 0, "chance": 100, "item_groups": [ "duct_tape" ] },
       { "x": 0, "y": 0, "chance": 100, "items": [ "flashlight" ], "ammo": 100 },
       { "x": -1, "y": 0, "chance": 100, "items": [ "caff_gum" ] },
       { "x": -1, "y": 0, "chance": 100, "items": [ "gum" ] },
@@ -453,7 +453,7 @@
     ],
     "items": [
       { "x": -1, "y": 0, "chance": 100, "items": [ "lighter" ] },
-      { "x": -1, "y": 0, "chance": 100, "items": [ "duct_tape" ] },
+      { "x": -1, "y": 0, "chance": 100, "item_groups": [ "duct_tape" ] },
       { "x": -1, "y": 0, "chance": 100, "items": [ "flashlight" ], "ammo": 100 },
       { "x": 1, "y": 0, "chance": 100, "items": [ "caff_gum" ] },
       { "x": 1, "y": 0, "chance": 100, "items": [ "gum" ] },
@@ -1588,7 +1588,7 @@
       { "x": -1, "y": 0, "chance": 10, "items": [ "pocket_firstaid" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "screwdriver" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "wrench" ] },
-      { "x": -1, "y": 2, "chance": 5, "items": [ "duct_tape" ] },
+      { "x": -1, "y": 2, "chance": 5, "item_groups": [ "duct_tape" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "mag_fieldrepair" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "misc_repairkit" ], "ammo": 100 },
       { "x": -1, "y": 2, "chance": 5, "items": [ "two_way_radio" ] },
@@ -1709,7 +1709,7 @@
       { "x": -1, "y": 0, "chance": 10, "items": [ "pocket_firstaid" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "screwdriver" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "wrench" ] },
-      { "x": -1, "y": 2, "chance": 5, "items": [ "duct_tape" ] },
+      { "x": -1, "y": 2, "chance": 5, "item_groups": [ "duct_tape" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "mag_fieldrepair" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "misc_repairkit" ], "ammo": 100 },
       { "x": -1, "y": 2, "chance": 5, "items": [ "two_way_radio" ] },
@@ -1816,7 +1816,7 @@
       { "x": -4, "y": 2, "chance": 5, "items": [ "hood_rain" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "screwdriver" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "wrench" ] },
-      { "x": -1, "y": 2, "chance": 5, "items": [ "duct_tape" ] },
+      { "x": -1, "y": 2, "chance": 5, "item_groups": [ "duct_tape" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "mag_fieldrepair" ] },
       { "x": -1, "y": 2, "chance": 7, "items": [ "misc_repairkit" ], "ammo": 100 },
       { "x": -1, "y": 2, "chance": 5, "items": [ "two_way_radio" ] },

data/mods/Aftershock/itemgroups/tool_groups.json

@@ -69,7 +69,7 @@
       { "item": "soldering_iron", "prob": 30 },
       { "item": "soldering_iron_portable", "prob": 30, "charges": [ 0, 50 ] },
       { "item": "solder_wire", "prob": 30 },
-      { "item": "duct_tape", "prob": 30, "count": [ 1, 2 ] }
+      { "group": "duct_tape", "prob": 30, "count": [ 1, 2 ] }
     ]
   },
   {
@@ -88,7 +88,10 @@
             "prob": 20
           },
           {
-            "collection": [ { "item": "plastic_sheet", "prob": 100, "count": [ 3, 6 ] }, { "item": "duct_tape", "prob": 100, "count": [ 1, 5 ] } ],
+            "collection": [
+              { "item": "plastic_sheet", "prob": 100, "count": [ 3, 6 ] },
+              { "group": "duct_tape", "prob": 100, "count": [ 1, 5 ] }
+            ],
             "prob": 60
           }
         ],
@@ -171,7 +174,7 @@
       { "item": "screwdriver_set", "prob": 15 },
       { "item": "pliers", "prob": 5 },
       { "item": "superglue", "prob": 5 },
-      { "item": "duct_tape", "prob": 10, "count": [ 1, 2 ] }
+      { "group": "duct_tape", "prob": 10, "count": [ 1, 2 ] }
     ]
   },
   {

data/mods/Aftershock/player/professions.json

@@ -40,7 +40,7 @@
           { "item": "spacer_cap" },
           { "item": "socks" },
           { "item": "boots" },
-          { "item": "duct_tape" },
+          { "group": "duct_tape" },
           { "item": "screwdriver" },
           { "item": "wristwatch" },
           { "item": "hat_hard", "variant": "orange_hat_hard" },