Skip to content

Fix Ancestrally Boosted Strikes incorrectly having a base More Damage Multiplier #2370

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

Open
Peechey wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −8
Open

Fix Ancestrally Boosted Strikes incorrectly having a base More Damage Multiplier #2370

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
16 changes: 8 additions & 8 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3443,12 +3443,12 @@ function calcs.offence(env, actor, activeSkill)
-- dynamic way of calculating the Ancestral Boost from a single source without duplicating the code
-- uptimeOverride: Ancestral Empowerment
-- combinedCalcs: ignore INC AoE as we will run that in calcCombinedAncestralBoost
local function calcAncestralBoost(skillName, moreDmg, uptimeOverride, combinedCalcs)
local function calcAncestralBoost(skillName, uptimeOverride, combinedCalcs)
globalOutput.CreateWarcryOffensiveCalcSection = true -- labels for the CalcSection
local skillNameVar = skillName:gsub(" ", "") -- Fist Of War -> FistOfWar
local skillNameLabel = skillName:lower()

globalOutput[skillNameVar.."DamageMultiplier"] = moreDmg or 1
globalOutput[skillNameVar.."DamageMultiplier"] = ancestrallyBoostedMoreDamageMulti
globalOutput[skillNameVar.."UptimeRatio"] = uptimeOverride or m_min( (1 / globalOutput.Speed) / globalOutput[skillNameVar.."Cooldown"], 1) * 100
if globalBreakdown then
globalBreakdown[skillNameVar.."UptimeRatio"] = {
Expand Down Expand Up @@ -3478,12 +3478,12 @@ function calcs.offence(env, actor, activeSkill)
end

-- combine Ancestral Empowerment with other sources of Slam Ancestral Boost, namely Fist of War, when both active
local function calcCombinedAncestralBoost(skillName, moreDmg, uptimeOverride, additionalSkillName)
local function calcCombinedAncestralBoost(skillName, uptimeOverride, additionalSkillName)
globalOutput.CreateWarcryOffensiveCalcSection = true -- labels for the CalcSection
local skillNameVar = skillName:gsub(" ", "") -- Fist Of War -> FistOfWar
local skillNameLabel = skillName:lower()

globalOutput[skillNameVar.."DamageMultiplier"] = moreDmg or 1
globalOutput[skillNameVar.."DamageMultiplier"] = ancestrallyBoostedMoreDamageMulti
-- for CalcSections, set the AncestralEmpowerment damage for mod breakdown
globalOutput[skillNameVar.."CombinedDamageMultiplier"] = globalOutput[skillNameVar.."DamageMultiplier"]
skillNameVar = skillNameVar.."Combined"
Expand Down Expand Up @@ -3526,19 +3526,19 @@ function calcs.offence(env, actor, activeSkill)
globalOutput.FistOfWarCooldown = skillModList:Sum("BASE", cfg, "FistOfWarCooldown") or 0
if skillModList:Flag(cfg, "AncestralEmpowerment") and activeSkill.skillTypes[SkillType.Slam] and not activeSkill.skillTypes[SkillType.Vaal] and not activeSkill.skillTypes[SkillType.OtherThingUsesSkill] then
if globalOutput.FistOfWarCooldown ~= 0 then -- get the fist of war calcs in output to use in Empowerment
calcAncestralBoost("Fist Of War", ancestrallyBoostedMoreDamageMulti, nil, true)
calcAncestralBoost("Fist Of War", nil, true)
globalOutput.TheoreticalOffensiveWarcryEffect = 1 -- reset effects from FistOfWar calc, we combine later
globalOutput.TheoreticalMaxOffensiveWarcryEffect = 1

calcCombinedAncestralBoost("Ancestral Empowerment", ancestrallyBoostedMoreDamageMulti, 50, "Fist Of War")
calcCombinedAncestralBoost("Ancestral Empowerment", 50, "Fist Of War")
globalOutput.FistOfWarUptimeRatio = nil -- hide from CalcSections, but we need it for the combined calc first
else
calcAncestralBoost("Ancestral Empowerment", ancestrallyBoostedMoreDamageMulti, 50)
calcAncestralBoost("Ancestral Empowerment", 50)
end
end
-- If Fist of War & Active Skill is a Slam Skill & NOT a Vaal Skill & NOT used by mirage or other
if not skillModList:Flag(cfg, "AncestralEmpowerment") and globalOutput.FistOfWarCooldown ~= 0 and activeSkill.skillTypes[SkillType.Slam] and not activeSkill.skillTypes[SkillType.Vaal] and not activeSkill.skillTypes[SkillType.OtherThingUsesSkill] then
calcAncestralBoost("Fist Of War", ancestrallyBoostedMoreDamageMulti)
calcAncestralBoost("Fist Of War")
else
output.FistOfWarDamageEffect = 1
end
Expand Down
Loading