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
16 changes: 8 additions & 8 deletions src/Data/Skills/act_dex.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4037,10 +4037,10 @@ skills["ChargedDash"] = {
},
},
preDamageFunc = function(activeSkill, output)
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
end,
statMap = {
["base_skill_show_average_damage_instead_of_dps"] = {
Expand Down Expand Up @@ -4164,10 +4164,10 @@ skills["ChargedDashAltX"] = {
},
},
preDamageFunc = function(activeSkill, output)
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashofProjection", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashAltX", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
end,
statMap = {
["base_skill_show_average_damage_instead_of_dps"] = {
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Skills/act_int.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11479,7 +11479,7 @@ skills["KineticFusilladeAltX"] = {
-- Average multiplier: sum of (0, X, 2X, 3X, ..., (n-1)X) / n
-- This equals: X * (0 + 1 + 2 + ... + (n-1)) / n = X * n(n-1)/2 / n = X * (n-1)/2
local avgMoreMult = moreDamagePerProj * (output.ProjectileCount - 1) / 2
activeSkill.skillModList:NewMod("Damage", "MORE", avgMoreMult, "Skill:KineticFusilladeofDetonation", ModFlag.Hit)
activeSkill.skillModList:NewMod("Damage", "MORE", avgMoreMult, "Skill:KineticFusilladeAltX", ModFlag.Hit)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the change that actually fixes the issue.


-- Store the average multiplier for display
output.KineticFusilladeAvgMoreMult = avgMoreMult
Expand Down
16 changes: 8 additions & 8 deletions src/Export/Skills/act_dex.txt
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,10 @@ local skills, mod, flag, skill = ...
},
},
preDamageFunc = function(activeSkill, output)
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDash", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
end,
statMap = {
["base_skill_show_average_damage_instead_of_dps"] = {
Expand Down Expand Up @@ -729,10 +729,10 @@ local skills, mod, flag, skill = ...
},
},
preDamageFunc = function(activeSkill, output)
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashofProjection", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
if activeSkill.skillPart == 3 then
local finalWaveDamageModifier = activeSkill.skillModList:Sum("INC", activeSkill.skillCfg, "chargedDashFinalDamageModifier")
activeSkill.skillModList:NewMod("Damage", "MORE", finalWaveDamageModifier, "Skill:ChargedDashAltX", ModFlag.Attack, { type = "Release Damage", skillPart = 3 })
end
end,
statMap = {
["base_skill_show_average_damage_instead_of_dps"] = {
Expand Down
2 changes: 1 addition & 1 deletion src/Export/Skills/act_int.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2441,7 +2441,7 @@ local skills, mod, flag, skill = ...
-- Average multiplier: sum of (0, X, 2X, 3X, ..., (n-1)X) / n
-- This equals: X * (0 + 1 + 2 + ... + (n-1)) / n = X * n(n-1)/2 / n = X * (n-1)/2
local avgMoreMult = moreDamagePerProj * (output.ProjectileCount - 1) / 2
activeSkill.skillModList:NewMod("Damage", "MORE", avgMoreMult, "Skill:KineticFusilladeofDetonation", ModFlag.Hit)
activeSkill.skillModList:NewMod("Damage", "MORE", avgMoreMult, "Skill:KineticFusilladeAltX", ModFlag.Hit)

-- Store the average multiplier for display
output.KineticFusilladeAvgMoreMult = avgMoreMult
Expand Down
Loading