diff --git a/src/Classes/ModStore.lua b/src/Classes/ModStore.lua index 2ff1033b..009aab56 100644 --- a/src/Classes/ModStore.lua +++ b/src/Classes/ModStore.lua @@ -486,22 +486,6 @@ function ModStoreClass:EvalMod(mod, cfg) end end end - -- Syntax: { type = "MeleeProximity", ramp = {MaxBonusPct,MinBonusPct} } - -- Both MaxBonusPct and MinBonusPct are percent in decimal form (1.0 = 100%) - -- Example: { type = "MeleeProximity", ramp = {1,0} } ## Duelist-Slayer: Impact - elseif tag.type == "MeleeProximity" then - if not cfg or not cfg.skillDist then - return - end - -- Max potency is 0-15 units of distance - if cfg.skillDist <= 15 then - value = value * tag.ramp[1] - -- Reduced potency (linear) until 40 units - elseif cfg.skillDist >= 16 and cfg.skillDist <= 39 then - value = value * (tag.ramp[1] - ((tag.ramp[1] / 25) * (cfg.skillDist - 15))) - elseif cfg.skillDist >= 40 then - value = 0 - end elseif tag.type == "Limit" then value = m_min(value, tag.limit or self:GetMultiplier(tag.limitVar, cfg)) elseif tag.type == "Condition" then @@ -809,4 +793,4 @@ function ModStoreClass:EvalMod(mod, cfg) end end return value -end \ No newline at end of file +end diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua index 3231b709..a2bd3467 100644 --- a/src/Modules/CalcActiveSkill.lua +++ b/src/Modules/CalcActiveSkill.lua @@ -445,12 +445,8 @@ function calcs.buildActiveSkillModList(env, activeSkill) end end - -- Calculate Distance for meleeDistance or projectileDistance (for melee proximity, e.g. Impact) - if skillFlags.melee then - effectiveRange = env.configInput.meleeDistance - else - effectiveRange = env.configInput.projectileDistance - end + -- Calculate distance from enemy + effectiveRange = env.configInput.enemyDistance -- Build config structure for modifier searches activeSkill.skillCfg = { diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index e3bc5cc9..93aed3be 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -273,10 +273,6 @@ local configSettings = { { var = "stoneGolemEqualsCarrionGolem", type = "check", label = "# Stone Golem = # Carrion Golem:", ifCond = "StoneEqualCarrionGolem", ifSkill = "Summon Carrion Golem", includeTransfigured = true, apply = function(val, modList, enemyModList) modList:NewMod("Condition:StoneEqualCarrionGolem", "FLAG", true, "Config") end }, - { label = "Close Combat:", ifSkill = "Close Combat" }, - { var = "closeCombatCombatRush", type = "check", label = "Is Combat Rush active?", ifSkill = "Close Combat", tooltip = "Combat Rush grants 20% more Attack Speed to Travel Skills not Supported by Close Combat.",apply = function(val, modList, enemyModList) - modList:NewMod("Condition:CombatRushActive", "FLAG", true, "Config") - end }, { label = "Cold Snap:", ifSkill = "Cold Snap", includeTransfigured = true }, { var = "ColdSnapBypassCD", type = "check", label = "Bypass CD?", ifSkill = "Cold Snap", includeTransfigured = true, apply = function(val, modList, enemyModList) modList:NewMod("CooldownRecovery", "OVERRIDE", 0, "Config", { type = "SkillName", skillName = "Cold Snap", includeTransfigured = true }) @@ -1415,8 +1411,7 @@ Huge sets the radius to 11. { var = "skillPierceCount", type = "count", label = "# of times Skill has Pierced:", ifStat = "PiercedCount", ifFlag = "piercing", apply = function(val, modList, enemyModList) modList:NewMod("PiercedCount", "BASE", val, "Config", { type = "Condition", var = "Effective" }) end }, - { var = "meleeDistance", type = "count", label = "Melee distance to enemy:", ifTagType = "MeleeProximity", ifFlag = "melee" }, - { var = "projectileDistance", type = "count", label = "Projectile travel distance:", ifTagType = "DistanceRamp", ifFlag = "projectile" }, + { var = "enemyDistance", type = "count", label = "Distance to enemy:", ifTagType = "DistanceRamp" }, { var = "conditionAtCloseRange", type = "check", label = "Is the enemy at Close Range?", ifCond = "AtCloseRange", apply = function(val, modList, enemyModList) modList:NewMod("Condition:AtCloseRange", "FLAG", true, "Config", { type = "Condition", var = "Effective" }) end }, diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index fac428be..bb5a6701 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -2739,7 +2739,6 @@ local specialModList = { ["you gain (%d+)%% increased area of effect for each mine"] = function(num) return { mod("AreaOfEffect", "INC", num, { type = "PerStat", stat = "ActiveMineLimit" }) } end, ["triggers level (%d+) summon triggerbots when allocated"] = { flag("HaveTriggerBots") }, -- Slayer - ["deal up to (%d+)%% more melee damage to enemies, based on proximity"] = function(num) return { mod("Damage", "MORE", num, nil, bor(ModFlag.Attack, ModFlag.Melee), { type = "MeleeProximity", ramp = {1,0} }) } end, ["cannot be stunned while leeching"] = { flag("StunImmune", { type = "Condition", var = "Leeching" }), }, ["you are immune to bleeding while leeching"] = { flag("BleedImmune", { type = "Condition", var = "Leeching" }), }, ["life leech effects are not removed at full life"] = { flag("CanLeechLifeOnFullLife") },