Skip to content

Stop crucible aoe mod from applying to any skill. #6251

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

Merged
merged 2 commits into from
Aug 13, 2023
Merged

Stop crucible aoe mod from applying to any skill. #6251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a741c4
FIX: fix crucible AOE mod applying to anything
Paliak May 31, 2023
44912c8
FIX: prevent AOE breakdown from always showing
Paliak May 31, 2023
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
12 changes: 7 additions & 5 deletions src/Modules/CalcOffence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,13 @@ function calcs.offence(env, actor, activeSkill)
end
if breakdown then
breakdown.AreaOfEffectMod = { }
breakdown.multiChain(breakdown.AreaOfEffectMod, {
{ "%.2f ^8(increased/reduced)", 1 + skillModList:Sum("INC", skillCfg, "AreaOfEffect") / 100 },
{ "%.2f ^8(more/less)", skillModList:More(skillCfg, "AreaOfEffect") },
total = s_format("= %.2f", output.AreaOfEffectMod),
})
if output.AreaOfEffectMod ~= 1 then
breakdown.multiChain(breakdown.AreaOfEffectMod, {
{ "%.2f ^8(increased/reduced)", 1 + skillModList:Sum("INC", skillCfg, "AreaOfEffect") / 100 },
{ "%.2f ^8(more/less)", skillModList:More(skillCfg, "AreaOfEffect") },
total = s_format("= %.2f", output.AreaOfEffectMod),
})
end
end
end

Expand Down
2 changes: 1 addition & 1 deletion src/Modules/ModParser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4402,7 +4402,7 @@ local specialModList = {
["while stationary, gain (%d+)%% increased area of effect every second, up to a maximum of (%d+)%%"] = function(num, _, limit) return {
mod("AreaOfEffect", "INC", num, { type = "Multiplier", var = "StationarySeconds", globalLimit = tonumber(limit), globalLimitKey = "ExpansiveMight" }, { type = "Condition", var = "Stationary" }),
} end,
["fireball and rolling magma have (%d+)%% more area of effect"] = function(num) return { mod("AreaOfEffect", "MORE", num, nil, { type = "SkillName", skillNameList = { "Fireball", "rolling Magma" } }) } end,
["fireball and rolling magma have (%d+)%% more area of effect"] = function(num) return { mod("AreaOfEffect", "MORE", num, { type = "SkillName", skillNameList = { "Fireball", "Rolling Magma" } }) } end,
["attack skills have added lightning damage equal to (%d+)%% of maximum mana"] = function(num) return {
mod("LightningMin", "BASE", 1, nil, ModFlag.Attack, { type = "PercentStat", stat = "Mana", percent = num }),
mod("LightningMax", "BASE", 1, nil, ModFlag.Attack, { type = "PercentStat", stat = "Mana", percent = num }),
Expand Down