Skip to content

Commit b6d5d09

Browse files
QuotaeQuotae
committed
Revert "Merge pull request #1 from Quotae/elusive"
This reverts commit 689b2fc, reversing changes made to 39853e0.
1 parent 689b2fc commit b6d5d09

File tree

8 files changed

+8
-55
lines changed

8 files changed

+8
-55
lines changed

‎Data/3_0/Skills/act_dex.lua‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7045,23 +7045,11 @@ skills["Slither"] = {
70457045
skillTypes = { [SkillType.TravelSkill] = true, [SkillType.Buff] = true, [SkillType.Instant] = true, [SkillType.Area] = true, [SkillType.ChaosSkill] = true, [SkillType.MovementSkill] = true, [SkillType.BlinkSkill] = true, [SkillType.Spell] = true, [SkillType.Triggerable] = true, [SkillType.Duration] = true, },
70467046
statDescriptionScope = "buff_skill_stat_descriptions",
70477047
castTime = 0,
7048-
statMap = {
7049-
["elusive_effect_+%"] = {
7050-
mod("ElusiveEffect", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }),
7051-
},
7052-
["slither_wither_stacks"] = {
7053-
flag("Condition:CanWither"),
7054-
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "CanWither" }),
7055-
},
7056-
},
70577048
baseFlags = {
70587049
spell = true,
70597050
duration = true,
70607051
},
70617052
baseMods = {
7062-
mod("ChaosDamageTaken", "INC", 6, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Withered", effectStackVar = "WitheredStackCount", effectStackLimit = 15 }),
7063-
flag("Condition:CanBeElusive"),
7064-
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "CanBeElusive" }),
70657053
},
70667054
qualityStats = {
70677055
{ "elusive_effect_+%", 0.5 },

‎Data/3_0/Skills/act_int.lua‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7758,12 +7758,10 @@ skills["Wither"] = {
77587758
div = 1000,
77597759
},
77607760
["chaos_damage_taken_+%"] = {
7761-
flag("Condition:CanWither"),
7762-
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "CanWither" }),
7763-
mod("ChaosDamageTaken", "INC", 6, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Withered", effectStackVar = "WitheredStackCount", effectStackLimit = 15 }),
7761+
mod("ChaosDamageTaken", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Withered" }),
77647762
},
77657763
["base_movement_velocity_+%"] = {
7766-
mod("MovementSpeed", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Wither" }),
7764+
mod("MovementSpeed", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Withered" }),
77677765
},
77687766
},
77697767
baseFlags = {

‎Data/3_0/Skills/sup_dex.lua‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,17 +1805,7 @@ skills["SupportPuncturingWeapon"] = {
18051805
ignoreMinionTypes = true,
18061806
statDescriptionScope = "gem_stat_descriptions",
18071807
baseMods = {
1808-
flag("Condition:Elusive"),
1809-
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "Elusive" }),
18101808
},
1811-
statMap = {
1812-
["elusive_effect_+%"] = {
1813-
mod("ElusiveEffect", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }),
1814-
},
1815-
["nightblade_elusive_grants_critical_strike_multiplier_+_to_supported_skills"] = {
1816-
mod("CritMultiplier", "BASE", nil, 0, 0, { type = "Condition", var = "Elusive" }),
1817-
},
1818-
},
18191809
qualityStats = {
18201810
{ "critical_strike_chance_+%", 1 },
18211811
},
@@ -2825,14 +2815,8 @@ skills["SupportChaosAttacks"] = {
28252815
excludeSkillTypes = { },
28262816
statDescriptionScope = "gem_stat_descriptions",
28272817
baseMods = {
2828-
mod("ChaosDamageTaken", "INC", 6, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Withered", effectStackVar = "WitheredStackCount", effectStackLimit = 15 }),
2818+
mod("ChaosDamageTaken", "INC", 6, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Withered", effectStackVar = "WitheringTouchWitheredStackCount", effectStackLimit = 15 }),
28292819
},
2830-
statMap = {
2831-
["withered_on_hit_chance_%"] = {
2832-
flag("Condition:CanWither"),
2833-
mod("Dummy", "DUMMY", 1, 0, 0, { type = "Condition", var = "CanWither" }),
2834-
},
2835-
},
28362820
qualityStats = {
28372821
{ "chaos_damage_+%", 0.5 },
28382822
},

‎Modules/CalcPerform.lua‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,6 @@ local function doActorMisc(env, actor)
360360
modDB:NewMod("Speed", "INC", 20, "Her Embrace")
361361
modDB:NewMod("MovementSpeed", "INC", 20, "Her Embrace")
362362
end
363-
if modDB:Flag(nil, "Elusive") then
364-
local effectMod = 1 + modDB:Sum("INC", nil, "ElusiveEffect", "BuffEffectOnSelf") / 100
365-
condList["Elusive"] = true
366-
modDB:NewMod("AttackDodgeChance", "BASE", m_floor(20 * effectMod), "Elusive")
367-
modDB:NewMod("SpellDodgeChance", "BASE", m_floor(20 * effectMod), "Elusive")
368-
modDB:NewMod("MovementSpeed", "INC", m_floor(40 * effectMod), "Elusive")
369-
end
370363
if modDB:Flag(nil, "Chill") then
371364
local effect = m_max(m_floor(30 * calcLib.mod(modDB, nil, "SelfChillEffect")), 0)
372365
modDB:NewMod("ActionSpeed", "INC", effect * (modDB:Flag(nil, "SelfChillEffectIsReversed") and 1 or -1), "Chill")

‎Modules/CalcSetup.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ function calcs.initModDB(env, modDB)
4949
modDB:NewMod("Condition:Burning", "FLAG", true, "Base", { type = "IgnoreCond" }, { type = "Condition", var = "Ignited" })
5050
modDB:NewMod("Condition:Chilled", "FLAG", true, "Base", { type = "IgnoreCond" }, { type = "Condition", var = "Frozen" })
5151
modDB:NewMod("Condition:Poisoned", "FLAG", true, "Base", { type = "IgnoreCond" }, { type = "MultiplierThreshold", var = "PoisonStack", threshold = 1 })
52-
modDB:NewMod("Condition:Poisoned", "FLAG", true, "Base", { type = "IgnoreCond" }, { type = "MultiplierThreshold", var = "PoisonStack", threshold = 1 })
5352
modDB:NewMod("Chill", "FLAG", true, "Base", { type = "Condition", var = "Chilled" })
5453
modDB:NewMod("Freeze", "FLAG", true, "Base", { type = "Condition", var = "Frozen" })
5554
modDB:NewMod("Fortify", "FLAG", true, "Base", { type = "Condition", var = "Fortify" })

‎Modules/Calcs.lua‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,6 @@ function calcs.buildOutput(build, mode)
302302
for name in pairs(env.buffs) do
303303
t_insert(buffList, name)
304304
end
305-
if env.modDB:Flag(nil, "Elusive") then
306-
t_insert(combatList, "Elusive")
307-
end
308305
table.sort(buffList)
309306
env.player.breakdown.SkillBuffs = { modList = { } }
310307
for _, name in ipairs(buffList) do

‎Modules/ConfigOptions.lua‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,11 @@ return {
178178
{ var = "winterOrbStages", type = "count", label = "Stages:", ifSkill = "Winter Orb", apply = function(val, modList, enemyModList)
179179
modList:NewMod("Multiplier:WinterOrbStage", "BASE", val, "Config", { type = "SkillName", skillName = "Winter Orb" })
180180
end },
181-
181+
{ label = "Withering Touch:", ifSkill = "Withering Touch" },
182+
{ var = "witheringTouchWitheredStackCount", type = "count", label = "# of Withered Stacks:", ifSkill = "Withering Touch", apply = function(val, modList, enemyModList)
183+
modList:NewMod("Multiplier:WitheringTouchWitheredStackCount", "BASE", val, "Config")
184+
end },
185+
182186
-- Section: Map modifiers/curses
183187
{ section = "Map Modifiers and Player Debuffs", col = 2 },
184188
{ label = "Map Prefix Modifiers:" },
@@ -389,9 +393,6 @@ return {
389393
{ var = "buffAdrenaline", type = "check", label = "Do you have Adrenaline?", tooltip = "This will enable the Adrenaline buff:\n100% increased Damage\n25% increased Attack, Cast and Movement Speed\n10% additional Physical Damage Reduction", apply = function(val, modList, enemyModList)
390394
modList:NewMod("Condition:Adrenaline", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
391395
end },
392-
{ var = "buffElusive", type = "check", label = "Are you Elusive?", ifCond = "Elusive", tooltip = "In addition to allowing any 'while Elusive' modifiers to apply,\nthis will enable the Elusive buff itself. (20% Attack and Spell Dodge, 40% increased Movement Speed)\nThe effect of Elusive decays over time.", apply = function(val, modList, enemyModList)
393-
modList:NewMod("Elusive", "FLAG", true, "Config", { type = "Condition", varList = { "Combat", "Elusive" } })
394-
end },
395396
{ var = "buffDivinity", type = "check", label = "Do you have Divinity?", ifCond = "Divinity", tooltip = "This will enable the Divinity buff:\n50% more Elemental Damage\n20% less Elemental Damage Taken", apply = function(val, modList, enemyModList)
396397
modList:NewMod("Condition:Divinity", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
397398
end },
@@ -697,9 +698,6 @@ return {
697698
{ var = "multiplierPoisonOnEnemy", type = "count", label = "# of Poison on Enemy:", implyCond = "Poisoned", apply = function(val, modList, enemyModList)
698699
enemyModList:NewMod("Multiplier:PoisonStack", "BASE", val, "Config", { type = "Condition", var = "Effective" })
699700
end },
700-
{ var = "multiplierWitheredStackCount", type = "count", label = "# of Withered Stacks:", ifCond = "CanWither", tooltip = "Withered applies 6% increased Chaos Damage Taken to the enemy, up to 15 stacks.", apply = function(val, modList, enemyModList)
701-
modList:NewMod("Multiplier:WitheredStackCount", "BASE", val, "Config", { type = "Condition", var = "Effective" })
702-
end },
703701
{ var = "conditionEnemyMaimed", type = "check", label = "Is the enemy Maimed?", apply = function(val, modList, enemyModList)
704702
enemyModList:NewMod("Condition:Maimed", "FLAG", true, "Config", { type = "Condition", var = "Effective" })
705703
end },

‎Modules/ModParser-3_0.lua‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,6 @@ local modNameList = {
350350
["fortify duration"] = "FortifyDuration",
351351
["effect of fortify on you"] = "FortifyEffectOnSelf",
352352
["effect of tailwind on you"] = "TailwindEffectOnSelf",
353-
["elusive effect"] = "ElusiveEffect",
354-
["effect of elusive on you"] = "ElusiveEffect",
355353
-- Basic damage types
356354
["damage"] = "Damage",
357355
["physical damage"] = "PhysicalDamage",
@@ -833,8 +831,6 @@ local modTagList = {
833831
["while you have onslaught"] = { tag = { type = "Condition", var = "Onslaught" } },
834832
["while phasing"] = { tag = { type = "Condition", var = "Phasing" } },
835833
["while you have tailwind"] = { tag = { type = "Condition", var = "Tailwind" } },
836-
["while elusive"] = { tag = { type = "Condition", var = "Elusive" } },
837-
["gain elusive"] = { tag = { type = "Condition", var = "Elusive" } },
838834
["while you have arcane surge"] = { tag = { type = "Condition", var = "AffectedByArcaneSurge" } },
839835
["while you have cat's stealth"] = { tag = { type = "Condition", var = "AffectedByCat'sStealth" } },
840836
["while you have avian's might"] = { tag = { type = "Condition", var = "AffectedByAvian'sMight" } },

0 commit comments

Comments
 (0)