Skip to content

Commit 78b16a0

Browse files
authored
FIX: Autoexertion not triggering supported skills (#8026)
1 parent e1d74ed commit 78b16a0

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

src/Data/Skills/sup_str.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4495,7 +4495,7 @@ skills["SupportOverexertion"] = {
44954495
mod("ExertIncrease", "INC", nil)
44964496
},
44974497
["support_overexertion_damage_+%_final_per_warcry_exerting_action"] = {
4498-
mod("AutoexertionExertAverageIncrease", "MORE", nil)
4498+
mod("OverexertionExertAverageIncrease", "MORE", nil)
44994499
},
45004500
},
45014501
qualityStats = {

src/Export/Skills/sup_str.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ local skills, mod, flag, skill = ...
631631
mod("ExertIncrease", "INC", nil)
632632
},
633633
["support_overexertion_damage_+%_final_per_warcry_exerting_action"] = {
634-
mod("AutoexertionExertAverageIncrease", "MORE", nil)
634+
mod("OverexertionExertAverageIncrease", "MORE", nil)
635635
},
636636
},
637637
#mods

src/Modules/CalcOffence.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,7 @@ function calcs.offence(env, actor, activeSkill)
25852585
local incExertedAttacks = skillModList:Sum("INC", cfg, "ExertIncrease")
25862586
local moreExertedAttacks = skillModList:Sum("MORE", cfg, "ExertIncrease")
25872587
local moreExertedAttackDamage = skillModList:Sum("MORE", cfg, "ExertAttackIncrease")
2588-
local autoExertionExertedDamage = skillModList:Sum("MORE", cfg, "AutoexertionExertAverageIncrease")
2588+
local autoExertionExertedDamage = skillModList:Sum("MORE", cfg, "OverexertionExertAverageIncrease")
25892589
local echoesOfCreationExertedDamage = skillModList:Sum("MORE", cfg, "EchoesExertAverageIncrease")
25902590
if activeSkill.skillModList:Flag(nil, "Condition:WarcryMaxHit") then
25912591
skillModList:NewMod("Damage", "INC", incExertedAttacks, "Exerted Attacks")
@@ -2601,7 +2601,7 @@ function calcs.offence(env, actor, activeSkill)
26012601
skillModList:NewMod("Damage", "MORE", echoesOfCreationExertedDamage * globalOutput.GlobalWarcryUptimeRatio / 100, "Uptime Scaled Echoes of Creation")
26022602
end
26032603
globalOutput.ExertedAttackAvgDmg = calcLib.mod(skillModList, skillCfg, "ExertIncrease")
2604-
globalOutput.ExertedAttackAvgDmg = globalOutput.ExertedAttackAvgDmg * calcLib.mod(skillModList, skillCfg, "ExertAttackIncrease", "AutoexertionExertAverageIncrease", "EchoesExertAverageIncrease")
2604+
globalOutput.ExertedAttackAvgDmg = globalOutput.ExertedAttackAvgDmg * calcLib.mod(skillModList, skillCfg, "ExertAttackIncrease", "OverexertionExertAverageIncrease", "EchoesExertAverageIncrease")
26052605
globalOutput.ExertedAttackHitEffect = globalOutput.ExertedAttackAvgDmg * globalOutput.ExertedAttackUptimeRatio / 100
26062606
globalOutput.ExertedAttackMaxHitEffect = globalOutput.ExertedAttackAvgDmg
26072607
if globalBreakdown then

src/Modules/CalcTriggers.lua

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,19 @@ local configTable = {
11741174
return skill.activeEffect.grantedEffect.name == "Call to Arms"
11751175
end}
11761176
end,
1177+
["autoexertion"] = function(env)
1178+
if env.player.mainSkill.activeEffect.grantedEffect.name == "Autoexertion" then
1179+
env.player.mainSkill.skillFlags.globalTrigger = true
1180+
return {source = env.player.mainSkill}
1181+
end
1182+
env.player.mainSkill.skillData.sourceRateIsFinal = true
1183+
env.player.mainSkill.skillData.ignoresTickRate = true
1184+
return {triggerOnUse = true,
1185+
useCastRate = true,
1186+
triggerSkillCond = function(env, skill)
1187+
return skill.activeEffect.grantedEffect.name == "Autoexertion"
1188+
end}
1189+
end,
11771190
["mark on hit"] = function()
11781191
return {triggerSkillCond = function(env, skill) return skill.skillTypes[SkillType.Attack] end}
11791192
end,

0 commit comments

Comments
 (0)