Skip to content

Fix error on Lich Jewel breakdown hover #2358

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.

Sign up for GitHub

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

Open
Blitz54 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix error on Lich Jewel breakdown hover #2358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/Classes/CalcBreakdownControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function CalcBreakdownClass:IsMouseOver()
if not self:IsShown() then
return
end
return self:IsMouseInBounds() or self:GetMouseOverControl()
return self:IsMouseInBounds() or self:GetMouseOverControl()
end

function CalcBreakdownClass:SetBreakdownData(displayData, pinned)
Expand Down Expand Up @@ -87,7 +87,7 @@ function CalcBreakdownClass:SetBreakdownData(displayData, pinned)
local _, num = string.gsub(row[col.key], "%d%d%d%d", "") -- count how many commas will be added
if main.showThousandsSeparators and num > 0 then
col.width = m_max(col.width or 0, DrawStringWidth(16, "VAR", col.label) + 6, DrawStringWidth(12, "VAR", row[col.key]) + 6 + (4 * num))
else
else
col.width = m_max(col.width or 0, DrawStringWidth(16, "VAR", col.label) + 6, DrawStringWidth(12, "VAR", row[col.key]) + 6)
end
end
Expand Down Expand Up @@ -176,7 +176,7 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
local section = {
type = "TABLE",
rowList = breakdown.reservations,
colList = {
colList = {
{ label = "Skill", key = "skillName" },
{ label = "Base", key = "base" },
{ label = "MCM", key = "mult" },
Expand All @@ -195,7 +195,7 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
local section = {
type = "TABLE",
rowList = breakdown.damageTypes,
colList = {
colList = {
{ label = "From", key = "source", right = true },
{ label = "Base", key = "base" },
{ label = "Inc/red", key = "inc" },
Expand Down Expand Up @@ -242,8 +242,8 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
table.sort(rowList, function(a, b)
return a['base'] > b['base']
end)
local section = {

local section = {
type = "TABLE",
rowList = rowList,
colList = colList,
Expand Down Expand Up @@ -297,7 +297,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
type = "TABLE",
label = sectionData.label,
rowList = rowList,
colList = {
colList = {
{ label = "Value", key = "displayValue" },
{ label = "Stat", key = "name" },
{ label = "Skill types", key = "flags" },
Expand Down Expand Up @@ -340,7 +340,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
local sourceType = row.mod.source:match("[^:]+")
if not sourceTotals[sourceType] then
sourceTotals[sourceType] = { }
end
end
end
for sourceType, lines in pairs(sourceTotals) do
cfg.source = sourceType
Expand Down Expand Up @@ -402,7 +402,7 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
row.sourceNameTooltip = function(tooltip)
local args = row.mod.sourceSlot
if row.mod.sourceSlot == "Jewel" and row.mod.sourceSlotNum ~= nil and build.spec.nodes[row.mod.sourceSlotNum] and build.spec.nodes[row.mod.sourceSlotNum].containJewelSocket then
args = { nodeId = row.mod.sourceSlotNum }
args = build.itemsTab.sockets[row.mod.sourceSlotNum]
end
build.itemsTab:AddItemTooltip(tooltip, item, args)
end
Expand Down Expand Up @@ -546,7 +546,7 @@ function CalcBreakdownClass:FormatModValue(value, modType)
return "?"
end
else
return value
return value
end
end

Expand Down
Loading