From d4a3d249026602587bb28e8591ce870754e3b878 Mon Sep 17 00:00:00 2001
From: Jesse Sestito <nobutadas.one@gmail.com>
Date: Sat, 23 May 2026 12:36:35 -0500
Subject: [PATCH] [lua] Windurst rank 1 and 2 enmity drop and Battlefield event
 skip

---
 scripts/globals/battlefield.lua                        |  2 +-
 .../windurst/1_1_The_Horutoto_Ruins_Experiment.lua     |  6 +++---
 .../missions/windurst/1_2_The_Heart_of_the_Matter.lua  | 10 +++++-----
 scripts/missions/windurst/1_3_The_Price_of_Peace.lua   |  4 ++--
 scripts/missions/windurst/2_1_Lost_for_Words.lua       |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/globals/battlefield.lua b/scripts/globals/battlefield.lua
index 6a63da0dbf1..fe01cdda502 100644
--- a/scripts/globals/battlefield.lua
+++ b/scripts/globals/battlefield.lua
@@ -944,7 +944,7 @@ end
 
 function Battlefield.onExitTrigger(player, npc)
     if player:getBattlefield() then
-        return Battlefield:progressOptionalCutscene(32003, { cs_option = 3 })
+        return Battlefield:progressOptionalCutscene(32003, { cs_option = 3, canSkip = true })
     end
 end
 
diff --git a/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua b/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua
index 5ff2c72c876..c4bdc90cc02 100644
--- a/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua
+++ b/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua
@@ -51,11 +51,11 @@ end
 
 local examineGizmo = function(player, gizmoIndex, successCS, failCS)
     if mission:getVar(player, 'RandomGizmo') == gizmoIndex then
-        return mission:progressEvent(successCS)
+        return mission:progressCutscene(successCS)
     else
         if not mission:isVarBitsSet(player, 'GizmoExamined', gizmoIndex) then
             mission:setVarBit(player, 'GizmoExamined', gizmoIndex)
-            return mission:progressEvent(failCS)
+            return mission:progressCutscene(failCS)
         else
             return mission:messageSpecial(innerHorutotoRuinsID.text.EXAMINED_RECEPTACLE)
         end
@@ -203,7 +203,7 @@ mission.sections =
         [xi.zone.INNER_HORUTOTO_RUINS] =
         {
             -- Gate: Magical Gizmo
-            ['_5c5'] = mission:progressEvent(42),
+            ['_5c5'] = mission:progressCutscene(42),
 
             onEventFinish =
             {
diff --git a/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua b/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua
index 110077bbbdf..36fb0eacfdf 100644
--- a/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua
+++ b/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua
@@ -58,7 +58,7 @@ local gizmoOnTrigger = function(player, gizmoNum, placeCS, collectCS)
         -- has orb been placed here?
         if not mission:isVarBitsSet(player, 'GizmoUsed', gizmoNum) then
             -- place orb
-            return mission:event(placeCS)
+            return mission:cutscene(placeCS)
         else
             -- orb has been already been placed
             player:messageSpecial(msgBase) -- "A dark Mana Orb is already placed here."
@@ -67,7 +67,7 @@ local gizmoOnTrigger = function(player, gizmoNum, placeCS, collectCS)
     elseif player:getMissionStatus(mission.areaId) == 4 then
         -- collect orb
         if not mission:isVarBitsSet(player, 'GizmoEmpty', gizmoNum) then
-            return mission:event(collectCS)
+            return mission:cutscene(collectCS)
         else
             --orb has already been retrieved
             player:messageSpecial(msgBase + 3) -- "You have already retrieved a glowing Mana Orb from here."
@@ -236,7 +236,7 @@ mission.sections =
 
         [xi.zone.EAST_SARUTABARUTA] =
         {
-            ['Pore-Ohre'] = mission:progressEvent(46),
+            ['Pore-Ohre'] = mission:progressCutscene(46),
 
             onEventFinish =
             {
@@ -256,7 +256,7 @@ mission.sections =
 
         [xi.zone.EAST_SARUTABARUTA] =
         {
-            ['Pore-Ohre'] = mission:event(47),
+            ['Pore-Ohre'] = mission:event(47), -- TODO: Is this a skippable event or cutscene?
         },
 
         [xi.zone.OUTER_HORUTOTO_RUINS] =
@@ -341,7 +341,7 @@ mission.sections =
 
         [xi.zone.OUTER_HORUTOTO_RUINS] =
         {
-            ['_5e9'] = mission:event(44),
+            ['_5e9'] = mission:cutscene(44),
 
             onEventFinish =
             {
diff --git a/scripts/missions/windurst/1_3_The_Price_of_Peace.lua b/scripts/missions/windurst/1_3_The_Price_of_Peace.lua
index 13622ca3374..61dc825b83e 100644
--- a/scripts/missions/windurst/1_3_The_Price_of_Peace.lua
+++ b/scripts/missions/windurst/1_3_The_Price_of_Peace.lua
@@ -177,8 +177,8 @@ mission.sections =
 
         [xi.zone.GIDDEUS] =
         {
-            ['Ghoo_Pakya'] = mission:progressEvent(49),
-            ['Laa_Mozi']   = mission:progressEvent(45),
+            ['Ghoo_Pakya'] = mission:progressCutscene(49),
+            ['Laa_Mozi']   = mission:progressCutscene(45),
 
             onEventFinish =
             {
diff --git a/scripts/missions/windurst/2_1_Lost_for_Words.lua b/scripts/missions/windurst/2_1_Lost_for_Words.lua
index d0734c3684e..1c7d539efbd 100644
--- a/scripts/missions/windurst/2_1_Lost_for_Words.lua
+++ b/scripts/missions/windurst/2_1_Lost_for_Words.lua
@@ -254,7 +254,7 @@ mission.sections =
 
         [xi.zone.INNER_HORUTOTO_RUINS] =
         {
-            ['_5ca'] = mission:progressEvent(46),
+            ['_5ca'] = mission:progressCutscene(46),
 
             onEventFinish =
             {