Merge pull request #82253 from BalthazarArgall/Glue

Glue audit

Author: BalthazarArgall

data/json/construction/walls.json

@@ -258,7 +258,7 @@
       [ [ "frame_wood", 1 ] ],
       [ [ "chunk_rubber", 16 ] ],
       [ [ "glass_sheet", 2 ] ],
-      [ [ "super_glue", 2 ], [ "duct_tape", 10 ] ]
+      [ [ "glue_strong", 2 ], [ "duct_tape", 10 ] ]
     ],
     "pre_note": "Must be supported on at least two sides.",
     "pre_special": "check_support",

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -1595,7 +1595,7 @@
       [ "10gal_hat", 3 ],
       [ "glasses_monocle", 2 ],
       { "group": "duct_tape_roll_part", "prob": 60 },
-      { "group": "superglue", "prob": 20 },
+      { "group": "glue_weak_domestic", "prob": 20 },
       [ "firecracker_pack", 5 ],
       [ "firecracker", 5 ],
       [ "fursuit", 5 ],

data/json/itemgroups/Clothing_Gear/gear.json

@@ -172,7 +172,8 @@
       { "group": "tools_tailor", "prob": 20 },
       { "group": "box_of_batteries_random", "prob": 10 },
       { "group": "duct_tape_roll", "prob": 10 },
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_domestic", "prob": 5 },
+      { "group": "glue_strong_domestic", "prob": 5 },
       [ "plastichoboreel", 5 ],
       [ "survivormap", 5 ],
       { "item": "teargas_sprayer", "prob": 25, "charges": [ 9, 10 ] }

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -282,7 +282,8 @@
       { "item": "liq_bandage_spray", "prob": 5, "charges": [ 1, -1 ] },
       { "group": "adhesive_bandages_box_used", "prob": 15 },
       { "group": "duct_tape_roll_part", "prob": 20 },
-      { "group": "superglue", "prob": 10 },
+      { "group": "glue_weak_domestic", "prob": 5 },
+      { "group": "glue_strong_domestic", "prob": 5 },
       { "item": "sewing_kit", "prob": 10, "charges": [ 0, -1 ] },
       { "item": "mouthpiece", "prob": 10 },
       { "item": "cigar", "prob": 20, "count": [ 1, 5 ] },
@@ -371,7 +372,8 @@
       [ "stereo", 10 ],
       [ "wrench", 10 ],
       [ "screwdriver", 15 ],
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_domestic", "prob": 5 },
+      { "group": "glue_strong_domestic", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_steel", 50 ],
       [ "sneakers_steel", 35 ],
@@ -2119,7 +2121,8 @@
       { "item": "chem_calcium_chloride", "prob": 2 },
       { "prob": 3, "group": "yeast_bag_plastic" },
       { "prob": 1, "group": "yogurt_starter_culture_bag_plastic_4" },
-      { "group": "superglue", "prob": 30 },
+      { "group": "glue_weak_domestic", "prob": 15 },
+      { "group": "glue_strong_domestic", "prob": 15 },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 1 },
       { "item": "adrenaline_injector", "prob": 1 },
