Add support for int support gems

Ablation
Ambush
Danse Macabre
Potential
Rising Tempest
Shock Siphon
Soul Thief
Spell Cascade
Spell Echo
Supercritical
Unleash
Withering Touch

Author: LocalIdentity

src/Data/SkillStatMap.lua

@@ -265,8 +265,8 @@ return {
 ["skill_double_hits_when_dual_wielding"] = {
 	skill("doubleHitsWhenDualWielding", true),
 },
-["base_spell_repeat_count"] = {
-	mod("RepeatCount", "BASE", nil, 0, 0, {type = "SkillType", skillType = SkillType.Multicastable }),
+["support_spell_echo_number_of_echo_cascades"] = {
+	mod("RepeatCount", "BASE", nil, 0, 0, {type = "SkillType", skillType = SkillType.Cascadable }),
 },
 ["base_melee_attack_repeat_count"] = {
 	mod("RepeatCount", "BASE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Multistrikeable }),
@@ -422,6 +422,10 @@ return {
 	mod("ElementalDamageManaLeech", "BASE", nil),
 	div = 100,
 },
+["base_mana_leech_from_physical_attack_damage_permyriad"] = {
+	mod("PhysicalDamageManaLeech", "BASE", nil, ModFlag.Attack),
+	div = 100,
+},
 ["base_life_leech_from_attack_damage_permyriad"] = {
 	mod("DamageLifeLeech", "BASE", nil, ModFlag.Attack),
 	div = 100,

src/Data/Skills/act_int.lua

@@ -1198,6 +1198,9 @@ skills["BoneBlastPlayer"] = {
 			damageIncrementalEffectiveness = 0.0094999996945262,
 			statDescriptionScope = "bone_blast",
 			baseFlags = {
+				spell = true,
+				duration = true,
+				area = true,
 			},
 			constantStats = {
 				{ "base_skill_effect_duration", 1000 },

src/Data/Skills/sup_int.lua

@@ -22,6 +22,11 @@ skills["SupportAblationPlayer"] = {
 			label = "Ablation",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_ablation_offering_skill_damage_+%_final"] = {
+					mod("Damage", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Offering }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -53,6 +58,11 @@ skills["SupportAmbushPlayer"] = {
 			label = "Ambush",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_ambush_critical_strike_chance_vs_enemies_on_full_life_+%_final"] = {
+					mod("CritChance", "MORE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "FullLife" }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -911,6 +921,14 @@ skills["SupportDanseMacabrePlayer"] = {
 			label = "Danse Macabre",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_danse_macabre_offering_skill_damage_+%_final_if_consumed_additional_skeleton"] = {
+					mod("Damage", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Offering }),
+				},
+				["offering_spells_effect_+%_if_consumed_additional_skeleton"] = {
+					mod("BuffEffect", "INC", nil, 0, 0, { type = "SkillType", skillType = SkillType.Offering }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2353,6 +2371,11 @@ skills["SupportPotentialPlayer"] = {
 			label = "Potential",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["skill_consume_power_charge_to_gain_critical_strike_chance_+%_final"] = {
+					mod("CritChance", "MORE", nil, 0, 0, { type = "Multiplier", var = "RemovablePowerCharge", limit = 1 }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2383,6 +2406,11 @@ skills["SupportTempestuousTempoPlayer"] = {
 			label = "Rising Tempest",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_elemental_damage_+%_final_per_different_elemental_skill_used_recently"] = {
+					mod("ElementalDamage", "MORE", nil, 0, 0, { type = "Multiplier", var = "DifferentElementalSkillUsedRecently" }),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2444,6 +2472,11 @@ skills["SupportEnergyShieldOnShockKillPlayer"] = {
 			incrementalEffectiveness = 0.012699999846518,
 			damageIncrementalEffectiveness = 0.061500001698732,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_recover_%_maximum_energy_shield_killing_shocked_enemies"] = {
+					mod("EnergyShieldOnKill", "BASE", nil, 0, 0, { type = "PercentStat", stat = "EnergyShield", percent = 1 }, { type = "ActorCondition", actor = "enemy", var = "Shocked" })
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2503,6 +2536,14 @@ skills["SupportSpellCascadePlayer"] = {
 			label = "Spell Cascade",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_spell_cascade_area_of_effect_+%_final"] = {
+					mod("AreaOfEffect", "MORE", nil),
+				},
+				["support_spell_cascade_damage_+%_final"] = {
+					mod("Damage", "MORE", nil),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2535,6 +2576,14 @@ skills["SupportSpellEchoPlayer"] = {
 			label = "Spell Echo",
 			incrementalEffectiveness = 0.092720001935959,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_multicast_cast_speed_+%_final"] = {
+					mod("Speed", "MORE", nil, ModFlag.Cast),
+				},
+				["support_spell_echo_area_of_effect_+%_final"] = {
+					mod("AreaOfEffect", "MORE", nil),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2624,6 +2673,11 @@ skills["SupportIncreasedCriticalDamagePlayer"] = {
 			baseEffectiveness = 0,
 			incrementalEffectiveness = 0.092720001935959,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_critical_damage_critical_strike_chance_+%_final"] = {
+					mod("CritChance", "MORE", nil),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {
@@ -2654,8 +2708,22 @@ skills["SupportUnleashPlayer"] = {
 			label = "Unleash",
 			incrementalEffectiveness = 0.092720001935959,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_anticipation_rapid_fire_count"] = {
+					mod("SealCount", "BASE", nil),
+				},
+				["unleash_support_seal_gain_frequency_as_%_of_total_cast_time"] = {
+					mod("SealGainFrequency", "BASE", nil),
+				},
+				["support_spell_rapid_fire_repeat_use_damage_+%_final"] = {
+					mod("SealRepeatPenalty", "MORE", nil),
+				},
+			},
 			baseFlags = {
 			},
+			baseMods = {
+				flag("HasSeals"),
+			},
 			constantStats = {
 				{ "support_spell_rapid_fire_repeat_use_damage_+%_final", -50 },
 				{ "unleash_support_seal_gain_frequency_as_%_of_total_cast_time", 200 },
@@ -2782,6 +2850,11 @@ skills["SupportWitheringTouchPlayer"] = {
 			label = "Withering Touch",
 			incrementalEffectiveness = 0.092720001935959,
 			statDescriptionScope = "gem_stat_descriptions",
+			statMap = {
+				["support_withering_touch_damage_+%_final"] = {
+					mod("Damage", "MORE", nil),
+				},
+			},
 			baseFlags = {
 			},
 			constantStats = {

src/Export/Skills/act_int.txt

@@ -84,7 +84,7 @@ statMap = {
 #skill BoneBlastPlayer
 #startSets
 #set BoneBlastPlayer
-#flags
+#flags spell duration area
 #mods
 #skillEnd
 

src/Export/Skills/sup_int.txt

@@ -8,12 +8,22 @@ local skills, mod, flag, skill = ...
 #skill SupportAblationPlayer
 #startSets
 #set SupportAblationPlayer
+statMap = {
+	["support_ablation_offering_skill_damage_+%_final"] = {
+		mod("Damage", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Offering }),
+	},
+},
 #mods
 #skillEnd
 
 #skill SupportAmbushPlayer
 #startSets
 #set SupportAmbushPlayer
+statMap = {
+	["support_ambush_critical_strike_chance_vs_enemies_on_full_life_+%_final"] = {
+		mod("CritChance", "MORE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "FullLife" }),
+	},
+},
 #mods
 #skillEnd
 
@@ -210,6 +220,14 @@ statMap = {
 #skill SupportDanseMacabrePlayer
 #startSets
 #set SupportDanseMacabrePlayer
+statMap = {
+	["support_danse_macabre_offering_skill_damage_+%_final_if_consumed_additional_skeleton"] = {
+		mod("Damage", "MORE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Offering }),
+	},
+	["offering_spells_effect_+%_if_consumed_additional_skeleton"] = {
+		mod("BuffEffect", "INC", nil, 0, 0, { type = "SkillType", skillType = SkillType.Offering }),
+	},
+},
 #mods
 #skillEnd
 
@@ -578,12 +596,22 @@ statMap = {
 #skill SupportPotentialPlayer
 #startSets
 #set SupportPotentialPlayer
+statMap = {
+	["skill_consume_power_charge_to_gain_critical_strike_chance_+%_final"] = {
+		mod("CritChance", "MORE", nil, 0, 0, { type = "Multiplier", var = "RemovablePowerCharge", limit = 1 }),
+	},
+},
 #mods
 #skillEnd
 
 #skill SupportTempestuousTempoPlayer
 #startSets
 #set SupportTempestuousTempoPlayer
+statMap = {
+	["support_elemental_damage_+%_final_per_different_elemental_skill_used_recently"] = {
+		mod("ElementalDamage", "MORE", nil, 0, 0, { type = "Multiplier", var = "DifferentElementalSkillUsedRecently" }),
+	},
+},
 #mods
 #skillEnd
 
@@ -596,6 +624,11 @@ statMap = {
 #skill SupportEnergyShieldOnShockKillPlayer
 #startSets
 #set SupportEnergyShieldOnShockKillPlayer
+statMap = {
+	["support_recover_%_maximum_energy_shield_killing_shocked_enemies"] = {
+		mod("EnergyShieldOnKill", "BASE", nil, 0, 0, { type = "PercentStat", stat = "EnergyShield", percent = 1 }, { type = "ActorCondition", actor = "enemy", var = "Shocked" })
+	},
+},
 #mods
 #skillEnd
 
@@ -608,12 +641,28 @@ statMap = {
 #skill SupportSpellCascadePlayer
 #startSets
 #set SupportSpellCascadePlayer
+statMap = {
+	["support_spell_cascade_area_of_effect_+%_final"] = {
+		mod("AreaOfEffect", "MORE", nil),
+	},
+	["support_spell_cascade_damage_+%_final"] = {
+		mod("Damage", "MORE", nil),
+	},
+},
 #mods
 #skillEnd
 
 #skill SupportSpellEchoPlayer
 #startSets
 #set SupportSpellEchoPlayer
+statMap = {
+	["support_multicast_cast_speed_+%_final"] = {
+		mod("Speed", "MORE", nil, ModFlag.Cast),
+	},
+	["support_spell_echo_area_of_effect_+%_final"] = {
+		mod("AreaOfEffect", "MORE", nil),
+	},
+},
 #mods
 #skillEnd
 
@@ -632,12 +681,29 @@ statMap = {
 #skill SupportIncreasedCriticalDamagePlayer
 #startSets
 #set SupportIncreasedCriticalDamagePlayer
+statMap = {
+	["support_critical_damage_critical_strike_chance_+%_final"] = {
+		mod("CritChance", "MORE", nil),
+	},
+},
 #mods
 #skillEnd
 
 #skill SupportUnleashPlayer
 #startSets
 #set SupportUnleashPlayer
+statMap = {
+	["support_anticipation_rapid_fire_count"] = {
+		mod("SealCount", "BASE", nil),
+	},
+	["unleash_support_seal_gain_frequency_as_%_of_total_cast_time"] = {
+		mod("SealGainFrequency", "BASE", nil),
+	},
+	["support_spell_rapid_fire_repeat_use_damage_+%_final"] = {
+		mod("SealRepeatPenalty", "MORE", nil),
+	},
+},
+#baseMod flag("HasSeals")
 #mods
 #skillEnd
 
@@ -656,5 +722,10 @@ statMap = {
 #skill SupportWitheringTouchPlayer
 #startSets
 #set SupportWitheringTouchPlayer
+statMap = {
+	["support_withering_touch_damage_+%_final"] = {
+		mod("Damage", "MORE", nil),
+	},
+},
 #mods
 #skillEnd

src/Modules/CalcOffence.lua

@@ -868,7 +868,8 @@ function calcs.offence(env, actor, activeSkill)
 
 	if skillModList:Flag(nil, "HasSeals") and activeSkill.skillTypes[SkillType.CanRapidFire] and not skillModList:Flag(nil, "NoRepeatBonuses") then
 		-- Applies DPS multiplier based on seals count
-		output.SealCooldown = skillModList:Sum("BASE", skillCfg, "SealGainFrequency") / calcLib.mod(skillModList, skillCfg, "SealGainFrequency")
+		local totalCastSpeed = 1 / activeSkill.activeEffect.grantedEffect.castTime * calcLib.mod(skillModList, skillCfg, "Speed")
+		output.SealCooldown =  1 / totalCastSpeed * skillModList:Sum("BASE", skillCfg, "SealGainFrequency") / calcLib.mod(skillModList, skillCfg, "SealGainFrequency") / 100
 		output.SealMax = skillModList:Sum("BASE", skillCfg, "SealCount")
 		output.AverageBurstHits = output.SealMax
 		output.TimeMaxSeals = output.SealCooldown * output.SealMax
@@ -880,19 +881,20 @@ function calcs.offence(env, actor, activeSkill)
 					skillModList:NewMod("CritChance", "INC", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
 				end
 				env.player.mainSkill.skillData.dpsMultiplier = (1 + output.SealMax * calcLib.mod(skillModList, skillCfg, "SealRepeatPenalty"))
-				env.player.mainSkill.skillData.hitTimeOverride = m_max(output.TimeMaxSeals, (1 / activeSkill.activeEffect.grantedEffect.castTime * 1.1 * calcLib.mod(skillModList, skillCfg, "Speed") * output.ActionSpeedMod))
+				env.player.mainSkill.skillData.hitTimeOverride = m_max(output.TimeMaxSeals, totalCastSpeed * 1.1)
 			else
-				env.player.mainSkill.skillData.dpsMultiplier = 1 + 1 / output.SealCooldown / (1 / activeSkill.activeEffect.grantedEffect.castTime * 1.1 * calcLib.mod(skillModList, skillCfg, "Speed") * output.ActionSpeedMod) * calcLib.mod(skillModList, skillCfg, "SealRepeatPenalty")
+				env.player.mainSkill.skillData.dpsMultiplier = 1 + 1 / output.SealCooldown / (totalCastSpeed * 1.1) * calcLib.mod(skillModList, skillCfg, "SealRepeatPenalty")
 			end
 		end
 
 		if breakdown then
 			breakdown.SealGainTime = { }
 			breakdown.multiChain(breakdown.SealGainTime, {
 				label = "Gain frequency:",
-				base = { "%.2fs ^8(base gain frequency)", skillModList:Sum("BASE", skillCfg, "SealGainFrequency") },
+				base = { "%.2fs ^8(base cast time)", activeSkill.activeEffect.grantedEffect.castTime },
 				{ "%.2f ^8(increased/reduced gain frequency)", 1 + skillModList:Sum("INC", skillCfg, "SealGainFrequency") / 100 },
-				{ "%.2f ^8(action speed modifier)",  output.ActionSpeedMod },
+				{ "%d%% ^8(of cast time)", skillModList:Sum("BASE", skillCfg, "SealGainFrequency") },
+				{ "%.2f ^8(increased/reduced cast speed)", 1 / calcLib.mod(skillModList, skillCfg, "Speed") },
 				total = s_format("= %.2fs ^8per Seal", output.SealCooldown),
 			})
 		end

src/Modules/ConfigOptions.lua

@@ -488,6 +488,16 @@ local configSettings = {
 	{ var = "animateWeaponLingeringBlade", type = "check", label = "Are you animating Lingering Blades?", ifSkill = "Animate Weapon", tooltip = "Enables additional damage given to Lingering Blades\nThe exact weapon is unknown but should be similar to Glass Shank", apply = function(val, modList, enemyModList)
 		modList:NewMod("Condition:AnimatingLingeringBlades", "FLAG", true, "Config")
 	end },
+	{ label = "Rising Tempest:", ifSkill = "Rising Tempest" },
+	{ var = "risingTempestLightning", type = "check", label = "Lightning Skill used Recently:", ifSkill = "Rising Tempest", apply = function(val, modList, enemyModList)
+		modList:NewMod("Multiplier:DifferentElementalSkillUsedRecently", "BASE", 1, "Config")
+	end },
+	{ var = "risingTempestCold", type = "check", label = "Cold Skill used Recently:", ifSkill = "Rising Tempest", apply = function(val, modList, enemyModList)
+		modList:NewMod("Multiplier:DifferentElementalSkillUsedRecently", "BASE", 1, "Config")
+	end },
+	{ var = "risingTempestFire", type = "check", label = "Fire Skill used Recently:", ifSkill = "Rising Tempest", apply = function(val, modList, enemyModList)
+		modList:NewMod("Multiplier:DifferentElementalSkillUsedRecently", "BASE", 1, "Config")
+	end },
 	{ label = "Shrapnel Ballista:", ifSkill = "Shrapnel Ballista", includeTransfigured = true },
 	{ var = "ShrapnelBallistaProjectileOverlap", type = "count", label = "# of Shotgunning Projectiles:", tooltip = "Maximum is limited by the number of Projectiles., default of 1, if Arrow nova then default of maximum projectiles", ifSkill = "Shrapnel Ballista", includeTransfigured = true, apply = function(val, modList, enemyModList)
 		modList:NewMod("SkillData", "LIST", { key = "ShrapnelBallistaProjectileOverlap", value = val }, "Config", { type = "SkillName", skillName = "Shrapnel Ballista", includeTransfigured = true })