Skip to content

Commit cb5a245

Browse files
deathbeamLocalIdentity
andauthored
Add support for searching all sockets for timeless jewel finder (#9591)
Signed-off-by: Tomas Slusny <slusnucky@gmail.com> Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 1db5caa commit cb5a245

File tree

3 files changed

+371
-275
lines changed

3 files changed

+371
-275
lines changed

src/Classes/TimelessJewelListControl.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function TimelessJewelListControlClass:AddValueTooltip(tooltip, index, data)
6868
end
6969
local treeData = self.build.spec.tree
7070
local sortedNodeLists = { }
71-
for legionId, desiredNode in pairs(self.sharedList.desiredNodes) do
71+
for legionId, desiredNode in pairs(self.sharedList.desiredNodes or { }) do
7272
if self.list[index][legionId] then
7373
if self.list[index][legionId].targetNodeNames and #self.list[index][legionId].targetNodeNames > 0 then
7474
sortedNodeLists[desiredNode.desiredIdx] = "^7 " .. desiredNode.displayName .. ":\n^8 " .. t_concat(self.list[index][legionId].targetNodeNames, "\n ")
@@ -91,7 +91,8 @@ end
9191

9292
function TimelessJewelListControlClass:OnSelClick(index, data, doubleClick)
9393
if doubleClick and self.list[index].label:match("B2B2B2") == nil then
94-
local label = "[" .. data.seed .. "; " .. data.total.. "; " .. self.sharedList.socket.keystone .. "]\n"
94+
local socketInfo = data.socketLabel or (self.sharedList.socket and self.sharedList.socket.keystone) or "Unknown"
95+
local label = "[" .. data.seed .. "; " .. data.total.. "; " .. socketInfo .. "]\n"
9596
local variant = self.sharedList.conqueror.id == 1 and 1 or (self.sharedList.conqueror.id - 1) .. "\n"
9697
local itemData = [[
9798
Heroic Tragedy ]] .. label .. [[

src/Classes/TimelessJewelSocketControl.lua

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,31 @@ function TimelessJewelSocketClass:Draw(viewPort, noTooltip)
1818
self.DropDownControl:Draw(viewPort)
1919
self:DrawControls(viewPort)
2020
if self:IsMouseOver() and not noTooltip and not main.popups[2] then
21-
SetDrawLayer(nil, 15)
22-
local viewerY
23-
if self.DropDownControl.dropUp and self.DropDownControl.dropped then
24-
viewerY = y + 20
25-
else
26-
viewerY = m_min(y - 150 - 5, viewPort.y + viewPort.height - 154)
21+
local hoveredSocketId = self.DropDownControl.list[self.DropDownControl:GetHoverIndex()].id
22+
local node = self.build.spec.nodes[hoveredSocketId]
23+
if node then
24+
SetDrawLayer(nil, 15)
25+
local viewerY
26+
if self.DropDownControl.dropUp and self.DropDownControl.dropped then
27+
viewerY = y + 20
28+
else
29+
viewerY = m_min(y - 150 - 5, viewPort.y + viewPort.height - 154)
30+
end
31+
local viewerX = x + 215
32+
SetDrawColor(1, 1, 1)
33+
DrawImage(nil, viewerX, viewerY, 304, 304)
34+
self.socketViewer.zoom = 5
35+
local scale = self.build.spec.tree.size / 1500
36+
self.socketViewer.zoomX = -node.x / scale
37+
self.socketViewer.zoomY = -node.y / scale
38+
SetViewport(viewerX + 2, viewerY + 2, 300, 300)
39+
self.socketViewer:Draw(self.build, { x = 0, y = 0, width = 300, height = 300 }, { })
40+
SetDrawLayer(nil, 30)
41+
SetDrawColor(1, 1, 1, 0.2)
42+
DrawImage(nil, 149, 0, 2, 300)
43+
DrawImage(nil, 0, 149, 300, 2)
44+
SetViewport()
45+
SetDrawLayer(nil, 0)
2746
end
28-
local viewerX = x + 215
29-
SetDrawColor(1, 1, 1)
30-
DrawImage(nil, viewerX, viewerY, 304, 304)
31-
local node = self.build.spec.nodes[self.DropDownControl.list[self.DropDownControl:GetHoverIndex()].id]
32-
self.socketViewer.zoom = 5
33-
local scale = self.build.spec.tree.size / 1500
34-
self.socketViewer.zoomX = -node.x / scale
35-
self.socketViewer.zoomY = -node.y / scale
36-
SetViewport(viewerX + 2, viewerY + 2, 300, 300)
37-
self.socketViewer:Draw(self.build, { x = 0, y = 0, width = 300, height = 300 }, { })
38-
SetDrawLayer(nil, 30)
39-
SetDrawColor(1, 1, 1, 0.2)
40-
DrawImage(nil, 149, 0, 2, 300)
41-
DrawImage(nil, 0, 149, 300, 2)
42-
SetViewport()
43-
SetDrawLayer(nil, 0)
4447
end
4548
end

0 commit comments

Comments
 (0)