fix Ring 3 and Weapon 1 Swap, Weapon 2 Swap (#9310)

This commit is contained in:
Peechey
2025-11-20 21:19:27 -06:00
committed by GitHub
parent 430457078b
commit 07dec37e54
2 changed files with 5 additions and 3 deletions

View File

@@ -16,7 +16,7 @@ local m_min = math.min
local m_ceil = math.ceil
local s_format = string.format
local baseSlots = { "Weapon 1", "Weapon 2", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring 1", "Ring 2", "Ring 3", "Belt", "Flask 1", "Flask 2", "Flask 3", "Flask 4", "Flask 5" }
local baseSlots = { "Weapon 1", "Weapon 2", "Weapon 1 Swap", "Weapon 2 Swap", "Helmet", "Body Armour", "Gloves", "Boots", "Amulet", "Ring 1", "Ring 2", "Ring 3", "Belt", "Flask 1", "Flask 2", "Flask 3", "Flask 4", "Flask 5" }
local TradeQueryClass = newClass("TradeQuery", function(self, itemsTab)
self.itemsTab = itemsTab
@@ -428,7 +428,9 @@ Highest Weight - Displays the order retrieved from trade]]
-- Individual slot rows
local slotTables = {}
for _, slotName in ipairs(baseSlots) do
t_insert(slotTables, { slotName = slotName })
if self.itemsTab.slots[slotName].shown() then
t_insert(slotTables, { slotName = slotName })
end
-- add abyssal sockets to slotTables if exist for this slot
if activeAbyssalSockets[slotName] then
for _, abyssalSocket in pairs(activeAbyssalSockets[slotName]) do

View File

@@ -727,7 +727,7 @@ function TradeQueryGeneratorClass:StartQuery(slot, options)
calcNodesInsteadOfMods = true,
}
end
elseif slot.slotName == "Weapon 2" or slot.slotName == "Weapon 1" then
elseif slot.slotName:find("^Weapon %d") then
if existingItem then
if existingItem.type == "Shield" then
itemCategoryQueryStr = "armour.shield"