[AMK] Update helm logic, added chocobo digging sites (#4579)

LandSandBoat · Nov 21, 2023 · 40b4841 · 40b4841
1 parent 718f4d0
commit 40b4841
Show file tree

Hide file tree

Showing 5 changed files with 246 additions and 106 deletions.
diff --git a/scripts/globals/chocobo_digging.lua b/scripts/globals/chocobo_digging.lua
@@ -970,9 +970,8 @@ xi.chocoboDig.start = function(player, precheck)
             roll = roll * .5
         end
 
-        -- AMK07
+        -- AMK mission 7 (index 6)
         if
-            xi.settings.main.ENABLE_AMK == 1 and
             player:getCurrentMission(xi.mission.log_id.AMK) == xi.mission.id.amk.SHOCK_ARRANT_ABUSE_OF_AUTHORITY and
             xi.amk.helpers.chocoboDig(player, zoneId, text)
         then

diff --git a/scripts/globals/helm.lua b/scripts/globals/helm.lua
@@ -1557,7 +1557,7 @@ xi.helm.onTrade = function(player, npc, trade, helmType, csid, func)
             npcUtil.giveKeyItem(player, xi.ki.RAINBOW_BERRY)
         end
 
-        -- AMK04
+        -- AMK mission 4 (index 3)
         if xi.settings.main.ENABLE_AMK == 1 then
             xi.amk.helpers.helmTrade(player, helmType, broke)
         end

diff --git a/scripts/missions/amk/06_An_Errand_The_Professors_Price.lua b/scripts/missions/amk/06_An_Errand_The_Professors_Price.lua
@@ -36,6 +36,7 @@ local orbKeyItems =
 }
 
 local beginCardianFight = function(player, npc)
+    -- TODO: Increase default number of cardians to 20 as is required. Mob IDs missing
     local numToSpawn = 15
 
     local modsToAdd = {}

diff --git a/scripts/missions/amk/07_Shock_Arrant_Abuse_of_Authority.lua b/scripts/missions/amk/07_Shock_Arrant_Abuse_of_Authority.lua
@@ -33,7 +33,8 @@ mission.sections =
                 -- Reminder
                 onTrigger = function(player, npc)
                     local diggingZone = xi.amk.helpers.getDiggingZone(player)
-                    return mission:progressEvent(10182, diggingZone)
+                    local diggingZoneCsId = xi.amk.helpers.digSites[diggingZone].eventID
+                    return mission:progressEvent(10182, diggingZoneCsId)
                 end,
             },
 
@@ -59,8 +60,10 @@ mission.sections =
             {
                 -- Reminder
                 onTrigger = function(player, npc)
+                    -- Variable is stored as 1-indexed zone offset, cutscenes are 0-indexed
                     local diggingZone = xi.amk.helpers.getDiggingZone(player)
-                    return mission:progressEvent(10189, diggingZone)
+                    local diggingZoneCsId = xi.amk.helpers.digSites[diggingZone].eventID
+                    return mission:progressEvent(10189, diggingZoneCsId)
                 end,
             },
         },