Skip to content

Commit 582ebae

Browse files
committed
fix damage to be 160 more, fix Ranged Attacks like Ice Shot or Kinetic Blast
1 parent 63801a2 commit 582ebae

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

src/Modules/CalcOffence.lua

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,16 +760,19 @@ function calcs.offence(env, actor, activeSkill)
760760
skillData.dpsMultiplier = skillModList:Sum("BASE", skillCfg, "ProjectileCount")
761761
end
762762

763-
-- attack traps and mines can repeat with Fatal Flourish
763+
-- attack that are traps and mines can repeat with Fatal Flourish and deal 160% more damage
764764
local fatalFlourishAttackTrapOrMine = activeSkill.skillTypes[SkillType.Attack] and (activeSkill.skillTypes[SkillType.Trapped] or activeSkill.skillTypes[SkillType.RemoteMined])
765765
local function repeatSkillTypesCheck(activeSkillTypes)
766+
if fatalFlourishAttackTrapOrMine or (activeSkillTypes[SkillType.RangedAttack] and (activeSkill.skillTypes[SkillType.Trappable] or activeSkill.skillTypes[SkillType.Mineable])) then
767+
return true
768+
end
766769
local excludeSkillTypes = { SkillType.SummonsTotem, SkillType.HasReservation, SkillType.Instant, SkillType.NonRepeatable, SkillType.CreatesMinion }
767770
for _, type in ipairs(excludeSkillTypes) do
768771
if activeSkillTypes[type] then
769772
return false
770773
end
771774
end
772-
return (fatalFlourishAttackTrapOrMine or activeSkillTypes[SkillType.Multicastable] or activeSkillTypes[SkillType.Multistrikeable])
775+
return (activeSkillTypes[SkillType.Multicastable] or activeSkillTypes[SkillType.Multistrikeable])
773776
end
774777
output.Repeats = 1 + (repeatSkillTypesCheck(activeSkill.skillTypes) and (skillModList:Sum("BASE", skillCfg, "RepeatCount") or 0) or 0)
775778
if output.Repeats > 1 then
@@ -807,7 +810,9 @@ function calcs.offence(env, actor, activeSkill)
807810
local modValue = mod.value
808811
DamageFinalMoreValueTotal = DamageFinalMoreValueTotal * (1 + modValue / 100)
809812
DamageMoreValueTotal = DamageMoreValueTotal + modValue
810-
if env.configInput.repeatMode == "AVERAGE" and not skillModList:Flag(nil, "OnlyFinalRepeat") and not fatalFlourishAttackTrapOrMine then
813+
if fatalFlourishAttackTrapOrMine then
814+
modValue = 100 + modValue
815+
elseif env.configInput.repeatMode == "AVERAGE" and not skillModList:Flag(nil, "OnlyFinalRepeat") then
811816
modValue = modValue / output.Repeats
812817
end
813818
skillModList:NewMod("Damage", "MORE", modValue, mod.source, mod.flags, mod.keywordFlags, unpack(mod))

0 commit comments

Comments
 (0)