From 6664b2044c3af657ade5c2f84235fe9a33b4cdc6 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Fri, 31 Oct 2025 00:22:27 +1100 Subject: [PATCH] Remove rej file --- src/Classes/GemSelectControl.lua.rej | 45 ---------------------------- 1 file changed, 45 deletions(-) delete mode 100644 src/Classes/GemSelectControl.lua.rej diff --git a/src/Classes/GemSelectControl.lua.rej b/src/Classes/GemSelectControl.lua.rej deleted file mode 100644 index 54fbd54d..00000000 --- a/src/Classes/GemSelectControl.lua.rej +++ /dev/null @@ -1,45 +0,0 @@ -diff a/src/Classes/GemSelectControl.lua b/src/Classes/GemSelectControl.lua (rejected hunks) -@@ -71,8 +71,6 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS) - gemInstance.level = self.skillsTab:ProcessGemLevel(gemData) - gemInstance.gemData = gemData - gemInstance.displayEffect = nil -- -- Add hovered gem to tooltip -- self:AddGemTooltip(gemInstance) - -- Calculate the impact of using this gem - local output = calcFunc(nil, useFullDPS) - -- Put the original gem back into the list -@@ -308,8 +306,8 @@ function GemSelectClass:UpdateSortCache() - for gemId, gemData in pairs(self.gems) do - sortCache.dps[gemId] = baseDPS - -- Ignore gems that don't support the active skill -- if sortCache.canSupport[gemId] or gemData.grantedEffect.hasGlobalEffect then -- local output = self:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS) -+ if sortCache.canSupport[gemId] or (gemData.grantedEffect.hasGlobalEffect and not gemData.grantedEffect.support) then -+ local output = self:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS, fastCalcOptions, calcBase) - -- Check for nil because some fields may not be populated, default to 0 - 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 - end -@@ -451,7 +449,22 @@ function GemSelectClass:Draw(viewPort, noTooltip) - local calcFunc, calcBase = self.skillsTab.build.calcsTab:GetMiscCalculator(self.build) - if calcFunc then - self.tooltip:Clear() -- local output = self:CalcOutputWithThisGem(calcFunc, self.gems[self.list[self.hoverSel]], self.skillsTab.sortGemsByDPSField == "FullDPS") -+ local gemData = self.gems[self.list[self.hoverSel]] -+ local output = self:CalcOutputWithThisGem(calcFunc, gemData, self.skillsTab.sortGemsByDPSField == "FullDPS", nil, calcBase) -+ local gemInstance = { -+ level = self.skillsTab:ProcessGemLevel(gemData), -+ quality = self.skillsTab.defaultGemQuality or 0, -+ count = 1, -+ enabled = true, -+ enableGlobal1 = true, -+ enableGlobal2 = true, -+ gemId = gemData.id, -+ nameSpec = gemData.name, -+ skillId = gemData.grantedEffectId, -+ displayEffect = nil, -+ gemData = gemData -+ } -+ self:AddGemTooltip(gemInstance) - self.tooltip:AddSeparator(10) - self.skillsTab.build:AddStatComparesToTooltip(self.tooltip, calcBase, output, "^7Selecting this gem will give you:") - self.tooltip:Draw(x, y + height + 2 + (self.hoverSel - 1) * (height - 4) - scrollBar.offset, width, height - 4, viewPort)