Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Vitamin C Supplements #77363

Merged
merged 7 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 16 additions & 0 deletions data/json/items/comestibles/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions data/json/npcs/NC_DOCTOR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
Loading