Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions src/Classes/PassiveSpec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,18 @@ function PassiveSpecClass:NodesInIntuitiveLeapLikeRadius(node)
return result
end

-- Returns the radius index a jewel actually uses in this spec, accounting for
-- "Non-Unique Time-Lost Jewels have 40% increased radius" (Baryanic Leylines)
function PassiveSpecClass:GetJewelRadiusIndex(item)
local radiusIndex = item.jewelRadiusIndex
if radiusIndex and self.hasTimeLostJewelRadiusIncrease
and item.rarity ~= "UNIQUE" and item.rarity ~= "RELIC"
and item.baseName and item.baseName:find("Time%-Lost") then
return data.timeLostJewelIncreasedRadiusIndex[radiusIndex] or radiusIndex
end
return radiusIndex
end

-- Rebuilds dependencies and paths for all nodes
function PassiveSpecClass:BuildAllDependsAndPaths()
-- This table will keep track of which nodes have been visited during each path-finding attempt
Expand All @@ -1413,6 +1425,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
end
end
wipeTable(intuitiveLeapLikeNodes)
self.hasTimeLostJewelRadiusIncrease = false
for id, node in pairs(self.allocNodes) do
if node.ascendancyName then -- avoid processing potentially replaceable nodes
self.tree:ProcessStats(node)
Expand All @@ -1421,6 +1434,9 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
t_insert(intuitiveLeapLikeNodes, radius)
end
end
if node.modList:Sum("INC", nil, "NonUniqueTimeLostJewelRadius") > 0 then
self.hasTimeLostJewelRadiusIncrease = true
end
processed[id] = true
end
end
Expand Down
21 changes: 14 additions & 7 deletions src/Classes/PassiveTreeView.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,10 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
end
else
-- Jewel in socket is not Thread of Hope or similar
-- Use the increased radii instead of the base ones if the socketed jewel benefits from them
local isIncreased = jewel and build.spec:GetJewelRadiusIndex(jewel) ~= jewel.jewelRadiusIndex
for index, data in ipairs(build.data.jewelRadius) do
if hoverNode.nodesInRadius[index][node.id] then
if (not data.increased) == (not isIncreased) and hoverNode.nodesInRadius[index][node.id] then
-- Draw normal jewel radii
if data.inner == 0 then
SetDrawColor(data.col)
Expand Down Expand Up @@ -1221,8 +1223,8 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
end

