Cannabis extract overhaul

data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json

@@ -134,6 +134,20 @@
         "prob": 100,
         "container-item": "jar_glass_sealed",
         "sealed": false
+      },
+      {
+        "item": "hi_q_cbd_shatter",
+        "charges": [ 5, 140 ],
+        "prob": 100,
+        "container-item": "jar_glass_sealed",
+        "sealed": false
+      },
+      {
+        "item": "hi_q_cbd_wax",
+        "charges": [ 5, 140 ],
+        "prob": 100,
+        "container-item": "jar_glass_sealed",
+        "sealed": false
       }
     ]
   },

data/json/itemgroups/science_and_tech.json

@@ -121,10 +121,8 @@
       { "item": "polycarbonate_sheet", "prob": 30 },
       { "item": "closed_loop_extractor_large", "prob": 2 },
       { "item": "closed_loop_extractor_small", "prob": 2 },
-      { "item": "filter_paper_qualitative", "prob": 10 },
-      { "item": "filter_paper_quantitative", "prob": 10 },
       { "item": "gasket_plastic", "prob": 10 },
-      { "item": "butane_tank", "prob": 15, "charges-min": 1 },
+      { "item": "butane_tank", "prob": 10, "charges-min": 50 },
       { "item": "vac_oven_small", "prob": 5 },
       { "item": "butane_can", "prob": 2, "charges-min": 1 },
       { "item": "chem_citric_acid", "prob": 16 }

data/json/itemgroups/supplies.json

@@ -288,6 +288,7 @@
       [ "nitrogen_membrane_filter", 1 ],
       [ "hd_pipe", 5 ],
       [ "hd_pipe_fittings", 5 ],
+      { "item": "gasket_plastic", "prob": 5, "count": [ 1, 3 ] },
       [ "hd_valve", 5 ],
       [ "pressure_gauge", 5 ],
       [ "pyrometer", 2 ],

data/json/itemgroups/tools.json

@@ -660,6 +660,8 @@
       [ "microscope", 5 ],
       [ "microscope_dissecting", 5 ],
       [ "funnel_separation", 3 ],
+      { "item": "filter_paper_qualitative", "prob": 3, "charges-min": 10 },
+      { "item": "filter_paper_quantitative", "prob": 3, "charges-min": 10 },
       [ "burette", 3 ],
       [ "rotovap", 3 ],
       [ "still_lab", 3 ],

data/json/items/comestibles/med.json

@@ -618,8 +618,8 @@
     "id": "hi_q_shatter",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": { "str_sp": "cannabis shatter" },
-    "description": "Concentrated cannabis extract, commonly known as dabs.  This particular style of concentrate in is a thin sheet and shatters like glass at room temperature.  Argueably its one of the better styles of concentrate compared to wax, crumble, or distillate.  Normal cannabis contains around 20% THC, this shatter should be around 55% THC.",
+    "name": { "str_sp": "high-quality THC shatter" },
+    "description": "Concentrated cannabis extract, commonly known as dabs.  This particular style of concentrate in is a thin sheet and shatters like glass at room temperature.  Arguably its one of the better styles of concentrate compared to wax, crumble, or distillate.  Normal cannabis contains around 20% THC, this shatter should be around 55% THC.",
     "looks_like": "honey_gold",
     "weight": "1 g",
     "volume": "1 ml",
@@ -654,7 +654,7 @@
     "id": "hi_q_wax",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": { "str_sp": "cannabis wax" },
+    "name": { "str_sp": "high-quality THC wax" },
     "description": "Concentrated cannabis extract, commonly known as dabs.  This particular style of concentrate has the look and consistency of a yellow waxy substance at room temperature.  Normal cannabis contains around 20% THC, this wax should be around 45% THC.",
     "looks_like": "honey_gold",
     "weight": "1 g",
@@ -671,7 +671,7 @@
     "flags": [ "NO_INGEST" ],
     "use_action": {
       "type": "consume_drug",
-      "activation_message": "You take a dab of some wax.  *cough cough* good stuff!",
+      "activation_message": "You take a dab of some wax.  *cough cough* Good stuff!",
       "effects": [
         { "id": "weed_high", "duration": "150 m" },
         { "id": "pkill1", "duration": "100 m" },
@@ -690,7 +690,7 @@
     "id": "hi_q_distillate",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": { "str_sp": "cannabis distillate" },
+    "name": { "str_sp": "high-quality THC distillate" },
     "description": "Concentrated cannabis extract.  This style of extract goes through the most processing, eliminating most if not all harmful ingredients.  Normal cannabis contains around 20% THC, this distillate should be around 88% THC.  Can be smoked using a refillable electronic cigarette.",
     "looks_like": "honey_gold",
     "weight": "1 g",
@@ -724,6 +724,110 @@
       "moves": 1500
     }
   },