@@ -2442,7 +2445,8 @@
       [ "screwdriver", 40 ],
       [ "screwdriver_set", 10 ],
       { "group": "duct_tape_roll_part", "prob": 10 },
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_domestic", "prob": 5 },
+      { "group": "glue_strong_domestic", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_winter", 60 ],
       [ "boots_hiking", 30 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -97,7 +97,8 @@
       [ "toilet_paper", 10 ],
       { "item": "handflare", "prob": 15, "charges": 300 },
       { "group": "duct_tape_roll_part", "prob": 25 },
-      { "group": "superglue", "prob": 45 },
+      { "group": "glue_weak_domestic", "prob": 25 },
+      { "group": "glue_strong_domestic", "prob": 20 },
       { "item": "flashlight", "prob": 25, "charges": [ 0, 300 ] },
       [ "thread", 20 ],
       { "group": "box_of_batteries_unopened", "prob": 25 },
@@ -1154,7 +1155,8 @@
       { "item": "screwdriver", "prob": 40 },
       { "item": "screwdriver_set", "prob": 20 },
       { "item": "socket_screwdriver_set", "prob": 10 },
-      { "group": "superglue", "prob": 55 },
+      { "group": "glue_weak_professional", "prob": 25 },
+      { "group": "glue_strong_professional", "prob": 20 },
       { "item": "hacksaw", "prob": 17 },
       { "item": "pliers", "prob": 40 },
       { "item": "gloves_leather", "prob": 45 },
@@ -1223,7 +1225,8 @@
           { "item": "screwdriver_set", "prob": 20 },
           { "item": "socket_screwdriver_set", "prob": 20 },
           { "group": "duct_tape_roll", "prob": 50 },
-          { "group": "superglue", "prob": 10 },
+          { "group": "glue_weak_professional_full", "prob": 5 },
+          { "group": "glue_strong_professional_full", "prob": 5 },
           { "item": "misc_repairkit", "prob": 25 },
           { "group": "tools_toolbox", "prob": 2 }
         ]
@@ -1402,7 +1405,8 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_professional", "prob": 5 },
+      { "group": "glue_strong_professional", "prob": 5 },
       [ "hand_controls", 1 ],
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ]
@@ -1463,7 +1467,8 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_professional", "prob": 5 },
+      { "group": "glue_strong_professional", "prob": 5 },
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1495,7 +1500,8 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_professional", "prob": 5 },
+      { "group": "glue_strong_professional", "prob": 5 },
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1760,7 +1766,8 @@
       { "item": "soldering_iron", "prob": 65 },
       { "item": "soldering_iron_portable", "prob": 65, "charges": [ 0, 50 ] },
       [ "solder_wire", 50 ],
-      { "group": "superglue", "prob": 55 },
+      { "group": "glue_weak_professional", "prob": 25 },
+      { "group": "glue_strong_professional", "prob": 30 },
       [ "screwdriver", 60 ],
       [ "motor_small", 30 ]
     ]
@@ -2048,7 +2055,8 @@
       [ "yarn", 15 ],
       [ "sinew", 15 ],
       { "group": "duct_tape_roll", "prob": 15 },
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_professional", "prob": 5 },
+      { "group": "glue_strong_professional", "prob": 5 },
       [ "feather", 15 ],
       [ "mag_animecon", 15 ],
       [ "mag_beauty", 15 ],

data/json/itemgroups/SUS/domestic.json

@@ -130,7 +130,8 @@
       { "item": "string_36", "count": [ 1, 4 ], "prob": 50 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 20 },
       { "group": "duct_tape_roll_part", "prob": 40 },
-      { "group": "superglue", "prob": 30 },
+      { "group": "glue_weak_domestic", "prob": 15 },
+      { "group": "glue_strong_domestic", "prob": 15 },
       { "item": "plastic_straw", "prob": 70, "count": [ 1, 6 ] },
       { "item": "plastic_straw", "prob": 40, "count": [ 1, 6 ] },
       { "item": "corkscrew", "prob": 60 },
@@ -288,7 +289,8 @@
       { "item": "thread", "prob": 30 },
       { "item": "sewing_kit", "prob": 47, "charges": [ 50, 150 ] },
       { "item": "solder_wire", "prob": 40 },
-      { "group": "superglue", "prob": 40 },
+      { "group": "glue_weak_domestic", "prob": 20 },
+      { "group": "glue_strong_domestic", "prob": 20 },
       { "item": "knitting_needles", "prob": 40 },
       { "group": "duct_tape_roll_part", "prob": 40 },
       { "item": "wax_paraffin", "prob": 10 },
