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
19 changes: 19 additions & 0 deletions spec/System/TestItemMods_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,25 @@ describe("TetsItemMods", function()
assert.are.equals(68, build.calcsTab.mainOutput.ChaosResistTotal)
end)

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

local itemDB = build.itemsTab.controls.uniqueDB
itemDB.db = { list = {
new("Item", "New Item\nRing"),
new("Item", "New Item\nRing\n+50% to Fire Resistance"),
new("Item", "New Item\nBroadhead Quiver"),
} }
itemDB:SetSortMode("FireTakenHit")

itemDB:ListBuilder()

assert.is_true(itemDB.list[1].measuredPower < 0)
assert.are.equals(-math.huge, itemDB.list[#itemDB.list].measuredPower)
end)

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

build.configTab.input.customMods = "\z
Expand Down
5 changes: 3 additions & 2 deletions src/Classes/ItemDBControl.lua
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 -math.huge
local now = GetTime()
if now - start > 50 then
self.defaultText = "^7Sorting... ("..m_floor(itemIndex/#list*100).."%)"
Expand Down
Loading