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 Flesh and Stone + Maim Support stacking #3929

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Fix Flesh and Stone + Maim Support stacking #3929

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c801afb
Fix Flesh and Stone + Maim stacking
Lothrik Jan 20, 2022
591dfc0
Generalize Flesh and Stone + Maim stacking behavior
Lothrik Jan 27, 2022
ce9c5ce
Update ModTools.lua
Lothrik Jan 27, 2022
ca25bb1
Update CalcPerform.lua
Lothrik Jan 27, 2022
9892587
Remove unnecessary function arguments
Lothrik Feb 3, 2022
cde2d46
Prevent error on adding new skill
Lothrik Feb 3, 2022
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
Prev Previous commit
Next Next commit
Remove unnecessary function arguments 
.. as checking the player's activeSkillList for every minion skill makes no sense and does absolutely nothing.
  • Loading branch information
@Lothrik
Lothrik committed Feb 3, 2022
commit 9892587cef06d20e857516048a9a9a38ce17b928
14 changes: 7 additions & 7 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,17 +1836,17 @@ function calcs.perform(env, avoidCache)
local inc = modStore:Sum("INC", skillCfg, "BuffEffect") + modDB:Sum("INC", nil, "BuffEffectOnSelf")
local more = modStore:More(skillCfg, "BuffEffect") * modDB:More(nil, "BuffEffectOnSelf")
srcList:ScaleAddList(buff.modList, (1 + inc / 100) * more)
mergeBuff(srcList, buffs, buff.name, env.player.activeSkillList)
mergeBuff(buff.unscalableModList, buffs, buff.name, env.player.activeSkillList)
mergeBuff(srcList, buffs, buff.name)
mergeBuff(buff.unscalableModList, buffs, buff.name)
end
if env.minion and (env.minion == castingMinion or buff.applyAllies) then
env.minion.modDB.conditions["AffectedBy"..buff.name:gsub(" ","")] = true
local srcList = new("ModList")
local inc = modStore:Sum("INC", skillCfg, "BuffEffect", "BuffEffectOnSelf")
local more = modStore:More(skillCfg, "BuffEffect", "BuffEffectOnSelf")
srcList:ScaleAddList(buff.modList, (1 + inc / 100) * more)
mergeBuff(srcList, minionBuffs, buff.name, env.player.activeSkillList)
mergeBuff(buff.unscalableModList, minionBuffs, buff.name, env.player.activeSkillList)
mergeBuff(srcList, minionBuffs, buff.name)
mergeBuff(buff.unscalableModList, minionBuffs, buff.name)
end
end
elseif buff.type == "Aura" then
Expand All @@ -1856,14 +1856,14 @@ function calcs.perform(env, avoidCache)
local inc = skillModList:Sum("INC", skillCfg, "AuraEffect", "BuffEffect") + modDB:Sum("INC", nil, "BuffEffectOnSelf", "AuraEffectOnSelf")
local more = skillModList:More(skillCfg, "AuraEffect", "BuffEffect") * modDB:More(nil, "BuffEffectOnSelf", "AuraEffectOnSelf")
srcList:ScaleAddList(buff.modList, (1 + inc / 100) * more)
mergeBuff(srcList, buffs, buff.name, env.player.activeSkillList)
mergeBuff(srcList, buffs, buff.name)
end
if env.minion and (env.minion ~= activeSkill.minion or not activeSkill.skillData.auraCannotAffectSelf) then
local srcList = new("ModList")
local inc = skillModList:Sum("INC", skillCfg, "AuraEffect", "BuffEffect") + env.minion.modDB:Sum("INC", nil, "BuffEffectOnSelf", "AuraEffectOnSelf")
local more = skillModList:More(skillCfg, "AuraEffect", "BuffEffect") * env.minion.modDB:More(nil, "BuffEffectOnSelf", "AuraEffectOnSelf")
srcList:ScaleAddList(buff.modList, (1 + inc / 100) * more)
mergeBuff(srcList, minionBuffs, buff.name, env.player.activeSkillList)
mergeBuff(srcList, minionBuffs, buff.name)
end
end
elseif buff.type == "Curse" then
Expand Down Expand Up @@ -1897,7 +1897,7 @@ function calcs.perform(env, avoidCache)
if activeSkill.skillData.stackCount then
srcList:NewMod("Multiplier:"..buff.name.."Stack", "BASE", activeSkill.skillData.stackCount, buff.name)
end
mergeBuff(srcList, debuffs, buff.name, env.player.activeSkillList)
mergeBuff(srcList, debuffs, buff.name)
end
end
end
Expand Down