Merge pull request #7089 from LandSandBoat/refactor_seals_lua

Chore: Tidy seals helpers
LandSandBoat · Feb 19, 2025 · 32cad72 · 32cad72
2 parents 5ce0e3d + 285f157
commit 32cad72
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/scripts/globals/seals.lua b/scripts/globals/seals.lua
@@ -23,7 +23,7 @@ local function getSealTradeOption(trade)
     local sealsInTrade = {}
     for itemID, sealData in pairs(xi.seals.sealItems) do
         if npcUtil.tradeHas(trade, itemID) then
-            table.insert(sealsInTrade, { sealData[1], trade:getItemQty(itemID) })
+            table.insert(sealsInTrade, { itemID, trade:getItemQty(itemID) })
         end
     end
 
@@ -37,16 +37,19 @@ function xi.seals.onTrade(player, npc, trade, eventParams)
     if next(sealOptions) then
         local confirmedSeals = {}
         for _, sealOption in ipairs(sealOptions) do
-            local storedSeals = player:getSeals(sealOption[1])
+            local itemId = sealOption[1]
+            local storedSeals = player:getSeals(xi.seals.sealItems[itemId][1])
             local itemCount   = sealOption[2]
-            eventParams[sealOption[1] + 2] = bit.lshift(storedSeals + itemCount, 16)
-            table.insert(confirmedSeals, { sealOption[1], itemCount })
+            eventParams[xi.seals.sealItems[itemId][1] + 2] = bit.lshift(storedSeals + itemCount, 16)
+            table.insert(confirmedSeals, { itemId, itemCount })
         end
 
         player:startEvent(unpack(eventParams))
         for _, sealData in ipairs(confirmedSeals) do
-            local sealId = sealData[1]
+            local itemId = sealData[1]
+            local sealId = xi.seals.sealItems[itemId][1]
             local sealCount = sealData[2]
+            trade:confirmItem(itemId, sealCount)
             player:addSeals(sealCount, sealId)
         end