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
5 changes: 3 additions & 2 deletions src/Classes/TimelessJewelListControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function TimelessJewelListControlClass:AddValueTooltip(tooltip, index, data)
end
local treeData = self.build.spec.tree
local sortedNodeLists = { }
for legionId, desiredNode in pairs(self.sharedList.desiredNodes) do
for legionId, desiredNode in pairs(self.sharedList.desiredNodes or { }) do
if self.list[index][legionId] then
if self.list[index][legionId].targetNodeNames and #self.list[index][legionId].targetNodeNames > 0 then
sortedNodeLists[desiredNode.desiredIdx] = "^7 " .. desiredNode.displayName .. ":\n^8 " .. t_concat(self.list[index][legionId].targetNodeNames, "\n ")
Expand All @@ -91,7 +91,8 @@ end

function TimelessJewelListControlClass:OnSelClick(index, data, doubleClick)
if doubleClick and self.list[index].label:match("B2B2B2") == nil then
local label = "[" .. data.seed .. "; " .. data.total.. "; " .. self.sharedList.socket.keystone .. "]\n"
local socketInfo = data.socketLabel or (self.sharedList.socket and self.sharedList.socket.keystone) or "Unknown"
local label = "[" .. data.seed .. "; " .. data.total.. "; " .. socketInfo .. "]\n"
local variant = self.sharedList.conqueror.id == 1 and 1 or (self.sharedList.conqueror.id - 1) .. "\n"
local itemData = [[
Heroic Tragedy ]] .. label .. [[
Expand Down
47 changes: 25 additions & 22 deletions src/Classes/TimelessJewelSocketControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,31 @@ function TimelessJewelSocketClass:Draw(viewPort, noTooltip)
self.DropDownControl:Draw(viewPort)
self:DrawControls(viewPort)
if self:IsMouseOver() and not noTooltip and not main.popups[2] then
SetDrawLayer(nil, 15)
local viewerY
if self.DropDownControl.dropUp and self.DropDownControl.dropped then
viewerY = y + 20
else
viewerY = m_min(y - 150 - 5, viewPort.y + viewPort.height - 154)
local hoveredSocketId = self.DropDownControl.list[self.DropDownControl:GetHoverIndex()].id
local node = self.build.spec.nodes[hoveredSocketId]
if node then
SetDrawLayer(nil, 15)
local viewerY
if self.DropDownControl.dropUp and self.DropDownControl.dropped then
viewerY = y + 20
else
viewerY = m_min(y - 150 - 5, viewPort.y + viewPort.height - 154)
end
local viewerX = x + 215
SetDrawColor(1, 1, 1)
DrawImage(nil, viewerX, viewerY, 304, 304)
self.socketViewer.zoom = 5
local scale = self.build.spec.tree.size / 1500
self.socketViewer.zoomX = -node.x / scale
self.socketViewer.zoomY = -node.y / scale
SetViewport(viewerX + 2, viewerY + 2, 300, 300)
self.socketViewer:Draw(self.build, { x = 0, y = 0, width = 300, height = 300 }, { })
SetDrawLayer(nil, 30)
SetDrawColor(1, 1, 1, 0.2)
DrawImage(nil, 149, 0, 2, 300)
DrawImage(nil, 0, 149, 300, 2)
SetViewport()
SetDrawLayer(nil, 0)
end
local viewerX = x + 215
SetDrawColor(1, 1, 1)
DrawImage(nil, viewerX, viewerY, 304, 304)
local node = self.build.spec.nodes[self.DropDownControl.list[self.DropDownControl:GetHoverIndex()].id]
self.socketViewer.zoom = 5
local scale = self.build.spec.tree.size / 1500
self.socketViewer.zoomX = -node.x / scale
self.socketViewer.zoomY = -node.y / scale
SetViewport(viewerX + 2, viewerY + 2, 300, 300)
self.socketViewer:Draw(self.build, { x = 0, y = 0, width = 300, height = 300 }, { })
SetDrawLayer(nil, 30)
SetDrawColor(1, 1, 1, 0.2)
DrawImage(nil, 149, 0, 2, 300)
DrawImage(nil, 0, 149, 300, 2)
SetViewport()
SetDrawLayer(nil, 0)
end
end
Loading
Loading