fix: update spawns of superglue (#4706)

* fix: update spawns of superglue * gooooober
cataclysmbnteam · May 31, 2024 · b088cbc · b088cbc
1 parent d7e86ee
commit b088cbc
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 85 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -377,7 +377,7 @@
       [ "stereo", 10 ],
       [ "wrench", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "item": "superglue", "prob": 5, "charges": [ 5, 10 ] },
       [ "boots", 70 ],
       [ "boots_steel", 50 ],
       [ "boots_hiking", 10 ],
@@ -521,7 +521,7 @@
     "id": "library_elec",
     "type": "item_group",
     "items": [
-      [ "superglue", 30 ],
+      { "item": "superglue", "prob": 30, "charges": [ 5, 10 ] },
       [ "processor", 15 ],
       [ "RAM", 22 ],
       [ "power_supply", 16 ],
@@ -1893,7 +1893,7 @@
       { "item": "mutagen", "prob": 1 },
       { "item": "purifier", "prob": 1 },
       { "item": "yeast", "prob": 3 },
-      { "item": "superglue", "prob": 30 },
+      { "item": "superglue", "prob": 30, "charges": [ 5, 10 ] },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 1 },
       { "item": "adrenaline_injector", "prob": 1 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -85,7 +85,7 @@
       [ "flashlight", 25 ],
       [ "thread", 20 ],
       { "group": "ammo_pocket_batteries_full", "prob": 25 },
-      [ "superglue", 25 ],
+      { "item": "superglue", "prob": 25, "charges": [ 5, 10 ] },
       [ "candle", 25 ],
       [ "hammer", 20 ],
       [ "screwdriver", 20 ],
@@ -1042,7 +1042,7 @@
       { "item": "wrench", "prob": 30 },
       { "item": "screwdriver", "prob": 40 },
       { "item": "screwdriver_set", "prob": 20 },
-      { "item": "superglue", "prob": 30 },
+      { "item": "superglue", "prob": 30, "charges": [ 5, 10 ] },
       { "item": "hacksaw", "prob": 17 },
       { "item": "pliers", "prob": 40 },
       { "item": "gloves_leather", "prob": 45 },
@@ -1300,7 +1300,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "item": "superglue", "prob": 5, "charges": [ 5, 10 ] },
       [ "polisher", 15 ],
       [ "solar_panel", 15 ]
     ]
@@ -1328,7 +1328,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "item": "superglue", "prob": 5, "charges": [ 5, 10 ] },
       [ "polisher", 15 ],
       [ "solar_panel", 15 ]
     ]
@@ -1384,7 +1384,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "item": "superglue", "prob": 5, "charges": [ 5, 10 ] },
       [ "polisher", 15 ],
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1414,7 +1414,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "item": "superglue", "prob": 5, "charges": [ 5, 10 ] },
       [ "polisher", 15 ],
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1600,7 +1600,7 @@
       [ "receiver", 5 ],
       [ "soldering_iron", 65 ],
       [ "solder_wire", 50 ],
-      [ "superglue", 55 ],
+      { "item": "superglue", "prob": 55, "charges": [ 5, 10 ] },
       [ "screwdriver", 60 ],
       [ "motor_small", 30 ]
     ]

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -155,7 +155,7 @@
       { "item": "bleach", "prob": 20, "charges-min": 1 },
       { "item": "ammonia", "prob": 24, "charges-min": 1 },
       { "item": "yeast", "prob": 2 },
-      { "item": "superglue", "prob": 20 },
+      { "item": "superglue", "prob": 20, "charges": [ 5, 10 ] },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 4 },
       { "item": "adrenaline_injector", "prob": 2 },
@@ -1058,7 +1058,7 @@
       { "item": "paper", "prob": 75, "charges": [ 40, 60 ] },
       { "item": "string_36", "prob": 75, "count": [ 1, 4 ] },
       { "item": "string_6", "prob": 50, "count": [ 1, 4 ] },
-      { "item": "superglue", "prob": 40 },
+      { "item": "superglue", "prob": 40, "charges": [ 5, 10 ] },
       { "item": "duct_tape", "prob": 20 },
       { "item": "matches", "prob": 45 },
       { "item": "lighter", "prob": 45 },

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

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

diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
@@ -181,7 +181,7 @@
       { "item": "bleach", "prob": 20, "charges-min": 1 },
       { "item": "ammonia", "prob": 24, "charges-min": 10 },
       [ "panacea", 8 ],
-      [ "superglue", 30 ],
+      { "item": "superglue", "prob": 30, "charges": [ 5, 10 ] },
       [ "bottle_glass", 10 ],
       [ "syringe", 8 ],
       [ "adrenaline_injector", 4 ],

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -128,7 +128,7 @@
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "pilot_light", 50 ],
       [ "duct_tape", 200 ],
-      [ "superglue", 100 ],
+      { "item": "superglue", "prob": 100, "charges": [ 5, 10 ] },
       [ "string_6", 100 ],
       [ "string_36", 100 ],
       [ "rope_6", 100 ],
@@ -217,7 +217,7 @@
       { "item": "rebar", "prob": 20, "count": [ 5, 10 ] },
       { "item": "brick", "prob": 20, "count": [ 5, 10 ] },
       [ "solder_wire", 20 ],