+  {
+    "id": "hi_q_cbd_shatter",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str_sp": "medical-grade CBD shatter" },
+    "description": "Concentrated cannabis extract, commonly known as dabs.  This particular style of concentrate in is a thin sheet and shatters like glass at room temperature.  Arguably its one of the better styles of concentrate compared to wax, crumble, or distillate.  Rather than get you high, this cannabis extract contains no THC and is best used as a painkiller.",
+    "looks_like": "honey_gold",
+    "weight": "1 g",
+    "volume": "1 ml",
+    "stack_size": 5,
+    "price": 3000,
+    "symbol": "!",
+    "color": "green",
+    "quench": -5,
+    "stim": -6,
+    "healthy": -1,
+    "fun": 30,
+    "addiction_potential": 10,
+    "flags": [ "NO_INGEST" ],
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You take a dab of some CBD shatter.  It has a rich terpene flavor and you feel a slight tingle in your muscles as your pain subsides.",
+      "effects": [
+        { "id": "pkill1", "duration": "180 m" },
+        { "id": "pkill2", "duration": "10 m" },
+        { "id": "smoke", "duration": "2 m" }
+      ],
+      "stat_adjustments": { "hunger": 4, "thirst": 6 },
+      "fields_produced": { "fd_weedsmoke": 2 },
+      "charges_needed": { "fire": 1 },
+      "tools_needed": { "apparatus": -1 },
+      "moves": 6000
+    }
+  },
+  {
+    "id": "hi_q_cbd_wax",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str_sp": "medical-grade CBD wax" },
+    "description": "Concentrated cannabis extract, commonly known as dabs.  This particular style of concentrate has the look and consistency of a yellow waxy substance at room temperature.  Rather than get you high, this cannabis extract contains no THC and is best used as a painkiller.",
+    "looks_like": "honey_gold",
+    "weight": "1 g",
+    "volume": "1 ml",
+    "stack_size": 5,
+    "price": 2000,
+    "symbol": "!",
+    "color": "green",
+    "quench": -10,
+    "stim": -8,
+    "healthy": -1,
+    "fun": 20,
+    "addiction_potential": 10,
+    "flags": [ "NO_INGEST" ],
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You take a dab of some CBD wax.  *cough cough* Good stuff!  You feel like the pains in your body have dulled a little bit.",
+      "effects": [
+        { "id": "pkill1", "duration": "140 m" },
+        { "id": "pkill2", "duration": "10 m" },
+        { "id": "smoke", "duration": "2 m" }
+      ],
+      "stat_adjustments": { "hunger": 5, "thirst": 7 },
+      "fields_produced": { "fd_weedsmoke": 2 },
+      "charges_needed": { "fire": 1 },
+      "tools_needed": { "apparatus": -1 },
+      "moves": 6000
+    }
+  },
+  {
+    "id": "hi_q_cbd_distillate",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str_sp": "medical-grade CBD distillate" },
+    "description": "Concentrated cannabis extract.  This style of extract goes through the most processing, eliminating most if not all harmful ingredients and inducing the best medical qualities.  Rather than get you high, this cannabis extract contains no THC and is best used as a painkiller.  Can be smoked using a refillable electronic cigarette.",
+    "looks_like": "honey_gold",
+    "weight": "1 g",
+    "volume": "1 ml",
+    "stack_size": 10,
+    "charges": 10,
+    "price": 1000,
+    "container": "jar_3l_glass_sealed",
+    "sealed": false,
+    "symbol": "!",
+    "color": "green",
+    "quench": -5,
+    "stim": -3,
+    "fun": 15,
+    "phase": "liquid",
+    "addiction_potential": 5,
+    "flags": [ "NO_INGEST" ],
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You take a dab of some CBD distillate.  Your pain starts to fade away…",
+      "effects": [
+        { "id": "pkill1", "duration": "180 m" },
+        { "id": "pkill2", "duration": "10 m" },
+        { "id": "smoke", "duration": "1 m" }
+      ],
+      "stat_adjustments": { "hunger": 4, "thirst": 6 },
+      "fields_produced": { "fd_weedsmoke": 2 },
+      "charges_needed": { "advanced_ecig": 1 },
+      "moves": 1500
+    }
+  },
   {
     "id": "ecig",
     "type": "COMESTIBLE",

data/json/items/tool/science.json

@@ -237,7 +237,8 @@
     "weight": "40860 g",
     "ammo": [ "battery" ],
     "volume": "27 L",
-    "price": 100000,
+    "price": 300000,
+    "price_postapoc": 8000,
     "to_hit": -10,
     "bashing": 10,
     "material": [ "steel" ],
@@ -263,6 +264,7 @@
     "weight": "36000 g",
     "volume": "60 L",
     "price": 500000,
+    "price_postapoc": 5000,
     "to_hit": -10,
     "bashing": 40,
     "material": [ "steel" ],
@@ -299,6 +301,7 @@
     "weight": "181600 g",
     "volume": "240 L",
     "price": 2000000,
+    "price_postapoc": 10000,
     "to_hit": -10,
     "bashing": 40,
     "material": [ "steel" ],
@@ -372,6 +375,7 @@
     "weight": "20 g",
     "volume": "25 ml",
     "price": 100,
+    "price_postapoc": 100,
     "initial_charges": 200,
     "max_charges": 200,
     "material": [ "paper" ],
@@ -411,9 +415,9 @@
     "symbol": "E",
     "color": "dark_gray",
     "looks_like": "motor",
-    "weight": "22700 g",
-    "volume": "6 L",
-    "price": 300000,
+    "weight": "14700 g",
+    "volume": "5 L",
+    "price": 100000,
     "price_postapoc": 4500,
     "to_hit": -5,
     "bashing": 10,
@@ -449,8 +453,8 @@
     "symbol": "E",
     "color": "dark_gray",
     "looks_like": "well_pump",
-    "weight": "27240 g",
-    "volume": "8 L",
+    "weight": "17240 g",
+    "volume": "6 L",
     "price": 280000,
     "to_hit": -5,
     "bashing": 10,