From 2276b29ce9dfc2c7e1a2c104fb9e37b4ef3d077e Mon Sep 17 00:00:00 2001
From: TheMurderUnicorn <TMUmain@consultant.com>
Date: Sat, 26 Oct 2024 19:58:53 -0400
Subject: [PATCH] Add Vitamin C Supplements (#77363)

* Add VitC Supplement

* Create Drug Spawn Groups

* Add VitC to softdrugs itemgroup

* Full vitC bottle Added to Doctor shopkeep

* Add VitC to vitamin_shop itemgroup

* Add VitC to SUS bathroom vitamins

* I really fucked up that last copy paste, fixed?
---
 .../itemgroups/Drugs_Tobacco_Alcohol/drugs.json  | 16 ++++++++++++++++
 .../Locations_MapExtras/mall_item_groups.json    |  1 +
 data/json/itemgroups/SUS/domestic.json           |  1 +
 data/json/items/comestibles/med.json             | 16 ++++++++++++++++
 data/json/npcs/NC_DOCTOR.json                    |  1 +
 5 files changed, 35 insertions(+)

diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
index 97303f06d63dd..265e46cae5571 100644
--- a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
+++ b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
@@ -336,6 +336,7 @@
       { "prob": 75, "group": "vitamins_bottle_plastic_pill_supplement_1_20" },
       { "item": "gummy_vitamins", "prob": 25, "count": [ 1, 10 ] },
       { "prob": 75, "group": "calcium_tablet_bottle_plastic_pill_supplement_1_20" },
+      { "prob": 40, "group": "vitc_tablet_bottle_plastic_pill_supplement_1_20" },
       { "prob": 85, "group": "bottle_otc_painkiller_1_20" },
       { "prob": 25, "group": "caffeine_bottle_plastic_pill_supplement_1_10" },
       { "prob": 15, "group": "pills_sleep_bottle_plastic_pill_prescription_1_10" },
@@ -601,6 +602,21 @@
     "container-item": "bottle_plastic_pill_supplement",
     "entries": [ { "item": "calcium_tablet", "container-item": "null", "count": 20 } ]
   },
+  {
+    "type": "item_group",
+    "id": "vitc_tablet_bottle_plastic_pill_supplement_1_20",
+    "subtype": "collection",
+    "//": "This group was not created automatically but may still contain errors.",
+    "container-item": "bottle_plastic_pill_supplement",
+    "entries": [ { "item": "vitc_tablet", "count": [ 1, 20 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "vitc_tablet_bottle_full",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_supplement",
+    "entries": [ { "item": "vitc_tablet", "count": 20 } ]
+  },
   {
     "type": "item_group",
     "id": "caffeine_bottle_plastic_pill_supplement_1_10",
diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
index ebfdf87966647..8bedc96f23009 100644
--- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
+++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -55,6 +55,7 @@
       { "group": "full_ifak", "prob": 15 },
       { "group": "vitamins_bottle_plastic_pill_supplement_20", "prob": 75 },
       { "group": "calcium_tablet_bottle_full", "prob": 75 },
+      { "group": "vitc_tablet_bottle_full", "prob": 75 },
       { "group": "aspirin_bottle_full", "prob": 45 },
       { "group": "ibuprofen_bottle_full", "prob": 45 },
       { "group": "naproxen_bottle_full", "prob": 45 },
diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
index b78a5aaef55c7..8379ea470eaaf 100644
--- a/data/json/itemgroups/SUS/domestic.json
+++ b/data/json/itemgroups/SUS/domestic.json
@@ -903,6 +903,7 @@
             "container-item": "null",
             "entry-wrapper": "bottle_plastic_small"
           },
+          { "item": "vitc_tablet", "prob": 7, "count": [ 1, 30 ], "entry-wrapper": "bottle_plastic_small" },
           {
             "item": "calcium_tablet",
             "prob": 10,
diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
index 25bccd24b3d5d..d49bada87e622 100644
--- a/data/json/items/comestibles/med.json
+++ b/data/json/items/comestibles/med.json
@@ -1855,6 +1855,22 @@
     "use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "calcium", 23 ] ] },
     "vitamins": [ [ "meat_allergen", 1 ] ]
   },
+  {
+    "id": "vitc_tablet",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str": "vitamin C supplement" },
+    "description": "A small white tablet promising more vitamin C than a human can conceivably absorb.",
+    "material": [ "drug_filler" ],
+    "weight": "1 g",
+    "volume": "5 ml",
+    "price": "7 cent",
+    "price_postapoc": "15 cent",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE", "EDIBLE_FROZEN" ],
+    "symbol": "!",
+    "color": "magenta",
+    "use_action": { "type": "consume_drug", "activation_message": "You take the %s.", "vitamins": [ [ "vitC", 556 ] ] }
+  },
   {
     "id": "gummy_vitamins",
     "copy-from": "vitamins",
diff --git a/data/json/npcs/NC_DOCTOR.json b/data/json/npcs/NC_DOCTOR.json
index ee10e2e266678..2b3019bb3aaed 100644
--- a/data/json/npcs/NC_DOCTOR.json
+++ b/data/json/npcs/NC_DOCTOR.json
@@ -90,6 +90,7 @@
       { "group": "box_of_contact_lens_any", "prob": 10 },
       { "prob": 75, "group": "vitamins_bottle_plastic_pill_supplement_20" },
       { "prob": 75, "group": "calcium_tablet_bottle_plastic_pill_supplement_20" },
+      { "prob": 75, "group": "vitc_tablet_bottle_full" },
       { "prob": 85, "group": "bottle_otc_painkiller_20" },
       { "prob": 25, "group": "caffeine_bottle_plastic_pill_supplement_10" },
       { "prob": 15, "group": "pills_sleep_bottle_plastic_pill_prescription_10" },