Skip to content

Update jewel radius colors and parsing for variable radii #100

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
Jan 9, 2025
Merged

Update jewel radius colors and parsing for variable radii #100

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
8 changes: 4 additions & 4 deletions src/Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,10 +1395,10 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
for _, value in ipairs(modList:List(nil, "JewelData")) do
jewelData[value.key] = value.value
end
if modList:List(nil, "ImpossibleEscapeKeystones") then
jewelData.impossibleEscapeKeystones = { }
for _, value in ipairs(modList:List(nil, "ImpossibleEscapeKeystones")) do
jewelData.impossibleEscapeKeystones[value.key] = value.value
if modList:List(nil, "FromNothingKeystones") then
jewelData.fromNothingKeystones = { }
for _, value in ipairs(modList:List(nil, "FromNothingKeystones")) do
jewelData.fromNothingKeystones[value.key] = value.value
end
end
if self.clusterJewel then
Expand Down
12 changes: 6 additions & 6 deletions src/Classes/PassiveSpec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,8 @@ function PassiveSpecClass:NodesInIntuitiveLeapLikeRadius(node)
end
end

if item.jewelData and item.jewelData.impossibleEscapeKeystone then
for keyName, keyNode in pairs(item.jewelData.impossibleEscapeKeystones) do
if item.jewelData and item.jewelData.fromNothingKeystone then
for keyName, keyNode in pairs(item.jewelData.fromNothingKeystones) do
if self.tree.keystoneMap[keyName] and self.tree.keystoneMap[keyName].nodesInRadius then
for affectedNodeId in pairs(self.tree.keystoneMap[keyName].nodesInRadius[radiusIndex]) do
if self.nodes[affectedNodeId].alloc then
Expand Down Expand Up @@ -956,9 +956,9 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
end
end

if item.jewelData and item.jewelData.impossibleEscapeKeystone then
if item.jewelData and item.jewelData.fromNothingKeystone then
for keyName, keyNode in pairs(self.tree.keystoneMap) do
if item.jewelData.impossibleEscapeKeystones[keyName] and keyNode.nodesInRadius then
if item.jewelData.fromNothingKeystones[keyName] and keyNode.nodesInRadius then
if keyNode.nodesInRadius[radiusIndex][node.id] then
t_insert(node.intuitiveLeapLikesAffecting, self.nodes[nodeId])
end
Expand Down Expand Up @@ -1295,8 +1295,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
and self.nodes[nodeId].nodesInRadius[self.build.itemsTab.items[itemId].jewelRadiusIndex][depNode.id]
) or (
self.build.itemsTab.items[itemId].jewelData
and self.build.itemsTab.items[itemId].jewelData.impossibleEscapeKeystones
and self:NodeInKeystoneRadius(self.build.itemsTab.items[itemId].jewelData.impossibleEscapeKeystones, depNode.id, self.build.itemsTab.items[itemId].jewelRadiusIndex)
and self.build.itemsTab.items[itemId].jewelData.fromNothingKeystones
and self:NodeInKeystoneRadius(self.build.itemsTab.items[itemId].jewelData.fromNothingKeystones, depNode.id, self.build.itemsTab.items[itemId].jewelRadiusIndex)
)
) then
-- Hold off on the pruning; this node could be supported by Intuitive Leap-like jewel
Expand Down
6 changes: 3 additions & 3 deletions src/Classes/PassiveTreeView.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,9 +854,9 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
local outerSize = radData.outer * scale
local innerSize = radData.inner * scale * 1.06
SetDrawColor(1,1,1,0.7)
if jewel.title == "Impossible Escape" then
-- Impossible Escape ring shows on the allocated Keystone
for keystoneName, _ in pairs(jewel.jewelData.impossibleEscapeKeystones) do
if jewel.title == "From Nothing" then
-- From Nothing ring shows on the allocated Keystone
for keystoneName, _ in pairs(jewel.jewelData.fromNothingKeystones) do
local keystone = spec.tree.keystoneMap[keystoneName]
if keystone and keystone.x and keystone.y then
innerSize = 150 * scale
Expand Down
Loading