Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9ce0469
setup infrastructure for more advanced search filters
Regisle Jul 12, 2022
998d5c2
add broken generateWeights function, and temp remove weightPerPoint
Regisle Jul 19, 2022
9e2384c
scale weights to be reasonable
Regisle Jul 19, 2022
de5c6ed
add search type
Regisle Jul 19, 2022
d895faf
add minimum weights and improve generate function
Regisle Jul 20, 2022
ce64ccc
add total stat for str/dex/devotion which also count small nodes
Regisle Jul 20, 2022
5d3a12c
fix legionAddtions and GV weight generation
Regisle Jul 20, 2022
bc3e75c
remove Filtertypes to isolate Generator and other minor changes
Regisle Jul 20, 2022
0d43530
change weights to be percentage based
Regisle Jul 20, 2022
8a210da
add generation of totalMods and fix GV divisor (as not normalised)
Regisle Jul 20, 2022
0d39fbf
fix keystones etc being counted as small nodes
Regisle Jul 20, 2022
b3698b6
fix missing then
Regisle Jul 20, 2022
3bd42bd
Various changes and UI rework
Lothrik Jul 20, 2022
164d536
Remove draw color reset as it's no longer necessary
Lothrik Jul 20, 2022
36ac0f4
Fix total_dex => total_dexterity
Lothrik Jul 20, 2022
1422173
Merge pull request #27 from Lothrik/TimelessJewelSearchImprovements
Regisle Jul 20, 2022
3240c2b
search fallback and normal searchlist
Regisle Jul 20, 2022
2a04aa1
remove unused case
Regisle Jul 20, 2022
036de15
Add minimum weight UI, process fallback node weights, fix total stat …
Lothrik Jul 20, 2022
cd37044
Fix errors
Lothrik Jul 20, 2022
6663c62
Improve formatSearchValue pattern matching
Lothrik Jul 20, 2022
d3786df
Fix a few more errors, more consistent rounding
Lothrik Jul 20, 2022
5fc6ff1
Save fallback weight mode idx in build XML
Lothrik Jul 20, 2022
e4614f5
Make enter insert a newline instead of searching
Lothrik Jul 21, 2022
8d2db95
Merge pull request #28 from Lothrik/TimelessJewelSearchImprovements2
Regisle Jul 21, 2022
248cf68
fix small node weights
Regisle Jul 21, 2022
46956b8
fix index
Regisle Jul 21, 2022
f4d64f4
Skip minimumWeight == 0
Lothrik Jul 21, 2022
2226d72
Fix random empty sortedNodeLists
Lothrik Jul 21, 2022
b5eb5d1
Properly indent Militant Faith at 10K seed
Lothrik Jul 21, 2022
62ee5de
Merge pull request #29 from Lothrik/TimelessJewelSearchImprovements3
Regisle Jul 21, 2022
4e1ead4
Add tooltips to timeless jewel node weight sliders
Lothrik Jul 21, 2022
36e9967
Merge pull request #30 from Lothrik/TimelessJewelSearchImprovements3
Regisle Jul 21, 2022
9c6ac9e
fix second weight not correctly being scaled
Regisle Jul 21, 2022
55fc00c
Dynamically reposition node slider tooltips
Lothrik Jul 21, 2022
b0d5541
Fix fallback weight generation for stat totals
Lothrik Jul 21, 2022
11996e6
Merge pull request #31 from Lothrik/TimelessJewelSearchImprovements4
Regisle Jul 21, 2022
40032ca
Increase timeless jewel popup window width 200px
Lothrik Jul 21, 2022
a81c0f3
Improve various tooltips, disable secondary weight slider on single s…
Lothrik Jul 21, 2022
d557d1e
Switch to multi-line node slider tooltips
Lothrik Jul 21, 2022
d17d019
Automatically set disabled weights to 0, adjust colors
Lothrik Jul 21, 2022
6245089
Add SliderControl scroll wheel support
Lothrik Jul 21, 2022
d7cbe1b
Switch to custom scrollWheelSpeedTbl
Lothrik Jul 21, 2022
8477379
Remove extraneous newLine from generated fallback node list
Lothrik Jul 21, 2022
fe532dd
Adjust wording
Lothrik Jul 21, 2022
82ae385
Further wording adjustments
Lothrik Jul 21, 2022
874f445
Faster scroll wheel speed for minimum node weight slider
Lothrik Jul 21, 2022
2dd41d3
Fix wrong shift scroll speed
Lothrik Jul 21, 2022
1c25876
Merge pull request #32 from Lothrik/TimelessJewelSearchImprovements4
Regisle Jul 21, 2022
394b29c
Swap slider scroll wheel direction + add keyboard arrow support
Lothrik Jul 22, 2022
a5d03b1
Add left/right arrow key support
Lothrik Jul 22, 2022
8779db2
Merge pull request #33 from Lothrik/TimelessJewelSearchImprovements4
Regisle Jul 22, 2022
7d6ef73
round(..., 3) weight output to edit box controls
Lothrik Jul 22, 2022
d3f5be9
Partial revert for consistency
Lothrik Jul 22, 2022
5c37545
Revert this line as well
Lothrik Jul 22, 2022
526bf89
Update TreeTab.lua
Lothrik Jul 22, 2022
aa84741
Anchor tooltips to slider position
Lothrik Jul 22, 2022
d213234
Correctly calculate height offset for tooltip
Lothrik Jul 22, 2022
5be6f16
Update TreeTab.lua
Lothrik Jul 22, 2022
2fab264
Round slider offset for tooltips instead of floor
Lothrik Jul 22, 2022
e2648d3
Hide slider tooltip while dragging to improve visibility
Lothrik Jul 22, 2022
cae2d0f
Merge pull request #34 from Lothrik/TimelessJewelSearchImprovements4
Regisle Jul 23, 2022
99e381b
Fix trailing newline in fallback weights not being culled
Lothrik Jul 24, 2022
b3f910d
Merge pull request #35 from Lothrik/TimelessJewelSearchImprovements4
Regisle Jul 24, 2022
55546a8
add option to toggle slider scroll direction
Regisle Jul 25, 2022
201c271
Add tooltip for scroll option and default to off
Jul 29, 2022
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
4 changes: 2 additions & 2 deletions src/Classes/PassiveSpec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
19 changes: 18 additions & 1 deletion src/Classes/SliderControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
14 changes: 10 additions & 4 deletions src/Classes/TimelessJewelListControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Classes/TimelessJewelSocketControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading