Skip to content

Commit b9d8bdd

Browse files
author
LocalIdentity
committed
Remove effect condition list
Isn't needed
1 parent 1ec4ed2 commit b9d8bdd

5 files changed

Lines changed: 8 additions & 22 deletions

File tree

src/Data/Skills/act_int.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8070,10 +8070,10 @@ skills["FlameWallPlayer"] = {
80708070
mod("FireMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Flame Wall", effectCond = "FlameWallAddedDamage" }),
80718071
},
80728072
["flame_wall_minimum_added_lightning_damage_to_add_to_projectile"] = {
8073-
mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCondList = { "FlameWallAddedDamage", "FlameWallInfused" } }),
8073+
mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
80748074
},
80758075
["flame_wall_maximum_added_lightning_damage_to_add_to_projectile"] = {
8076-
mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCondList = { "FlameWallAddedDamage", "FlameWallInfused" } }),
8076+
mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
80778077
},
80788078
},
80798079
baseFlags = {

src/Export/Skills/act_int.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,10 +576,10 @@ statMap = {
576576
mod("FireMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Flame Wall", effectCond = "FlameWallAddedDamage" }),
577577
},
578578
["flame_wall_minimum_added_lightning_damage_to_add_to_projectile"] = {
579-
mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCondList = { "FlameWallAddedDamage", "FlameWallInfused" } }),
579+
mod("LightningMin", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
580580
},
581581
["flame_wall_maximum_added_lightning_damage_to_add_to_projectile"] = {
582-
mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCondList = { "FlameWallAddedDamage", "FlameWallInfused" } }),
582+
mod("LightningMax", "BASE", nil, ModFlag.Projectile, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Infused Flame Wall", effectCond ="FlameWallInfused" }),
583583
},
584584
},
585585
#mods

src/Modules/CalcActiveSkill.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,6 @@ function calcs.buildActiveSkillModList(env, activeSkill)
954954
name = effectName,
955955
allowTotemBuff = effectTag.allowTotemBuff,
956956
cond = effectTag.effectCond,
957-
condList = effectTag.effectCondList,
958957
enemyCond = effectTag.effectEnemyCond,
959958
stackVar = effectTag.effectStackVar,
960959
stackLimit = effectTag.effectStackLimit,

src/Modules/CalcPerform.lua

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1904,20 +1904,7 @@ function calcs.perform(env, skipEHP)
19041904
end
19051905
end
19061906
end
1907-
1908-
1909-
local function conditionCheck(buff, skillModList, skillCfg)
1910-
if buff.cond and not skillModList:GetCondition(buff.cond, skillCfg) then
1911-
return true
1912-
elseif buff.condList then
1913-
for _, cond in ipairs(buff.condList) do
1914-
if cond and not skillModList:GetCondition(cond, skillCfg) then
1915-
return true
1916-
end
1917-
end
1918-
end
1919-
return false
1920-
end
1907+
19211908
local appliedCombustion = false
19221909
local warcryList = { }
19231910
for _, activeSkill in ipairs(env.player.activeSkillList) do
@@ -1930,7 +1917,7 @@ function calcs.perform(env, skipEHP)
19301917
local skillModList = activeSkill.skillModList
19311918
local skillCfg = activeSkill.skillCfg
19321919
for _, buff in ipairs(activeSkill.buffList) do
1933-
if conditionCheck(buff, skillModList, skillCfg) then
1920+
if buff.cond and not skillModList:GetCondition(buff.cond, skillCfg) then
19341921
-- Nothing!
19351922
elseif buff.enemyCond and not enemyDB:GetCondition(buff.enemyCond) then
19361923
-- Also nothing :/

src/Modules/ConfigOptions.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,8 @@ local configSettings = {
376376
{ var = "flameWallAddedDamage", type = "check", label = "Projectile Travelled through?", ifSkill = "Flame Wall", apply = function(val, modList, enemyModList)
377377
modList:NewMod("Condition:FlameWallAddedDamage", "FLAG", true, "Config")
378378
end },
379-
{ var = "flameWallInfused", type = "check", label = "Lightning Infused?", ifSkill = "Flame Wall", apply = function(val, modList, enemyModList)
380-
modList:NewMod("Condition:FlameWallInfused", "FLAG", true, "Config")
379+
{ var = "flameWallInfused", type = "check", label = "Lightning Infused?", ifOption = "flameWallAddedDamage", apply = function(val, modList, enemyModList)
380+
modList:NewMod("Condition:FlameWallInfused", "FLAG", true, "Config", { type = "Condition", var = "FlameWallAddedDamage" })
381381
end },
382382
{ label = "Flicker Strike:", ifSkill = "Flicker Strike", includeTransfigured = true },
383383
{ var = "FlickerStrikeBypassCD", type = "check", label = "Bypass CD?", ifSkill = "Flicker Strike", includeTransfigured = true, defaultState = true, apply = function(val, modList, enemyModList)

0 commit comments

Comments
 (0)