More pharmacological expansion infrastructure work + a few new drugs

data/json/effects.json

@@ -2035,12 +2035,43 @@
   },
   {
     "type": "effect_type",
-    "id": "pkill1",
+    "id": "bleedrate_up",
+    "max_intensity": 3,
+    "rating": "bad",
+    "blood_analysis_description": "Blood Thinner",
+    "effect_dur_scaling": [ { "effect_id": "bleed", "modifier": 1.05, "same_bp": false } ]
+  },
+  {
+    "type": "effect_type",
+    "id": "ibuprofen_eff",
+    "//": "Blood pressure up.  Remember that this is divided by 10000, so maximum 5% increase.",
+    "rating": "bad",
+    "base_mods": { "blood_pressure_tick": [ 100 ], "blood_pressure_min": [ 2 ], "blood_pressure_max_val": [ 500 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "pkill1_generic",
     "max_duration": "4 m",
     "base_mods": { "pkill_tick": [ 42 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] },
     "rating": "good",
     "blood_analysis_description": "Minor Painkiller"
   },
+  {
+    "type": "effect_type",
+    "id": "pkill1_nsaid",
+    "max_duration": "4 m",
+    "base_mods": { "pkill_tick": [ 42 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] },
+    "rating": "good",
+    "blood_analysis_description": "Minor Painkiller (NSAID-based)"
+  },
+  {
+    "type": "effect_type",
+    "id": "pkill1_acetaminophen",
+    "max_duration": "4 m",
+    "base_mods": { "pkill_tick": [ 42 ], "pkill_min": [ 1 ], "pkill_max_val": [ 15 ] },
+    "rating": "good",
+    "blood_analysis_description": "Minor Painkiller (Acetaminophen)"
+  },
   {
     "type": "effect_type",
     "id": "pkill2",
@@ -3621,6 +3652,26 @@
     "rating": "bad",
     "blood_analysis_description": "Scurvy"
   },
+  {
+    "type": "effect_type",
+    "id": "betablock",
+    "name": [ "Beta blocker" ],
+    "desc": [
+      "You are under the influence of a beta blocker.  This controls your heart rate, decreasing the influence of stressful events such as pain on it.  However, it also lowers blood pressure and induces fatigue."
+    ],
+    "max_intensity": 3,
+    "base_mods": {
+      "blood_pressure_tick": [ 250 ],
+      "blood_pressure_min": [ -2 ],
+      "blood_pressure_min_val": [ -200 ],
+      "fatigue_min": [ 4 ],
+      "fatigue_chance": [ 500 ],
+      "fatigue_max_val": [ 200 ]
+    },
+    "scaling_mods": { "blood_pressure_min": [ -1 ], "blood_pressure_min_val": [ -100 ], "fatigue_max_val": [ 50 ], "fatigue_min": [ 2 ] },
+    "rating": "neutral",
+    "blood_analysis_description": "Beta Blocker"
+  },
   {
     "type": "effect_type",
     "id": "hypervitaminosis",

data/json/effects_on_condition/npc_eocs/hallucination_eocs.json

@@ -168,7 +168,7 @@
     "id": "numbness",
     "effect": [
       { "u_message": "You suddenly feel so numb…", "type": "mixed" },
-      { "u_add_effect": "pkill1", "duration": "15 minutes" }
+      { "u_add_effect": "pkill1_generic", "duration": "15 minutes" }
     ]
   },
   {

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -4517,10 +4517,14 @@
   {
     "type": "item_group",
     "id": "aspirin_bottle_plastic_pill_painkiller_20",
-    "subtype": "collection",
+    "subtype": "distribution",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bottle_plastic_pill_painkiller",
-    "entries": [ { "item": "aspirin", "container-item": "null", "count": 20 } ]
+    "entries": [
+      { "item": "aspirin", "container-item": "null", "count": 20 },
+      { "item": "ibuprofen", "container-item": "null", "count": 20 },
+      { "item": "acetaminophen", "container-item": "null", "count": 20 }
+    ]
   },
   {
     "type": "item_group",

data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json

@@ -75,11 +75,14 @@
     "//": "Painkillers balanced according to rarity excluding illicit drugs",
     "subtype": "distribution",
     "entries": [
-      { "group": "aspirin_ad_group", "prob": 150 },
-      { "group": "codeine_ad_group", "prob": 30 },
-      { "group": "tramadol_ad_group", "prob": 30 },
-      { "item": "morphine", "count-min": 1, "count-max": 12, "container-item": "null", "prob": 5 },
-      { "group": "oxycodone_ad_group", "prob": 100 }
+      { "group": "aspirin_ad_group", "prob": 50 },
+      { "group": "ibuprofen_ad_group", "prob": 100 },
+      { "group": "acetaminophen_ad_group", "prob": 100 },
+      { "group": "naproxen_ad_group", "prob": 50 },
+      { "group": "codeine_ad_group", "prob": 60 },
+      { "group": "tramadol_ad_group", "prob": 60 },
+      { "item": "morphine", "count-min": 1, "count-max": 12, "container-item": "null", "prob": 10 },
+      { "group": "oxycodone_ad_group", "prob": 200 }
     ]
   },
   {
@@ -88,7 +91,10 @@
     "//": "Common healing items found almost everywhere",
     "items": [
       { "group": "used_1st_aid", "prob": 5 },
-      [ "aspirin", 50 ],
+      [ "aspirin", 10 ],
+      [ "ibuprofen", 17 ],
+      [ "acetaminophen", 13 ],
+      [ "naproxen", 10 ],
       { "group": "alcohol_wipes_box_used", "prob": 40 },
       { "group": "alcohol_wipes_box_full", "prob": 5 },
       { "item": "bandages", "prob": 30, "count": [ 1, 3 ] },
@@ -323,6 +329,27 @@
     "container-item": "bottle_plastic_pill_prescription",
     "entries": [ { "item": "aspirin", "container-item": "null", "count": [ 5, 60 ] } ]
   },
+  {
+    "type": "item_group",
+    "id": "acetaminophen_ad_group",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "acetaminophen", "container-item": "null", "count": [ 5, 60 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "ibuprofen_ad_group",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "ibuprofen", "container-item": "null", "count": [ 5, 60 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "naproxen_ad_group",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "naproxen", "container-item": "null", "count": [ 5, 60 ] } ]
+  },
   {
     "type": "item_group",
     "id": "codeine_ad_group",
@@ -579,6 +606,27 @@
     "container-item": "bottle_plastic_pill_prescription",
     "entries": [ { "item": "aspirin", "container-item": "null", "count": 20 } ]
   },
+  {
+    "type": "item_group",
+    "id": "ibuprofen_bottle_full",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "ibuprofen", "container-item": "null", "count": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "acetaminophen_bottle_full",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "acetaminophen", "container-item": "null", "count": 20 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "naproxen_bottle_full",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "naproxen", "container-item": "null", "count": 20 } ]
+  },
   {
     "type": "item_group",
     "id": "melatonin_bottle_full",

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -2342,6 +2342,9 @@
       [ "cookies", 60 ],
       [ "brownie", 60 ],
       [ "aspirin", 40 ],
+      [ "ibuprofen", 40 ],
+      [ "acetaminophen", 40 ],
+      [ "naproxen", 40 ],
       { "group": "tobacco_products", "prob": 150 },
       { "group": "cigar_box_opened", "prob": 20 },
       { "group": "cigar_box_unopened", "prob": 5 },

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -6,7 +6,7 @@
     "magazine": 100,
     "subtype": "distribution",
     "entries": [
-      { "prob": 85, "group": "aspirin_bottle_plastic_pill_painkiller_1_10" },
+      { "prob": 85, "group": "aspirin_bottle_plastic_pill_painkiller_1_20" },
       { "prob": 25, "group": "caffeine_bottle_plastic_pill_supplement_1_10" },
       { "prob": 5, "group": "melatonin_tablet_bottle_plastic_pill_supplement_1_30" },
       { "group": "tobacco_products", "prob": 161 },
@@ -2165,14 +2165,6 @@
       { "item": "touristmap", "prob": 1 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "aspirin_bottle_plastic_pill_painkiller_1_10",
-    "subtype": "collection",
-    "//": "This group was created automatically and may contain errors.",
-    "container-item": "bottle_plastic_pill_painkiller",
-    "entries": [ { "item": "aspirin", "container-item": "null", "count": [ 1, 10 ] } ]
-  },
   {
     "type": "item_group",
     "id": "egg_bird_unfert_carton_egg_10",

data/json/itemgroups/Locations_MapExtras/mall_item_groups.json

@@ -56,6 +56,9 @@
       { "group": "vitamins_bottle_plastic_pill_supplement_20", "prob": 75 },
       { "group": "calcium_tablet_bottle_full", "prob": 75 },
       { "group": "aspirin_bottle_full", "prob": 45 },
+      { "group": "ibuprofen_bottle_full", "prob": 45 },
+      { "group": "naproxen_bottle_full", "prob": 45 },
+      { "group": "acetaminophen_bottle_full", "prob": 45 },
       { "group": "caffeine_bottle_full", "prob": 50 },
       { "group": "pills_sleep_bottle_full", "prob": 45 },
       { "group": "melatonin_bottle_full", "prob": 30 },

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -1127,7 +1127,7 @@
       [ "bikini_bottom", 10 ],
       [ "bikini_bottom_short", 5 ],
       { "prob": 10, "group": "vitamins_bottle_plastic_pill_supplement_1_10" },
-      { "prob": 10, "group": "aspirin_bottle_plastic_pill_painkiller_1_10" },
+      { "prob": 10, "group": "aspirin_bottle_plastic_pill_painkiller_1_20" },
       [ "karate_gi", 10 ],
       [ "judo_gi", 5 ],
       [ "fitness_band", 5 ],

data/json/itemgroups/SUS/domestic.json

@@ -779,7 +779,28 @@
         "distribution": [
           {
             "item": "aspirin",
-            "prob": 160,
+            "prob": 50,
+            "count": [ 1, 30 ],
+            "container-item": "null",
+            "entry-wrapper": "bottle_plastic_pill_painkiller"
+          },
+          {
+            "item": "acetaminophen",
+            "prob": 70,
+            "count": [ 1, 30 ],
+            "container-item": "null",
+            "entry-wrapper": "bottle_plastic_pill_painkiller"
+          },
+          {
+            "item": "ibuprofen",
+            "prob": 80,
+            "count": [ 1, 30 ],
+            "container-item": "null",
+            "entry-wrapper": "bottle_plastic_pill_painkiller"
+          },
+          {
+            "item": "naproxen",
+            "prob": 20,
             "count": [ 1, 30 ],
             "container-item": "null",
             "entry-wrapper": "bottle_plastic_pill_painkiller"

data/json/itemgroups/activities_hobbies.json

@@ -741,10 +741,14 @@
   {
     "type": "item_group",
     "id": "aspirin_bottle_plastic_pill_painkiller_1_20",
-    "subtype": "collection",
+    "subtype": "distribution",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bottle_plastic_pill_painkiller",
-    "entries": [ { "item": "aspirin", "container-item": "null", "count": [ 1, 20 ] } ]
+    "entries": [
+      { "item": "aspirin", "container-item": "null", "count": [ 1, 20 ] },
+      { "item": "ibuprofen", "container-item": "null", "count": [ 1, 20 ] },
+      { "item": "acetaminophen", "container-item": "null", "count": [ 1, 20 ] }
+    ]
   },
   {
     "type": "item_group",

data/json/itemgroups/tools.json

@@ -978,18 +978,26 @@
   {
     "type": "item_group",
     "id": "aspirin_bottle_plastic_pill_painkiller_10",
-    "subtype": "collection",
+    "subtype": "distribution",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bottle_plastic_pill_painkiller",
-    "entries": [ { "item": "aspirin", "container-item": "null", "count": 10 } ]
+    "entries": [
+      { "item": "aspirin", "container-item": "null", "count": 10 },
+      { "item": "acetaminophen", "container-item": "null", "count": 10 },
+      { "item": "ibuprofen", "container-item": "null", "count": 10 }
+    ]
   },
   {
     "type": "item_group",
     "id": "aspirin_bottle_plastic_pill_painkiller_0_10",
-    "subtype": "collection",
+    "subtype": "distribution",
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bottle_plastic_pill_painkiller",
-    "entries": [ { "item": "aspirin", "container-item": "null", "count": [ 0, 10 ] } ]
+    "entries": [
+      { "item": "aspirin", "container-item": "null", "count": [ 0, 10 ] },
+      { "item": "acetaminophen", "container-item": "null", "count": [ 0, 10 ] },
+      { "item": "ibuprofen", "container-item": "null", "count": [ 0, 10 ] }
+    ]
   },
   {
     "type": "item_group",

data/json/items/comestibles/drink.json

@@ -1416,7 +1416,10 @@
     "description": "A bitter tea made by boiling willow bark in water, used since ancient times as a mild painkiller.",
     "fun": -2,
     "flags": [ "NO_AUTO_CONSUME" ],
-    "use_action": { "type": "consume_drug", "effects": [ { "id": "pkill1", "duration": 90 }, { "id": "nausea", "duration": "5 m" } ] }
+    "use_action": {
+      "type": "consume_drug",
+      "effects": [ { "id": "pkill1_nsaid", "duration": 90 }, { "id": "nausea", "duration": "5 m" } ]
+    }
   },
   {
     "type": "COMESTIBLE",