Skip to content

Add Support for Time-Lost Notable Passive effect mod #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LocalIdentity merged 1 commit into from
Sep 11, 2025
Merged

Add Support for Time-Lost Notable Passive effect mod #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions src/Classes/PassiveTreeView.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
tooltip:AddSeparator(14)
end

local function addModInfoToTooltip(node, i, line, localSmallIncEffect)
local function addModInfoToTooltip(node, i, line, localIncEffect)
if node.mods[i] then
if launch.devModeAlt and node.mods[i].list then
-- Modifier debugging info
Expand All @@ -1239,9 +1239,9 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
end
end

-- Apply Inc Node scaling from Hulking Form only visually
if (incSmallPassiveSkillEffect + localSmallIncEffect) > 0 and node.type == "Normal" and not node.isAttribute and not node.ascendancyName and node.mods[i].list then
local scale = 1 + (incSmallPassiveSkillEffect + localSmallIncEffect) / 100
-- Apply Inc Node scaling from Hulking Form + Radius Jewels only visually
if (incSmallPassiveSkillEffect + localIncEffect) > 0 and (node.type == "Normal" or node.type == "Notable") and not node.isAttribute and not node.ascendancyName and node.mods[i].list then
local scale = 1 + (node.type == "Normal" and incSmallPassiveSkillEffect or 0 + localIncEffect) / 100
local modsList = copyTable(node.mods[i].list)
local scaledList = new("ModList")
-- some passive node mods are only Condition/Flag and have no value to scale by default, grab number from line
Expand Down Expand Up @@ -1303,7 +1303,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
-- loop over mods generated in CalcSetup by rad.func calls and grab the lines added
-- processStats once on copied node to cleanly setup for the tooltip
local function processTimeLostModsAndGetLocalEffect(mNode, build)
local localSmallIncEffect = 0
local localIncEffect = 0
local hasWSCondition = false
local newSd = copyTable(build.spec.tree.nodes[mNode.id].sd)
for _, mod in ipairs(mNode.finalModList) do
Expand All @@ -1313,7 +1313,9 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
if modCriteria.type == "Condition" and modCriteria.var and modCriteria.var:match("^WeaponSet") then
if (tonumber(modCriteria.var:match("(%d)")) == (build.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1)) then
if mod.name == "JewelSmallPassiveSkillEffect" then
localSmallIncEffect = mod.value
localIncEffect = mod.value
elseif mod.name == "JewelNotablePassiveSkillEffect" then
localIncEffect = mod.value
elseif mod.parsedLine then
mergeStats(newSd, mod.parsedLine, build.spec)
end
Expand All @@ -1323,15 +1325,17 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
end
if not hasWSCondition then
if mod.name == "JewelSmallPassiveSkillEffect" then
localSmallIncEffect = mod.value
localIncEffect = mod.value
elseif mod.name == "JewelNotablePassiveSkillEffect" then
localIncEffect = mod.value
elseif mod.parsedLine then
mergeStats(newSd, mod.parsedLine, build.spec)
end
end
end
mNode.sd = copyTable(newSd)
build.spec.tree:ProcessStats(mNode)
return localSmallIncEffect
return localIncEffect
end

-- we only want to run the timeLost function on a node that can could be in a jewel socket radius of up to Large
Expand All @@ -1358,12 +1362,12 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
end
if mNode.sd and mNode.sd[1] and not mNode.allMasteryOptions then
tooltip:AddLine(16, "")
local localSmallIncEffect = 0
local localIncEffect = 0
if not mNode.isAttribute and (mNode.type == "Normal" or mNode.type == "Notable") and isNodeInARadius(node) then
localSmallIncEffect = processTimeLostModsAndGetLocalEffect(mNode, build)
localIncEffect = processTimeLostModsAndGetLocalEffect(mNode, build)
end
for i, line in ipairs(mNode.sd) do
addModInfoToTooltip(mNode, i, line, localSmallIncEffect)
addModInfoToTooltip(mNode, i, line, localIncEffect)
end
end

Expand Down
21 changes: 21 additions & 0 deletions src/Modules/CalcSetup.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ end

function calcs.buildModListForNode(env, node, incSmallPassiveSkill)
local localSmallIncEffect = 0
local localNotableIncEffect = 0
local modList = new("ModList")
if node.type == "Keystone" then
modList:AddMod(node.keystoneMod)
Expand Down Expand Up @@ -225,6 +226,19 @@ function calcs.buildModListForNode(env, node, incSmallPassiveSkill)
localSmallIncEffect = mod.value
end
end
if mod.name == "JewelNotablePassiveSkillEffect" then
for _, modCriteria in ipairs(mod) do
if modCriteria.type == "Condition" and modCriteria.var and modCriteria.var:match("^WeaponSet") then
if (tonumber(modCriteria.var:match("(%d)")) == (env.build.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1)) then
localNotableIncEffect = mod.value
end
hasWSCondition = true
end
end
if not hasWSCondition then
localNotableIncEffect = mod.value
end
end
end

-- Apply Inc Node scaling from Hulking Form
Expand All @@ -235,6 +249,13 @@ function calcs.buildModListForNode(env, node, incSmallPassiveSkill)
modList = scaledList
end

if localNotableIncEffect > 0 and node.type == "Notable" and not node.isAttribute and not node.ascendancyName then
local scale = 1 + localNotableIncEffect / 100
local scaledList = new("ModList")
scaledList:ScaleAddList(modList, scale)
modList = scaledList
end

return modList
end

Expand Down