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.

Sign up for GitHub

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

Tacoma - Doctor improvements #57387

Merged
merged 9 commits into from
May 6, 2022
Merged

Tacoma - Doctor improvements #57387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e1daf01
Port Tacoma doctor updates
haveric May 2, 2022
774dfad
Add spawns for crutches
haveric May 3, 2022
e7cbd62
Add crutches quest and cleanup quests/dialog
haveric May 3, 2022
580c360
Fix sickly laborer anesthetic vars
haveric May 3, 2022
2655ac9
Move some vars to npc
haveric May 3, 2022
c025f08
json style + consume anesthetic directly
haveric May 3, 2022
3c1bb01
Merge branch 'master' into tacoma-doctor
haveric May 4, 2022
9bd5692
Make scrapper subquest an actual mission
haveric May 5, 2022
6e73f97
Cleanup doctor quests
haveric May 5, 2022
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
6 changes: 4 additions & 2 deletions data/json/itemgroups/Locations_MapExtras/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
]
},
{
Expand Down Expand Up @@ -263,7 +264,8 @@
[ "survnote", 1 ],
[ "badge_doctor", 1 ],
[ "tourist_table", 1 ],
[ "thermos", 10 ]
[ "thermos", 10 ],
[ "crutches", 5 ]
]
},
{
Expand Down
6 changes: 4 additions & 2 deletions data/json/itemgroups/SUS/domestic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
{
Expand All @@ -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 }
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/looted_buildings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
}
]
13 changes: 13 additions & 0 deletions data/json/npcs/tacoma_ranch/NPC_ranch_barber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
{
Expand Down
13 changes: 13 additions & 0 deletions data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
17 changes: 16 additions & 1 deletion data/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
]
}
]
13 changes: 13 additions & 0 deletions data/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
]
Expand Down
13 changes: 13 additions & 0 deletions data/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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…",
Expand Down
Loading