Merge branch 'main' into water-wheel-goes-sploosh

cataclysmbnteam · Jun 3, 2024 · ced4a90 · ced4a90
2 parents 2b984a1 + de6c3ac
commit ced4a90
Show file tree

Hide file tree

Showing 91 changed files with 2,935 additions and 891 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 },
@@ -2733,5 +2733,32 @@
     "type": "item_group",
     "id": "oa_ig_sb_water",
     "items": [ { "item": "water", "prob": 30, "charges-min": 0, "charges-max": 200, "container-item": "keg" } ]
+  },
+  {
+    "type": "item_group",
+    "id": "os_items",
+    "items": [
+      [ "flashlight", 50 ],
+      [ "heavy_flashlight", 40 ],
+      [ "gloves_work", 30 ],
+      [ "gloves_rubber", 60 ],
+      [ "boots_rubber", 60 ],
+      [ "hat_hard", 60 ],
+      [ "shovel", 40 ],
+      [ "jackhammer", 5 ],
+      [ "elec_jackhammer", 5 ],
+      [ "folding_poncho", 40 ],
+      [ "radio", 40 ],
+      [ "well_pump", 10 ],
+      [ "toolbox", 5 ],
+      [ "wrench", 15 ],
+      [ "bag_canvas", 40 ],
+      [ "jumper_cable", 40 ],
+      [ "jumper_cable_heavy", 20 ],
+      [ "glasses_safety", 30 ],
+      [ "crowbar", 15 ],
+      [ "mask_filter", 30 ],
+      [ "electric_lantern", 30 ]
+    ]
   }
 ]
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/comestibles/drink.json b/data/json/items/comestibles/drink.json
@@ -186,7 +186,9 @@
     "description": "A healthy beverage made from chamomile flowers steeped in boiling water.  Can be used to treat insomnia.",
     "price": "1 USD",
     "price_postapoc": "25 cent",
-    "fun": 1
+    "fun": 1,
+    "stim": -3,
+    "fatigue_mod": -20
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -1296,7 +1296,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "MED",
     "name": { "str_sp": "Ambien" },
-    "description": "A habit-forming tranquilizer with a variety of psychoactive side effects.  Used in the treatment of insomnia.  Its generic name is zolpidem tartrate.",
+    "description": "A habit-forming tranquilizer with a variety of psychoactive side effects.  Used in the treatment of insomnia.  Its active ingredient is zolpidem tartrate.",
     "weight": "1 g",
     "volume": "250 ml",
     "price": "30 USD",
@@ -1307,6 +1307,7 @@
     "symbol": "!",
     "color": "light_red",
     "stim": -8,
+    "fatigue_mod": -60,
     "fun": 5,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "addiction_potential": 40,
@@ -1354,7 +1355,9 @@
     "color": "magenta",
     "healthy": -2,
     "addiction_type": "opiate",
-    "use_action": "SLEEP"
+    "use_action": "SLEEP",
+    "stim": -6,
+    "fatigue_mod": -40
   },
   {
     "id": "poppysyrup",

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,10 +289,11 @@
     "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" ]
+    "flags": [ "UNRECOVERABLE", "NO_SALVAGE" ],
+    "stackable": true
   },
   {
     "type": "GENERIC",
@@ -333,6 +334,7 @@
     "material": "chitin",
     "flags": [ "NO_SALVAGE" ],
     "milling": { "into": "meal_chitin_piece", "conversion_rate": 4 },
+    "stackable": true,
     "weight": "89 g",
     "volume": "250 ml",
     "bashing": 1,
@@ -348,6 +350,7 @@
     "snippet_category": "endochitin_desc",
     "description": "A piece of an insect's endoskeleton.",
     "price": 0,
+    "stackable": true,
     "material": "chitin",
     "flags": [ "NO_SALVAGE" ],
     "weight": "89 g",
@@ -1656,6 +1659,7 @@
     "material": "aluminum",
     "weight": "14 g",
     "volume": "5 ml",
+    "stackable": true,
     "to_hit": 2
   },
   {
@@ -2309,7 +2313,8 @@
     "price_postapoc": "0 cent",
     "material": [ "dry_plant" ],
     "weight": "80 g",
-    "volume": "500 ml"
+    "volume": "500 ml",
+    "stackable": true
   },
   {
     "type": "GENERIC",
@@ -3161,5 +3166,21 @@
     "name": { "str": "wool pillow" },
     "description": "A pillow to rest your head on when sleeping.  This one is made entirely of fluffy wool!",
     "material": [ "wool" ]
+  },
+  {
+    "id": "kevlar_plate",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "Kevlar plate" },
+    "description": "This is a plate of reinforced Kevlar.  It could be used to repair items made of Kevlar.",
+    "weight": "300 g",
+    "volume": "250 ml",
+    "price": "10 USD",
+    "price_postapoc": "25 cent",
+    "material": "kevlar",
+    "symbol": ",",
+    "color": "green",
+    "flags": [ "NO_SALVAGE" ],
+    "stackable": true
   }
 ]
diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json
@@ -338,7 +338,15 @@
     "dispersion": 375,
     "durability": 6,
     "reload": 800,
-    "valid_mod_locations": [ [ "accessories", 4 ], [ "dampening", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "mechanism", 1 ] ]
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "dampening", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "underbarrel", 1 ],
+      [ "mechanism", 1 ]
+    ]
   },
   {
     "id": "compositecrossbow",
@@ -380,7 +388,8 @@
     "loudness": 12,
     "dispersion": 325,
     "durability": 6,
-    "reload": 1000
+    "reload": 1000,
+    "valid_mod_locations": [ [ "sling", 1 ], [ "dampening", 1 ] ]
   },
   {
     "id": "huge_crossbow",
@@ -402,7 +411,7 @@
     "recoil": 30,
     "durability": 6,
     "reload": 6000,
-    "valid_mod_locations": [ [ "dampening", 1 ] ]
+    "valid_mod_locations": [ [ "sling", 1 ], [ "dampening", 1 ] ]
   },
   {
     "id": "rep_crossbow",
@@ -426,6 +435,6 @@
     "durability": 6,
     "clip_size": 10,
     "reload": 200,
-    "valid_mod_locations": [ [ "dampening", 1 ], [ "grip", 1 ], [ "mechanism", 1 ] ]
+    "valid_mod_locations": [ [ "sling", 1 ], [ "dampening", 1 ], [ "grip", 1 ], [ "mechanism", 1 ] ]
   }
 ]
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
@@ -16,7 +16,8 @@
     "volume": "500 ml",
     "bashing": 12,
     "price": "75 USD",
-    "price_postapoc": "10 cent"
+    "price_postapoc": "10 cent",
+    "stackable": true
   },
   {
     "id": "scrap",
@@ -318,7 +319,8 @@
     "volume": "25 ml",
     "bashing": 1,
     "to_hit": -2,
-    "flags": [ "NO_SALVAGE" ]
+    "flags": [ "NO_SALVAGE" ],
+    "stackable": true
   },
   {
     "id": "tin",

diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json
@@ -63,7 +63,7 @@
   },
   {
     "id": "plastic_scrap",
-    "type": "TOOL",
+    "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "plastic scrap" },
     "description": "This is a tiny piece of plastic.  Useless on its own, but could be melted down if you gather enough.",
@@ -74,6 +74,7 @@
     "material": "plastic",
     "symbol": ",",
     "color": "light_blue",
-    "flags": [ "NO_SALVAGE" ]
+    "flags": [ "NO_SALVAGE" ],
+    "stackable": true
   }
 ]