Skip to content

Commit 8217546

Browse files
committed
cleaner logic, fix for trigger/mirage
1 parent 514228e commit 8217546

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/Modules/CalcActiveSkill.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,8 @@ local function getWeaponFlags(env, weaponData, weaponTypes, skillTypeDualWieldOn
216216
end
217217
if weaponTypes then
218218
for _, types in ipairs(weaponTypes) do
219-
if (not skillTypeDualWieldOnly and (not types[weaponData.type] or ((weaponData.countsAsDualWielding and not types["One Handed "..info.flag]) or (not weaponData.countsAsDualWielding and not (types["Two Handed Axe"] or types["Two Handed Sword"] or types["Two Handed Mace"] or types["Staff"])))))
220-
and
221-
(not weaponData.countsAsAll1H or not (types["Claw"] or types["Dagger"] or types["One Handed Axe"] or types["One Handed Mace"] or types["One Handed Sword"]))
222-
and
223-
((weaponData.countsAsDualWielding and (not types["One Handed "..info.flag])) or (not weaponData.countsAsDualWielding and not (not weaponData.countsAsAll1H and (types["Two Handed Axe"] or types["Two Handed Sword"] or types["Two Handed Mace"] or types["Staff"]))))
219+
if weaponData.countsAsDualWielding and ((not skillTypeDualWieldOnly and (not types[weaponData.type] or not types["One Handed "..info.flag])) and (not types["One Handed "..info.flag])) -- Wings of Entropy
220+
or (not weaponData.countsAsDualWielding and not types[weaponData.type] and (not weaponData.countsAsAll1H or not (types["Claw"] or types["Dagger"] or types["One Handed Axe"] or types["One Handed Mace"] or types["One Handed Sword"])))
224221
then
225222
return nil, info
226223
end

0 commit comments

Comments
 (0)