Superglue audit (CleverRaven#75682)

* convert superglue to use charges * superglue bottles * Replace itemgroups * adjust recipes * Few fixes * Add explanation to charge * lint * Description update * move superglue to generic item * description fix * revert material to plastic * Adjusts containers to prevent unloading * Turn bone glue into ammo This is to prevent innawoods migration getting mad at me * Migration * Mod adjustments * missed old superglue * remove superglue recipe (again) * Typo fix (Thanks Ferret!) * Superglue migrates into smaller container * innawoods migration fix * Update data/json/items/containers/containers.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
inogenous · Aug 16, 2024 · 0b8d7ba · 0b8d7ba
1 parent 99472fc
commit 0b8d7ba
Show file tree

Hide file tree

Showing 63 changed files with 294 additions and 209 deletions.
diff --git a/data/json/construction/walls.json b/data/json/construction/walls.json
@@ -258,7 +258,7 @@
       [ [ "frame_wood", 1 ] ],
       [ [ "chunk_rubber", 16 ] ],
       [ [ "glass_sheet", 2 ] ],
-      [ [ "superglue", 2 ], [ "duct_tape", 10 ] ]
+      [ [ "super_glue", 2 ], [ "duct_tape", 10 ] ]
     ],
     "pre_note": "Must be supported on at least two sides.",
     "pre_special": "check_support",

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1621,7 +1621,7 @@
       [ "10gal_hat", 3 ],
       [ "glasses_monocle", 2 ],
       [ "duct_tape", 60 ],
-      [ "superglue", 20 ],
+      { "group": "superglue", "prob": 20 },
       [ "firecracker_pack", 5 ],
       [ "firecracker", 5 ],
       [ "wolfsuit", 3 ],

diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -172,7 +172,7 @@
       { "group": "tools_tailor", "prob": 20 },
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
       [ "duct_tape", 10 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "plastichoboreel", 5 ],
       [ "survivormap", 5 ],
       { "item": "teargas_sprayer", "prob": 25, "charges": [ 9, 10 ] }

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -289,7 +289,7 @@
       { "item": "liq_bandage_spray", "prob": 5, "charges": [ 1, -1 ] },
       { "group": "adhesive_bandages_box_used", "prob": 15 },
       { "item": "duct_tape", "prob": 20, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 10 },
+      { "group": "superglue", "prob": 10 },
       { "item": "sewing_kit", "prob": 10, "charges": [ 0, -1 ] },
       { "item": "mouthpiece", "prob": 10 },
       { "item": "cigar", "prob": 20, "count": [ 1, 5 ] },
@@ -377,7 +377,7 @@
       [ "stereo", 10 ],
       [ "wrench", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_steel", 50 ],
       [ "sneakers_steel", 35 ],
@@ -2139,7 +2139,7 @@
       { "item": "chem_calcium_chloride", "prob": 2 },
       { "prob": 3, "group": "yeast_bag_plastic" },
       { "prob": 1, "group": "yogurt_starter_culture_bag_plastic_4" },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 30 },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 1 },
       { "item": "adrenaline_injector", "prob": 1 },
@@ -2465,7 +2465,7 @@
       [ "screwdriver", 40 ],
       [ "screwdriver_set", 10 ],
       { "item": "duct_tape", "prob": 10, "charges": [ 25, 400 ] },
