From 728b1c7fed2c3a3a6c794ce33ebc51645a672b63 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:02:53 -0400 Subject: [PATCH 1/7] Add VitC Supplement --- data/json/items/comestibles/med.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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", From 9cb7b7c851bc6f699d3ed306d457bbb2021b6b52 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:38:11 -0400 Subject: [PATCH 2/7] Create Drug Spawn Groups --- .../itemgroups/Drugs_Tobacco_Alcohol/drugs.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json index 97303f06d63dd..6eafaac620777 100644 --- a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json +++ b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json @@ -601,6 +601,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", From 988fd71ff765ba796dc32cba53d6e066b10dbd3a Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:40:25 -0400 Subject: [PATCH 3/7] Add VitC to softdrugs itemgroup --- data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json index 6eafaac620777..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" }, From 1b0f6e4f0a905bd64585615d9bc43f0dce2c3d01 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:42:20 -0400 Subject: [PATCH 4/7] Full vitC bottle Added to Doctor shopkeep --- data/json/npcs/NC_DOCTOR.json | 1 + 1 file changed, 1 insertion(+) 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" }, From 7cff86d819f89fb257c4819ded87fbb918f2e154 Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:43:44 -0400 Subject: [PATCH 5/7] Add VitC to vitamin_shop itemgroup --- data/json/itemgroups/Locations_MapExtras/mall_item_groups.json | 1 + 1 file changed, 1 insertion(+) 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 }, From 1b300fc3aa64ddd2e51d70ce3c419b692485500b Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:45:09 -0400 Subject: [PATCH 6/7] Add VitC to SUS bathroom vitamins --- data/json/itemgroups/SUS/domestic.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index b78a5aaef55c7..9f3b1f57bb7d8 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -1,3 +1,8 @@ +Cataclysm: Dark Days Ahead JSON Web Linting Tool +This is a tool to help modders and editors of the open source game Cataclysm: Dark Days Ahead write JSON in the game's expected format. + +Paste some JSON into the field below and click "Lint" to run an autoformatter against it. + [ { "id": "SUS_silverware", @@ -903,6 +908,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, @@ -1215,3 +1221,4 @@ "entries": [ { "item": "tums", "container-item": "null", "count": [ 1, 20 ] } ] } ] + From 42416ad4441688d53f195c93afa290ddbe40ac9b Mon Sep 17 00:00:00 2001 From: TheMurderUnicorn Date: Sat, 26 Oct 2024 16:50:31 -0400 Subject: [PATCH 7/7] I really fucked up that last copy paste, fixed? --- data/json/itemgroups/SUS/domestic.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index 9f3b1f57bb7d8..8379ea470eaaf 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -1,8 +1,3 @@ -Cataclysm: Dark Days Ahead JSON Web Linting Tool -This is a tool to help modders and editors of the open source game Cataclysm: Dark Days Ahead write JSON in the game's expected format. - -Paste some JSON into the field below and click "Lint" to run an autoformatter against it. - [ { "id": "SUS_silverware", @@ -1221,4 +1216,3 @@ Paste some JSON into the field below and click "Lint" to run an autoformatter ag "entries": [ { "item": "tums", "container-item": "null", "count": [ 1, 20 ] } ] } ] -