-- Draw ring overlays for jewel sockets
local function drawJewelRadius(jewel, scrX, scrY, tint)
local radData = build.data.jewelRadius[jewel.jewelRadiusIndex]
local function drawJewelRadius(jewel, scrX, scrY, tint, jewelSpec)
local radData = build.data.jewelRadius[jewelSpec:GetJewelRadiusIndex(jewel)]
local outerSize = radData.outer * data.gameConstants["PassiveTreeJewelDistanceMultiplier"] * scale
local innerSize = radData.inner * data.gameConstants["PassiveTreeJewelDistanceMultiplier"] * scale * 1.06
SetDrawColor(tint[1], tint[2], tint[3], tint[4])
Expand Down Expand Up @@ -1270,6 +1272,9 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
if node == hoverNode then
local effectiveJewel = jewel or cJewel
local isThreadOfHope = effectiveJewel and effectiveJewel.jewelRadiusLabel == "Variable"
-- Preview the increased radii instead of the base ones if the socketed jewel benefits from them
local jewelSpec = jewel and spec or self.compareSpec
local isIncreased = effectiveJewel and jewelSpec and jewelSpec:GetJewelRadiusIndex(effectiveJewel) ~= effectiveJewel.jewelRadiusIndex
for _, radData in ipairs(build.data.jewelRadius) do
local outerSize = radData.outer * data.gameConstants["PassiveTreeJewelDistanceMultiplier"] * scale
local innerSize = radData.inner * data.gameConstants["PassiveTreeJewelDistanceMultiplier"] * scale
Expand All @@ -1282,7 +1287,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
end
else
-- Standard jewel: draw the full-disc radii (inner == 0)
if innerSize == 0 then
if innerSize == 0 and (not radData.increased) == (not isIncreased) then
SetDrawColor(radData.col)
DrawImage(self.ring, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2)
end
Expand All @@ -1295,10 +1300,10 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
local sameJewel = compareJewelsEqual(jewel, cJewel)
if pHasRadius then
local tint = (not self.compareSpec or sameJewel) and JEWEL_RADIUS_TINT_NEUTRAL or JEWEL_RADIUS_TINT_PRIMARY_ONLY
drawJewelRadius(jewel, scrX, scrY, tint)
drawJewelRadius(jewel, scrX, scrY, tint, spec)
end
if cHasRadius and not sameJewel then
drawJewelRadius(cJewel, scrX, scrY, JEWEL_RADIUS_TINT_COMPARE_ONLY)
drawJewelRadius(cJewel, scrX, scrY, JEWEL_RADIUS_TINT_COMPARE_ONLY, self.compareSpec)
end
end
end
Expand Down Expand Up @@ -1800,7 +1805,9 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
local isInRadius = false
for id, socket in pairs(build.itemsTab.sockets) do
if build.itemsTab.activeSocketList and socket.inactive == false or socket.inactive == nil then
isInRadius = isInRadius or (build.spec.nodes[id] and build.spec.nodes[id].nodesInRadius and build.spec.nodes[id].nodesInRadius[4][node.id] ~= nil)
-- index 4 is Very Large; its increased version covers the largest possible Time-Lost radius
local maxRadiusIndex = build.spec.hasTimeLostJewelRadiusIncrease and data.timeLostJewelIncreasedRadiusIndex[4] or 4
isInRadius = isInRadius or (build.spec.nodes[id] and build.spec.nodes[id].nodesInRadius and build.spec.nodes[id].nodesInRadius[maxRadiusIndex][node.id] ~= nil)
if isInRadius then break end
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/Data/ModCache.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6337,7 +6337,7 @@ c["Non-Keystone Passive Skills in Medium Radius of allocated Keystone Passive Sk
c["Non-Minion Skills have 50% less Reservation Efficiency"]={{[1]={[1]={neg=true,skillType=6,type="SkillType"},flags=0,keywordFlags=0,name="ReservationEfficiency",type="MORE",value=-50}},nil}
c["Non-Unique Life Flasks apply their Effects constantly"]={nil,"Non-Unique Life Flasks apply their Effects constantly "}
c["Non-Unique Life Flasks apply their Effects constantly Recovery from Life Flasks cannot be Instant"]={nil,"Non-Unique Life Flasks apply their Effects constantly Recovery from Life Flasks cannot be Instant "}
c["Non-Unique Time-Lost Jewels have 40% increased radius"]={nil,"Non-Unique Time-Lost Jewels have 40% increased radius "}
c["Non-Unique Time-Lost Jewels have 40% increased radius"]={{[1]={flags=0,keywordFlags=0,name="NonUniqueTimeLostJewelRadius",type="INC",value=40}},nil}
c["Oasis"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Oasis"}},nil}
c["Off-hand Hits inflict Runefather's Challenge"]={nil,"Off-hand Hits inflict Runefather's Challenge "}
c["Off-hand Hits inflict Runefather's Challenge Inflicts Runefather's Challenge on enemies 6 metres in front of you when raised, no more than once every 2 seconds"]={nil,"Off-hand Hits inflict Runefather's Challenge Inflicts Runefather's Challenge on enemies 6 metres in front of you when raised, no more than once every 2 seconds "}
Expand Down
7 changes: 4 additions & 3 deletions src/Modules/CalcSetup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,7 @@ function calcs.initEnv(build, mode, override, specEnv)
end
if item and not (node and node.sinister) and ( item.jewelRadiusIndex or (override and override.extraJewelFuncs and #override.extraJewelFuncs > 0) ) then
-- Jewel has a radius, add it to the list
local radiusIndex = env.spec:GetJewelRadiusIndex(item)
local funcList = (item.jewelData and item.jewelData.funcList) or { { type = "Self", func = function(node, out, data)
-- Default function just tallies all stats in radius
if node then
Expand All @@ -974,19 +975,19 @@ function calcs.initEnv(build, mode, override, specEnv)
end } }
for _, func in ipairs(funcList) do
t_insert(env.radiusJewelList, {
nodes = node.nodesInRadius and node.nodesInRadius[item.jewelRadiusIndex] or { },
nodes = node.nodesInRadius and node.nodesInRadius[radiusIndex] or { },
func = func.func,
type = func.type,
item = item,
nodeId = slot.nodeId,
attributes = node.attributesInRadius and node.attributesInRadius[item.jewelRadiusIndex] or { },
attributes = node.attributesInRadius and node.attributesInRadius[radiusIndex] or { },
data = { },
-- store this to compare with cache later
jewelHash = getHashFromString(item.modSource..item.raw)
})
if func.type ~= "Self" and node.nodesInRadius then
-- Add nearby unallocated nodes to the extra node list
for nodeId, node in pairs(node.nodesInRadius[item.jewelRadiusIndex]) do
for nodeId, node in pairs(node.nodesInRadius[radiusIndex]) do
if not env.allocNodes[nodeId] then
env.extraRadiusNodeList[nodeId] = env.spec.nodes[nodeId]
end
Expand Down
11 changes: 11 additions & 0 deletions src/Modules/Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,20 @@ data.jewelRadii = {
{ inner = 1400, outer = 1700, col = "^xFFCC00", label = "Variable" },
{ inner = 1650, outer = 1950, col = "^xFF6600", label = "Variable" },
{ inner = 1800, outer = 2100, col = "^x0099FF", label = "Variable" },

-- 40% increased versions of the four base radii, used for non-Unique Time-Lost
-- jewels when "Non-Unique Time-Lost Jewels have 40% increased radius" is allocated
-- (Baryanic Leylines). `increased` keeps them out of the generic radius previews.
{ inner = 0, outer = 1400, col = "^xBB6600", label = "Increased Small", increased = true },
{ inner = 0, outer = 1610, col = "^x66FFCC", label = "Increased Medium", increased = true },
{ inner = 0, outer = 1820, col = "^x2222CC", label = "Increased Large", increased = true },
{ inner = 0, outer = 2100, col = "^xC100FF", label = "Increased Very Large", increased = true },
}
}

-- Maps a Time-Lost jewel's base radius index to its 40% increased counterpart above
data.timeLostJewelIncreasedRadiusIndex = { [1] = 13, [2] = 14, [3] = 15, [4] = 16 }

data.jewelRadius = data.setJewelRadiiGlobally(latestTreeVersion)

-- Stat descriptions
Expand Down
1 change: 1 addition & 0 deletions src/Modules/ModParser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5525,6 +5525,7 @@ local specialModList = {
["upgrades radius to medium"] = { mod("JewelData", "LIST", { key = "timeLostJewelRadiusOverride", value = 2 })},
["upgrades radius to large"] = { mod("JewelData", "LIST", { key = "timeLostJewelRadiusOverride", value = 3 })},
["upgrades radius to very large"] = { mod("JewelData", "LIST", { key = "timeLostJewelRadiusOverride", value = 4 })},
["non%-unique time%-lost jewels have (%d+)%% increased radius"] = function(num) return { mod("NonUniqueTimeLostJewelRadius", "INC", num) } end,
["primordial"] = { mod("Multiplier:PrimordialItem", "BASE", 1) },
["spectres have a base duration of (%d+) seconds"] = { mod("SkillData", "LIST", { key = "duration", value = 6 }, { type = "SkillName", skillName = "Raise Spectre", includeTransfigured = true }) },
["flasks applied to you have (%d+)%% increased effect"] = function(num) return { mod("FlaskEffect", "INC", num, { type = "ActorCondition", actor = "player"}) } end,
Expand Down
Loading