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
12 changes: 11 additions & 1 deletion src/Classes/PassiveSpec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ end
function PassiveSpecClass:BuildAllDependsAndPaths()
-- This table will keep track of which nodes have been visited during each path-finding attempt
local visited = { }
local attributes = { "Dexterity", "Intelligence", "Strength" }
local attributes = { "Dexterity", "Intelligence", "Strength", "Attribute" }
-- Check all nodes for other nodes which depend on them (i.e. are only connected to the tree through that node)
self.switchableNodes = { }
for id, node in pairs(self.nodes) do
Expand Down Expand Up @@ -1036,6 +1036,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
local jewelType = 5
if conqueredBy.conqueror.type == "kalguur" then
jewelType = 1
elseif conqueredBy.conqueror.type == "abyss" then
jewelType = 2
end
local seed = conqueredBy.id
if jewelType == 5 then
Expand Down Expand Up @@ -1195,6 +1197,14 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
-- local legionNode = legionNodes[110] -- eternal_small_blank
-- self:ReplaceNode(node, legionNode)
-- end
if conqueredBy.conqueror.type == "abyss" then
if isValueInArray(attributes, node.dn) then
self:NodeAdditionOrReplacementFromString(node, " \n+3 to Tribute")
else
local legionNode = legionNodes[201] -- abyss_small_tribute
self:ReplaceNode(node, legionNode)
end
end
end
self:ReconnectNodeToClassStart(node)
end
Expand Down
5 changes: 4 additions & 1 deletion src/Classes/PassiveTreeView.lua
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,12 @@
if conqueror == "kalguur" then
conqueror = "kalguuran"
end

local circle1 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreen".. conqueror .."jewelcircle1.dds")
local circle2 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/passiveskillscreen".. conqueror .."jewelcircle2.dds")
if conqueror == "abyss" then
circle1 = tree:GetAssetByName("art/textures/interface/2d/2dart/uiimages/ingame/".. conqueror .."/".. conqueror .."passiveskillscreenjewelcircle1.dds")

Check warning on line 951 in src/Classes/PassiveTreeView.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (passiveskillscreenjewelcircle)
circle2 = circle1
end
DrawImage(circle1.handle, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2, unpack(circle1))
DrawImage(circle2.handle, scrX - outerSize, scrY - outerSize, outerSize * 2, outerSize * 2, unpack(circle2))
else
Expand Down
150 changes: 111 additions & 39 deletions src/Data/ModCache.lua

Large diffs are not rendered by default.

Loading
Loading