From d3f25833b03f9c98e293c59139a55b2ebadbc476 Mon Sep 17 00:00:00 2001 From: theyareclose <50838271+theyareclose@users.noreply.github.com> Date: Tue, 25 Jun 2024 19:53:43 -0600 Subject: [PATCH] Adding Doctor and Pharmacist Professions (#74643) * Adding Doctor and Pharmacist Professions This adds a Doctor and Pharmacist profession. It also generalizes the "MD" trait to include more medical professionals. * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update professions.json Incorporating feedback on pharmacist and morphine, fixing item amounts to spawn correctly, and adding more pharmaceuticals to the pharmacist. * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update professions.json Resolving conflict with aspirin in medical resident. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/mutations/mutations.json | 2 +- data/json/professions.json | 118 +++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 2d0fca3265b14..89faf221b8184 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -9085,7 +9085,7 @@ "name": { "str": "MD" }, "points": 0, "//": "In the US, a medical 'residency' is essentially an extended post-graduate, on-the-job medical training. The idea here is that hospital computer systems would recognize the PC as a valid user and grant access.", - "description": "You were just through with the administrative formalities for your residency when the Cataclysm struck. \"Your\" hospital was overrun and evacuated, but there's always work for a good doctor.", + "description": "You trained as a medical professional in a clinic or hospital. You can put \"Dr.\" in front of your name and everything.", "valid": false, "purifiable": false, "profession": true diff --git a/data/json/professions.json b/data/json/professions.json index 32344d742541c..8daee39b3b366 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -2003,6 +2003,7 @@ "prof_wound_care", "prof_wound_care_expert", "prof_intro_biology", + "prof_intro_chemistry", "prof_physiology", "prof_burn_care", "prof_dissect_humans" @@ -2033,6 +2034,123 @@ "female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] } } }, + { + "type": "profession", + "id": "doctor", + "name": "Doctor", + "requirement": "achievement_reach_hospital", + "description": "You were a patient-facing doctor practicing general or specialized medicine. While your bedside manner might not get you far in this new world, your medical skills will certainly help.", + "points": 5, + "skills": [ { "level": 7, "name": "firstaid" }, { "level": 3, "name": "speech" } ], + "proficiencies": [ + "prof_wound_care", + "prof_wound_care_expert", + "prof_intro_biology", + "prof_intro_chemistry", + "prof_physiology", + "prof_burn_care", + "prof_dissect_humans" + ], + "traits": [ "PROF_MED" ], + "items": { + "both": { + "items": [ + "dress_shirt", + "gloves_medical", + "socks", + "dress_shoes", + "coat_lab", + "badge_doctor", + "glasses_safety", + "wristwatch", + "water_clean", + { "item": "bandages", "count": 5 }, + { "item": "adhesive_bandages", "count": 10 }, + "disinfectant", + "thermometer", + "pepto", + "stethoscope", + "scalpel" + ], + "entries": [ { "item": "pants", "variant": "pants_blue" }, { "group": "charged_smart_phone" }, { "group": "full_1st_aid" } ] + }, + "male": [ "boxer_shorts" ], + "female": [ "bra", "panties" ] + }, + "age_lower": 25 + }, + { + "type": "profession", + "id": "pharmacist", + "name": "Pharmacist", + "requirement": "achievement_reach_hospital", + "description": "You were a pharmacist working in a community pharmacy. No simple pill-pusher, you have a plethora of knowledge of drug preparation, biochemistry, and biology. With your trusty mortar and pestle, you hope to grind the undead to a pulp.", + "points": 5, + "skills": [ { "level": 6, "name": "firstaid" }, { "level": 1, "name": "speech" } ], + "proficiencies": [ "prof_intro_biology", "prof_intro_chemistry", "prof_organic_chemistry", "prof_biochemistry", "prof_physiology" ], + "traits": [ "PROF_MED" ], + "items": { + "both": { + "items": [ + "dress_shirt", + "gloves_medical", + "socks", + "dress_shoes", + "coat_lab", + "badge_doctor", + "glasses_safety", + "wristwatch", + "mortar_pestle", + "water_clean", + { "item": "bandages", "count": 5 }, + { "item": "adhesive_bandages", "count": 10 }, + "disinfectant", + "pepto", + "flu_shot", + { + "item": "tramadol", + "count": 30, + "container-item": "null", + "entry-wrapper": "bottle_plastic_pill_prescription" + }, + { + "item": "ibuprofen", + "count": 30, + "container-item": "null", + "entry-wrapper": "bottle_plastic_pill_prescription" + }, + { + "item": "aspirin", + "count": 30, + "container-item": "null", + "entry-wrapper": "bottle_plastic_pill_prescription" + }, + { + "item": "antibiotics", + "count": 10, + "container-item": "null", + "entry-wrapper": "bottle_plastic_pill_prescription" + }, + { + "item": "antifungal", + "count": 10, + "container-item": "null", + "entry-wrapper": "bottle_plastic_pill_prescription" + }, + { + "item": "antiparasitic", + "count": 10, + "container-item": "null", + "entry-wrapper": "bottle_plastic_pill_prescription" + } + ], + "entries": [ { "item": "pants", "variant": "pants_blue" }, { "group": "charged_smart_phone" }, { "group": "full_1st_aid" } ] + }, + "male": [ "boxer_shorts" ], + "female": [ "bra", "panties" ] + }, + "age_lower": 25 + }, { "type": "profession", "id": "gangster",