Skip to content
Merged
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
25 changes: 25 additions & 0 deletions spec/System/TestSkills_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,31 @@ describe("TestSkills", function()
assert.True(baseCorruptingCryDps == build.calcsTab.mainOutput.CorruptingBloodDPS)
end)

it("Flame Breath attack speed scales DPS and is not capped by its channel cooldown", function()
build.itemsTab:CreateDisplayItemFromRaw([[
New Item
Roaring Talisman
]])
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")

build.skillsTab:PasteSocketGroup("Flame Breath 20/0 1")
runCallback("OnFrame")

local baseSpeed = build.calcsTab.mainOutput.Speed
local baseDPS = build.calcsTab.mainOutput.TotalDPS

assert.True(baseSpeed > 1)
assert.True(baseDPS > 0)

build.configTab.input.customMods = "100% increased attack speed"
build.configTab:BuildModList()
runCallback("OnFrame")

assert.True(build.calcsTab.mainOutput.Speed > baseSpeed * 1.9)
assert.True(build.calcsTab.mainOutput.TotalDPS > baseDPS * 1.9)
end)

it("Test Atziri's Allure - ignore curse limit", function()
build.skillsTab:PasteSocketGroup("Elemental Weakness 20/0 1\nAtziri's Allure 1/0 1")
build.skillsTab:PasteSocketGroup("Flammability 20/0 1\n")
Expand Down
3 changes: 3 additions & 0 deletions src/Data/SkillStatMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,9 @@ return {
["display_this_skill_cooldown_does_not_recover_during_buff"] = {
flag("NoCooldownRecoveryInDuration"),
},
["channelled_skill_do_not_go_on_cooldown_on_finishing_channel"] = {
flag("CooldownDoesNotLimitSkillSpeed"),
},
["totem_skill_cast_speed_+%"] = {
mod("Speed", "INC", nil, ModFlag.Cast, KeywordFlag.Totem),
},
Expand Down
6 changes: 4 additions & 2 deletions src/Modules/CalcOffence.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2741,7 +2741,9 @@ function calcs.offence(env, actor, activeSkill)
end
if globalOutput.Cooldown then
output.Cooldown = globalOutput.Cooldown
output.Speed = m_min(output.Speed, 1 / output.Cooldown * output.Repeats)
if not skillModList:Flag(skillCfg, "CooldownDoesNotLimitSkillSpeed") then
output.Speed = m_min(output.Speed, 1 / output.Cooldown * output.Repeats)
end
end
if output.Cooldown and skillFlags.selfCast or skillData.maxHitRatePerEnemy or skillData.hitTimeOverride then
skillFlags.notAverage = true
Expand Down Expand Up @@ -2844,7 +2846,7 @@ function calcs.offence(env, actor, activeSkill)
t_insert(breakdown.Speed, s_format("= %.2f ^8(eff. attack rate)", output.Speed))
end
-- Cooldown:
if output.Cooldown and (1 / output.Cooldown) < output.CastRate then
if output.Cooldown and (1 / output.Cooldown) < output.CastRate and not skillModList:Flag(skillCfg, "CooldownDoesNotLimitSkillSpeed") then
t_insert(breakdown.Speed, s_format("\n"))
t_insert(breakdown.Speed, s_format("1 / %.2f ^8(skill cooldown)", output.Cooldown))
if output.Repeats > 1 then
Expand Down
Loading