Merge branch 'dev' into feature/imbued-support-implementation

Author: LocalIdentity

src/Classes/GemSelectControl.lua

@@ -63,7 +63,6 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
 	else
 		gemList[self.index] = {
 			level = gemData.naturalMaxLevel,
-			qualityId = "Default",
 			quality = self.skillsTab.defaultGemQuality or 0,
 			count = 1,
 			enabled = true,
@@ -80,7 +79,6 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
 	gemInstance.level = self.skillsTab:ProcessGemLevel(gemData, self.imbuedSelect)
 	gemInstance.gemData = gemData
 	gemInstance.displayEffect = nil
-	gemInstance.qualityId = "Default"
 	-- Calculate the impact of using this gem
 	local output = calcFunc(nil, useFullDPS)
 	-- Put the original gem back into the list
@@ -377,7 +375,7 @@ function GemSelectClass:UpdateGem(setText, addUndo)
 	if setText then
 		self:SetText(self.gemName)
 	end
-	self.gemChangeFunc(self.gemId and self.gemId:gsub("%w+:", ""), "Default", addUndo and self.gemName ~= self.initialBuf)
+	self.gemChangeFunc(self.gemId and self.gemId:gsub("%w+:", ""), addUndo and self.gemName ~= self.initialBuf)
 end
 
 function GemSelectClass:ScrollSelIntoView()
@@ -478,7 +476,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
 				local output= self:CalcOutputWithThisGem(calcFunc, gemData, self.skillsTab.sortGemsByDPSField == "FullDPS")
 				local gemInstance = {
 						level = self.skillsTab:ProcessGemLevel(gemData, self.imbuedSelect),
-						qualityId = "Default",
 						quality = self.skillsTab.defaultGemQuality or 0,
 						count = 1,
 						enabled = true,
@@ -531,7 +528,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
 			end
 
 			if gemInstance and gemInstance.gemData then
-				gemInstance.qualityId = "Default"
 				self:AddGemTooltip(gemInstance)
 			else
 				self.tooltip:AddLine(16, self.imbuedSelect and imbuedTooltipText or toolTipText)

src/Classes/ImportTab.lua

@@ -1116,11 +1116,11 @@ function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName)
 			self:ImportItem(socketedItem, slotName .. " Abyssal Socket "..abyssalSocketId)
 			abyssalSocketId = abyssalSocketId + 1
 		else
-			local normalizedBasename, qualityType = sanitiseText(socketedItem.typeLine)
+			local normalizedBasename = sanitiseText(socketedItem.typeLine)
 			local gemId = self.build.data.gemForBaseName[normalizedBasename:lower()]
 			if socketedItem.hybrid then
 				-- Used by transfigured gems and dual-skill gems (currently just Stormbind) 
-				normalizedBasename, qualityType = sanitiseText(socketedItem.hybrid.baseTypeName)
+				normalizedBasename = sanitiseText(socketedItem.hybrid.baseTypeName)
 				gemId = self.build.data.gemForBaseName[normalizedBasename:lower()]
 				if gemId and socketedItem.hybrid.isVaalGem then
 					gemId = self.build.data.gemGrantedEffectIdForVaalGemId[self.build.data.gems[gemId].grantedEffectId]
@@ -1130,7 +1130,6 @@ function ImportTabClass:ImportSocketedItems(item, socketedItems, slotName)
 				local gemInstance = { level = 20, quality = 0, enabled = true, enableGlobal1 = true, gemId = gemId }
 				gemInstance.nameSpec = self.build.data.gems[gemId].name
 				gemInstance.support = socketedItem.support
-				gemInstance.qualityId = qualityType
 				for _, property in pairs(socketedItem.properties) do
 					if property.name == "Level" then
 						gemInstance.level = tonumber(property.values[1][1]:match("%d+"))

src/Classes/SkillsTab.lua

@@ -793,16 +793,20 @@ function SkillsTabClass:CreateGemSlot(index)
 					end
 				end
 			end
-			-- Check if there is a quality of this type for the effect
-			if gemData and gemData.grantedEffect.qualityStats and gemData.grantedEffect.qualityStats["Default"] then
-				local qualityTable = gemData.grantedEffect.qualityStats["Default"]
-				addQualityLines(qualityTable, gemData.grantedEffect)
-				tooltip:AddSeparator(10)
+			-- Check if there is quality for the effect
+			if gemData and gemData.grantedEffect and gemData.grantedEffect.qualityStats then
+				local qualityTable = gemData.grantedEffect.qualityStats
+				if qualityTable[1] then
+					addQualityLines(qualityTable, gemData.grantedEffect)
+					tooltip:AddSeparator(10)
+				end
 			end
-			if gemData and gemData.secondaryGrantedEffect and gemData.secondaryGrantedEffect.qualityStats and gemData.secondaryGrantedEffect.qualityStats["Default"] then
-				local qualityTable = gemData.secondaryGrantedEffect.qualityStats["Default"]
-				addQualityLines(qualityTable, gemData.secondaryGrantedEffect)
-				tooltip:AddSeparator(10)
+			if gemData and gemData.secondaryGrantedEffect and gemData.secondaryGrantedEffect.qualityStats then
+				local qualityTable = gemData.secondaryGrantedEffect.qualityStats
+				if qualityTable[1] then
+					addQualityLines(qualityTable, gemData.secondaryGrantedEffect)
+					tooltip:AddSeparator(10)
+				end
 			end
 
 			local calcFunc, calcBase = self.build.calcsTab:GetMiscCalculator(self.build)