Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions spec/System/TestAttackSpeedFloor_spec.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
describe("TestAttackSpeedFloor", function()
local function cyclone(mods, skill)
newBuild()
if skill then
build.itemsTab:CreateDisplayItemFromRaw("Rarity: NORMAL\nCorroded Blade")
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")
end
build.skillsTab:PasteSocketGroup((skill or "Cyclone").." 20/0 1\n")
build.configTab.input.customMods = mods
build.configTab:BuildModList()
runCallback("OnFrame")
return build.calcsTab.mainOutput
end

local ailments = "100% chance to cause Bleeding on Hit\n100% chance to Poison on Hit\n100% chance to Ignite\nAdds 10 to 20 Fire Damage to Attacks\n"

it("still scales ailments with attack speed above 100% reduced", function()
local output = cyclone(ailments.."99% reduced Attack Speed")
assert.is_true(output.Speed > 0)
assert.is_true(output.BleedDPS > 0)
assert.is_true(output.TotalPoisonDPS > 0)
assert.is_true(output.IgniteDPS > 0)
end)

for _, reduced in ipairs({ 100, 104, 150 }) do
it("does not hit or inflict ailments with "..reduced.."% reduced attack speed", function()
local output = cyclone(ailments..reduced.."% reduced Attack Speed")
assert.are.equals(0, output.Speed)
assert.are.equals(0, output.TotalDPS)
assert.are.equals(0, output.BleedDPS)
assert.are.equals(0, output.TotalPoisonDPS)
assert.are.equals(0, output.IgniteDPS)
assert.are.equals(0, output.CombinedDPS)
end)
end

it("does not ignite with a cooldown attack at 100% reduced attack speed", function()
local output = cyclone(ailments.."99% reduced Attack Speed", "Vigilant Strike")
assert.is_not_nil(output.Cooldown)
assert.is_true(output.BleedDPS > 0)
assert.is_true(output.IgniteDPS > 0)
output = cyclone(ailments.."100% reduced Attack Speed", "Vigilant Strike")
assert.are.equals(0, output.Speed)
assert.are.equals(0, output.BleedDPS)
assert.are.equals(0, output.IgniteDPS)
assert.are.equals(0, output.CombinedDPS)
end)
end)
17 changes: 15 additions & 2 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,14 @@ function calcs.offence(env, actor, activeSkill)
if skillFlags.warcry then
output.Speed = 1 / output.WarcryCastTime
else
output.Speed = 1 / (baseTime / round((1 + inc/100) * more, 2) + skillModList:Sum("BASE", cfg, "TotalAttackTime") + skillModList:Sum("BASE", cfg, "TotalCastTime"))
local speedMult = round((1 + inc/100) * more, 2)
if speedMult <= 0 then
-- 100% or more reduced speed: the skill is never used, so it can't hit or inflict ailments
output.Speed = 0
globalOutput.SpeedReducedToZero = true
else
output.Speed = 1 / (baseTime / speedMult + skillModList:Sum("BASE", cfg, "TotalAttackTime") + skillModList:Sum("BASE", cfg, "TotalCastTime"))
end

end
output.CastRate = output.Speed
Expand Down Expand Up @@ -4497,6 +4504,8 @@ function calcs.offence(env, actor, activeSkill)
if (globalOutput.HitSpeed or globalOutput.Speed) > 0 then
--assume skills with no cast, attack, or cooldown time are single cast
bleedStacks = bleedStacks * globalOutput.BleedDuration * (globalOutput.HitSpeed or globalOutput.Speed)
elseif globalOutput.SpeedReducedToZero then
bleedStacks = 0
end
local activeTotems = env.modDB:Override(nil, "TotemsSummoned") or skillModList:Sum("BASE", skillCfg, "ActiveTotemLimit", "ActiveBallistaLimit")
if skillFlags.totem then
Expand Down Expand Up @@ -4790,6 +4799,8 @@ function calcs.offence(env, actor, activeSkill)
uncappedPoisonStacks = m_max(PoisonStacks, maxPoisonStacks)
PoisonStacks = m_min(PoisonStacks, maxPoisonStacks)
end
elseif globalOutput.SpeedReducedToZero then
PoisonStacks = 0
end
if PoisonStacks < additionalPoisonStacks and (env.configInput.multiplierPoisonOnEnemy or 0) == 0 then
skillModList:NewMod("Condition:NonPoisonedOnly", "FLAG", true, "Calculation")
Expand Down Expand Up @@ -5081,7 +5092,9 @@ function calcs.offence(env, actor, activeSkill)
-- The average number of ignites that will be active on the enemy at once
local igniteStacks = output.HitChance / 100 * igniteChance * skillData.dpsMultiplier
if not skillData.triggeredOnDeath then
if output.Cooldown then
if globalOutput.SpeedReducedToZero then
igniteStacks = 0
elseif output.Cooldown then
igniteStacks = igniteStacks * globalOutput.IgniteDuration / m_max(output.Cooldown, (output.HitTime or output.Time))
elseif (globalOutput.HitSpeed or globalOutput.Speed) > 0 then
--assume skills with no cast, attack, or cooldown time are single cast
Expand Down
Loading