From 57cac7e1c6fe5fefb09a016ea5f2a2575db5a65a Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:45:58 +0100 Subject: [PATCH 1/8] reward is building the farm --- .../npcs/tacoma_ranch/NPC_ranch_foreman.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index 9077bc011ee7b..dd21c1972f673 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -157,6 +157,7 @@ "item": "2x4", "count": 200, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_2", "dialogue": { "describe": "We need help…", @@ -219,6 +220,7 @@ "difficulty": 5, "value": 50000, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_3", "dialogue": { "describe": "We need help…", @@ -294,6 +296,7 @@ "item": "nail", "count": 2500, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_4", "dialogue": { "describe": "We need help…", @@ -352,6 +355,7 @@ "item": "salt", "count": 3888, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_5", "dialogue": { "describe": "We need help…", @@ -419,6 +423,7 @@ "item": "fertilizer_liquid", "count": 120, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_6", "dialogue": { "describe": "We need help…", @@ -464,6 +469,7 @@ "item": "rock", "count": 75, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_7", "dialogue": { "describe": "We need help…", @@ -511,6 +517,7 @@ "item": "pipe", "count": 50, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_8", "dialogue": { "describe": "We need help…", @@ -561,6 +568,7 @@ "item": "motor", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_9", "dialogue": { "describe": "We need help…", @@ -624,6 +632,7 @@ "item": "bleach", "count": 150, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_10_1", "dialogue": { "describe": "We need help…", @@ -663,6 +672,7 @@ "item": "bandages", "count": 36, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_10", "dialogue": { "describe": "We need help…", @@ -691,6 +701,7 @@ "item": "disinfectant", "count": 60, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_11", "dialogue": { "describe": "We need help…", @@ -723,6 +734,7 @@ "item": "welder", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_12", "dialogue": { "describe": "We need help…", @@ -784,6 +796,7 @@ "item": "battery_car", "count": 12, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_13", "dialogue": { "describe": "We need help…", @@ -824,6 +837,7 @@ "item": "two_way_radio", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_14", "dialogue": { "describe": "We need help…", @@ -862,6 +876,7 @@ "item": "backpack", "count": 5, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_15", "dialogue": { "describe": "We need help…", @@ -902,6 +917,7 @@ "item": "brewing_cookbook", "count": 1, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_16", "dialogue": { "describe": "We need help…", @@ -935,6 +951,7 @@ "item": "sugar", "count": 10000, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_FOREMAN_17", "dialogue": { "describe": "We need help…", @@ -967,6 +984,7 @@ "item": "glass_sheet", "count": 30, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_NULL", "dialogue": { "describe": "We need help…", From 05474a91c51bd41d246a23eefe40962e23758850 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:48:24 +0100 Subject: [PATCH 2/8] charity for randoms --- data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json b/data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json index 0fb976a577d86..26060484487d6 100644 --- a/data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json +++ b/data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json @@ -278,6 +278,7 @@ "difficulty": 2, "value": 1000, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "item": "fire_brick", "count": 20, "dialogue": { @@ -300,6 +301,7 @@ "difficulty": 2, "value": 1000, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "dialogue": { "describe": "Ask Jenny Forcette if she can help Pablo Nunez with his mill designs.", "offer": "n/a", From 0569f8a1b9bb1cea677155d413e968816e41f9db Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:47:00 +0100 Subject: [PATCH 3/8] potential favor from the public --- data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json | 2 ++ data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json b/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json index 25949759fdde2..dcccea9eee748 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json @@ -232,6 +232,7 @@ "item": "crutches", "count": 1, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_DOCTOR_MEDICAL_GLOVES", "dialogue": { "describe": "We need help…", @@ -256,6 +257,7 @@ "item": "gloves_medical", "count": 5, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC", "dialogue": { "describe": "We need help…", diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json index 8e25b1a0456ef..7c67f087bf85d 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json @@ -119,6 +119,7 @@ "item": "aspirin", "count": 100, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_2", "dialogue": { "describe": "We need help…", @@ -161,6 +162,7 @@ "item": "hotplate", "count": 3, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_3", "dialogue": { "describe": "We need help…", @@ -200,6 +202,7 @@ "item": "vitamins", "count": 200, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_4", "dialogue": { "describe": "We need help…", @@ -243,6 +246,7 @@ "item": "char_purifier", "count": 4, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_5", "dialogue": { "describe": "We need help…", @@ -275,6 +279,7 @@ "value": 50000, "item": "chemistry_set", "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_6", "dialogue": { "describe": "We need help…", @@ -318,6 +323,7 @@ "item": "mask_filter", "count": 10, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_7", "dialogue": { "describe": "We need help…", @@ -369,6 +375,7 @@ "item": "gloves_rubber", "count": 4, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_8", "dialogue": { "describe": "We need help…", @@ -418,6 +425,7 @@ "item": "scalpel", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_9", "dialogue": { "describe": "We need help…", @@ -474,6 +482,7 @@ "value": 50000, "item": "emergency_book", "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_NURSE_11", "dialogue": { "describe": "We need help…", @@ -519,6 +528,7 @@ "item": "syringe", "count": 10, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_NULL", "dialogue": { "describe": "We need help…", From 891187bd7febe53105422be2b087d1f6a3580a84 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:48:02 +0100 Subject: [PATCH 4/8] potential favor from outside traders --- data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json index abfc69a348f12..9d2c28d73bf74 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json @@ -235,6 +235,7 @@ "item": "still", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_BARTENDER_2", "dialogue": { "describe": "We need help…", @@ -269,6 +270,7 @@ "item": "yeast", "count": 20, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_BARTENDER_3", "dialogue": { "describe": "We need help…", @@ -304,6 +306,7 @@ "item": "seed_sugar_beet", "count": 10, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_BARTENDER_4", "dialogue": { "describe": "We need help…", @@ -344,6 +347,7 @@ "item": "metal_tank", "count": 12, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_RANCH_BARTENDER_5", "dialogue": { "describe": "We need help…", @@ -378,6 +382,7 @@ "item": "55gal_drum", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, "followup": "MISSION_NULL", "dialogue": { "describe": "We need help…", From b9b3cfa6186e7e28d5921db37963330ca18c9cb7 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:09:11 +0100 Subject: [PATCH 5/8] wip jury-rigged rewards still need to figure out how to reach this point --- .../tacoma_ranch/NPC_ranch_bartender.json | 1 + .../npcs/tacoma_ranch/NPC_ranch_doctor.json | 1 + .../npcs/tacoma_ranch/NPC_ranch_foreman.json | 20 +++++++++++++++++++ .../npcs/tacoma_ranch/NPC_ranch_nurse.json | 1 + 4 files changed, 23 insertions(+) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json index 9d2c28d73bf74..00c95121c0f58 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json @@ -396,6 +396,7 @@ "failure": "It was a lost cause anyways…" }, "end": { + "effect": { "u_add_var": "mission_flag_Bartender_rewarded", "value": "no" }, "update_mapgen": { "om_terrain": "ranch_camp_51", "place_item": [ { "item": "55gal_drum", "x": 18, "y": 3, "repeat": 2, "faction": "tacoma_commune" } ], diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json b/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json index dcccea9eee748..0a060b79ec1c7 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json @@ -304,6 +304,7 @@ "end": { "update_mapgen": [ { "om_terrain": "ranch_camp_50", "set": [ { "point": "furniture", "id": "f_anesthetic", "x": 19, "y": 19 } ] } ], "effect": [ + { "u_add_var": "mission_flag_Doctor_rewarded", "value": "no" }, { "u_consume_item": "anesthetic", "count": 3000 }, { "npc_add_var": "dialogue_tacoma_ranch_provides_surgery", "value": "yes" } ] diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index dd21c1972f673..560a3de91187c 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -147,6 +147,26 @@ "dynamic_line": "we're still in early stages of getting set up, but we're not overly flush for hands, that's for sure. I don't think we'd turn many people away, of course, but besides strong hands and willing labor, we could really use someone who could cook. I can't tell you what it'd do for morale. You could try asking some of the people staying on the surface in the refugee center maybe, I don't think they were part of most of the original discussions about the ranch.", "responses": [ { "text": "I'll keep an eye out.", "topic": "TALK_RANCH_FOREMAN" } ] }, + { + "type": "talk_topic", + "id": "TALK_RANCH_FOREMAN_Bartender_done", + "dynamic_line": "Ever since you got the bartender set up, our liquor business has been running so much better! As thanks for your efforts, I wanted to reward you with a portion of recent profits.", + "speaker_effect": { "effect": [ { "u_spawn_item": "FMCNote", "count": 75 }, { "u_lose_var": "mission_flag_Bartender_rewarded" } ] }, + "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN" } ] + }, + { + "type": "talk_topic", + "id": "TALK_RANCH_FOREMAN_Doctor_done", + "dynamic_line": "I heard you helped jumpstart our local medical services. With that basic need covered, everyone has been able to focus on their work a lot more, so to thank you for your efforts, I wanted to reward you.", + "speaker_effect": { + "effect": [ + { "u_spawn_item": "FMCNote", "count": 25 }, + { "u_lose_var": "mission_flag_Doctor_rewarded" }, + { "u_lose_var": "mission_flag_Nurse_rewarded" } + ] + }, + "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN" } ] + }, { "id": "MISSION_RANCH_FOREMAN_1", "type": "mission_definition", diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json index 7c67f087bf85d..5a3431593a51b 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json @@ -542,6 +542,7 @@ "failure": "It was a lost cause anyways…" }, "end": { + "effect": { "u_add_var": "mission_flag_Nurse_rewarded", "value": "no" }, "update_mapgen": [ { "om_terrain": "ranch_camp_59", From 0a71a70dcedc7febe49e0903cf85a44a9515d785 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:57:49 +0100 Subject: [PATCH 6/8] aforementioned point reached yet to be playtested --- .../npcs/tacoma_ranch/NPC_ranch_foreman.json | 54 ++++++++++++++----- .../npcs/tacoma_ranch/NPC_ranch_nurse.json | 1 - 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index 560a3de91187c..bed66e478374a 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -15,11 +15,29 @@ "id": "TALK_RANCH_FOREMAN", "type": "talk_topic", "dynamic_line": { - "u_is_wearing": "badge_marshal", - "yes": "Can I help you, marshal?", - "no": { "u_male": true, "yes": "Morning sir, how can I help you?", "no": "Morning ma'am, how can I help you?" } + "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ], + "no": "Hello again. If you have no other business with me, I'd like to talk to you about something.", + "yes": { + "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ], + "no": "Hello again. If you have no other business with me, I'd like to talk to you about something.", + "yes": { + "u_is_wearing": "badge_marshal", + "yes": "Can I help you, marshal?", + "no": { "u_male": true, "yes": "Morning sir, how can I help you?", "no": "Morning ma'am, how can I help you?" } + } + } }, "responses": [ + { + "text": "What is it?", + "topic": "TALK_RANCH_FOREMAN_reward", + "condition": { + "or": [ + { "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ] }, + { "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ] } + ] + } + }, { "text": "The merchant at the Refugee Center sent me to get a prospectus from you.", "topic": "TALK_RANCH_FOREMAN_PROSPECTUS", @@ -147,25 +165,37 @@ "dynamic_line": "we're still in early stages of getting set up, but we're not overly flush for hands, that's for sure. I don't think we'd turn many people away, of course, but besides strong hands and willing labor, we could really use someone who could cook. I can't tell you what it'd do for morale. You could try asking some of the people staying on the surface in the refugee center maybe, I don't think they were part of most of the original discussions about the ranch.", "responses": [ { "text": "I'll keep an eye out.", "topic": "TALK_RANCH_FOREMAN" } ] }, + { + "type": "talk_topic", + "id": "TALK_RANCH_FOREMAN_reward", + "dynamic_line": "You've done a lot for the ranch, by generally helping both community with both wellness and trade. As the project lead, I want to make sure these efforts don't go unnoticed.", + "responses": [ + { + "text": "You mean setting up the doctor's office?", + "topic": "TALK_RANCH_FOREMAN_Doctor_done", + "condition": { "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ] } + }, + { + "text": "Is this about bootstrapping the trade relating to the bar?", + "topic": "TALK_RANCH_FOREMAN_Bartender_done", + "condition": { "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ] } + }, + { "text": "Understood. Back to business.", "topic": "TALK_RANCH_FOREMAN" } + ] + }, { "type": "talk_topic", "id": "TALK_RANCH_FOREMAN_Bartender_done", "dynamic_line": "Ever since you got the bartender set up, our liquor business has been running so much better! As thanks for your efforts, I wanted to reward you with a portion of recent profits.", "speaker_effect": { "effect": [ { "u_spawn_item": "FMCNote", "count": 75 }, { "u_lose_var": "mission_flag_Bartender_rewarded" } ] }, - "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN" } ] + "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN_reward" } ] }, { "type": "talk_topic", "id": "TALK_RANCH_FOREMAN_Doctor_done", "dynamic_line": "I heard you helped jumpstart our local medical services. With that basic need covered, everyone has been able to focus on their work a lot more, so to thank you for your efforts, I wanted to reward you.", - "speaker_effect": { - "effect": [ - { "u_spawn_item": "FMCNote", "count": 25 }, - { "u_lose_var": "mission_flag_Doctor_rewarded" }, - { "u_lose_var": "mission_flag_Nurse_rewarded" } - ] - }, - "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN" } ] + "speaker_effect": { "effect": [ { "u_spawn_item": "FMCNote", "count": 25 }, { "u_lose_var": "mission_flag_Doctor_rewarded" } ] }, + "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN_reward" } ] }, { "id": "MISSION_RANCH_FOREMAN_1", diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json index 5a3431593a51b..7c67f087bf85d 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json @@ -542,7 +542,6 @@ "failure": "It was a lost cause anyways…" }, "end": { - "effect": { "u_add_var": "mission_flag_Nurse_rewarded", "value": "no" }, "update_mapgen": [ { "om_terrain": "ranch_camp_59", From 004994577f5873a4b71058c649f8bf754b30fe6b Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:06:57 +0100 Subject: [PATCH 7/8] word --- data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index bed66e478374a..b4a2ab43dade8 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -168,7 +168,7 @@ { "type": "talk_topic", "id": "TALK_RANCH_FOREMAN_reward", - "dynamic_line": "You've done a lot for the ranch, by generally helping both community with both wellness and trade. As the project lead, I want to make sure these efforts don't go unnoticed.", + "dynamic_line": "You've done a lot for the ranch, by generally helping the community with both wellness and trade. As the project lead, I want to make sure these efforts don't go unnoticed.", "responses": [ { "text": "You mean setting up the doctor's office?", From 5c8405b77b53f564720bc3f1fc5ea62dad633215 Mon Sep 17 00:00:00 2001 From: Kamejeir <99511880+Kamejeir@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:59:41 +0100 Subject: [PATCH 8/8] flip --- data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index b4a2ab43dade8..88af7a49c2c01 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -16,11 +16,11 @@ "type": "talk_topic", "dynamic_line": { "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ], - "no": "Hello again. If you have no other business with me, I'd like to talk to you about something.", - "yes": { + "yes": "Hello again. If you have no other business with me, I'd like to talk to you about something.", + "no": { "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ], - "no": "Hello again. If you have no other business with me, I'd like to talk to you about something.", - "yes": { + "yes": "Hello again. If you have no other business with me, I'd like to talk to you about something.", + "no": { "u_is_wearing": "badge_marshal", "yes": "Can I help you, marshal?", "no": { "u_male": true, "yes": "Morning sir, how can I help you?", "no": "Morning ma'am, how can I help you?" }