Skill fixes

Remove orbs in area calc for new Storm Burst
Change Shock Nova to use Ring + Nova calc by default

Author: LocalIdentity

src/Data/Skills/act_int.lua

@@ -16157,18 +16157,18 @@ skills["ShockNova"] = {
 	castTime = 0.7,
 	parts = {
 		{
-			name = "Ring",
+			name = "Ring + Nova",
 		},
 		{
-			name = "Nova",
+			name = "Ring",
 		},
 		{
-			name = "Ring + Nova",
+			name = "Nova",
 		},
 	},
 	statMap = {
 		["shock_nova_ring_chance_to_shock_+%"] =  {
-			mod("EnemyShockChance", "BASE", nil, 0, 0, { type = "SkillPart", skillPartList = { 2, 3 } }),
+			mod("EnemyShockChance", "BASE", nil, 0, 0, { type = "SkillPart", skillPartList = { 1, 2 } }),
 		},
 	},
 	baseFlags = {
@@ -16177,7 +16177,7 @@ skills["ShockNova"] = {
 	},
 	baseMods = {
 		skill("radius", 26),
-		skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 3 }),
+		skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 1 }),
 	},
 	qualityStats = {
 		Default = {
@@ -16252,10 +16252,10 @@ skills["ShockNovaAltX"] = {
 	castTime = 0.25,
 	parts = {
 		{
-			name = "Nova",
+			name = "Ring + Nova",
 		},
 		{
-			name = "Ring + Nova",
+			name = "Nova",
 		},
 	},
 	baseFlags = {
@@ -16264,7 +16264,7 @@ skills["ShockNovaAltX"] = {
 	},
 	baseMods = {
 		skill("radius", 26),
-		skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 2 }),
+		skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 1 }),
 	},
 	qualityStats = {
 		Default = {
@@ -18433,21 +18433,12 @@ skills["StormBurstAltX"] = {
 		{
 			name = "1 Orb Tick"
 		},
-		{
-			name = "Max Channelled Orbs"
-		},
 		{
 			name = "Max Duration Explode"
 		},
 	},
 	preDamageFunc = function(activeSkill, output)
 		if activeSkill.skillPart == 2 then
-			local duration = activeSkill.skillData.duration * output.DurationMod
-			-- duration * 10 / (jump * 10), instead of duration / jump to avoid floating point issues
-			local jumpPeriod = activeSkill.skillData.repeatFrequency * 10
-			-- additional 1 tick upon spawn of orb
-			activeSkill.skillData.dpsMultiplier = (activeSkill.skillData.dpsMultiplier or 1) * (1 + math.floor(duration * 10 / jumpPeriod))
-		elseif activeSkill.skillPart == 3 then
 			local remainingJumps = math.floor((activeSkill.skillData.duration * output.DurationMod + 0.001) / activeSkill.skillData.repeatFrequency)
 			-- Tested in-game and the skill grants more damage only after you have at least 0.8s duration
 			activeSkill.skillModList:NewMod("Damage", "MORE", math.max(activeSkill.skillData.remainingDurationDamage * remainingJumps - 100, 0), "Skill:StormBurst")

src/Export/Skills/act_int.txt

@@ -3674,36 +3674,36 @@ local skills, mod, flag, skill = ...
 #flags spell area
 	parts = {
 		{
-			name = "Ring",
+			name = "Ring + Nova",
 		},
 		{
-			name = "Nova",
+			name = "Ring",
 		},
 		{
-			name = "Ring + Nova",
+			name = "Nova",
 		},
 	},
 	statMap = {
 		["shock_nova_ring_chance_to_shock_+%"] =  {
-			mod("EnemyShockChance", "BASE", nil, 0, 0, { type = "SkillPart", skillPartList = { 2, 3 } }),
+			mod("EnemyShockChance", "BASE", nil, 0, 0, { type = "SkillPart", skillPartList = { 1, 2 } }),
 		},
 	},
 #baseMod skill("radius", 26)
-#baseMod skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 3 })
+#baseMod skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 1 })
 #mods
 
 #skill ShockNovaAltX
 #flags spell area
 	parts = {
 		{
-			name = "Nova",
+			name = "Ring + Nova",
 		},
 		{
-			name = "Ring + Nova",
+			name = "Nova",
 		},
 	},
 #baseMod skill("radius", 26)
-#baseMod skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 2 })
+#baseMod skill("dpsMultiplier", 2, { type = "SkillPart", skillPart = 1 })
 #mods
 
 #skill SigilOfPower
@@ -4087,21 +4087,12 @@ local skills, mod, flag, skill = ...
 		{
 			name = "1 Orb Tick"
 		},
-		{
-			name = "Max Channelled Orbs"
-		},
 		{
 			name = "Max Duration Explode"
 		},
 	},
 	preDamageFunc = function(activeSkill, output)
 		if activeSkill.skillPart == 2 then
-			local duration = activeSkill.skillData.duration * output.DurationMod
-			-- duration * 10 / (jump * 10), instead of duration / jump to avoid floating point issues
-			local jumpPeriod = activeSkill.skillData.repeatFrequency * 10
-			-- additional 1 tick upon spawn of orb
-			activeSkill.skillData.dpsMultiplier = (activeSkill.skillData.dpsMultiplier or 1) * (1 + math.floor(duration * 10 / jumpPeriod))
-		elseif activeSkill.skillPart == 3 then
 			local remainingJumps = math.floor((activeSkill.skillData.duration * output.DurationMod + 0.001) / activeSkill.skillData.repeatFrequency)
 			-- Tested in-game and the skill grants more damage only after you have at least 0.8s duration
 			activeSkill.skillModList:NewMod("Damage", "MORE", math.max(activeSkill.skillData.remainingDurationDamage * remainingJumps - 100, 0), "Skill:StormBurst")