Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Mine and Trap Throw Count #7769

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Fix Mine and Trap Throw Count #7769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,9 @@ function calcs.offence(env, actor, activeSkill)
end
output.TrapThrowingSpeed = baseSpeed * calcLib.mod(skillModList, skillCfg, "TrapThrowingSpeed") * output.ActionSpeedMod
local trapThrowCount = calcLib.val(skillModList, "TrapThrowCount", skillCfg)
if skillData.trapCooldown or skillData.cooldown then
trapThrowCount = 1
end
output.TrapThrowCount = trapThrowCount
output.TrapThrowingSpeed = m_min(output.TrapThrowingSpeed, data.misc.ServerTickRate)
output.TrapThrowingTime = 1 / output.TrapThrowingSpeed
Expand Down Expand Up @@ -1224,6 +1227,9 @@ function calcs.offence(env, actor, activeSkill)
output.MineLayingSpeed = baseSpeed * calcLib.mod(skillModList, skillCfg, "MineLayingSpeed") * output.ActionSpeedMod
-- Calculate additional mine throw
local mineThrowCount = calcLib.val(skillModList, "MineThrowCount", skillCfg)
if skillData.trapCooldown or skillData.cooldown then
mineThrowCount = 1
end
output.MineThrowCount = mineThrowCount
if mineThrowCount >= 1 then
-- Throwing Mines takes 10% more time for each *additional* Mine thrown
Expand Down
Loading