Skip to content

Commit a29428d

Browse files
committed
Narrow details for requirements to delete on secondary
1 parent 46c98d3 commit a29428d

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
@@ -242,7 +242,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
242242
end
243243
activeSkill.skillPartName = part.name
244244
skillFlags.multiPart = #activeGemParts > 1
245-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
245+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.parts and #activeEffect.gemData.secondaryGrantedEffect.parts > 1) then
246246
activeEffect.srcInstance.skillPart = nil
247247
activeEffect.srcInstance.skillPartCalcs = nil
248248
end
@@ -537,7 +537,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
537537
skillModList:NewMod("Multiplier:ActiveMineCount", "BASE", activeSkill.activeMineCount, "Base")
538538
env.enemy.modDB.multipliers["ActiveMineCount"] = m_max(activeSkill.activeMineCount or 0, env.enemy.modDB.multipliers["ActiveMineCount"] or 0)
539539
end
540-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
540+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.tags and activeEffect.gemData.secondaryGrantedEffect.tags.mine) then
541541
activeEffect.srcInstance.skillMineCountCalcs = nil
542542
activeEffect.srcInstance.skillMineCount = nil
543543
end
@@ -639,7 +639,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
639639
end
640640
minion.itemSet = env.build.itemsTab.itemSets[activeEffect.srcInstance.skillMinionItemSet]
641641
end
642-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
642+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.minionHasItemSet) then
643643
activeEffect.srcInstance.skillMinionItemSetCalcs = nil
644644
activeEffect.srcInstance.skillMinionItemSet = nil
645645
end
@@ -681,7 +681,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
681681
end
682682
end
683683
end
684-
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect) then
684+
elseif activeEffect.srcInstance and not (activeEffect.gemData and activeEffect.gemData.secondaryGrantedEffect and activeEffect.gemData.secondaryGrantedEffect.skillTypes and activeEffect.gemData.secondaryGrantedEffect.skillTypes[SkillType.Minion]) then
685685
activeEffect.srcInstance.skillMinionCalcs = nil
686686
activeEffect.srcInstance.skillMinion = nil
687687
activeEffect.srcInstance.skillMinionItemSetCalcs = nil

0 commit comments

Comments
 (0)