Merge pull request #57387 from haveric/tacoma-doctor

Tacoma - Doctor improvements
CleverRaven · May 6, 2022 · 5363e66 · 5363e66
2 parents c532a5c + 6e73f97
commit 5363e66
Show file tree

Hide file tree

Showing 24 changed files with 834 additions and 11 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -215,7 +215,8 @@
       { "item": "chem_hydrogen_peroxide", "prob": 5, "charges-min": 1 },
       [ "strong_antibiotic", 1 ],
       [ "antibiotics", 5 ],
-      [ "weak_antibiotic", 15 ]
+      [ "weak_antibiotic", 15 ],
+      [ "crutches", 5 ]
     ]
   },
   {
@@ -263,7 +264,8 @@
       [ "survnote", 1 ],
       [ "badge_doctor", 1 ],
       [ "tourist_table", 1 ],
-      [ "thermos", 10 ]
+      [ "thermos", 10 ],
+      [ "crutches", 5 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -843,7 +843,8 @@
       { "group": "suits_mens", "prob": 10 },
       { "group": "bags_unisex", "prob": 20 },
       { "group": "hats_unisex", "prob": 20 },
-      { "group": "scarfs_unisex", "prob": 30 }
+      { "group": "scarfs_unisex", "prob": 30 },
+      { "item": "crutches", "prob": 1 }
     ]
   },
   {
@@ -870,7 +871,8 @@
       { "group": "suits_womens", "prob": 50 },
       { "group": "bags_unisex", "prob": 20 },
       { "group": "hats_unisex", "prob": 20 },
-      { "group": "scarfs_unisex", "prob": 20 }
+      { "group": "scarfs_unisex", "prob": 20 },
+      { "item": "crutches", "prob": 1 }
     ]
   },
   {

diff --git a/data/json/mapgen/looted_buildings.json b/data/json/mapgen/looted_buildings.json
@@ -3,7 +3,7 @@
     "type": "mapgen",
     "method": "json",
     "//": "Pseudo terrain used for Tacoma companion raids",
-    "om_terrain": [ "looted_house", "looted_house_roof", "looted_house_basement" ],
+    "om_terrain": [ "looted_house", "looted_house_roof", "looted_house_basement", "looted_hospital", "looted_hospital_roof" ],
     "object": { "fill_ter": "t_floor" }
   }
 ]
diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_barber.json b/data/json/npcs/tacoma_ranch/NPC_ranch_barber.json
@@ -15,6 +15,19 @@
     "type": "talk_topic",
     "dynamic_line": "Can I interest you in a trim?  It'll cost you 6 merch for a haircut or 3 for a beard trim.  I can do color and styling too.",
     "responses": [
+      {
+        "text": "The doctor needs some help building an anesthetic machine.  Do you have anything that could help?",
+        "topic": "TALK_RANCH_GENERIC_ANESTHETIC_FOR_DOCTOR",
+        "condition": {
+          "and": [
+            { "u_has_mission": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC" },
+            {
+              "not": { "npc_has_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" }
+            }
+          ]
+        },
+        "effect": [ { "npc_add_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" } ]
+      },
       { "text": "What is your job here?", "topic": "TALK_RANCH_BARBER_JOB" },
       { "text": "Do you need any help?", "topic": "TALK_RANCH_BARBER_HIRE" },
       {

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json
@@ -16,6 +16,19 @@
     "type": "talk_topic",
     "dynamic_line": "Want a drink?",
     "responses": [
+      {
+        "text": "The doctor needs some help building an anesthetic machine.  Do you have anything that could help?",
+        "topic": "TALK_RANCH_GENERIC_ANESTHETIC_FOR_DOCTOR",
+        "condition": {
+          "and": [
+            { "u_has_mission": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC" },
+            {
+              "not": { "npc_has_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" }
+            }
+          ]
+        },
+        "effect": [ { "npc_add_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" } ]
+      },
       { "text": "What is your job here?", "topic": "TALK_RANCH_BARKEEP_JOB" },
       { "text": "I'm looking for information.", "topic": "TALK_RANCH_BARKEEP_INFORMATION" },
       { "text": "Do you need any help?", "topic": "TALK_MISSION_LIST" },

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json b/data/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json
@@ -14,6 +14,21 @@
     "type": "talk_topic",
     "id": "TALK_RANCH_CONSTRUCTION_1",
     "dynamic_line": "My partner is in charge of fortifying this place, you should ask him about what needs to be done.",
-    "responses": [ { "text": "I'll talk to him then…", "topic": "TALK_DONE" } ]
+    "responses": [
+      {
+        "text": "The doctor needs some help building an anesthetic machine.  Do you have anything that could help?",
+        "topic": "TALK_RANCH_GENERIC_ANESTHETIC_FOR_DOCTOR",
+        "condition": {
+          "and": [
+            { "u_has_mission": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC" },
+            {
+              "not": { "npc_has_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" }
+            }
+          ]
+        },
+        "effect": [ { "npc_add_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" } ]
+      },
+      { "text": "I'll talk to him then…", "topic": "TALK_DONE" }
+    ]
   }
 ]
diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json b/data/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json
@@ -15,6 +15,19 @@
     "id": "TALK_RANCH_CONSTRUCTION_2",
     "dynamic_line": "Howdy.",
     "responses": [
+      {
+        "text": "The doctor needs some help building an anesthetic machine.  Do you have anything that could help?",
+        "topic": "TALK_RANCH_GENERIC_ANESTHETIC_FOR_DOCTOR",
+        "condition": {
+          "and": [
+            { "u_has_mission": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC" },
+            {
+              "not": { "npc_has_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" }
+            }
+          ]
+        },
+        "effect": [ { "npc_add_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" } ]
+      },
       { "text": "What are you doing here?", "topic": "TALK_RANCH_CONSTRUCTION_2_JOB" },
       { "text": "I've got to go…", "topic": "TALK_DONE" }
     ]

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json b/data/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json
@@ -15,6 +15,19 @@
     "type": "talk_topic",
     "dynamic_line": "I hope you are here to do business.",
     "responses": [
+      {
+        "text": "The doctor needs some help building an anesthetic machine.  Do you have anything that could help?",
+        "topic": "TALK_RANCH_GENERIC_ANESTHETIC_FOR_DOCTOR",
+        "condition": {
+          "and": [
+            { "u_has_mission": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC" },
+            {
+              "not": { "npc_has_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" }
+            }
+          ]
+        },
+        "effect": [ { "npc_add_var": "doctor_anesthetic_asked", "type": "mission", "context": "tacoma_ranch", "value": "yes" } ]
+      },
       { "text": "What are you doing here?", "topic": "TALK_RANCH_CROP_OVERSEER_JOB" },
       {
         "text": "I figured you might be looking for some help…",