Skip to content
Merged
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
21 changes: 14 additions & 7 deletions src/Export/Scripts/passivetree_ggg.lua
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,12 @@

-- TODO: minimal check
local nodeOrbit = 0
if orbitDataSearch.orbit ~= nil and orbitDataSearch.orbit ~= 0 then
nodeOrbit = (orbitDataSearch.orbit + 1) * arcDirection(node, data.nodes[nodeIdOut], orbitDataSearch)
if orbitDataSearch.orbit ~= nil then
if orbitDataSearch.orbit == 0 and not orbitDataSearch.orbitX and not orbitDataSearch.orbitY then
nodeOrbit = 0x7FFFFFFF
else
nodeOrbit = (orbitDataSearch.orbit + 1) * arcDirection(node, data.nodes[nodeIdOut], orbitDataSearch)
end
end

local connectionData = {
Expand All @@ -403,11 +407,14 @@
["ascendancy"] = ascendancySearchNameById[node.unlockConstraint.ascendancy],
["nodes"] = node.unlockConstraint.nodes,
}
nodeData["nodeOverlay"] = {
["alloc"] = "OracleFrameAllocated",
["path"] = "OracleFrameCanAllocate",
["unalloc"] = "OracleFrameUnallocated",
}

if not node.isMastery then
nodeData["nodeOverlay"] = {
["alloc"] = "OracleFrameAllocated",
["path"] = "OracleFrameCanAllocate",
["unalloc"] = "OracleFrameUnallocated",
}
end
end

orbitsConstants[node.orbit + 1] = math.max(orbitsConstants[node.orbit + 1] or 1, node.orbitIndex)
Expand Down Expand Up @@ -679,7 +686,7 @@
-- build orbits info
tree.assets={
CharacterAscendancyLineConnectorActive={
[1]="CharacterAscendancy_orbit_intermediateactive0.png"

Check warning on line 689 in src/Export/Scripts/passivetree_ggg.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (intermediateactive)
},
CharacterAscendancyLineConnectorIntermediate={
[1]="CharacterAscendancy_orbit_intermediate0.png"
Expand All @@ -688,7 +695,7 @@
[1]="CharacterAscendancy_orbit_normal0.png"
},
CharacterAscendancyOrbit1Active={
[1]="CharacterAscendancy_orbit_intermediateactive9.png"

Check warning on line 698 in src/Export/Scripts/passivetree_ggg.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (intermediateactive)
},
CharacterAscendancyOrbit1Intermediate={
[1]="CharacterAscendancy_orbit_intermediate9.png"
Expand All @@ -697,7 +704,7 @@
[1]="CharacterAscendancy_orbit_normal9.png"
},
CharacterAscendancyOrbit2Active={
[1]="CharacterAscendancy_orbit_intermediateactive8.png"

Check warning on line 707 in src/Export/Scripts/passivetree_ggg.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (intermediateactive)
},
CharacterAscendancyOrbit2Intermediate={
[1]="CharacterAscendancy_orbit_intermediate8.png"
Expand All @@ -706,7 +713,7 @@
[1]="CharacterAscendancy_orbit_normal8.png"
},
CharacterAscendancyOrbit3Active={
[1]="CharacterAscendancy_orbit_intermediateactive6.png"

Check warning on line 716 in src/Export/Scripts/passivetree_ggg.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (intermediateactive)
},
CharacterAscendancyOrbit3Intermediate={
[1]="CharacterAscendancy_orbit_intermediate6.png"
Expand All @@ -715,7 +722,7 @@
[1]="CharacterAscendancy_orbit_normal6.png"
},
CharacterAscendancyOrbit4Active={
[1]="CharacterAscendancy_orbit_intermediateactive5.png"

Check warning on line 725 in src/Export/Scripts/passivetree_ggg.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (intermediateactive)
},
CharacterAscendancyOrbit4Intermediate={
[1]="CharacterAscendancy_orbit_intermediate5.png"
Expand Down
Loading
Loading