@@ -331,7 +333,8 @@
     "subtype": "collection",
     "entries": [
       { "group": "tools_common", "count": 2 },
-      { "group": "superglue", "prob": 90 },
+      { "group": "glue_weak_domestic", "prob": 45 },
+      { "group": "glue_strong_domestic", "prob": 45 },
       { "item": "boxcutter", "prob": 85 },
       { "group": "duct_tape_roll_part", "prob": 85 },
       { "item": "flashlight", "prob": 80, "charges": [ 100, 300 ] },
@@ -400,7 +403,8 @@
       { "item": "corkscrew", "prob": 70 },
       { "group": "adhesive_bandages_box_used", "prob": 60 },
       { "group": "duct_tape_roll_part", "prob": 40 },
-      { "group": "superglue", "prob": 30 },
+      { "group": "glue_weak_domestic", "prob": 15 },
+      { "group": "glue_strong_domestic", "prob": 15 },
       { "item": "light_battery_cell", "count": 4, "prob": 50, "charges": 100 },
       { "group": "batteries", "prob": 50 },
       { "item": "deck_of_cards", "prob": 50 },

data/json/itemgroups/SUS/office.json

@@ -73,7 +73,7 @@
       { "item": "rubber_band", "prob": 20, "count": [ 2, 10 ] },
       { "item": "coin_quarter", "prob": 10, "count": [ 1, 8 ] },
       { "group": "duct_tape_roll_part", "prob": 5 },
-      { "group": "superglue", "prob": 5 },
+      { "group": "glue_weak_domestic", "prob": 5 },
       { "item": "umbrella", "prob": 5 },
       { "item": "teleumbrella", "prob": 5 },
       { "item": "survnote", "prob": 1 },

data/json/itemgroups/collections_domestic.json

@@ -153,7 +153,8 @@
       { "item": "binoculars", "prob": 20 },
       { "item": "roller_blades", "prob": 20 },
       { "group": "duct_tape_roll_part", "prob": 100 },
-      { "group": "superglue", "prob": 60 },
+      { "group": "glue_weak_domestic", "prob": 60 },
+      { "group": "glue_strong_domestic", "prob": 40 },
       { "item": "lawnmower", "prob": 25 },
       { "item": "lawn_dart", "prob": 10 },
       { "item": "dehydrator", "prob": 15 },
@@ -208,7 +209,8 @@
       { "prob": 2, "group": "yeast_bag_plastic" },
       { "prob": 1, "group": "yogurt_starter_culture_bag_plastic_4" },
       { "item": "royal_jelly", "prob": 8 },
-      { "group": "superglue", "prob": 20 },
+      { "group": "glue_weak_domestic", "prob": 10 },
+      { "group": "glue_strong_domestic", "prob": 10 },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 4 },
       { "item": "adrenaline_injector", "prob": 2 },
@@ -1274,7 +1276,8 @@
           { "item": "xacto", "prob": 10 },
           { "item": "screwdriver", "prob": 10 },
           { "group": "duct_tape_roll_part", "prob": 100 },
-          { "group": "superglue", "prob": 10 },
+          { "group": "glue_weak_domestic", "prob": 5 },
+          { "group": "glue_strong_domestic", "prob": 5 },
           { "item": "splinter", "prob": 10, "count": [ 2, 3 ] },
           { "item": "toolbox_empty", "prob": 100 }
         ],

data/json/itemgroups/electronics.json

@@ -7,7 +7,8 @@
       { "item": "voltmeter", "prob": 30 },
       { "item": "multimeter", "prob": 30, "charges": [ 0, 100 ] },
       [ "jumper_cable_heavy", 10 ],
-      { "group": "superglue", "prob": 30 },
+      { "group": "glue_weak_domestic", "prob": 15 },
+      { "group": "glue_strong_domestic", "prob": 15 },
       { "item": "electrohack", "prob": 3, "charges": [ 0, 100 ] },
       [ "processor", 15 ],
       [ "RAM", 22 ],

data/json/itemgroups/military.json

@@ -820,7 +820,7 @@
       [ "motor", 2 ],
       [ "wheel", 10 ],
       { "item": "polycarbonate_sheet", "prob": 4, "count": [ 1, 3 ] },
-      { "item": "rubber_cement", "prob": 15, "count": [ 3, 9 ] },
+      { "group": "glue_weak_professional" },
       [ "vac_mold", 1 ],
       [ "wheel_wide", 10 ],
       [ "wheel_small", 10 ],