Skip to content

Commit af0bc4d

Browse files
author
LocalIdentity
committed
Fix KF breakdown
Had the predictive and lockstep calcs reversed
1 parent 02d8258 commit af0bc4d

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/Data/Skills/act_int.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11317,7 +11317,8 @@ skills["KineticFusillade"] = {
1131711317
t_insert(breakdownAPS, "")
1131811318
t_insert(breakdownAPS, s_format("^6Lockstep"))
1131911319
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
11320-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectiveAPS))
11320+
t_insert(breakdownAPS, s_format("^8Rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
11321+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectiveAPS))
1132111322
if currentAPS then
1132211323
local currentInc = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed")
1132311324
local neededInc = ((maxEffectiveAPS / currentAPS) * (1 + currentInc / 100) - 1) * 100
@@ -11335,8 +11336,7 @@ skills["KineticFusillade"] = {
1133511336
t_insert(breakdownAPS, "")
1133611337
t_insert(breakdownAPS, s_format("^6Predictive"))
1133711338
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
11338-
t_insert(breakdownAPS, s_format("^8rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
11339-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectivePredictiveAPS))
11339+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectivePredictiveAPS))
1134011340
if currentAPS > maxEffectivePredictiveAPS then
1134111341
t_insert(breakdownAPS, s_format("^1Current attack rate (%.2f) exceeds max effective rate!", currentAPS))
1134211342
t_insert(breakdownAPS, s_format("^1Reduce attack speed by at least^7 %d%% ^1", math.ceil(-additionalPredictiveInc)))
@@ -11537,7 +11537,8 @@ skills["KineticFusilladeAltX"] = {
1153711537
t_insert(breakdownAPS, "")
1153811538
t_insert(breakdownAPS, s_format("^6Lockstep"))
1153911539
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
11540-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectiveAPS))
11540+
t_insert(breakdownAPS, s_format("^8Rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
11541+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectiveAPS))
1154111542
if currentAPS then
1154211543
local currentInc = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed")
1154311544
local neededInc = ((maxEffectiveAPS / currentAPS) * (1 + currentInc / 100) - 1) * 100
@@ -11555,8 +11556,7 @@ skills["KineticFusilladeAltX"] = {
1155511556
t_insert(breakdownAPS, "")
1155611557
t_insert(breakdownAPS, s_format("^6Predictive"))
1155711558
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
11558-
t_insert(breakdownAPS, s_format("^8rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
11559-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectivePredictiveAPS))
11559+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectivePredictiveAPS))
1156011560
if currentAPS > maxEffectivePredictiveAPS then
1156111561
t_insert(breakdownAPS, s_format("^1Current attack rate (%.2f) exceeds max effective rate!", currentAPS))
1156211562
t_insert(breakdownAPS, s_format("^1Reduce attack speed by at least^7 %d%% ^1", math.ceil(-additionalPredictiveInc)))

‎src/Export/Skills/act_int.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,7 +2357,8 @@ local skills, mod, flag, skill = ...
23572357
t_insert(breakdownAPS, "")
23582358
t_insert(breakdownAPS, s_format("^6Lockstep"))
23592359
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
2360-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectiveAPS))
2360+
t_insert(breakdownAPS, s_format("^8Rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
2361+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectiveAPS))
23612362
if currentAPS then
23622363
local currentInc = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed")
23632364
local neededInc = ((maxEffectiveAPS / currentAPS) * (1 + currentInc / 100) - 1) * 100
@@ -2375,8 +2376,7 @@ local skills, mod, flag, skill = ...
23752376
t_insert(breakdownAPS, "")
23762377
t_insert(breakdownAPS, s_format("^6Predictive"))
23772378
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
2378-
t_insert(breakdownAPS, s_format("^8rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
2379-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectivePredictiveAPS))
2379+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectivePredictiveAPS))
23802380
if currentAPS > maxEffectivePredictiveAPS then
23812381
t_insert(breakdownAPS, s_format("^1Current attack rate (%.2f) exceeds max effective rate!", currentAPS))
23822382
t_insert(breakdownAPS, s_format("^1Reduce attack speed by at least^7 %d%% ^1", math.ceil(-additionalPredictiveInc)))
@@ -2499,7 +2499,8 @@ local skills, mod, flag, skill = ...
24992499
t_insert(breakdownAPS, "")
25002500
t_insert(breakdownAPS, s_format("^6Lockstep"))
25012501
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
2502-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectiveAPS))
2502+
t_insert(breakdownAPS, s_format("^8Rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
2503+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectiveAPS))
25032504
if currentAPS then
25042505
local currentInc = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "Speed")
25052506
local neededInc = ((maxEffectiveAPS / currentAPS) * (1 + currentInc / 100) - 1) * 100
@@ -2517,8 +2518,7 @@ local skills, mod, flag, skill = ...
25172518
t_insert(breakdownAPS, "")
25182519
t_insert(breakdownAPS, s_format("^6Predictive"))
25192520
t_insert(breakdownAPS, s_format("^8Effective delay:^7 (%.1f + %.2f) x %.4f = %.4fs", hoverDelay, baseTimeForAllProjectiles, durationMod, effectiveDelay))
2520-
t_insert(breakdownAPS, s_format("^8rounded up to nearest server tick^7 = %.4fs", effectiveDelayRounded))
2521-
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelayRounded, maxEffectivePredictiveAPS))
2521+
t_insert(breakdownAPS, s_format("^8Max effective attack rate:^7 1 / %.4f = %.2f", effectiveDelay, maxEffectivePredictiveAPS))
25222522
if currentAPS > maxEffectivePredictiveAPS then
25232523
t_insert(breakdownAPS, s_format("^1Current attack rate (%.2f) exceeds max effective rate!", currentAPS))
25242524
t_insert(breakdownAPS, s_format("^1Reduce attack speed by at least^7 %d%% ^1", math.ceil(-additionalPredictiveInc)))

0 commit comments

Comments
 (0)