Skip to content

Don't save default minion skill set choice #7099

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

Closed
wants to merge 4 commits into from
Closed

Don't save default minion skill set choice #7099

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdae8f6
FIX: don't save defualt minion skill set choice
Paliak Dec 18, 2023
f7d9809
FIX: don't save defualt values for skillMinionSkillCalcs and skillMin…
Paliak Dec 18, 2023
080d393
FIX: prevent running isValueInArray if val is nil
Paliak Dec 18, 2023
ea22cf2
Merge branch 'PathOfBuildingCommunity:dev' into fix-spearding-phantas…
Paliak Jul 17, 2024
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
10 changes: 2 additions & 8 deletions src/Modules/CalcActiveSkill.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,11 @@ function calcs.buildActiveSkillModList(env, activeSkill)
if minionList[1] and not activeSkill.actor.minionData then
local minionType
if env.mode == "CALCS" and activeSkill == env.player.mainSkill then
local index = isValueInArray(minionList, activeEffect.srcInstance.skillMinionCalcs) or 1
local index = activeEffect.srcInstance.skillMinionCalcs and isValueInArray(minionList, activeEffect.srcInstance.skillMinionCalcs) or 1
minionType = minionList[index]
activeEffect.srcInstance.skillMinionCalcs = minionType
else
local index = isValueInArray(minionList, activeEffect.srcInstance.skillMinion) or 1
local index = activeEffect.srcInstance.skillMinion and isValueInArray(minionList, activeEffect.srcInstance.skillMinion) or 1
minionType = minionList[index]
activeEffect.srcInstance.skillMinion = minionType
end
if minionType then
local minion = { }
Expand Down Expand Up @@ -830,12 +828,8 @@ function calcs.createMinionSkills(env, activeSkill)
local skillIndex
if env.mode == "CALCS" then
skillIndex = m_max(m_min(activeEffect.srcInstance.skillMinionSkillCalcs or 1, #minion.activeSkillList), 1)
activeEffect.srcInstance.skillMinionSkillCalcs = skillIndex
else
skillIndex = m_max(m_min(activeEffect.srcInstance.skillMinionSkill or 1, #minion.activeSkillList), 1)
if env.mode == "MAIN" then
activeEffect.srcInstance.skillMinionSkill = skillIndex
end
end
minion.mainSkill = minion.activeSkillList[skillIndex]
end
Loading