-      { "item": "superglue", "prob": 5 },
+      { "group": "superglue", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_winter", 60 ],
       [ "boots_hiking", 30 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -97,11 +97,10 @@
       [ "toilet_paper", 10 ],
       { "item": "handflare", "prob": 15, "charges": 300 },
       [ "duct_tape", 25 ],
-      [ "superglue", 20 ],
+      { "group": "superglue", "prob": 45 },
       { "item": "flashlight", "prob": 25, "charges": [ 0, 300 ] },
       [ "thread", 20 ],
       { "group": "ammo_pocket_batteries_full", "prob": 25 },
-      [ "superglue", 25 ],
       { "item": "candle", "prob": 25, "charges": [ 0, 100 ] },
       [ "hammer", 20 ],
       [ "screwdriver", 20 ],
@@ -1202,7 +1201,7 @@
       { "item": "screwdriver", "prob": 40 },
       { "item": "screwdriver_set", "prob": 20 },
       { "item": "socket_screwdriver_set", "prob": 10 },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 55 },
       { "item": "hacksaw", "prob": 17 },
       { "item": "pliers", "prob": 40 },
       { "item": "gloves_leather", "prob": 45 },
@@ -1211,7 +1210,6 @@
       { "item": "manual_mechanics", "prob": 35 },
       { "item": "manual_fabrication", "prob": 20 },
       { "item": "duct_tape", "prob": 70, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 25 },
       { "item": "misc_repairkit", "prob": 15 },
       { "group": "tools_toolbox", "prob": 2 }
     ]
@@ -1272,7 +1270,7 @@
           { "item": "screwdriver_set", "prob": 20 },
           { "item": "socket_screwdriver_set", "prob": 20 },
           { "item": "duct_tape", "prob": 50 },
-          { "item": "superglue", "prob": 10 },
+          { "group": "superglue", "prob": 10 },
           { "item": "misc_repairkit", "prob": 25 },
           { "group": "tools_toolbox", "prob": 2 }
         ]
@@ -1450,7 +1448,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "hand_controls", 1 ],
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ]
@@ -1510,7 +1508,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1541,7 +1539,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1799,7 +1797,7 @@
       { "item": "soldering_iron", "prob": 65 },
       { "item": "soldering_iron_portable", "prob": 65, "charges": [ 0, 50 ] },
       [ "solder_wire", 50 ],
-      [ "superglue", 55 ],
+      { "group": "superglue", "prob": 55 },
       [ "screwdriver", 60 ],
       [ "motor_small", 30 ]
     ]
@@ -2099,7 +2097,7 @@
       [ "yarn", 15 ],
       [ "sinew", 15 ],
       [ "duct_tape", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "feather", 15 ],
       [ "mag_animecon", 15 ],
       [ "mag_beauty", 15 ],

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -130,7 +130,7 @@
       { "item": "string_36", "count": [ 1, 4 ], "prob": 50 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 20 },
       { "item": "duct_tape", "prob": 40, "charges": [ 25, 400 ] },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 30 },
       { "item": "plastic_straw", "prob": 70, "count": [ 1, 6 ] },
       { "item": "plastic_straw", "prob": 40, "count": [ 1, 6 ] },
       { "item": "corkscrew", "prob": 60 },
@@ -286,7 +286,7 @@
       { "item": "thread", "prob": 30 },
       { "item": "sewing_kit", "prob": 47, "charges": [ 50, 150 ] },
       { "item": "solder_wire", "prob": 40 },
-      { "item": "superglue", "prob": 40 },
+      { "group": "superglue", "prob": 40 },
       { "item": "knitting_needles", "prob": 40 },
       { "item": "duct_tape", "prob": 40, "charges": [ 5, 160 ] },
       { "item": "wax_paraffin", "prob": 10 },
@@ -329,7 +329,7 @@
     "subtype": "collection",
     "entries": [
       { "group": "tools_common", "count": 2 },
-      { "item": "superglue", "prob": 90 },
+      { "group": "superglue", "prob": 90 },
       { "item": "boxcutter", "prob": 85 },
       { "item": "duct_tape", "prob": 85, "charges": [ 5, 200 ] },
       { "item": "flashlight", "prob": 80, "ammo-item": "light_disposable_cell", "charges": [ 100, 300 ] },
@@ -397,7 +397,7 @@
       { "item": "corkscrew", "prob": 70 },
       { "group": "adhesive_bandages_box_used", "prob": 60 },
       { "item": "duct_tape", "prob": 40, "charges": [ 100, 400 ] },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 30 },
       { "item": "light_battery_cell", "count": 4, "prob": 50, "charges": 100 },
       { "item": "deck_of_cards", "prob": 50 },
       { "item": "teleumbrella", "prob": 50 },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -153,7 +153,7 @@
       { "item": "binoculars", "prob": 20 },
       { "item": "roller_blades", "prob": 20 },
       { "item": "duct_tape", "prob": 100, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 60 },
