Timeless jewel search improvements (#4622)

* setup infrastructure for more advanced search filters

* add broken generateWeights function, and temp remove weightPerPoint

* scale weights to be reasonable

* add search type

* add minimum weights and improve generate function

* add total stat for str/dex/devotion which also count small nodes

* fix legionAddtions and GV weight generation

* remove Filtertypes to isolate Generator and other minor changes

* change weights to be percentage based

* add generation of totalMods and fix GV divisor (as not normalised)

* fix keystones etc being counted as small nodes

* fix missing then

* Various changes and UI rework

* Remove draw color reset as it's no longer necessary

* Fix total_dex => total_dexterity

* search fallback and normal searchlist

* remove unused case

* Add minimum weight UI, process fallback node weights, fix total stat tooltips

* Fix errors

* Improve formatSearchValue pattern matching

* Fix a few more errors, more consistent rounding

* Save fallback weight mode idx in build XML

* Make enter insert a newline instead of searching

* fix small node weights

* fix index

* Skip minimumWeight == 0

* Fix random empty sortedNodeLists

* Properly indent Militant Faith at 10K seed

* Add tooltips to timeless jewel node weight sliders

* fix second weight not correctly being scaled

* Dynamically reposition node slider tooltips

* Fix fallback weight generation for stat totals

* Increase timeless jewel popup window width 200px

* Improve various tooltips, disable secondary weight slider on single stat nodes

* Switch to multi-line node slider tooltips

* Automatically set disabled weights to 0, adjust colors

* Add SliderControl scroll wheel support

* Switch to custom scrollWheelSpeedTbl

* Remove extraneous newLine from generated fallback node list

* Adjust wording

* Further wording adjustments

* Faster scroll wheel speed for minimum node weight slider

* Fix wrong shift scroll speed

* Swap slider scroll wheel direction + add keyboard arrow support

* Add left/right arrow key support

* round(..., 3) weight output to edit box controls

* Partial revert for consistency

* Revert this line as well

* Update TreeTab.lua

* Anchor tooltips to slider position

* Correctly calculate height offset for tooltip

* Update TreeTab.lua

* Round slider offset for tooltips instead of floor

* Hide slider tooltip while dragging to improve visibility

* Fix trailing newline in fallback weights not being culled

* add option to toggle slider scroll direction

* Add tooltip for scroll option and default to off

Co-authored-by: Lothrik <maximius@gmail.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: 3 people

src/Classes/PassiveSpec.lua

@@ -691,7 +691,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 			end
 
 			local replaceHelperFunc = function(statToFix, statKey, statMod, value)
-				if statMod.fmt == "g" then -- note the only one we actualy care about is "Ritual of Flesh" life regen
+				if statMod.fmt == "g" then -- note the only one we actually care about is "Ritual of Flesh" life regen
 					if statKey:find("per_minute") then
 						value = round(value / 60, 1)
 					elseif statKey:find("permyriad") then
@@ -702,7 +702,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
 				end
 				--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)
+					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

src/Classes/SliderControl.lua

@@ -7,12 +7,13 @@ local m_min = math.min
 local m_max = math.max
 local m_ceil = math.ceil
 
-local SliderClass = newClass("SliderControl", "Control", "TooltipHost", function(self, anchor, x, y, width, height, changeFunc)
+local SliderClass = newClass("SliderControl", "Control", "TooltipHost", function(self, anchor, x, y, width, height, changeFunc, scrollWheelSpeedTbl)
 	self.Control(anchor, x, y, width, height)
 	self.TooltipHost()
 	self.knobSize = height - 2
 	self.val = 0
 	self.changeFunc = changeFunc
+	self.scrollWheelSpeedTbl = scrollWheelSpeedTbl or { ["SHIFT"] = 0.25, ["CTRL"] = 0.01, ["DEFAULT"] = 0.05 }
 end)
 
 function SliderClass:IsMouseOver()
@@ -160,5 +161,21 @@ function SliderClass:OnKeyUp(key)
 			local cursorX, cursorY = GetCursorPos()
 			self:SetValFromKnobX((cursorX - self.dragCX) + self.dragKnobX)
 		end
+	elseif (not main.invertSliderScrollDirection and key == "WHEELDOWN") or (main.invertSliderScrollDirection and  key == "WHEELUP") or key == "DOWN" or key == "LEFT" then
+		if IsKeyDown("SHIFT") then
+			self:SetVal(self.val - self.scrollWheelSpeedTbl["SHIFT"])
+		elseif IsKeyDown("CTRL") then
+			self:SetVal(self.val - self.scrollWheelSpeedTbl["CTRL"])
+		else
+			self:SetVal(self.val - self.scrollWheelSpeedTbl["DEFAULT"])
+		end
+	elseif (not main.invertSliderScrollDirection and key == "WHEELUP") or (main.invertSliderScrollDirection and key == "WHEELDOWN") or key == "UP" or key == "RIGHT" then
+		if IsKeyDown("SHIFT") then
+			self:SetVal(self.val + self.scrollWheelSpeedTbl["SHIFT"])
+		elseif IsKeyDown("CTRL") then
+			self:SetVal(self.val + self.scrollWheelSpeedTbl["CTRL"])
+		else
+			self:SetVal(self.val + self.scrollWheelSpeedTbl["DEFAULT"])
+		end
 	end
 end

src/Classes/TimelessJewelListControl.lua

@@ -37,15 +37,21 @@ function TimelessJewelListControlClass:AddValueTooltip(tooltip, index, data)
 		local treeData = self.build.spec.tree
 		local sortedNodeLists = { }
 		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                ")
+			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                ")
+				else
+					sortedNodeLists[desiredNode.desiredIdx] = "^7        " .. desiredNode.displayName .. ":\n^8                None"
+				end
 			end
 		end
-		if sortedNodeLists then
-			tooltip:AddLine(16, "Node List:")
+		if next(sortedNodeLists) then
+			tooltip:AddLine(16, "^7Node List:")
 			for _, sortedNodeList in pairs(sortedNodeLists) do
 				tooltip:AddLine(16, sortedNodeList)
 			end
+		end
+		if data.total > 0 then
 			tooltip:AddLine(16, "^7Combined Node Weight: " .. data.total)
 		end
 	end

src/Classes/TimelessJewelSocketControl.lua

@@ -39,7 +39,6 @@ function TimelessJewelSocketClass:Draw(viewPort, noTooltip)
 		SetDrawColor(1, 1, 1, 0.2)
 		DrawImage(nil, 149, 0, 2, 300)
 		DrawImage(nil, 0, 149, 300, 2)
-		SetDrawColor(1, 1, 1, 1) -- bug fix, don't mind me
 		SetViewport()
 		SetDrawLayer(nil, 0)
 	end