Skip to content

Commit 176d705

Browse files
committed
Narrow details for requirements to delete on secondary
1 parent 7127369 commit 176d705

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Modules/CalcActiveSkill.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
234234
end
235235
activeSkill.skillPartName = part.name
236236
skillFlags.multiPart = #activeGemParts > 1
237-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
237+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.parts and #activeEffect.gemData.secondaryGrantedEffect.parts > 1) then
238238
activeEffect.srcInstance.skillPart = nil
239239
activeEffect.srcInstance.skillPartCalcs = nil
240240
end
@@ -513,7 +513,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
513513
skillModList:NewMod("Multiplier:ActiveMineCount", "BASE", activeSkill.activeMineCount, "Base")
514514
env.enemy.modDB.multipliers["ActiveMineCount"] = m_max(activeSkill.activeMineCount or 0, env.enemy.modDB.multipliers["ActiveMineCount"] or 0)
515515
end
516-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
516+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.tags and activeEffect.gemData.secondaryGrantedEffect.tags.mine) then
517517
activeEffect.srcInstance.skillMineCountCalcs = nil
518518
activeEffect.srcInstance.skillMineCount = nil
519519
end
@@ -601,7 +601,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
601601
end
602602
minion.itemSet = env.build.itemsTab.itemSets[activeEffect.srcInstance.skillMinionItemSet]
603603
end
604-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
604+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.minionHasItemSet) then
605605
activeEffect.srcInstance.skillMinionItemSetCalcs = nil
606606
activeEffect.srcInstance.skillMinionItemSet = nil
607607
end
@@ -643,7 +643,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
643643
end
644644
end
645645
end
646-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
646+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.skillTypes and activeEffect.gemData.secondaryGrantedEffect.skillTypes[SkillType.Minion]) then
647647
activeEffect.srcInstance.skillMinionCalcs = nil
648648
activeEffect.srcInstance.skillMinion = nil
649649
activeEffect.srcInstance.skillMinionItemSetCalcs = nil

0 commit comments

Comments
 (0)