Skip to content

Commit 41de8e6

Browse files
FIX: Autoexertion not using active skill cooldown. Misc cleanup. (#8801)
Co-authored-by: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com>
1 parent 7206d7a commit 41de8e6

5 files changed

Lines changed: 8 additions & 10 deletions

File tree

src/Data/SkillStatMap.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ return {
236236
skill("triggeredByAutomation", nil, { type = "SkillType", skillTypeList = {SkillType.Triggerable, SkillType.Spell, SkillType.Instant} }),
237237
},
238238
["support_autocast_warcries"] = {
239-
skill("triggeredByAutoCry", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Warcry }),
239+
skill("triggeredByAutoexertion", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Warcry }),
240240
},
241241
["cast_on_stunned_%"] = {
242242
skill("chanceToTriggerOnStun", nil, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }),

src/Data/Skills/act_str.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -731,9 +731,6 @@ skills["SupportAutoexertion"] = {
731731
mod("BaseManaCostOverride", "OVERRIDE", nil),
732732
},
733733
},
734-
baseMods = {
735-
skill("SupportedByAutoexertion", true),
736-
},
737734
qualityStats = {
738735
Default = {
739736
{ "base_cooldown_speed_+%", 0.5 },

src/Export/Skills/act_str.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ local skills, mod, flag, skill = ...
135135
mod("BaseManaCostOverride", "OVERRIDE", nil),
136136
},
137137
},
138-
baseMods = {
139-
skill("SupportedByAutoexertion", true),
140-
},
141138
#mods
142139

143140
#skill BattlemagesCry

src/Modules/CalcOffence.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ local function calcWarcryCastTime(skillModList, skillCfg, skillData, actor)
282282
local warcryCastTime = baseSpeed * calcLib.mod(skillModList, skillCfg, "WarcrySpeed") * calcs.actionSpeedMod(actor)
283283
warcryCastTime = m_min(warcryCastTime, data.misc.ServerTickRate)
284284
warcryCastTime = 1 / warcryCastTime
285-
if skillModList:Flag(skillCfg, "InstantWarcry") or skillData.SupportedByAutoexertion then
285+
if skillModList:Flag(skillCfg, "InstantWarcry") or skillData.triggeredByAutoexertion then
286286
warcryCastTime = 0
287287
end
288288
return warcryCastTime

src/Modules/CalcTriggers.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ local configTable = {
11691169
return isWandAttack and not skill.skillData.triggeredBySpellSlinger
11701170
end}
11711171
end,
1172-
["call to arms"] = function(env)
1172+
["call to arms"] = function(env) -- This is for backwards compatibility only
11731173
if env.player.mainSkill.activeEffect.grantedEffect.name == "Call to Arms" then
11741174
env.player.mainSkill.skillFlags.globalTrigger = true
11751175
env.player.mainSkill.skillFlags.skipEffectiveRate = true
@@ -1208,8 +1208,12 @@ local configTable = {
12081208
env.player.mainSkill.skillFlags.globalTrigger = true
12091209
env.player.mainSkill.skillFlags.skipEffectiveRate = true
12101210
else -- Needed to get the cooldown form the active part
1211+
-- Autoexertion has cooldown as part of its support part
1212+
-- Not really sure which one should apply here
1213+
-- Applying the one form the active part to be consistant
1214+
-- with skills like Automation and Spellslinger
12111215
for _, skill in ipairs(env.player.activeSkillList) do
1212-
if skill.activeEffect.grantedEffect.name == "Automation" then
1216+
if skill.activeEffect.grantedEffect.name == "Autoexertion" then
12131217
env.player.mainSkill.triggeredBy.grantedEffect = skill.activeEffect.grantedEffect
12141218
break
12151219
end

0 commit comments

Comments
 (0)