-      [ "superglue", 30 ],
+      { "item": "superglue", "prob": 30, "charges": [ 5, 10 ] },
       [ "chain", 20 ],
       [ "rope_6", 4 ],
       [ "rope_30", 35 ],

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -482,7 +482,7 @@
       [ "teleporter", 1 ],
       [ "laptop", 4 ],
       [ "plut_cell", 4 ],
-      [ "superglue", 30 ],
+      { "item": "superglue", "prob": 30, "charges": [ 5, 10 ] },
       [ "pliers", 10 ],
       [ "matches", 10 ],
       [ "glasses_safety", 20 ],

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -272,8 +272,8 @@
     "price": "18 USD",
     "price_postapoc": "1 USD",
     "material": "plastic",
-    "weight": "45 g",
-    "volume": "250 ml",
+    "weight": "4500 mg",
+    "volume": "25 ml",
     "to_hit": -2,
     "flags": [ "UNRECOVERABLE" ],
     "stackable": true
@@ -289,8 +289,8 @@
     "price": "18 USD",
     "price_postapoc": "50 cent",
     "material": "bone",
-    "weight": "45 g",
-    "volume": "250 ml",
+    "weight": "4500 mg",
+    "volume": "25 ml",
     "to_hit": -2,
     "flags": [ "UNRECOVERABLE", "NO_SALVAGE" ],
     "stackable": true

diff --git a/data/json/recipes/electronic/tools.json b/data/json/recipes/electronic/tools.json
@@ -110,7 +110,7 @@
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "e_scrap", 2 ], [ "glowplug", 1 ] ],
-      [ [ "copper", 1 ], [ "nail_glue", 1, "LIST" ], [ "wire", 1 ] ],
+      [ [ "copper", 1 ], [ "nail", 1 ], [ "wire", 1 ] ],
       [ [ "scrap", 1 ] ],
       [ [ "adhesive", 1, "LIST" ] ],
       [ [ "cable", 5 ] ]

diff --git a/data/mods/No_Hope/Recipes/recipes.json b/data/mods/No_Hope/Recipes/recipes.json
@@ -139,66 +139,6 @@
     "tools": [ [ [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ],
     "components": [ [ [ "l_base_223", 1 ] ], [ [ "l_lmg_223_kit", 1 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "tihar",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_RANGED",
-    "skill_used": "mechanics",
-    "skills_required": [ "gun", 2 ],
-    "difficulty": 6,
-    "time": "2 h 40 m",
-    "autolearn": true,
-    "using": [ [ "welding_standard", 15 ] ],
-    "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ],
-    "components": [
-      [ [ "pipe", 4 ] ],
-      [ [ "duct_tape", 100 ], [ "superglue", 1 ] ],
-      [ [ "2x4", 1 ], [ "stick", 1 ] ],
-      [ [ "metal_tank_little", 1 ] ],
-      [ [ "steel_chunk", 3 ], [ "scrap", 9 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "helsing",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_RANGED",
-    "skill_used": "mechanics",
-    "skills_required": [ "gun", 3 ],
-    "difficulty": 8,
-    "time": "3 h",
-    "autolearn": true,
-    "using": [ [ "welding_standard", 30 ] ],
-    "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ],
-    "components": [
-      [ [ "pipe", 8 ] ],
-      [ [ "duct_tape", 100 ], [ "superglue", 1 ] ],
-      [ [ "2x4", 1 ], [ "stick", 1 ] ],
-      [ [ "metal_tank_little", 1 ] ],
-      [ [ "steel_chunk", 3 ], [ "scrap", 9 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "result": "pneumatic_shotgun",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_RANGED",
-    "skill_used": "mechanics",
-    "skills_required": [ "gun", 3 ],
-    "difficulty": 7,
-    "time": "3 h",
-    "autolearn": true,
-    "using": [ [ "welding_standard", 30 ] ],
-    "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ],
-    "components": [
-      [ [ "pipe", 3 ] ],
-      [ [ "duct_tape", 100 ], [ "superglue", 1 ] ],
-      [ [ "2x4", 1 ], [ "stick", 1 ] ],
-      [ [ "metal_tank_little", 1 ] ],
-      [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ]
-    ]
-  },
   {
     "result": "nailrifle",
     "type": "recipe",
@@ -433,7 +373,7 @@
       [ [ "sheet_metal_small", 4 ] ],
       [ [ "steel_standard", 1, "LIST" ] ],
       [ [ "plastic_chunk", 10 ] ],
-      [ [ "duct_tape", 100 ], [ "superglue", 4 ] ],
+      [ [ "adhesive", 4, "LIST" ] ],
       [ [ "cordage_superior", 6, "LIST" ] ]
     ]
   },
@@ -458,7 +398,7 @@
       [ [ "sheet_metal_small", 4 ] ],
       [ [ "steel_standard", 1, "LIST" ] ],
       [ [ "plastic_chunk", 15 ] ],
-      [ [ "duct_tape", 100 ], [ "superglue", 4 ] ],
+      [ [ "adhesive", 4, "LIST" ] ],
       [ [ "cordage_superior", 6, "LIST" ] ]
     ]
   },