Skip to content

Sort the Calculations Tab breakdown lists by value #7211

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 4 commits into from
Jan 13, 2024
Merged

Sort the Calculations Tab breakdown lists by value #7211

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c391593
Sort the CalcBreakdownControl list by value.
duiker101 Jan 7, 2024
7969f76
Sort the CalcBreakdownControl taking in consideration boolean values.
duiker101 Jan 8, 2024
b65bafc
Use a copy of the modList in CalcBreakdownControl
duiker101 Jan 8, 2024
ce6e091
Sort generic breakdown and slots
duiker101 Jan 12, 2024
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
30 changes: 26 additions & 4 deletions src/Classes/CalcBreakdownControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,19 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
end

if breakdown.rowList and #breakdown.rowList > 0 then
-- sort by the first column (the value)
local rowList = copyTable(breakdown.rowList, true)
local colKey = breakdown.colList[1].key
table.sort(rowList, function(a, b)
return a[colKey] > b[colKey]
end)

-- Generic table
local section = {
type = "TABLE",
label = breakdown.label,
footer = breakdown.footer,
rowList = breakdown.rowList,
rowList = rowList,
colList = breakdown.colList,
}
t_insert(self.sectionList, section)
Expand Down Expand Up @@ -225,6 +232,10 @@ function CalcBreakdownClass:AddBreakdownSection(sectionData)
rowList = breakdown.slots
end

table.sort(rowList, function(a, b)
return a['base'] > b['base']
end)

local section = {
type = "TABLE",
rowList = rowList,
Expand Down Expand Up @@ -260,8 +271,8 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
cfg.actor = sectionData.actor
local rowList
local modStore = (sectionData.enemy and actor.enemy.modDB) or (sectionData.cfg and actor.mainSkill.skillModList) or actor.modDB
if modList then
rowList = modList
if modList then
rowList = copyTable(modList)
else
if type(sectionData.modName) == "table" then
rowList = modStore:Tabulate(sectionData.modType, cfg, unpack(sectionData.modName))
Expand Down Expand Up @@ -289,6 +300,17 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
}
t_insert(self.sectionList, section)

table.sort(rowList, function(a, b)
-- Sort Modifiers by descending value
if type(a.value) == 'number' and type(b.value) == 'number' then
return b.value < a.value
end
if type(a.value) == 'boolean' and type(b.value) == 'boolean' then
return a.value and not b.value
end
return false
end)

if not modList and not sectionData.modType then
-- Sort modifiers by type
for i, row in ipairs(rowList) do
Expand Down Expand Up @@ -726,4 +748,4 @@ function CalcBreakdownClass:OnKeyUp(key)
self.controls.scrollBar:Scroll(-1)
end
return self
end
end