Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Tidy seals helpers #7089

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions scripts/globals/seals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down