consider delay between projectiles for max effective APS

Signed-off-by: Justin Stitt <[email protected]>

Author: JustinStitt

src/Export/Skills/act_int.txt

@@ -2267,18 +2267,18 @@ local skills, mod, flag, skill = ...
 #flags attack projectile area duration
 	parts = {
 		{
-			name = "1 Projectile"
+			name = "All Projectiles",
 		},
 		{
-			name = "All Projectiles",
+			name = "1 Projectile"
 		},
 	},
 	preDamageFunc = function(activeSkill, output, breakdown)
 		local skillData = activeSkill.skillData
 		local t_insert = table.insert
 		local s_format = string.format
 
-		if activeSkill.skillPart == 2 then
+		if activeSkill.skillPart == 1 then
 			-- Set base dpsMultiplier for projectile count
 			activeSkill.skillData.dpsMultiplier = output.ProjectileCount
 
@@ -2313,23 +2313,34 @@ local skills, mod, flag, skill = ...
 		local t_insert = table.insert
 		local s_format = string.format
 
+		local baseDelayBetweenProjectiles = 0.05
+		local projectileCount = 1
+
+		if activeSkill.skillPart == 1 then
+			projectileCount = output.ProjectileCount
+		end
+
 		-- Calculate effective attack rate accounting for delayed projectile firing
 		-- Projectiles orbit for base_skill_effect_duration before firing
 		-- Recasting resets the timer, so attacking too fast wastes potential damage
 		local baseDuration = skillData.duration
 		local actualDuration = output.Duration or baseDuration
-		local ticksNeeded = math.ceil(actualDuration / data.misc.ServerTickTime)
-		local effectiveDelay = ticksNeeded * data.misc.ServerTickTime
+		local ticksNeededForInitialDelay = math.ceil(actualDuration / data.misc.ServerTickTime)
+		local timePerProjectile = baseDelayBetweenProjectiles * output.DurationMod
+		local timeForAllProjectiles = timePerProjectile * projectileCount
+		local effectiveDelay = ticksNeededForInitialDelay * data.misc.ServerTickTime + math.ceil(timeForAllProjectiles / data.misc.ServerTickTime) * data.misc.ServerTickTime
 		local maxEffectiveAPS = 1 / effectiveDelay
 		local currentAPS = output.Speed
 
 		output.KineticFusilladeMaxEffectiveAPS = maxEffectiveAPS
 
 		if breakdown then
 			local breakdownAPS = {}
-			t_insert(breakdownAPS, s_format("^8Projectiles orbit for %.3fs before firing", actualDuration))
+			t_insert(breakdownAPS, s_format("^1(These calculations are speculative and best-effort)", actualDuration))
+			t_insert(breakdownAPS, s_format("^8Delay of^7 %.3fs ^8before projectiles start firing", actualDuration))
+			t_insert(breakdownAPS, s_format("^8Each projectile fires sequentially with a^7 %.3fs ^8delay between each projectile", timePerProjectile))
 			t_insert(breakdownAPS, s_format("^8Server tick time:^7 %.3fs", data.misc.ServerTickTime))
-			t_insert(breakdownAPS, s_format("^8Ticks needed:^7 %d ^8(rounded up)", ticksNeeded))
+			t_insert(breakdownAPS, s_format("^8Ticks needed:^7 %d ^8(rounded up)", ticksNeededForInitialDelay + math.ceil(timeForAllProjectiles / data.misc.ServerTickTime)))
 			t_insert(breakdownAPS, s_format("^8Effective delay:^7 %.3fs", effectiveDelay))
 			t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.3f = %.2f", effectiveDelay, maxEffectiveAPS))
 			if currentAPS and currentAPS > maxEffectiveAPS then
@@ -2344,7 +2355,7 @@ local skills, mod, flag, skill = ...
 		end
 
 		-- Adjust dpsMultiplier if attacking too fast (only for "All Projectiles" mode)
-		if activeSkill.skillPart == 2 then
+		if activeSkill.skillPart == 1 then
 			if currentAPS and currentAPS > maxEffectiveAPS then
 				local efficiencyRatio = maxEffectiveAPS / currentAPS
 				local originalMultiplier = skillData.dpsMultiplier or output.ProjectileCount