+      { "group": "superglue", "prob": 60 },
       { "item": "lawnmower", "prob": 25 },
       { "item": "lawn_dart", "prob": 10 },
       { "item": "dehydrator", "prob": 15 },
@@ -205,7 +205,7 @@
       { "prob": 2, "group": "yeast_bag_plastic" },
       { "prob": 1, "group": "yogurt_starter_culture_bag_plastic_4" },
       { "item": "royal_jelly", "prob": 8 },
-      { "item": "superglue", "prob": 20 },
+      { "group": "superglue", "prob": 20 },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 4 },
       { "item": "adrenaline_injector", "prob": 2 },
@@ -1438,7 +1438,7 @@
           { "item": "xacto", "prob": 10 },
           { "item": "screwdriver", "prob": 10 },
           { "item": "duct_tape", "prob": 5, "charges": [ 25, 100 ] },
-          { "item": "superglue", "prob": 10 },
+          { "group": "superglue", "prob": 10 },
           { "item": "splinter", "prob": 10, "count": [ 2, 3 ] },
           { "item": "toolbox_empty", "prob": 100 }
         ],

diff --git a/data/json/itemgroups/defense_mode.json b/data/json/itemgroups/defense_mode.json
@@ -74,7 +74,7 @@
       { "item": "cotton_patchwork" },
       { "item": "fur" },
       { "item": "leather" },
-      { "item": "superglue" },
+      { "group": "superglue" },
       { "item": "string_36" },
       { "item": "chain" },
       { "item": "processor" },

diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
@@ -7,7 +7,7 @@
       { "item": "voltmeter", "prob": 30, "charges": [ 0, 100 ] },
       { "item": "multimeter", "prob": 30, "charges": [ 0, 100 ] },
       [ "jumper_cable_heavy", 10 ],
-      [ "superglue", 30 ],
+      { "group": "superglue", "prob": 30 },
       { "item": "electrohack", "prob": 3, "charges": [ 0, 100 ] },
       [ "processor", 15 ],
       [ "RAM", 22 ],

diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
@@ -165,7 +165,7 @@
       { "item": "chem_baking_soda", "prob": 5, "charges": [ 1, -1 ] },
       { "item": "chem_calcium_chloride", "prob": 5 },
       [ "panacea", 8 ],
-      [ "superglue", 30 ],
+      { "group": "superglue", "prob": 30 },
       [ "bottle_glass", 10 ],
       [ "syringe", 8 ],
       [ "adrenaline_injector", 4 ],

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -235,7 +235,7 @@
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "pilot_light", 50 ],
       { "item": "duct_tape", "prob": 200, "charges": [ 50, 200 ] },
-      [ "superglue", 100 ],
+      { "group": "superglue", "prob": 100 },
       [ "string_6", 100 ],
       [ "string_36", 100 ],
       [ "rubber_cement", 50 ],
