add support for Expand, add flags for Area vs Damage Seal Supports

Author: Peechey

src/Data/Skills/sup_int.lua

@@ -3812,8 +3812,23 @@ skills["SupportExpandPlayer"] = {
 			label = "Expand",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_expand_max_seals"] = {
+					mod("SealCount", "BASE", nil),
+				},
+				["skill_area_of_effect_+%_per_expand_seal"] = {
+					mod("SealRepeatPenalty", "MORE", nil),
+				},
+				["expand_support_seal_gain_frequency_as_%_of_total_cast_time"] = {
+					mod("SealGainFrequency", "BASE", nil),
+				},
+			},
 			baseFlags = {
 			},
+			baseMods = {
+				flag("HasSeals"),
+				flag("AreaSeal"),
+			},
 			constantStats = {
 				{ "support_expand_max_seals", 3 },
 				{ "support_expand_charge_gain_interval_ms", 0 },
@@ -7592,6 +7607,7 @@ skills["SupportUnleashPlayer"] = {
 			},
 			baseMods = {
 				flag("HasSeals"),
+				flag("DamageSeal"),
 			},
 			constantStats = {
 				{ "support_spell_rapid_fire_repeat_use_damage_+%_final", -50 },

src/Export/Skills/sup_int.txt

@@ -665,6 +665,19 @@ statMap = {
 
 #skill SupportExpandPlayer
 #set SupportExpandPlayer
+statMap = {
+	["support_expand_max_seals"] = {
+		mod("SealCount", "BASE", nil),
+	},
+	["skill_area_of_effect_+%_per_expand_seal"] = {
+		mod("SealRepeatPenalty", "MORE", nil),
+	},
+	["expand_support_seal_gain_frequency_as_%_of_total_cast_time"] = {
+		mod("SealGainFrequency", "BASE", nil),
+	},
+},
+#baseMod flag("HasSeals")
+#baseMod flag("AreaSeal")
 #mods
 #skillEnd
 
@@ -1445,6 +1458,7 @@ statMap = {
 #skill SupportUnleashPlayer
 #set SupportUnleashPlayer
 #baseMod flag("HasSeals")
+#baseMod flag("DamageSeal")
 #mods
 #skillEnd
 

src/Modules/CalcOffence.lua

@@ -402,6 +402,14 @@ function calcs.offence(env, actor, activeSkill)
 	output.ArmourBreakPerHit = calcLib.val(skillModList, "ArmourBreakPerHit", skillCfg)
 
 	local function calcAreaOfEffect(skillModList, skillCfg, skillData, skillFlags, output, breakdown)
+		-- Applies increased AoE based on seals count
+		if skillModList:Flag(nil, "HasSeals") and skillModList:Flag(nil, "AreaSeal") and not skillModList:Flag(nil, "NoRepeatBonuses") then
+			output.SealCooldown = activeSkill.activeEffect.grantedEffect.castTime * skillModList:Sum("BASE", skillCfg, "SealGainFrequency") / calcLib.mod(skillModList, skillCfg, "SealGainFrequency") / 100
+			output.SealMax = skillModList:Sum("BASE", skillCfg, "SealCount")
+			output.TimeMaxSeals = output.SealCooldown * output.SealMax
+			env.player.mainSkill.skillModList:NewMod("AreaOfEffect", "INC", (output.SealMax * (calcLib.mod(skillModList, skillCfg, "SealRepeatPenalty") - 1) * 100), "Expand")
+		end
+
 		local incArea, moreArea = calcLib.mods(skillModList, skillCfg, "AreaOfEffect", "AreaOfEffectPrimary")
 		output.AreaOfEffectMod = round(round(incArea * moreArea, 10), 2)
 		if skillData.radiusIsWeaponRange then
@@ -1096,7 +1104,7 @@ function calcs.offence(env, actor, activeSkill)
 		modDB:NewMod("DPS", "MORE", detonateTwice, "Grenade Activate Twice")
 	end
 
-	if skillModList:Flag(nil, "HasSeals") and activeSkill.skillTypes[SkillType.Unleashable] and not skillModList:Flag(nil, "NoRepeatBonuses") then
+	if skillModList:Flag(nil, "HasSeals") and skillModList:Flag(nil, "DamageSeal") and not skillModList:Flag(nil, "NoRepeatBonuses") then
 		-- Applies DPS multiplier based on seals count
 		local totalCastSpeed = 1 / activeSkill.activeEffect.grantedEffect.castTime * calcLib.mod(skillModList, skillCfg, "Speed")
 		output.SealCooldown = activeSkill.activeEffect.grantedEffect.castTime * skillModList:Sum("BASE", skillCfg, "SealGainFrequency") / calcLib.mod(skillModList, skillCfg, "SealGainFrequency") / 100
@@ -5672,7 +5680,7 @@ function calcs.offence(env, actor, activeSkill)
 			elseif skillFlags.totem then
 				useSpeed = (output.Cooldown and output.Cooldown > 0 and (output.TotemPlacementSpeed > 0 and output.TotemPlacementSpeed or 1 / output.Cooldown) or output.TotemPlacementSpeed) / repeats
 				timeType = "totem placement"
-			elseif skillModList:Flag(nil, "HasSeals") and skillModList:Flag(nil, "UseMaxUnleash") then
+			elseif skillModList:Flag(nil, "HasSeals") and skillModList:Flag(nil, "DamageSeal") and skillModList:Flag(nil, "UseMaxUnleash") then
 				useSpeed = env.player.mainSkill.skillData.hitTimeOverride / repeats
 				timeType = "full unleash"
 			elseif output.EffectiveReloadTime then -- Crossbows: Account for mana cost only happening on reload (once all bolts are fired)