From cdae8f6538369967939c695290786bdea6e86a34 Mon Sep 17 00:00:00 2001 From: Paliak <91493239+Paliak@users.noreply.github.com> Date: Mon, 18 Dec 2023 20:52:30 +0100 Subject: [PATCH 1/3] FIX: don't save defualt minion skill set choice --- src/Modules/CalcActiveSkill.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index 42c9643586..ebf365b37d 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -603,11 +603,9 @@ function calcs.buildActiveSkillModList(env, activeSkill) if env.mode == "CALCS" and activeSkill == env.player.mainSkill then local index = isValueInArray(minionList, activeEffect.srcInstance.skillMinionCalcs) or 1 minionType = minionList[index] - activeEffect.srcInstance.skillMinionCalcs = minionType else local index = isValueInArray(minionList, activeEffect.srcInstance.skillMinion) or 1 minionType = minionList[index] - activeEffect.srcInstance.skillMinion = minionType end if minionType then local minion = { } From f7d98094629f811452a3d88424fd1b003477a595 Mon Sep 17 00:00:00 2001 From: Paliak <91493239+Paliak@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:13:25 +0100 Subject: [PATCH 2/3] FIX: don't save defualt values for skillMinionSkillCalcs and skillMinionSkill --- src/Modules/CalcActiveSkill.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index ebf365b37d..a0d919e596 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -810,12 +810,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 From 080d39369b53364014ff02fe8badf029daba1ff8 Mon Sep 17 00:00:00 2001 From: Paliak <91493239+Paliak@users.noreply.github.com> Date: Mon, 18 Dec 2023 21:31:30 +0100 Subject: [PATCH 3/3] FIX: prevent running isValueInArray if val is nil --- src/Modules/CalcActiveSkill.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index a0d919e596..9d5a3b06de 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -601,10 +601,10 @@ 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] 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] end if minionType then