Merge pull request #4569 from LandSandBoat/4527-nexus-cape-unique

Use Unique Event for tracking initial Nexus Cape received
LandSandBoat · Sep 30, 2023 · b64aa58 · b64aa58
2 parents be773fd + 7aa8056
commit b64aa58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/scripts/enum/unique_event.lua b/scripts/enum/unique_event.lua
@@ -13,4 +13,5 @@ xi = xi or {}
 xi.uniqueEvent =
 {
     EKOKOKO_INTRODUCTION = 0,
+    RECEIVED_NEXUS_CAPE  = 1,
 }
diff --git a/scripts/zones/Lower_Jeuno/npcs/Treasure_Coffer.lua b/scripts/zones/Lower_Jeuno/npcs/Treasure_Coffer.lua
@@ -1873,7 +1873,7 @@ entity.onTrigger = function(player, npc)
                             xi.settings.main.ENABLE_ASA == 1 and
                             not player:hasItem(xi.item.NEXUS_CAPE)
 
-    local receivedNexusCape = player:getCharVar('receivedNexusCape') == 1
+    local receivedNexusCape = player:hasCompletedUniqueEvent(xi.uniqueEvent.RECEIVED_NEXUS_CAPE)
     local kiArgs = { 0, 0, 0, 0 }
 
     -- Reminder that a "true" here removes the option from the player's menu
@@ -1922,13 +1922,13 @@ entity.onEventFinish = function(player, csid, option, npc)
     if csid == 10099 then
         if
             option == 16777216 and
-            player:getCharVar('receivedNexusCape') == 0 and
+            not player:hasCompletedUniqueEvent(xi.uniqueEvent.RECEIVED_NEXUS_CAPE) and
             npcUtil.giveItem(player, xi.item.NEXUS_CAPE)
         then
-            player:setCharVar('receivedNexusCape', 1)
+            player:setUniqueEvent(xi.uniqueEvent.RECEIVED_NEXUS_CAPE)
         elseif
             option == 33554432 or
-            (option == 16777216 and player:getCharVar('receivedNexusCape') == 1)
+            (option == 16777216 and player:hasCompletedUniqueEvent(xi.uniqueEvent.RECEIVED_NEXUS_CAPE))
         then
             player:addUsedItem(xi.item.NEXUS_CAPE)
         elseif option >= 1 and option <= 20 then