Add support for Bonestorm, Flameblast, Incinerate, Supercharged Slam DPS

src/Classes/GemSelectControl.lua

@@ -548,7 +548,7 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 	-- Will need rework if a gem can have 2+ additional supports
 	self:AddGrantedEffectInfo(gemInstance, grantedEffect, true)
 	for _, statSet in ipairs(grantedEffect.statSets) do
-		self:AddStatSetInfo(gemInstance, grantedEffect, statSet)
+		self:AddStatSetInfo(gemInstance, grantedEffect, statSet, nil , _)
 	end
 
 	for _, additional in ipairs(additionalEffects or {}) do
@@ -560,11 +560,11 @@ function GemSelectClass:AddGemTooltip(gemInstance)
 			self.tooltip:AddSeparator(10)
 			self:AddGrantedEffectInfo(gemInstance, additional)
 			for _, statSet in ipairs(additional.statSets) do
-				self:AddStatSetInfo(gemInstance, additional, statSet)
+				self:AddStatSetInfo(gemInstance, additional, statSet, nil, _)
 			end
 		else
 			for _, statSet in ipairs(additional.statSets) do
-				self:AddStatSetInfo(gemInstance, additional, statSet, true)
+				self:AddStatSetInfo(gemInstance, additional, statSet, true, _)
 			end
 		end
 	end
@@ -692,10 +692,10 @@ function GemSelectClass:AddGrantedEffectInfo(gemInstance, grantedEffect, addReq)
 		end
 	end
 end
-function GemSelectClass:AddStatSetInfo(gemInstance, grantedEffect, statSet, noLabel)
+function GemSelectClass:AddStatSetInfo(gemInstance, grantedEffect, statSet, noLabel, index)
 	local displayInstance = gemInstance.displayEffect or gemInstance
 	local statSetLevel = statSet.levels[displayInstance.level] or { }
-	if statSet.label ~= grantedEffect.name and statSet.label ~= "" and not noLabel then
+	if not (index == 1 and statSet.label == grantedEffect.name) and statSet.label ~= "" and not noLabel then
 		self.tooltip:AddSeparator(10)
 		self.tooltip:AddLine(20, colorCodes.GEM .. statSet.label)
 		self.tooltip:AddSeparator(10)

src/Data/SkillStatMap.lua

