Further Timeless Jewel search improvements

src/Classes/PassiveSpec.lua

@@ -700,13 +700,13 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 						value = value / 1000
 					end
 				end
-				--if statMod.fmt == "d" then --only ever d or g, and we want both past here
+				--if statMod.fmt == "d" then -- only ever d or g, and we want both past here
 				if statMod.min ~= statMod.max then
 					return statToFix:gsub("%("..statMod.min.."%-"..statMod.max.."%)", value)
 				elseif statMod.min ~= value then -- only true for might/legacy of the vaal which can combine stats
 					return statToFix:gsub(statMod.min, value)
 				end
-				return statToFix -- if it doesnt need to be changed
+				return statToFix -- if it doesn't need to be changed
 			end
 
 			if node.type == "Notable" then
@@ -716,7 +716,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 				else
 					jewelDataTbl = data.readLUT(conqueredBy.id, node.id, jewelType)
 				end
-				print("Need to Update: " .. node.id .. " [" .. node.dn .. "]")
+				--print("Need to Update: " .. node.id .. " [" .. node.dn .. "]")
 				if not next(jewelDataTbl) then
 					ConPrintf("Missing LUT: " .. data.timelessJewelTypes[jewelType])
 				else

src/Classes/TimelessJewelListControl.lua

@@ -7,16 +7,16 @@
 local m_random = math.random
 local t_concat = table.concat
 
-local TimelessJewelListControlClass = newClass("TimelessJewelListControl", "ListControl", function(self, anchor, x, y, width, height, build, list, sharedList, hideHoverControl)
-	self.list = list or { }
-	self.ListControl(anchor, x, y, width, height, 16, true, false, self.list)
+local TimelessJewelListControlClass = newClass("TimelessJewelListControl", "ListControl", function(self, anchor, x, y, width, height, build)
 	self.build = build
-	self.sharedList = sharedList
-	self.hideHoverControl = hideHoverControl
+	self.sharedList = self.build.timelessData.sharedResults or { }
+	self.list = self.build.timelessData.searchResults or { }
+	self.ListControl(anchor, x, y, width, height, 16, true, false, self.list)
 	self.selIndex = nil
 end)
 
-function TimelessJewelListControlClass:Draw(viewPort)
+function TimelessJewelListControlClass:Draw(viewPort, noTooltip)
+	self.noTooltip = noTooltip
 	self.ListControl.Draw(self, viewPort)
 end
 
@@ -28,25 +28,25 @@ end
 
 function TimelessJewelListControlClass:AddValueTooltip(tooltip, index, data)
 	tooltip:Clear()
-	if not self.hideHoverControl:IsMouseOver() then
+	if not self.noTooltip then
 		if self.list[index].label:match("B2B2B2") == nil then
 			tooltip:AddLine(16, "^7Double click to add this jewel to your build.")
 		else
 			tooltip:AddLine(16, "^7" .. self.sharedList.type.label .. " " .. data.seed .. " was successfully added to your build.")
 		end
 		local treeData = self.build.spec.tree
 		local sortedNodeLists = { }
-		for _, desiredNode in pairs(self.sharedList.desiredNodes) do
-			if self.list[index][desiredNode.nodeId] and self.list[index][desiredNode.nodeId].targetNodeNames and #self.list[index][desiredNode.nodeId].targetNodeNames > 0 then
-				sortedNodeLists[desiredNode.desiredIdx] = "        " .. desiredNode.displayName .. ":\n                " .. t_concat(self.list[index][desiredNode.nodeId].targetNodeNames, "\n                ")
+		for legionId, desiredNode in pairs(self.sharedList.desiredNodes) do
+			if self.list[index][legionId] and 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                ")
 			end
 		end
 		if sortedNodeLists then
 			tooltip:AddLine(16, "Node List:")
 			for _, sortedNodeList in pairs(sortedNodeLists) do
 				tooltip:AddLine(16, sortedNodeList)
 			end
-			tooltip:AddLine(16, "Combined Node Weight: " .. data.total)
+			tooltip:AddLine(16, "^7Combined Node Weight: " .. data.total)
 		end
 	end
 end

src/Classes/TimelessJewelSocketControl.lua

@@ -6,24 +6,18 @@
 
 local m_min = math.min
 
-local TimelessJewelSocketClass = newClass("TimelessJewelSocketControl", "DropDownControl", function(self, anchor, x, y, width, height, list, selFunc, build, socketViewer, hideHoverControls)
+local TimelessJewelSocketClass = newClass("TimelessJewelSocketControl", "DropDownControl", function(self, anchor, x, y, width, height, list, selFunc, build, socketViewer)
 	self.DropDownControl(anchor, x, y, width, height, list, selFunc)
 	self.build = build
 	self.socketViewer = socketViewer
-	self.hideHoverControls = hideHoverControls
 end)
 
-function TimelessJewelSocketClass:Draw(viewPort)
+function TimelessJewelSocketClass:Draw(viewPort, noTooltip)
 	local x, y = self:GetPos()
 	local width, height = self:GetSize()
 	self.DropDownControl:Draw(viewPort)
 	self:DrawControls(viewPort)
-	for _, hoverControl in pairs(self.hideHoverControls) do
-		if hoverControl:IsMouseOver() then
-			return
-		end
-	end
-	if not main.popups[2] and self:IsMouseOver() then
+	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