Add support for Gemling's additional quality Stats (#2333)

* Add support for Gemling's additional quality Stats

Adds support for the new gemling quality stats
There are still a bunch that need supporting but that should be easy
Only shows the quality stats and adds their effect when you have the node allocated
Also fixes an issue where some stat descriptions for quality mods weren't working as they were using the wrong stat set stat description scope

* Add support for new quality mods

* Fix default distance not applying for distance ramp

The placeholder value wasn't being used for distance ramp, you had to manually set it

* Fix gem tooltip max width

* Rain of Blade quality

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: LocalIdentity

spec/System/TestSkillsTab_spec.lua

@@ -321,7 +321,7 @@ describe("TestSkillsTab", function()
 					label = "Test Group",
 					enabled = true,
 					gemList = {
-						{ nameSpec = "TestGem", level = 20, quality = 0, qualityId = "Default", enabled = true, count = 1 }
+						{ nameSpec = "TestGem", level = 20, quality = 0, enabled = true, count = 1 }
 					}
 				}
 

spec/System/TestSkills_spec.lua

@@ -63,6 +63,45 @@ describe("TestSkills", function()
 		assertGemSupportLevel("Apocalypse", 3, 4)
 	end)
 
+	it("applies Advanced Thaumaturgy quality stats only when enabled", function()
+		local advancedThaumaturgy = build.spec.nodes[14429]
+		assert.is_not_nil(advancedThaumaturgy)
+		assert.True(advancedThaumaturgy.modList:Flag(nil, "GemlingQuality"))
+
+		local grantedEffect = data.skills["AlchemistsBoonPlayer"]
+		local statSet = grantedEffect.statSets[1]
+		local skillInstance = {
+			level = 20,
+			quality = 20,
+		}
+
+		local stats = calcLib.buildSkillInstanceStats(skillInstance, grantedEffect, statSet)
+		assert.is_not_nil(stats["skill_alchemists_boon_generate_x_charges_for_any_flask_per_minute"])
+		assert.is_nil(stats["alchemists_boon_attack_speed_granted_+%_during_life_flask"])
+		assert.is_nil(stats["alchemists_boon_cast_speed_granted_+%_during_mana_flask"])
+
+		stats = calcLib.buildSkillInstanceStats(skillInstance, grantedEffect, statSet, true)
+		assert.are.equals(20, stats["alchemists_boon_attack_speed_granted_+%_during_life_flask"])
+		assert.are.equals(20, stats["alchemists_boon_cast_speed_granted_+%_during_mana_flask"])
+	end)
+
+	it("describes quality stats from secondary skill stat sets", function()
+		local grantedEffect = data.skills["ExplosiveSpearPlayer"]
+		local qualityStat = grantedEffect.qualityStats[1]
+		local stats = {
+			active_skill_base_area_of_effect_radius = 4,
+		}
+
+		assert.same({ 1, 2 }, qualityStat[3])
+		local firstDescriptions = build.data.describeStats(stats, grantedEffect.statSets[1].statDescriptionScope, true)
+		local qualityStatSet = grantedEffect.statSets[qualityStat[3][1] + 1]
+		local qualityDescriptions = build.data.describeStats(stats, qualityStatSet.statDescriptionScope, true)
+
+		assert.are.equals(0, #firstDescriptions)
+		assert.is_true(#qualityDescriptions > 0)
+		assert.matches("Explosion radius", qualityDescriptions[1])
+	end)
+
 
 	it("uses granted effect minion list when active skill minion list is missing", function()
 		local srcInstance = { statSet = { }, skillPart = { }, nameSpec = "Spectre: Test" }

src/Classes/CompareTab.lua

@@ -2973,7 +2973,6 @@ function CompareTabClass:ComparePowerBuilder(compareEntry, powerStat, categories
 							nameSpec = cGem.nameSpec,
 							level = cGem.level,
 							quality = cGem.quality,
-							qualityId = cGem.qualityId,
 							enabled = cGem.enabled,
 							grantedEffect = cGem.grantedEffect,
 							gemData = cGem.gemData,

src/Classes/GemSelectControl.lua

@@ -471,6 +471,7 @@ function GemSelectClass:Draw(viewPort, noTooltip)
 				-- Rebuilding this tooltip runs a full build calculation, so only rebuild when the hovered gem or the underlying build changes
 				if self.tooltip:CheckForUpdate(gemData, self.skillsTab.build.outputRevision, self.skillsTab.displayGroup, self.skillsTab.sortGemsByDPSField,
 						self.skillsTab.defaultGemLevel, self.skillsTab.defaultGemQuality, self.skillsTab.defaultCorruptionLevel, self.skillsTab.defaultCorruptionState) then
+					self.tooltip.maxWidth = 500
 					-- No fastCalcOptions here: the tooltip's stat compare shows defensive stats too, so it needs the full (unaccelerated) calc
 					local output = self:CalcOutputWithThisGem(calcFunc, gemData, self.skillsTab.sortGemsByDPSField == "FullDPS")
 					local gemInstance = {

src/Classes/GemTooltip.lua

@@ -4,14 +4,15 @@
 -- Shared renderer for gem-style tooltips.
 
 local m_max = math.max
+local m_min = math.min
 
 local GemTooltip = { }
 
 local function getFontSizes()
 	return main.showFlavourText and 18 or 16, main.showFlavourText and 24 or 20
 end
 
-local function addDescriptionLine(tooltip, build, statSet, line, stat, index)
+local function addDescriptionLine(tooltip, build, statSet, line, stat, index, colorCode)
 	local fontSizeBig = getFontSizes()
 	local source = statSet.statMap[stat] or build.data.skillStatMap[stat]
 	local bg = (index % 2 == 0) and "GemHoverModBg" or nil
@@ -26,7 +27,7 @@ local function addDescriptionLine(tooltip, build, statSet, line, stat, index)
 			end
 			line = line .. " ^2" .. devText
 		end
-		tooltip:AddLine(fontSizeBig, colorCodes.MAGIC .. line, "FONTIN SC", bg)
+		tooltip:AddLine(fontSizeBig, (colorCode or colorCodes.MAGIC) .. line, "FONTIN SC", bg)
 	else
 		if launch.devModeAlt then
 			line = line .. " ^1" .. stat
@@ -206,6 +207,7 @@ end
 local function addStatSetInfo(tooltip, build, gemInstance, grantedEffect, statSet, noLabel, index, levelRange)
 	local fontSizeBig, fontSizeTitle = getFontSizes()
 	local displayInstance = getDisplayInstance(gemInstance)
+	local includeAltQualityStats = build.calcsTab.mainEnv.modDB:Flag(nil, "GemlingQuality")
 	local statSetLevel = statSet.levels[levelRange and gemInstance.level or displayInstance.level] or statSet.levels[1] or { }
 	if not (index == 1 and statSet.label == grantedEffect.name) and statSet.label ~= "" and not noLabel then
 		tooltip:AddSeparator(10)
@@ -226,18 +228,25 @@ local function addStatSetInfo(tooltip, build, gemInstance, grantedEffect, statSe
 			local copiedInstance = copyTable(gemInstance, true)
 			copiedInstance.quality = 0
 			copiedInstance.level = 20
-			local statsLevel20 = calcLib.buildSkillInstanceStats(copiedInstance, grantedEffect, statSet)
+			local statsLevel20 = calcLib.buildSkillInstanceStats(copiedInstance, grantedEffect, statSet, includeAltQualityStats)
 			copiedInstance.level = 1
-			stats = calcLib.buildSkillInstanceStats(copiedInstance, grantedEffect, statSet)
+			stats = calcLib.buildSkillInstanceStats(copiedInstance, grantedEffect, statSet, includeAltQualityStats)
 			for statName, min in pairs(stats) do
 				stats[statName] = { min = min, max = statsLevel20[statName] or min }
 			end
 		else
-			stats = calcLib.buildSkillInstanceStats(displayInstance, grantedEffect, statSet)
+			stats = calcLib.buildSkillInstanceStats(displayInstance, grantedEffect, statSet, includeAltQualityStats)
 		end
 		local descriptions, lineMap = build.data.describeStats(stats, statSet.statDescriptionScope)
+		local altQualityStatColor = { }
+		if includeAltQualityStats then
+			for _, stat in ipairs(grantedEffect.altQualityStats or { }) do
+				altQualityStatColor[stat[1]] = colorCodes.ENCHANTED
+			end
+		end
 		for i, line in ipairs(descriptions) do
-			addDescriptionLine(tooltip, build, statSet, line, lineMap[line], i)
+			local stat = lineMap[line]
+			addDescriptionLine(tooltip, build, statSet, line, stat, i, stat and altQualityStatColor[stat])
 		end
 	end
 end
@@ -248,19 +257,29 @@ local function addEffectStats(tooltip, build, gemInstance, grantedEffect, noLabe
 	end
 end
 
-local function addQualityRangeInfo(tooltip, build, grantedEffect, addedHeader)
+local function addQualityRangeInfo(tooltip, build, grantedEffect, addedHeader, includeAltQualityStats)
 	-- Quality ranges are tree-only. SkillsTab shows the 20 quality value separately, but tree nodes need the 0-20 range inline.
-	if not grantedEffect.qualityStats or #grantedEffect.qualityStats == 0 then
+	local qualityStats = { }
+	for _, stat in ipairs(grantedEffect.qualityStats or { }) do
+		qualityStats[#qualityStats + 1] = { stat = stat[1], value = stat[2], statSetIndexes = stat[3], color = colorCodes.MAGIC }
+	end
+	if includeAltQualityStats then
+		for _, stat in ipairs(grantedEffect.altQualityStats or { }) do
+			qualityStats[#qualityStats + 1] = { stat = stat[1], value = stat[2], statSetIndexes = stat[3], color = colorCodes.ENCHANTED }
+		end
+	end
+	if #qualityStats == 0 then
 		return addedHeader
 	end
 	local fontSizeBig = getFontSizes()
 	local lineIndex = 1
-	for _, stat in ipairs(grantedEffect.qualityStats) do
-		if stat[1] and stat[2] then
-			local stats = { [stat[1]] = 20 * stat[2] }
-			local descriptions, lineMap = build.data.describeStats(stats, grantedEffect.statSets[1].statDescriptionScope, true)
+	for _, stat in ipairs(qualityStats) do
+		if stat.stat and stat.value then
+			local stats = { [stat.stat] = 20 * stat.value }
+			local statSet = grantedEffect.statSets[(stat.statSetIndexes[1] or 0) + 1] or grantedEffect.statSets[1]
+			local descriptions, lineMap = build.data.describeStats(stats, statSet.statDescriptionScope, true)
 			for _, line in ipairs(descriptions) do
-				local statName = lineMap[line] or stat[1]
+				local statName = lineMap[line] or stat.stat
 				if not addedHeader then
 					tooltip:AddLine(fontSizeBig, "\n^7Additional Effects From Quality:", "FONTIN SC")
 					addedHeader = true
@@ -273,7 +292,7 @@ local function addQualityRangeInfo(tooltip, build, grantedEffect, addedHeader)
 					end
 					return "(0-" .. value .. ")"
 				end, 1)
-				addDescriptionLine(tooltip, build, grantedEffect.statSets[1], line, statName, lineIndex)
+				addDescriptionLine(tooltip, build, statSet, line, statName, lineIndex, stat.color)
 				lineIndex = lineIndex + 1
 			end
 		end
@@ -288,6 +307,7 @@ function GemTooltip.AddGemTooltip(tooltip, build, gemInstance, options)
 	tooltip.center = false
 	tooltip.color = colorCodes.GEM
 	tooltip.minWidth = 600
+	tooltip.maxWidth = m_min(tooltip.maxWidth or 600, 600)
 	tooltip.tooltipHeader = "GEM"
 	tooltip.gemIcon = gemInstance.gemData.grantedEffect.icon
 	tooltip.gemBackground = gemInstance.gemData.grantedEffect.id
@@ -343,9 +363,10 @@ function GemTooltip.AddGemTooltip(tooltip, build, gemInstance, options)
 
 	if options.includeQualityRange then
 		local addedHeader
-		addedHeader = addQualityRangeInfo(tooltip, build, grantedEffect, addedHeader)
+		local includeAltQualityStats = build.calcsTab.mainEnv.modDB:Flag(nil, "GemlingQuality")
+		addedHeader = addQualityRangeInfo(tooltip, build, grantedEffect, addedHeader, includeAltQualityStats)
 		for _, effect in ipairs(additionalEffects or { }) do
-			addedHeader = addQualityRangeInfo(tooltip, build, effect, addedHeader)
+			addedHeader = addQualityRangeInfo(tooltip, build, effect, addedHeader, includeAltQualityStats)
 		end
 	end
 

src/Classes/SkillsTab.lua

@@ -890,6 +890,25 @@ function SkillsTabClass:CreateGemSlot(index)
 		if not gemData then
 			return
 		end
+		local includeAltQualityStats = self.build.calcsTab.mainEnv.modDB:Flag(nil, "GemlingQuality")
+		local hasQualityStats = function(grantedEffect)
+			return grantedEffect and (
+				(grantedEffect.qualityStats and #grantedEffect.qualityStats > 0) or
+				(includeAltQualityStats and grantedEffect.altQualityStats and #grantedEffect.altQualityStats > 0)
+			)
+		end
+		local getQualityStats = function(grantedEffect)
+			local qualityStats = { }
+			for _, stat in ipairs(grantedEffect.qualityStats or { }) do
+				qualityStats[#qualityStats + 1] = { stat = stat[1], value = stat[2], statSetIndexes = stat[3], color = colorCodes.MAGIC }
+			end
+			if includeAltQualityStats then
+				for _, stat in ipairs(grantedEffect.altQualityStats or { }) do
+					qualityStats[#qualityStats + 1] = { stat = stat[1], value = stat[2], statSetIndexes = stat[3], color = colorCodes.ENCHANTED }
+				end
+			end
+			return qualityStats
+		end
 		-- Function for both granted effect and secondary such as vaal
 		local addQualityLines = function(qualityList, grantedEffect)
 			if #qualityList > 0 then
@@ -900,17 +919,19 @@ function SkillsTabClass:CreateGemSlot(index)
 				end
 				-- Hardcoded to use 20% quality instead of grabbing from gem, this is for consistency and so we always show something
 				tooltip:AddLine(16, colorCodes.NORMAL.."At +20% Quality:")
-				for k, qual in pairs(qualityList) do
+				for _, qual in ipairs(qualityList) do
 					-- Do the stats one at a time because we're not guaranteed to get the descriptions in the same order we look at them here
 					local stats = { }
-					stats[qual[1]] = qual[2] * 20
-					local descriptions = self.build.data.describeStats(stats, grantedEffect.statSets[1].statDescriptionScope, true)
+					stats[qual.stat] = qual.value * 20
+					local statSet = grantedEffect.statSets[(qual.statSetIndexes[1] or 0) + 1] or grantedEffect.statSets[1]
+					local descriptions, lineMap = self.build.data.describeStats(stats, statSet.statDescriptionScope, true)
 					-- line may be nil if the value results in no line due to not being enough quality
 					for _, line in ipairs(descriptions) do
 						if line then
+							local statName = lineMap[line] or qual.stat
 							-- Check if we have a handler for the mod in the gem's statMap or in the shared stat map for skills
-							if grantedEffect.statSets[1].statMap[qual[1]] or self.build.data.skillStatMap[qual[1]] then
-								tooltip:AddLine(16, colorCodes.MAGIC..line)
+							if statSet.statMap[statName] or self.build.data.skillStatMap[statName] then
+								tooltip:AddLine(16, qual.color..line)
 							else
 								local line = colorCodes.UNSUPPORTED..line
 								line = main.notSupportedModTooltips and (line .. main.notSupportedTooltipText) or line
@@ -921,24 +942,22 @@ function SkillsTabClass:CreateGemSlot(index)
 				end
 			end
 		end
-		-- Check if there is a quality of this type for the effect
-		-- Currently only checks the first 2 additionalGrantedEffects. Will need to fix if gems ever add more
-		if gemData and gemData.grantedEffect.qualityStats and #gemData.grantedEffect.qualityStats > 0 then
-			local qualityTable = gemData.grantedEffect.qualityStats
-			addQualityLines(qualityTable, gemData.grantedEffect)
+		local qualityStatsShown = false
+		if hasQualityStats(gemData.grantedEffect) then
+			addQualityLines(getQualityStats(gemData.grantedEffect), gemData.grantedEffect)
+			qualityStatsShown = true
 		end
-		if gemData and gemData.additionalGrantedEffects[1] and gemData.additionalGrantedEffects[1].qualityStats and #gemData.additionalGrantedEffects[1].qualityStats > 0 then
-			local qualityTable = gemData.additionalGrantedEffects[1].qualityStats
-			tooltip:AddSeparator(10)
-			addQualityLines(qualityTable, gemData.additionalGrantedEffects[1])
-		end
-		if gemData and gemData.additionalGrantedEffects[2] and gemData.additionalGrantedEffects[2].qualityStats and #gemData.additionalGrantedEffects[2].qualityStats > 0  then
-			local qualityTable = gemData.additionalGrantedEffects[2].qualityStats
-			tooltip:AddSeparator(10)
-			addQualityLines(qualityTable, gemData.additionalGrantedEffects[2])
+		for _, effect in ipairs(gemData.additionalGrantedEffects or { }) do
+			if hasQualityStats(effect) then
+				if qualityStatsShown then
+					tooltip:AddSeparator(10)
+				end
+				addQualityLines(getQualityStats(effect), effect)
+				qualityStatsShown = true
+			end
 		end
 		-- Add stat comparisons for hovered quality (based on set quality)
-		if gemData and (gemData.grantedEffect.qualityStats or (gemData.additionalGrantedEffects[1] and gemData.additionalGrantedEffects[1].qualityStats or gemData.additionalGrantedEffects[2] and gemData.additionalGrantedEffects[2].qualityStats)) and self.displayGroup.gemList[index] then
+		if qualityStatsShown and self.displayGroup.gemList[index] then
 			local calcFunc, calcBase = self.build.calcsTab:GetMiscCalculator(self.build)
 			if calcFunc then
 				local storedQuality = self.displayGroup.gemList[index].quality

src/Data/ModCache.lua

@@ -5680,7 +5680,7 @@ c["Gain no inherent bonuses from Attributes"]={{[1]={flags=0,keywordFlags=0,name
 c["Gain the benefits of Bonded modifiers on Runes and Idols"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanUseBondedModifiers",type="FLAG",value=true}},nil}
 c["Gains 0.18 Charges per Second"]={{[1]={flags=0,keywordFlags=0,name="FlaskChargesGenerated",type="BASE",value=0.18}},nil}
 c["Gains 0.20 Charges per Second"]={{[1]={flags=0,keywordFlags=0,name="FlaskChargesGenerated",type="BASE",value=0.2}},nil}
-c["Gem Quality grants Socketed Skills an additional effect"]={nil,"Gem Quality grants Socketed Skills an additional effect "}
+c["Gem Quality grants Socketed Skills an additional effect"]={{[1]={flags=0,keywordFlags=0,name="GemlingQuality",type="FLAG",value=true}},nil}
 c["Giant's Blood"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Giant's Blood"}},nil}
 c["Glancing Blows"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Glancing Blows"}},nil}
 c["Glorifying the defilement of 4050 souls in tribute to Ulaman"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=5,type="abyss"},id=4050}}}},nil}