From 8c7611c55b7c1320d8b92c6ee4861fb0acf9447c Mon Sep 17 00:00:00 2001
From: cknight828 <128895471+cknight828@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:23:17 +0900
Subject: [PATCH] Fix the Kord mission (#76626)

* Fix Cody's offering mission condition

* Make Jay receive KORD only after Cody's mission is completed

* Ensure the player gives broken kord to Jay
---
 .../npcs/isolated_road/isolated_road_cody_dialogue.json     | 6 +++++-
 .../json/npcs/isolated_road/isolated_road_jay_dialogue.json | 5 +++--
 data/json/npcs/isolated_road/isolated_road_missions.json    | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json b/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
index 5400d17ee8a90..6a57faecc2ada 100644
--- a/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
+++ b/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
@@ -292,7 +292,11 @@
     "responses": [
       { "text": "What's with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
       { "text": "Who are you?", "topic": "TALK_BLACKSMITH_ABOUT" },
-      { "text": "Are you and Jay close?", "topic": "TALK_BLACKSMITH_JAY" },
+      {
+        "text": "Are you and Jay close?",
+        "topic": "TALK_BLACKSMITH_JAY",
+        "condition": { "not": { "compare_string": [ "yes", { "u_val": "dialogue_artisans_blacksmith_accepted_quest" } ] } }
+      },
       { "text": "Alright.", "topic": "TALK_BLACKSMITH_SERVICES" }
     ]
   },
diff --git a/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json b/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json
index 5b57443703bdb..cbbd499e2a3d3 100644
--- a/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json
+++ b/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json
@@ -22,9 +22,11 @@
         "condition": {
           "and": [
             { "u_has_items": { "item": "broken_kord", "count": 1 } },
-            { "not": { "compare_string": [ "yes", { "u_val": "dialogue_artisans_gunsmith_mentioned_quest" } ] } }
+            { "not": { "compare_string": [ "yes", { "u_val": "dialogue_artisans_gunsmith_mentioned_quest" } ] } },
+            { "compare_string": [ "yes", { "u_val": "dialogue_artisans_blacksmith_completed_quest" } ] }
           ]
         },
+        "effect": { "u_sell_item": "broken_kord" },
         "topic": "TALK_GUNSMITH_KORD"
       },
       {
@@ -199,7 +201,6 @@
         "text": "I'm listening.",
         "effect": [
           { "add_mission": "MISSION_GUNSMITH_1" },
-          { "u_sell_item": "broken_kord" },
           { "u_add_var": "dialogue_artisans_gunsmith_accepted_quest", "value": "yes" }
         ],
         "topic": "TALK_GUNSMITH_Q1_DETAILS"
diff --git a/data/json/npcs/isolated_road/isolated_road_missions.json b/data/json/npcs/isolated_road/isolated_road_missions.json
index 807cc1a5f23b2..230cb1df90dc0 100644
--- a/data/json/npcs/isolated_road/isolated_road_missions.json
+++ b/data/json/npcs/isolated_road/isolated_road_missions.json
@@ -24,7 +24,8 @@
       "success": "Thanks, darlin'.  If you could show it to Jay, that would mean a lot to me.  If there's anything I could ever make for you as payment after that, just let me know.",
       "success_lie": "That's great!  Make sure to show it to Jay.",
       "failure": "Well you tried at least…"
-    }
+    },
+    "end": { "effect": { "u_add_var": "dialogue_artisans_blacksmith_completed_quest", "value": "yes" } }
   },
   {
     "id": "MISSION_GUNSMITH_1",