@@ -336,7 +336,7 @@
   {
     "type": "item_group",
     "id": "supplies_woodcrafts",
-    "items": [ [ "superglue", 40 ], [ "sandpaper", 40 ], [ "screwdriver", 5 ], [ "chisel", 10 ], [ "hammer", 5 ] ]
+    "items": [ { "group": "superglue", "prob": 40 }, [ "sandpaper", 40 ], [ "screwdriver", 5 ], [ "chisel", 10 ], [ "hammer", 5 ] ]
   },
   {
     "id": "supplies_hardware",
@@ -363,7 +363,7 @@
       { "item": "brick", "prob": 20, "count": [ 5, 10 ] },
       { "group": "wrapped_gasmask_filter", "count": [ 2, 6 ], "prob": 20 },
       [ "solder_wire", 20 ],
-      [ "superglue", 30 ],
+      { "group": "superglue", "prob": 30 },
       [ "rubber_cement", 25 ],
       [ "magnet", 10 ],
       [ "chain", 20 ],
@@ -756,7 +756,7 @@
       { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 18, "charges": [ 0, -1 ] },
       { "item": "duct_tape", "prob": 5, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 5 },
+      { "group": "superglue", "prob": 5 },
       { "group": "ammo_pocket_batteries", "prob": 5 },
       { "item": "flashlight", "prob": 10, "charges": [ 0, 300 ] },
       [ "office_holepunch", 10 ],
@@ -795,7 +795,7 @@
       { "group": "writing_utensils", "prob": 35 },
       [ "file", 15 ],
       { "item": "duct_tape", "prob": 15, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 15 },
+      { "group": "superglue", "prob": 15 },
       [ "file", 15 ],
       [ "office_holepunch", 15 ],
       [ "bubblewrap", 15 ],

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -45,7 +45,7 @@
       { "item": "tuning_pegs", "prob": 100, "count": [ 5, 15 ] },
       { "item": "piano_wire", "prob": 100, "count": [ 1, 3 ] },
       [ "hand_drill", 20 ],
-      { "item": "superglue", "prob": 100, "count": [ 1, 3 ] },
+      { "item": "super_glue", "prob": 100, "count": [ 1, 3 ] },
       [ "chisel", 10 ],
       [ "sandpaper", 100 ]
     ]
@@ -101,7 +101,7 @@
       [ "screwdriver_set", 50 ],
       [ "socket_screwdriver_set", 10 ],
       [ "duct_tape", 10 ],
-      [ "superglue", 10 ],
+      { "group": "superglue", "prob": 10 },
       [ "tin_snips", 10 ],
       [ "wrench", 20 ],
       [ "wrench_small", 20 ],
@@ -820,7 +820,7 @@
       [ "teleporter", 1 ],
       { "item": "laptop", "prob": 4, "charges": [ 0, 500 ] },
       { "item": "plut_cell", "prob": 4, "charges": [ 1, 5 ] },
-      [ "superglue", 30 ],
+      { "group": "superglue", "prob": 30 },
       [ "pliers", 10 ],
       [ "tin_snips", 10 ],
       { "item": "matches", "prob": 10, "charges": [ 1, 20 ] },
@@ -1040,5 +1040,20 @@
     "subtype": "collection",
     "id": "dynamite_shipment",
     "items": [ { "item": "dynamite", "count": [ 2, 3 ] } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "superglue",
+    "items": [ { "item": "super_glue", "charges-min": 0, "charges-max": 600, "container-group": "superglue_bottles" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "superglue_bottles",
+    "items": [
+      { "item": "small_squeeze_tube", "variant": "small_squeeze_tube_superglue", "prob": 90 },
+      { "item": "bottle_plastic_tiny_glue", "variant": "bottle_plastic_tiny_superglue", "prob": 10 }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/vehicles_fuel_related.json b/data/json/itemgroups/vehicles_fuel_related.json
@@ -85,7 +85,7 @@
         "prob": 80
       },
       { "item": "duct_tape", "charges": [ 20, 200 ], "prob": 30 },
-      { "item": "superglue", "prob": 20 },
+      { "group": "superglue", "prob": 20 },
       { "distribution": [ { "item": "pockknife" }, { "item": "boxcutter" } ], "prob": 60 },
       { "item": "glowstick", "count": [ 0, 2 ], "charges": 1400, "prob": 30 },
       {

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -479,6 +479,12 @@
     "name": "duct tape",
     "default": "duct_tape"
   },
+  {
+    "type": "ammunition_type",
+    "id": "superglue",
+    "name": "super glue",
+    "default": "super_glue"
+  },
   {
     "type": "ammunition_type",
     "id": "battery",