Skip to content

Fix negative stat item sorting #1889

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
unrealdreamz wants to merge 1 commit into
base: dev
Choose a base branch
from
+38 −3
Open

Fix negative stat item sorting #1889

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
34 changes: 34 additions & 0 deletions spec/System/TestItemMods_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,40 @@ describe("TetsItemMods", function()
-- newBuild() takes care of resetting everything in setup()
end)

it("sorts defensive item stats when the best score is negative", function()
build.configTab.input.enemyFireDamage = "1000"
build.configTab:BuildModList()
runCallback("OnFrame")

local saferRing = new("Item", [[
New Item
Ring
+50% to Fire Resistance
]])
local baselineRing = new("Item", [[
New Item
Ring
]])
local itemDB = build.itemsTab.controls.uniqueDB
itemDB.db = { list = { baselineRing, saferRing } }
itemDB.sortMode = "FireTakenHit"
itemDB.sortDetail = {
stat = "FireTakenHit",
transform = function(value)
return -value
end
}
itemDB.sortOrder = {
itemDB.sortControl.STAT,
itemDB.sortControl.NAME
}

itemDB:ListBuilder()

assert.are.equals(saferRing, itemDB.list[1])
assert.is_true(saferRing.measuredPower < 0)
end)

it("Both slots mod (evasion and es mastery)", function()

build.configTab.input.customMods = "\z
Expand Down
7 changes: 4 additions & 3 deletions src/Classes/ItemDBControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,17 +239,18 @@ function ItemDBClass:ListBuilder()
local start = GetTime()
local calcFunc, calcBase = self.itemsTab.build.calcsTab:GetMiscCalculator(self.build)
for itemIndex, item in ipairs(list) do
item.measuredPower = 0
item.measuredPower = nil
for slotName, slot in pairs(self.itemsTab.slots) do
if self.itemsTab:IsItemValidForSlot(item, slotName) and not slot.inactive and (not slot.weaponSet or slot.weaponSet == (self.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1)) then
local output = calcFunc(item.base.flask and { toggleFlask = item } or item.base.charm and { toggleCharm = item } or { repSlotName = slotName, repItem = item }, useFullDPS)
local measuredPower = output.Minion and output.Minion[self.sortMode] or output[self.sortMode] or 0
if self.sortDetail.transform then
measuredPower = self.sortDetail.transform(measuredPower)
end
item.measuredPower = m_max(item.measuredPower, measuredPower)
item.measuredPower = item.measuredPower and m_max(item.measuredPower, measuredPower) or measuredPower
end
end
item.measuredPower = item.measuredPower or 0
local now = GetTime()
if now - start > 50 then
self.defaultText = "^7Sorting... ("..m_floor(itemIndex/#list*100).."%)"
Expand Down Expand Up @@ -375,4 +376,4 @@ function ItemDBClass:OnHoverKeyUp(key)
itemLib.wiki.openItem(item)
end
end
end
end