Skip to content

Commit 17571b6

Browse files
author
LocalIdentity
committed
Remove more quality lines
1 parent 71eeba7 commit 17571b6

1 file changed

Lines changed: 8 additions & 18 deletions

File tree

src/Classes/GemSelectControl.lua

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ local GemSelectClass = newClass("GemSelectControl", "EditControl", function(self
5454
self.imbuedSelect = imbued
5555
end)
5656

57-
function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, qualityId, useFullDPS)
57+
function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
5858
local gemList = self.skillsTab.displayGroup.gemList
5959
local displayGemList = self.skillsTab.displayGroup.displayGemList
6060
local oldGem
@@ -63,7 +63,7 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, qualityId, useF
6363
else
6464
gemList[self.index] = {
6565
level = gemData.naturalMaxLevel,
66-
qualityId = qualityId,
66+
qualityId = "Default",
6767
quality = self.skillsTab.defaultGemQuality or 0,
6868
count = 1,
6969
enabled = true,
@@ -80,9 +80,7 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, qualityId, useF
8080
gemInstance.level = self.skillsTab:ProcessGemLevel(gemData, self.imbuedSelect)
8181
gemInstance.gemData = gemData
8282
gemInstance.displayEffect = nil
83-
if gemInstance.qualityId == nil or gemInstance.qualityId == "" then
84-
gemInstance.qualityId = "Default"
85-
end
83+
gemInstance.qualityId = "Default"
8684
-- Calculate the impact of using this gem
8785
local output = calcFunc(nil, useFullDPS)
8886
-- Put the original gem back into the list
@@ -123,10 +121,6 @@ function GemSelectClass:PopulateGemList()
123121
end
124122
end
125123

126-
function GemSelectClass:GetQualityType() -- todo: whatever is using this adds the Default quality to gems, it seems, can't fully remove yet?
127-
return "Default"
128-
end
129-
130124
function GemSelectClass:FilterSupport(gemId, gemData)
131125
local showSupportTypes = self.skillsTab.showSupportGemTypes
132126
local isLegacyAwakened = (gemData.grantedEffect.legacy and gemData.grantedEffect.plusVersionOf)
@@ -338,7 +332,7 @@ function GemSelectClass:UpdateSortCache()
338332
sortCache.dps[gemId] = baseDPS
339333
-- Ignore gems that don't support the active skill
340334
if sortCache.canSupport[gemId] or (gemData.grantedEffect.hasGlobalEffect and not gemData.grantedEffect.support) then
341-
local output = self:CalcOutputWithThisGem(calcFunc, gemData, self:GetQualityType(gemId), useFullDPS)
335+
local output = self:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
342336
-- Check for nil because some fields may not be populated, default to 0
343337
sortCache.dps[gemId] = (dpsField == "FullDPS" and output[dpsField] ~= nil and output[dpsField]) or (output.Minion and output.Minion.CombinedDPS) or (output[dpsField] ~= nil and output[dpsField]) or 0
344338
end
@@ -383,7 +377,7 @@ function GemSelectClass:UpdateGem(setText, addUndo)
383377
if setText then
384378
self:SetText(self.gemName)
385379
end
386-
self.gemChangeFunc(self.gemId and self.gemId:gsub("%w+:", ""), self:GetQualityType(self.gemId), addUndo and self.gemName ~= self.initialBuf)
380+
self.gemChangeFunc(self.gemId and self.gemId:gsub("%w+:", ""), "Default", addUndo and self.gemName ~= self.initialBuf)
387381
end
388382

389383
function GemSelectClass:ScrollSelIntoView()
@@ -481,11 +475,10 @@ function GemSelectClass:Draw(viewPort, noTooltip)
481475
if calcFunc then
482476
self.tooltip:Clear()
483477
local gemData = self.gems[self.list[self.hoverSel]]
484-
local qualityType = self:GetQualityType(self.list[self.hoverSel])
485-
local output= self:CalcOutputWithThisGem(calcFunc, gemData, qualityType, self.skillsTab.sortGemsByDPSField == "FullDPS")
478+
local output= self:CalcOutputWithThisGem(calcFunc, gemData, self.skillsTab.sortGemsByDPSField == "FullDPS")
486479
local gemInstance = {
487480
level = self.skillsTab:ProcessGemLevel(gemData, self.imbuedSelect),
488-
qualityId = qualityType,
481+
qualityId = "Default",
489482
quality = self.skillsTab.defaultGemQuality or 0,
490483
count = 1,
491484
enabled = true,
@@ -538,10 +531,7 @@ function GemSelectClass:Draw(viewPort, noTooltip)
538531
end
539532

540533
if gemInstance and gemInstance.gemData then
541-
-- Check valid qualityId, set to 'Default' if missing
542-
if gemInstance.qualityId == nil or gemInstance.qualityId == "" then
543-
gemInstance.qualityId = "Default"
544-
end
534+
gemInstance.qualityId = "Default"
545535
self:AddGemTooltip(gemInstance)
546536
else
547537
self.tooltip:AddLine(16, self.imbuedSelect and imbuedTooltipText or toolTipText)

0 commit comments

Comments
 (0)