Skip to content

Commit 009a7c5

Browse files
justjuanguijustjuangui
andauthored
Fix orbit values for passive nodes and update node overlays for non-mastery nodes (#1998)
Co-authored-by: justjuangui <servicios@juacarvajal.com>
1 parent de32187 commit 009a7c5

2 files changed

Lines changed: 152 additions & 250 deletions

File tree

src/Export/Scripts/passivetree_ggg.lua

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,12 @@ for id, node in pairsSortByKey(data.nodes) do
384384

385385
-- TODO: minimal check
386386
local nodeOrbit = 0
387-
if orbitDataSearch.orbit ~= nil and orbitDataSearch.orbit ~= 0 then
388-
nodeOrbit = (orbitDataSearch.orbit + 1) * arcDirection(node, data.nodes[nodeIdOut], orbitDataSearch)
387+
if orbitDataSearch.orbit ~= nil then
388+
if orbitDataSearch.orbit == 0 and not orbitDataSearch.orbitX and not orbitDataSearch.orbitY then
389+
nodeOrbit = 0x7FFFFFFF
390+
else
391+
nodeOrbit = (orbitDataSearch.orbit + 1) * arcDirection(node, data.nodes[nodeIdOut], orbitDataSearch)
392+
end
389393
end
390394

391395
local connectionData = {
@@ -403,11 +407,14 @@ for id, node in pairsSortByKey(data.nodes) do
403407
["ascendancy"] = ascendancySearchNameById[node.unlockConstraint.ascendancy],
404408
["nodes"] = node.unlockConstraint.nodes,
405409
}
406-
nodeData["nodeOverlay"] = {
407-
["alloc"] = "OracleFrameAllocated",
408-
["path"] = "OracleFrameCanAllocate",
409-
["unalloc"] = "OracleFrameUnallocated",
410-
}
410+
411+
if not node.isMastery then
412+
nodeData["nodeOverlay"] = {
413+
["alloc"] = "OracleFrameAllocated",
414+
["path"] = "OracleFrameCanAllocate",
415+
["unalloc"] = "OracleFrameUnallocated",
416+
}
417+
end
411418
end
412419

413420
orbitsConstants[node.orbit + 1] = math.max(orbitsConstants[node.orbit + 1] or 1, node.orbitIndex)

0 commit comments

Comments
 (0)