Remove more quality stuff

Author: LocalIdentity

src/Classes/GemSelectControl.lua

@@ -61,7 +61,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,
@@ -78,7 +77,6 @@ function GemSelectClass:CalcOutputWithThisGem(calcFunc, gemData, useFullDPS)
 	gemInstance.level = self.skillsTab:ProcessGemLevel(gemData)
 	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
@@ -471,7 +469,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
 				local output= self:CalcOutputWithThisGem(calcFunc, gemData, self.skillsTab.sortGemsByDPSField == "FullDPS")
 				local gemInstance = {
 						level = self.skillsTab:ProcessGemLevel(gemData),
-						qualityId = "Default",
 						quality = self.skillsTab.defaultGemQuality or 0,
 						count = 1,
 						enabled = true,
@@ -512,7 +509,6 @@ function GemSelectClass:Draw(viewPort, noTooltip)
 			local cursorX, cursorY = GetCursorPos()
 			self.tooltip:Clear()
 			if gemInstance and gemInstance.gemData then
-				gemInstance.qualityId = "Default"
 				self:AddGemTooltip(gemInstance)
 			else
 				self.tooltip:AddLine(16, 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/Export/Scripts/skills.lua

@@ -404,10 +404,10 @@ directiveTable.skill = function(state, args, out)
 	if not skill.qualityStats then
 		skill.qualityStats = { }
 		for i, qualityStatsRow in ipairs(dat("GrantedEffectQualityStats"):GetRowList("GrantedEffect", granted)) do
-			skill.qualityStats[i] = { }
+			skill.qualityStats.Default = { }
 			for j, stat in ipairs(qualityStatsRow.GrantedStats) do
-				table.insert(skill.qualityStats[i], { stat.Id, qualityStatsRow.StatValues[j] / 1000 })
-				--ConPrintf("[%d] %s %s", i, granted.ActiveSkill.DisplayName, stat.Id)
+				table.insert(skill.qualityStats.Default, { stat.Id, qualityStatsRow.StatValues[j] / 1000 })
+				--ConPrintf("%s %s", granted.ActiveSkill.DisplayName, stat.Id)
 			end
 		end
 	end
@@ -454,18 +454,11 @@ directiveTable.mods = function(state, args, out)
 	if not args:match("noQualityStats") then
 		if next(skill.qualityStats) ~= nil then
 			out:write('\tqualityStats = {\n')
-			for i, alternates in ipairs(skill.qualityStats) do
-				if i == 1 then
-					out:write('\t\tDefault = {\n')
-				else
-					local value = i - 1
-					out:write('\t\tAlternate' .. value .. ' = {\n')
-				end
-				for _, stat in ipairs(alternates) do
-					out:write('\t\t\t{ "', stat[1], '", ', stat[2], ' },\n')
-				end
-				out:write('\t\t},\n')
+			out:write('\t\tDefault = {\n')
+			for _, stat in ipairs(skill.qualityStats.Default or skill.qualityStats) do
+				out:write('\t\t\t{ "', stat[1], '", ', stat[2], ' },\n')
 			end
+			out:write('\t\t},\n')
 			out:write('\t},\n')
 		end
 	end

src/Modules/CalcActiveSkill.lua

@@ -171,7 +171,6 @@ function calcs.copyActiveSkill(env, mode, skill)
 	if skill.activeEffect.srcInstance then
 		activeEffect.level = skill.activeEffect.srcInstance.level
 		activeEffect.quality = skill.activeEffect.srcInstance.quality
-		activeEffect.qualityId = skill.activeEffect.srcInstance.qualityId
 		activeEffect.srcInstance = skill.activeEffect.srcInstance
 		activeEffect.gemData = skill.activeEffect.srcInstance.gemData
 	end

src/Modules/CalcSetup.lua

@@ -1523,7 +1523,6 @@ function calcs.initEnv(build, mode, override, specEnv)
 								grantedEffect = grantedEffect,
 								level = gemInstance.level,
 								quality = gemInstance.quality,
-								qualityId = gemInstance.qualityId,
 								srcInstance = gemInstance,
 								gemData = gemInstance.gemData,
 								superseded = false,
@@ -1595,7 +1594,6 @@ function calcs.initEnv(build, mode, override, specEnv)
 									grantedEffect = grantedEffect,
 									level = gemInstance.level,
 									quality = gemInstance.quality,
-									qualityId = gemInstance.qualityId,
 									srcInstance = gemInstance,
 									gemData = gemInstance.gemData,
 								}

src/Modules/CalcTools.lua

@@ -176,8 +176,7 @@ end
 function calcLib.buildSkillInstanceStats(skillInstance, grantedEffect)
 	local stats = { }
 	if skillInstance.quality > 0 and grantedEffect.qualityStats then
-		local qualityId = skillInstance.qualityId or "Default"
-		local qualityStats = grantedEffect.qualityStats[qualityId]
+		local qualityStats = grantedEffect.qualityStats.Default
 		if not qualityStats then
 			qualityStats = grantedEffect.qualityStats
 		end