Skip to content
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

Fix Seismic Cry including old AoE increase mod #7791

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Fix Seismic Cry including old AoE increase mod #7791

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions src/Data/Skills/act_str.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8434,9 +8434,6 @@ skills["SeismicCry"] = {
["skill_empowers_next_x_melee_attacks"] = {
mod("SeismicExertedAttacks", "BASE", nil),
},
["seismic_cry_slam_skill_area_+%_increase_per_repeat"] = {
mod("SeismicAoEIncMultiplier", "BASE", nil),
},
["seismic_cry_base_slam_skill_area_+%"] = {
mod("SeismicAoEMoreMultiplier", "BASE", nil),
},
Expand Down Expand Up @@ -8465,7 +8462,6 @@ skills["SeismicCry"] = {
{ "seismic_cry_+%_stun_threshold_per_5_MP", 15 },
{ "seismic_cry_+%_physical_damamge_reduction_per_5_MP", 5 },
{ "seismic_cry_base_slam_skill_area_+%", 50 },
{ "seismic_cry_slam_skill_area_+%_increase_per_repeat", 30 },
{ "skill_empower_limitation_specifier_for_stat_description", 2 },
},
stats = {
Expand Down
3 changes: 0 additions & 3 deletions src/Export/Skills/act_str.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1557,9 +1557,6 @@ local skills, mod, flag, skill = ...
["skill_empowers_next_x_melee_attacks"] = {
mod("SeismicExertedAttacks", "BASE", nil),
},
["seismic_cry_slam_skill_area_+%_increase_per_repeat"] = {
mod("SeismicAoEIncMultiplier", "BASE", nil),
},
["seismic_cry_base_slam_skill_area_+%"] = {
mod("SeismicAoEMoreMultiplier", "BASE", nil),
},
Expand Down
17 changes: 0 additions & 17 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,23 +2519,6 @@ function calcs.offence(env, actor, activeSkill)
end
t_insert(globalBreakdown.SeismicUpTimeRatio, s_format("= %d%%", globalOutput.SeismicUpTimeRatio))
end
-- calculate the stacking AoE modifier of Seismic slams
local SeismicAoEPerExert = env.modDB:Sum("BASE", cfg, "SeismicIncAoEPerExert") / 100
local AoEImpact = 0
local MaxSingleAoEImpact = 0
for i = 1, globalOutput.SeismicExertsCount do
AoEImpact = AoEImpact + (i * SeismicAoEPerExert)
MaxSingleAoEImpact = MaxSingleAoEImpact + SeismicAoEPerExert
end
local AvgAoEImpact = AoEImpact / globalOutput.SeismicExertsCount

-- account for AoE increase
if activeSkill.skillModList:Flag(nil, "Condition:WarcryMaxHit") then
skillModList:NewMod("AreaOfEffect", "INC", MaxSingleAoEImpact * 100, "Max Seismic Exert AoE")
else
skillModList:NewMod("AreaOfEffect", "INC", m_floor(AvgAoEImpact * globalOutput.SeismicUpTimeRatio), "Avg Seismic Exert AoE")
end
calcAreaOfEffect(skillModList, skillCfg, skillData, skillFlags, globalOutput, globalBreakdown)
globalOutput.SeismicCryCalculated = true
elseif value.activeEffect.grantedEffect.name == "Battlemage's Cry" and not globalOutput.BattleMageCryCalculated then
globalOutput.BattleMageCryDuration = calcSkillDuration(value.skillModList, value.skillCfg, value.skillData, env, enemyDB)
Expand Down
1 change: 0 additions & 1 deletion src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,6 @@ function calcs.perform(env, skipEHP)
local seismicArmour = activeSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "SeismicArmourPer5MP")
local SeismicAoEMoreMultiplier = activeSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "SeismicAoEMoreMultiplier")
env.player.modDB:NewMod("NumSeismicExerts", "BASE", m_floor((activeSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "SeismicExertedAttacks") + extraExertions) * exertMultiplier))
env.player.modDB:NewMod("SeismicIncAoEPerExert", "BASE", activeSkill.skillModList:Sum("BASE", env.player.mainSkill.skillCfg, "SeismicAoEIncMultiplier"))
env.player.modDB:NewMod("AreaOfEffect", "MORE", m_floor(SeismicAoEMoreMultiplier * buff_inc) * uptime, "Seismic Cry")
env.player.modDB:NewMod("StunThreshold", "INC", m_floor(seismicStunEffect * buff_inc) * uptime, "Seismic Cry", { type = "Multiplier", var = "WarcryPower", div = 5, limit = 5 })
env.player.modDB:NewMod("Armour", "MORE", m_floor(seismicArmour * buff_inc) * uptime, "Seismic Cry", { type = "Multiplier", var = "WarcryPower", div = 5, limit = 5 })
Expand Down
Loading