@@ -136,6 +136,10 @@ return {
 ["spell_cast_time_cannot_be_modified"] = {
 	skill("fixedCastTime", true),
 },
+["base_minimum_channel_time_ms"] = {
+	skill("minChannelTime", true),
+	div = 1000,
+},
 ["global_always_hit"] = {
 	skill("cannotBeEvaded", true),
 },
@@ -519,6 +523,10 @@ return {
 ["attack_and_cast_speed_+%"] = {
 	mod("Speed", "INC", nil),
 },
+["skill_speed_+%"] = {
+	mod("Speed", "INC", nil),
+	mod("WarcrySpeed", "INC", nil),
+},
 ["cast_speed_+%_granted_from_skill"] = {
 	mod("Speed", "INC", nil, ModFlag.Cast),
 },
@@ -2761,6 +2769,9 @@ return {
 ["quality_display_sandstorm_swipe_is_gem"] = {
 	-- Display Only
 },
+["cast_speed_modifiers_apply_to_over_time_cost"] = {
+	-- Display Only
+},
 ["quality_display_base_totem_duration_is_gem"] = {
 	-- Display Only
 },
@@ -2770,4 +2781,7 @@ return {
 ["skill_specific_stat_description_mode"] = {
 	-- Display Only
 },
+["quality_display_supercharged_slam_is_gem"] = {
+	-- Display Only
+},
 }

src/Data/Skills/act_dex.lua

@@ -1134,6 +1134,7 @@ skills["DetonatingArrowPlayer"] = {
 	},
 			preDamageFunc = function(activeSkill, output)
 				activeSkill.skillData.hitTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:DetonatingArrowStage")
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:DetonatingArrowStage")
 			end,
 	statSets = {
 		[1] = {
@@ -7296,6 +7297,7 @@ skills["SnipePlayer"] = {
 	},
 			preDamageFunc = function(activeSkill, output)
 				activeSkill.skillData.hitTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
 			end,
 	statSets = {
 		[1] = {

src/Data/Skills/act_int.lua

@@ -1798,16 +1798,27 @@ skills["BonestormPlayer"] = {
 		[39] = { critChance = 15, levelRequirement = 90, cost = { ManaPerMinute = 20158, }, },
 		[40] = { critChance = 15, levelRequirement = 90, cost = { ManaPerMinute = 21924, }, },
 	},
+			preDamageFunc = function(activeSkill, output)
+				activeSkill.skillData.hitTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BonestormStage") / output.ProjectileCount or 1
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BonestormStage") / output.ProjectileCount or 1
+				activeSkill.skillData.dpsMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:BonestormStage")
+			end,
 	statSets = {
 		[1] = {
 			label = "Projectile",
 			baseEffectiveness = 1.4199999570847,
 			incrementalEffectiveness = 0.12999999523163,
 			damageIncrementalEffectiveness = 0.0068999999202788,
 			statDescriptionScope = "bone_spike_statset_0",
+			statMap = {
+				["base_number_of_allowed_bone_storm_projectiles"] = {
+					mod("Multiplier:BonestormMaxStages", "BASE", nil),
+				},
+			},
 			baseFlags = {
 				spell = true,
 				projectile = true,
+				channelRelease = true,
 			},
 			constantStats = {
 				{ "base_number_of_projectiles", 1 },
@@ -1886,10 +1897,22 @@ skills["BonestormPlayer"] = {
 			incrementalEffectiveness = 0.12999999523163,
 			damageIncrementalEffectiveness = 0.0068999999202788,
 			statDescriptionScope = "bone_spike_statset_1",
+			statMap = {
+				["bone_spear_power_charged_aoe_+%_final_per_additional_power_charge"] = {
+					mod("AreaOfEffect", "MORE", nil, 0, 0, { type = "Multiplier", var = "RemovablePowerCharge" }),
+				},
+				["bone_spear_power_charged_aoe_+"] = {
+					skill("radiusExtra", nil, { type = "MultiplierThreshold", var = "RemovablePowerCharge", threshold = 1 }),
+				},
+				["base_number_of_allowed_bone_storm_projectiles"] = {
+					mod("Multiplier:BonestormMaxStages", "BASE", nil),
+				},
+			},
 			baseFlags = {
 				spell = true,
 				area = true,
 				projectile = true,
+				channelRelease = true,
 			},
 			constantStats = {
 				{ "movement_speed_+%_final_while_performing_action", -70 },
@@ -8080,16 +8103,31 @@ skills["FlameblastPlayer"] = {
 		[39] = { critChance = 8, storedUses = 1, levelRequirement = 90, cooldown = 15, cost = { ManaPerMinute = 19137, }, },
 		[40] = { critChance = 8, storedUses = 1, levelRequirement = 90, cooldown = 15, cost = { ManaPerMinute = 20814, }, },
 	},
+			preDamageFunc = function(activeSkill, output)
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:FlameblastStage")
+			end,
 	statSets = {
 		[1] = {
 			label = "Flameblast",
 			baseEffectiveness = 2.2999999523163,
 			incrementalEffectiveness = 0.12999999523163,
 			damageIncrementalEffectiveness = 0.0096000004559755,
 			statDescriptionScope = "skill_stat_descriptions",
+			statMap = {
+				["charged_blast_spell_damage_+%_final_per_stack"] = {
+					mod("Damage", "MORE", nil, ModFlag.Spell, 0, { type = "Multiplier", var = "FlameblastStage" }),
+				},
+				["vaal_flameblast_radius_+_per_stage"] = {
+					skill("radiusExtra", nil, { type = "Multiplier", var = "FlameblastStage" }),
+				},
+				["flameblast_maximum_stages"] = {
+					mod("Multiplier:FlameblastMaxStages", "BASE", nil),
+				},
+			},
 			baseFlags = {
 				spell = true,
 				area = true,
+				channelRelease = true,
 			},
 			constantStats = {
 				{ "charged_blast_spell_damage_+%_final_per_stack", 75 },
@@ -10292,6 +10330,7 @@ skills["GatheringStormPlayer"] = {
 	},
 			preDamageFunc = function(activeSkill, output)
 				activeSkill.skillData.hitTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
 			end,
 	statSets = {
 		[1] = {
@@ -13371,17 +13410,33 @@ skills["IncineratePlayer"] = {
 		[39] = { critChance = 6, levelRequirement = 90, },
 		[40] = { critChance = 6, levelRequirement = 90, },
 	},
+			preDamageFunc = function(activeSkill, output)
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:IncinerateStage")
+			end,
 	statSets = {
 		[1] = {
 			label = "Incinerate",
 			baseEffectiveness = 3.9000000953674,
 			incrementalEffectiveness = 0.12999999523163,
 			damageIncrementalEffectiveness = 0.0096000004559755,
 			statDescriptionScope = "incinerate_player_statset_0",
+			statMap = {
+				["incinerate_damage_+%_final_per_stage"] = {
+					mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "IncinerateStage" }),
+				},
+				["incinerate_maximum_stages"] = {
+					mod("Multiplier:IncinerateMaxStages", "BASE", nil),
+				},
+				["incinerate_gain_stage_every_x_ms"] = {
+					skill("channelTimeOverride", nil),
+					div = 1000,
+				},
+			},
 			baseFlags = {
 				spell = true,
 				area = true,
 				duration = true,
+				channelRelease = true,
 			},
 			constantStats = {
 				{ "incinerate_cone_angle", 20 },

src/Data/Skills/act_str.lua

@@ -9233,6 +9233,9 @@ skills["PlasmaBlastPlayer"] = {
 		[39] = { baseMultiplier = 139.44, levelRequirement = 0, },
 		[40] = { baseMultiplier = 150.22, levelRequirement = 0, },
 	},
+			preDamageFunc = function(activeSkill, output)
+				activeSkill.skillData.channelTimeMultiplier = 1
+			end,
 	statSets = {
 		[1] = {
 			label = "Projectile",
@@ -11639,6 +11642,7 @@ skills["PerfectStrikePlayer"] = {
 	},
 			preDamageFunc = function(activeSkill, output)
 				activeSkill.skillData.hitTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
 			end,
 	statSets = {
 		[1] = {
@@ -14079,15 +14083,33 @@ skills["SuperchargedSlamPlayer"] = {
 		[39] = { attackTime = 1000, baseMultiplier = 8.63, levelRequirement = 90, cost = { ManaPerMinute = 11734, }, },
 		[40] = { attackTime = 1000, baseMultiplier = 9.21, levelRequirement = 90, cost = { ManaPerMinute = 12487, }, },
 	},
+			preDamageFunc = function(activeSkill, output)
+				activeSkill.skillData.hitTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:SuperchargedSlamStage")
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:SuperchargedSlamStage")
+			end,
 	statSets = {
 		[1] = {
 			label = "Impact",
 			incrementalEffectiveness = 0.092720001935959,
 			statDescriptionScope = "channelled_slam_statset_0",
+			statMap = {
+				["channelled_slam_damage_+%_final_per_stage"] = {
+					mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "SuperchargedSlamStage" }),
+				},
+				["channelled_slam_max_stages"] = {
+					mod("Multiplier:SuperchargedSlamMaxStages", "BASE", nil),
+				},
+				["base_skill_show_average_damage_instead_of_dps"] = {
+				},
+			},
 			baseFlags = {
 				attack = true,
 				area = true,
 				melee = true,
+				channelRelease = true,
+			},
+			baseMods = {
+				mod("DPS", "MORE", 100, 0, 0, { type = "Multiplier", var = "SuperchargedSlamStage" }),
 			},
 			constantStats = {
 				{ "active_skill_base_area_of_effect_radius", 16 },
@@ -14150,10 +14172,27 @@ skills["SuperchargedSlamPlayer"] = {
 			label = "Aftershock",
 			incrementalEffectiveness = 0.092720001935959,
 			statDescriptionScope = "channelled_slam_statset_1",
+			statMap = {
+				["channelled_slam_damage_+%_final_per_stage"] = {
+					mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "SuperchargedSlamStage" }),
+				},
+				["channelled_slam_max_stages"] = {
+					mod("Multiplier:SuperchargedSlamMaxStages", "BASE", nil),
+				},
+				["aftershock_radius_+_per_previous_aftershock"] = {
+					skill("radiusExtra", nil, { type = "Multiplier", var = "SuperchargedSlamStage", limit = 30, limitTotal = true }),
+				},
+				["base_skill_show_average_damage_instead_of_dps"] = {
+				},
+			},
 			baseFlags = {
 				attack = true,
 				area = true,
 				melee = true,
+				channelRelease = true,
+			},
+			baseMods = {
+				mod("DPS", "MORE", 100, 0, 0, { type = "Multiplier", var = "SuperchargedSlamStage" }),
 			},
 			constantStats = {
 				{ "active_skill_base_area_of_effect_radius", 16 },

src/Data/Skills/other.lua

@@ -5824,12 +5824,22 @@ skills["TemperWeaponPlayer"] = {
 		[39] = { storedUses = 1, levelRequirement = 90, cooldown = 5, cost = { ManaPerMinute = 4319, }, },
 		[40] = { storedUses = 1, levelRequirement = 90, cooldown = 5, cost = { ManaPerMinute = 4596, }, },
 	},
+			preDamageFunc = function(activeSkill, output)
+				activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:TemperWeaponStage")
+			end,
 	statSets = {
 		[1] = {
 			label = "Temper Weapon",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "skill_stat_descriptions",
+			statMap = {
+				["imbue_weapon_max_exerts"] = {
+					mod("Multiplier:TemperWeaponMaxStages", "BASE", nil),
+					div = 3,
+				},
+			},
 			baseFlags = {
+				channelRelease = true,
 			},
 			constantStats = {
 				{ "imbue_weapon_max_exerts", 12 },

src/Export/Skills/act_dex.txt

@@ -104,6 +104,7 @@ statMap = {
 #skill DetonatingArrowPlayer
 preDamageFunc = function(activeSkill, output)
 	activeSkill.skillData.hitTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:DetonatingArrowStage")
+	activeSkill.skillData.channelTimeMultiplier = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "Multiplier:DetonatingArrowStage")
 end,
 #set DetonatingArrowPlayer
 #flags attack projectile channelRelease
@@ -452,6 +453,7 @@ statMap = {
 #skill SnipePlayer
 preDamageFunc = function(activeSkill, output)
 	activeSkill.skillData.hitTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
+	activeSkill.skillData.channelTimeMultiplier = activeSkill.skillData.channelPercentOfAttackTime
 end,
 #set SnipePlayer
 #flags attack projectile channelRelease