Skip to content

Fix legion passive index off-by-one error #4578

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
merged 2 commits into from
Jul 13, 2022
Merged

Fix legion passive index off-by-one error #4578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1a69a
Fix legion passive index off-by-one error
Lothrik Jul 12, 2022
a2c8e36
Replace magic number with named constant
Lothrik Jul 12, 2022
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
36 changes: 18 additions & 18 deletions src/Classes/PassiveSpec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,11 +725,11 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
-- FIXME: complete implementation of this. Need to set roll values for stats
-- based on their `fmt` specification
if headerSize == 2 or headerSize == 3 then
self:ReplaceNode(node, legionNodes[jewelDataTbl[1] - 94])
self:ReplaceNode(node, legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions])

for i, repStat in ipairs(legionNodes[jewelDataTbl[1] - 94].sd) do
local statKey = legionNodes[jewelDataTbl[1] - 94].sortedStats[i]
local statMod = legionNodes[jewelDataTbl[1] - 94].stats[statKey]
for i, repStat in ipairs(legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].sd) do
local statKey = legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].sortedStats[i]
local statMod = legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].stats[statKey]
repStat = replaceHelperFunc(repStat, statKey, statMod, jewelDataTbl[statMod.index + 1])
self:NodeAdditionOrReplacementFromString(node, repStat, i == 1) -- wipe mods on first run
end
Expand All @@ -746,9 +746,9 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
end
end
if bias >= 0 then
self:ReplaceNode(node, legionNodes[76]) -- might of the vaal
self:ReplaceNode(node, legionNodes[77]) -- might of the vaal
else
self:ReplaceNode(node, legionNodes[77]) -- legacy of the vaal
self:ReplaceNode(node, legionNodes[78]) -- legacy of the vaal
end
local additions = {}
for i,val in ipairs(jewelDataTbl) do
Expand All @@ -763,8 +763,8 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
break
end
end
for add,val in pairs(additions) do
local addition = legionAdditions[add]
for add, val in pairs(additions) do
local addition = legionAdditions[add + 1]
for _, addStat in ipairs(addition.sd) do
for k,statMod in pairs(addition.stats) do -- should only be 1 big, these didnt get changed so cant just grab index
addStat = replaceHelperFunc(addStat, k, statMod, val)
Expand All @@ -777,21 +777,21 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
end
else
for _, jewelData in ipairs(jewelDataTbl) do
if jewelData >= 94 then -- replace
jewelData = jewelData - 94
if jewelData >= data.timelessJewelAdditions then -- replace
jewelData = jewelData + 1 - data.timelessJewelAdditions
local legionNode = legionNodes[jewelData]
if legionNode then
self:ReplaceNode(node, legionNode)
else
ConPrintf("Unhandled 'replace' ID: " .. jewelData)
end
elseif jewelData then -- add
local addition = legionAdditions[jewelData]
local addition = legionAdditions[jewelData + 1]
for _, addStat in ipairs(addition.sd) do
self:NodeAdditionOrReplacementFromString(node, " \n" .. addStat)
end
elseif next(jewelData) then
ConPrintf("Unhandled OP: " .. jewelData)
ConPrintf("Unhandled OP: " .. jewelData + 1)
end
end
end
Expand All @@ -812,14 +812,14 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
else
jewelDataTbl = data.readLUT(conqueredBy.id, node.id, jewelType)
end
print("Need to Update: " .. node.id .. " [" .. node.dn .. "]")
--print("Need to Update: " .. node.id .. " [" .. node.dn .. "]")
if not next(jewelDataTbl) then
ConPrintf("Missing LUT: " .. data.timelessJewelTypes[jewelType])
else
self:ReplaceNode(node, legionNodes[jewelDataTbl[1] - 94])
self:ReplaceNode(node, legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions])
for i, repStat in ipairs(node.sd) do
local statKey = legionNodes[jewelDataTbl[1] - 94].sortedStats[i]
local statMod = legionNodes[jewelDataTbl[1] - 94].stats[statKey]
local statKey = legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].sortedStats[i]
local statMod = legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].stats[statKey]
repStat = replaceHelperFunc(repStat, statKey, statMod, jewelDataTbl[2])
self:NodeAdditionOrReplacementFromString(node, repStat, true)
end
Expand All @@ -832,13 +832,13 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
self:NodeAdditionOrReplacementFromString(node, " \n+" .. dex .. " to Dexterity")
elseif conqueredBy.conqueror.type == "templar" then
if isValueInArray(attributes, node.dn) then
local legionNode = legionNodes[90] -- templar_devotion_node
local legionNode = legionNodes[91] -- templar_devotion_node
self:ReplaceNode(node, legionNode)
else
self:NodeAdditionOrReplacementFromString(node, " \n+5 to Devotion")
end
elseif conqueredBy.conqueror.type == "eternal" then
local legionNode = legionNodes[109] -- eternal_small_blank
local legionNode = legionNodes[110] -- eternal_small_blank
self:ReplaceNode(node, legionNode)
end
end
Expand Down
14 changes: 7 additions & 7 deletions src/Classes/TreeTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,12 +1079,12 @@ function TreeTabClass:FindTimelessJewel()
else
local curNode = nil
local curNodeId = nil
if jewelDataTbl[1] >= 94 then -- replace
curNode = legionNodes[jewelDataTbl[1] - 94]
curNodeId = curNode and legionNodes[jewelDataTbl[1] - 94].id or nil
if jewelDataTbl[1] >= data.timelessJewelAdditions then -- replace
curNode = legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions]
curNodeId = curNode and legionNodes[jewelDataTbl[1] + 1 - data.timelessJewelAdditions].id or nil
else -- add
curNode = legionAdditions[jewelDataTbl[1]]
curNodeId = curNode and legionAdditions[jewelDataTbl[1]].id or nil
curNode = legionAdditions[jewelDataTbl[1] + 1]
curNodeId = curNode and legionAdditions[jewelDataTbl[1] + 1].id or nil
end
if timelessData.jewelType.id == 1 then
local headerSize = #jewelDataTbl
Expand All @@ -1104,8 +1104,8 @@ function TreeTabClass:FindTimelessJewel()
end
elseif headerSize == 6 or headerSize == 8 then
for i, jewelData in ipairs(jewelDataTbl) do
curNode = legionAdditions[jewelDataTbl[i]]
curNodeId = curNode and legionAdditions[jewelDataTbl[i]].id or nil
curNode = legionAdditions[jewelDataTbl[i] + 1]
curNodeId = curNode and legionAdditions[jewelDataTbl[i] + 1].id or nil
if i <= (headerSize / 2) then
if desiredNodes[curNodeId] then
resultNodes[curSeed][curNodeId] = resultNodes[curSeed][curNodeId] or { targetNodeNames = { }, totalWeight = 0 }
Expand Down
Loading