From b8a607e8c981d8d913bed50da0554e4a8cc8df9f Mon Sep 17 00:00:00 2001 From: Tarik <50704992+TarikBeentjes61@users.noreply.github.com> Date: Wed, 4 Mar 2026 15:11:06 +0100 Subject: [PATCH 1/2] Added support for Animate Weapon of Self Reflection and Energy Blade --- src/Modules/CalcActiveSkill.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index cfa9a6d197..39cc95d211 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -759,6 +759,10 @@ function calcs.buildActiveSkillModList(env, activeSkill) end end end + -- handles animate weapon of self reflection when using energy blade + if activeEffect.grantedEffect.id == "AnimateWeaponAltX" and env.modDB.conditions["AffectedByEnergyBlade"] then + minion.weaponData1 = env.player.weaponData1 + end end elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then activeEffect.srcInstance.skillMinionCalcs = nil From 5694ba7a0ba6fb8939135782c3cff03bcf1616f1 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Tue, 10 Mar 2026 02:14:09 +1100 Subject: [PATCH 2/2] Simplify logic Change the logic so it doesn't only work with AW of Self Reflection --- src/Data/Skills/act_dex.lua | 7 +++---- src/Export/Skills/act_dex.txt | 5 +---- src/Modules/CalcActiveSkill.lua | 6 +----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Data/Skills/act_dex.lua b/src/Data/Skills/act_dex.lua index 7ecd9bc9d4..81cbaf9bb2 100644 --- a/src/Data/Skills/act_dex.lua +++ b/src/Data/Skills/act_dex.lua @@ -312,10 +312,6 @@ skills["AnimateWeaponAltX"] = { }, statDescriptionScope = "minion_spell_skill_stat_descriptions", castTime = 0.6, - minionHasItemSet = true, - minionUses = { - ["Weapon 1"] = true, - }, minionList = { "AnimatedWeapon", }, @@ -329,6 +325,9 @@ skills["AnimateWeaponAltX"] = { minion = true, duration = true, }, + baseMods = { + skill("minionUseMainHandWeapon", true), + }, qualityStats = { Default = { { "base_number_of_animated_weapons_allowed", 0.05 }, diff --git a/src/Export/Skills/act_dex.txt b/src/Export/Skills/act_dex.txt index f04cab31b9..e096ed7df8 100644 --- a/src/Export/Skills/act_dex.txt +++ b/src/Export/Skills/act_dex.txt @@ -70,10 +70,6 @@ local skills, mod, flag, skill = ... #skill AnimateWeaponAltX #flags spell minion duration - minionHasItemSet = true, - minionUses = { - ["Weapon 1"] = true, - }, minionList = { "AnimatedWeapon", }, @@ -82,6 +78,7 @@ local skills, mod, flag, skill = ... mod("Multiplier:AnimatedWeapon", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }) }, }, +#baseMod skill("minionUseMainHandWeapon", true) #mods #skill AnimateWeaponAltY diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index 39cc95d211..4564dc1519 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -722,7 +722,7 @@ function calcs.buildActiveSkillModList(env, activeSkill) activeEffect.srcInstance.skillMinionItemSetCalcs = nil activeEffect.srcInstance.skillMinionItemSet = nil end - if activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.type == "Bow" then + if (activeSkill.skillData.minionUseBowAndQuiver and env.player.weaponData1.type == "Bow") or activeSkill.skillData.minionUseMainHandWeapon then minion.weaponData1 = env.player.weaponData1 elseif env.theIronMass and minionType == "RaisedSkeleton" then minion.weaponData1 = env.player.weaponData1 @@ -759,10 +759,6 @@ function calcs.buildActiveSkillModList(env, activeSkill) end end end - -- handles animate weapon of self reflection when using energy blade - if activeEffect.grantedEffect.id == "AnimateWeaponAltX" and env.modDB.conditions["AffectedByEnergyBlade"] then - minion.weaponData1 = env.player.weaponData1 - end end elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then activeEffect.srcInstance.skillMinionCalcs = nil