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 Formless Inferno not increasing minion life properly #5874

Merged
merged 1 commit into from
Apr 3, 2023
Merged

Fix Formless Inferno not increasing minion life properly #5874

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
29 changes: 13 additions & 16 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,19 +1660,6 @@ function calcs.perform(env, avoidCache)

-- Calculate attributes and life/mana pools
doActorAttribsPoolsConditions(env, env.player)
if env.minion then
for _, value in ipairs(env.player.mainSkill.skillModList:List(env.player.mainSkill.skillCfg, "MinionModifier")) do
if not value.type or env.minion.type == value.type then
env.minion.modDB:AddMod(value.mod)
end
end
for _, name in ipairs(env.minion.modDB:List(nil, "Keystone")) do
if env.spec.tree.keystoneMap[name] then
env.minion.modDB:AddList(env.spec.tree.keystoneMap[name].modList)
end
end
doActorAttribsPoolsConditions(env, env.minion)
end

-- Calculate skill life and mana reservations
env.player.reserved_LifeBase = 0
Expand Down Expand Up @@ -1778,9 +1765,6 @@ function calcs.perform(env, avoidCache)

-- Set the life/mana reservations
doActorLifeManaReservation(env.player)
if env.minion then
doActorLifeManaReservation(env.minion)
end

-- Process attribute requirements
do
Expand Down Expand Up @@ -3423,6 +3407,19 @@ function calcs.perform(env, avoidCache)
calcs.offence(env, env.player, env.player.mainSkill)

if env.minion then
for _, value in ipairs(env.player.mainSkill.skillModList:List(env.player.mainSkill.skillCfg, "MinionModifier")) do
if not value.type or env.minion.type == value.type then
env.minion.modDB:AddMod(value.mod)
end
end
for _, name in ipairs(env.minion.modDB:List(nil, "Keystone")) do
if env.spec.tree.keystoneMap[name] then
env.minion.modDB:AddList(env.spec.tree.keystoneMap[name].modList)
end
end
doActorAttribsPoolsConditions(env, env.minion)
doActorLifeManaReservation(env.minion)

calcs.defence(env, env.minion)
calcs.offence(env, env.minion, env.minion.mainSkill)
end
Expand Down