Skip to content

Refactor grantedEffectList ordering logic #2234

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

Open
okazakikun wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −5
Open

Refactor grantedEffectList ordering logic #2234

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
18 changes: 13 additions & 5 deletions src/Modules/Data.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,12 +950,20 @@ local function setupGem(gem, gemId)
end
if gem.grantedEffectDisplayOrder then
local tempTable = {}
local moved = false
for i, temp in ipairs(gem.grantedEffectList) do
if gem.grantedEffectDisplayOrder[i] then
tempTable[i] = gem.grantedEffectList[gem.grantedEffectDisplayOrder[i] + 1]
local used = {}
for i, order in ipairs(gem.grantedEffectDisplayOrder) do
local index = order + 1
if gem.grantedEffectList[index] and not used[index] then
tempTable[i] = gem.grantedEffectList[index]
used[index] = true
else
tempTable[i] = temp
tempTable[i] = gem.grantedEffectList[i]
used[i] = true
end
end
for i, effect in ipairs(gem.grantedEffectList) do
if not used[i] then
table.insert(tempTable, effect)
end
end
gem.grantedEffectList = tempTable
Expand Down