Skip to content
Merged
Show file tree
Hide file tree
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
17 changes: 12 additions & 5 deletions spec/System/TestSocketables_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ describe("TestSocketables", function()
for name, rune in pairs(modRunes) do
for runeSlotType, mods in pairs(rune) do
if runeSlotType == slotType then
-- Need to add an entry of the name for each mod line for tests
for _, _ in ipairs(mods) do
table.insert(names, name)
end
table.insert(names, name)
end
end
end
Expand Down Expand Up @@ -64,7 +61,17 @@ describe("TestSocketables", function()
-- To keep the test fast, only check that the lengths match
-- This should also catch issues with multi-mod line runes since the rune name will appear
-- for the number of mod lines that the rune has.
assert.are.equals(#itemTabRunes, #modRunes)
if #itemTabRunes ~= #modRunes then
ConPrintf("Item Tab Runes for slot type '%s':", slotType)
for _, name in ipairs(itemTabRunes) do
ConPrintf(" %s", name)
end
ConPrintf("Mod Runes for slot type '%s':", slotType)
for _, name in ipairs(modRunes) do
ConPrintf(" %s", name)
end
end
assert.are.equals(#itemTabRunes, #modRunes, "Mismatch in number of runes for slot type: " .. slotType)
end

-- Note: Except for weapon/armour/caster,
Expand Down
20 changes: 12 additions & 8 deletions src/Classes/ItemsTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -536,11 +536,17 @@ holding Shift will put it in the second.]])
end
drop.tooltipFunc = function(tooltip, mode, index, value)
tooltip:Clear()
if value.label ~= "None" then
if value.lines and value.lines[1] ~= "None" then
tooltip:AddLine(14, "^7"..value.name)
tooltip:AddLine(14, "^7"..data.itemBases[value.name].implicit)
for _, line in ipairs(value.lines) do
tooltip:AddLine(14, "^7"..line)
end
-- Adding Comparison
self:AddModComparisonTooltip(tooltip, { value.label, type = "Rune" })
local compLines = { type = "Rune" }
for _, line in ipairs(value.lines) do
t_insert(compLines, line)
end
self:AddModComparisonTooltip(tooltip, compLines)
end
end
drop.shown = function()
Expand Down Expand Up @@ -1576,18 +1582,16 @@ function ItemsTabClass:UpdateAffixControls()
self:UpdateCustomControls()
end

local runeModLines = { { name = "None", label = "None", order = -1, slot = "None", group = -1 } }
local runeModLines = { { name = "None", label = "None", lines = { "None" }, order = -1, slot = "None", group = -1 } }
for name, runeMods in pairs(data.itemMods.Runes) do
-- Some runes have multiple mod lines; insert each as separate entry
for slotType, runeMod in pairs(runeMods) do
for i, mod in ipairs(runeMod) do
t_insert(runeModLines, { name = name, label = mod, order = runeMod.statOrder[1], slot = slotType, group = #runeMod })
end
t_insert(runeModLines, { name = name, label = runeMod[1], lines = runeMod, req = runeMod.rank[1], order = runeMod.statOrder[1], slot = slotType, group = #runeMod })
end
end
table.sort(runeModLines, function(a, b)
if a.order == b.order then
return a.label < b.label
return a.req < b.req
elseif a.group == b.group then
return a.order < b.order
else
Expand Down
Loading
Loading