Skip to content

Commit 611d3b8

Browse files
author
LocalIdentity
committed
Stop check that granted effect is support
1 parent cba56e3 commit 611d3b8

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

src/Modules/CalcActiveSkill.lua

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,11 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
109109

110110
for index, supportEffect in ipairs(supportList) do
111111
-- Pass 1: Add skill types from compatible supports
112-
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
113-
for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
114-
activeSkill.skillTypes[skillType] = true
112+
if supportEffect.grantedEffect.support then
113+
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
114+
for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
115+
activeSkill.skillTypes[skillType] = true
116+
end
115117
end
116118
else
117119
t_insert(rejectedSupportsIndices, index)
@@ -125,27 +127,31 @@ function calcs.createActiveSkill(activeEffect, supportList, actor, socketGroup,
125127
notAddedNewSupport = true
126128
for index, supportEffectIndex in ipairs(rejectedSupportsIndices) do
127129
local supportEffect = supportList[supportEffectIndex]
128-
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
129-
notAddedNewSupport = false
130-
rejectedSupportsIndices[index] = nil
131-
for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
132-
activeSkill.skillTypes[skillType] = true
130+
if supportEffect.grantedEffect.support then
131+
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
132+
notAddedNewSupport = false
133+
rejectedSupportsIndices[index] = nil
134+
for _, skillType in pairs(supportEffect.grantedEffect.addSkillTypes) do
135+
activeSkill.skillTypes[skillType] = true
136+
end
133137
end
134138
end
135139
end
136140
until (notAddedNewSupport)
137141

138142
for _, supportEffect in ipairs(supportList) do
139143
-- Pass 2: Add all compatible supports
140-
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
141-
t_insert(activeSkill.effectList, supportEffect)
142-
if supportEffect.isSupporting and activeEffect.srcInstance then
143-
supportEffect.isSupporting[activeEffect.srcInstance] = true
144-
end
145-
if supportEffect.grantedEffect.addFlags and not summonSkill then
146-
-- Support skill adds flags to supported skills (eg. Remote Mine adds 'mine')
147-
for k in pairs(supportEffect.grantedEffect.addFlags) do
148-
skillFlags[k] = true
144+
if supportEffect.grantedEffect.support then
145+
if calcLib.canGrantedEffectSupportActiveSkill(supportEffect.grantedEffect, activeSkill) then
146+
t_insert(activeSkill.effectList, supportEffect)
147+
if supportEffect.isSupporting and activeEffect.srcInstance then
148+
supportEffect.isSupporting[activeEffect.srcInstance] = true
149+
end
150+
if supportEffect.grantedEffect.addFlags and not summonSkill then
151+
-- Support skill adds flags to supported skills (eg. Remote Mine adds 'mine')
152+
for k in pairs(supportEffect.grantedEffect.addFlags) do
153+
skillFlags[k] = true
154+
end
149155
end
150156
end
151157
end

0 commit comments

Comments
 (0)