From ecb7fdef1f9788d7e8f04dde111dc94c9575abaf Mon Sep 17 00:00:00 2001
From: Xaver-DaRed <xaver.entropia@gmail.com>
Date: Fri, 6 Jun 2025 02:11:01 +0200
Subject: [PATCH] Fix "Mighty Fist" interaction

---
 scripts/quests/bastok/The_Darksmith.lua       | 12 ++++++++++++
 scripts/zones/Metalworks/npcs/Mighty_Fist.lua | 19 -------------------
 2 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 scripts/zones/Metalworks/npcs/Mighty_Fist.lua

diff --git a/scripts/quests/bastok/The_Darksmith.lua b/scripts/quests/bastok/The_Darksmith.lua
index f5750a07374..7ce1f49d8eb 100644
--- a/scripts/quests/bastok/The_Darksmith.lua
+++ b/scripts/quests/bastok/The_Darksmith.lua
@@ -49,10 +49,22 @@ quest.sections =
                         return quest:progressEvent(566)
                     end
                 end,
+
+                onTrigger = function(player, npc)
+                    if not quest:getMustZone(player) then
+                        return quest:event(561) -- First trigger only. Reset on zone.
+                    else
+                        return quest:event(560) -- Subsequent triggers.
+                    end
+                end,
             },
 
             onEventFinish =
             {
+                [561] = function(player, csid, option, npc)
+                    quest:setMustZone(player)
+                end,
+
                 [566] = function(player, csid, option, npc)
                     player:confirmTrade()
 
diff --git a/scripts/zones/Metalworks/npcs/Mighty_Fist.lua b/scripts/zones/Metalworks/npcs/Mighty_Fist.lua
deleted file mode 100644
index 7c4e124f2e0..00000000000
--- a/scripts/zones/Metalworks/npcs/Mighty_Fist.lua
+++ /dev/null
@@ -1,19 +0,0 @@
------------------------------------
--- Area: Metalworks
---  NPC: Mighty Fist
--- !pos -47 2 -30 237
------------------------------------
----@type TNpcEntity
-local entity = {}
-
-entity.onTrigger = function(player, npc)
-    local randMessage = math.random(0, 1)
-
-    if randMessage == 1 then
-        player:startEvent(560)
-    else
-        player:startEvent(561)
-    end
-end
-
-return entity