From a94401c4edbf99005e51492dc1fb00a551ba878f Mon Sep 17 00:00:00 2001 From: ExaltedShard <39774255+ExaltedShard@users.noreply.github.com> Date: Thu, 31 May 2018 03:31:30 +0900 Subject: [PATCH 1/2] Added support for Indigon --- Modules/ConfigOptions.lua | 3 +++ Modules/ModParser-3_0.lua | 1 + 2 files changed, 4 insertions(+) diff --git a/Modules/ConfigOptions.lua b/Modules/ConfigOptions.lua index 42c73f320..530045aad 100644 --- a/Modules/ConfigOptions.lua +++ b/Modules/ConfigOptions.lua @@ -512,6 +512,9 @@ return { { var = "conditionBlockedHitFromUniqueEnemyInPast10Sec", type = "check", ifVer = "3_0", label = "Blocked hit from a Unique in the past 10s?", ifNode = 63490, apply = function(val, modList, enemyModList) modList:NewMod("Condition:BlockedHitFromUniqueEnemyInPast10Sec", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) end }, + { var = "multiplierManaUsedRecently", type = "count", label = "# Mana Used Recently:", ifMult = "ManaUsedRecently", tooltip = "This option is specific to Indigon.", apply = function(val, modList, enemyModList) + modList:NewMod("Multiplier:ManaUsedRecently", "BASE", val, "Config", { type = "Condition", var = "Combat" }) + end }, -- Section: Effective DPS options { section = "For Effective DPS", col = 1 }, diff --git a/Modules/ModParser-3_0.lua b/Modules/ModParser-3_0.lua index 149b80df6..6f61bcd03 100644 --- a/Modules/ModParser-3_0.lua +++ b/Modules/ModParser-3_0.lua @@ -609,6 +609,7 @@ local modTagList = { ["per green socket"] = { tag = { type = "Multiplier", var = "GreenSocketIn{SlotName}" } }, ["per blue socket"] = { tag = { type = "Multiplier", var = "BlueSocketIn{SlotName}" } }, ["per white socket"] = { tag = { type = "Multiplier", var = "WhiteSocketIn{SlotName}" } }, + ["for each (%d+) total mana you have spent recently"] = function(num) return { tag = { type = "Multiplier", var = "ManaUsedRecently", div = num } } end, -- Per stat ["per (%d+) strength"] = function(num) return { tag = { type = "PerStat", stat = "Str", div = num } } end, ["per (%d+) dexterity"] = function(num) return { tag = { type = "PerStat", stat = "Dex", div = num } } end, From 1a4c95633212a6e897fdae4c5ba450f86d92be48 Mon Sep 17 00:00:00 2001 From: ExaltedShard <39774255+ExaltedShard@users.noreply.github.com> Date: Thu, 31 May 2018 16:52:58 +0900 Subject: [PATCH 2/2] Better wording and imply a skill is used --- Modules/ConfigOptions.lua | 5 +++-- Modules/ModParser-3_0.lua | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/ConfigOptions.lua b/Modules/ConfigOptions.lua index 530045aad..1fa0a46dc 100644 --- a/Modules/ConfigOptions.lua +++ b/Modules/ConfigOptions.lua @@ -512,8 +512,9 @@ return { { var = "conditionBlockedHitFromUniqueEnemyInPast10Sec", type = "check", ifVer = "3_0", label = "Blocked hit from a Unique in the past 10s?", ifNode = 63490, apply = function(val, modList, enemyModList) modList:NewMod("Condition:BlockedHitFromUniqueEnemyInPast10Sec", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) end }, - { var = "multiplierManaUsedRecently", type = "count", label = "# Mana Used Recently:", ifMult = "ManaUsedRecently", tooltip = "This option is specific to Indigon.", apply = function(val, modList, enemyModList) - modList:NewMod("Multiplier:ManaUsedRecently", "BASE", val, "Config", { type = "Condition", var = "Combat" }) + { var = "multiplierManaSpentRecently", type = "count", label = "# Mana Spent Recently:", ifMult = "ManaSpentRecently", implyCond = "UsedSkillRecently", tooltip = "This option is specific to Indigon.\nThis also implies that you have used a Skill Recently.", apply = function(val, modList, enemyModList) + modList:NewMod("Multiplier:ManaSpentRecently", "BASE", val, "Config", { type = "Condition", var = "Combat" }) + modList:NewMod("Condition:UsedSkillRecently", "FLAG", val >= 1, "Config", { type = "Condition", var = "Combat" }) end }, -- Section: Effective DPS options diff --git a/Modules/ModParser-3_0.lua b/Modules/ModParser-3_0.lua index 6f61bcd03..7e62061d6 100644 --- a/Modules/ModParser-3_0.lua +++ b/Modules/ModParser-3_0.lua @@ -609,7 +609,7 @@ local modTagList = { ["per green socket"] = { tag = { type = "Multiplier", var = "GreenSocketIn{SlotName}" } }, ["per blue socket"] = { tag = { type = "Multiplier", var = "BlueSocketIn{SlotName}" } }, ["per white socket"] = { tag = { type = "Multiplier", var = "WhiteSocketIn{SlotName}" } }, - ["for each (%d+) total mana you have spent recently"] = function(num) return { tag = { type = "Multiplier", var = "ManaUsedRecently", div = num } } end, + ["for each (%d+) total mana you have spent recently"] = function(num) return { tag = { type = "Multiplier", var = "ManaSpentRecently", div = num } } end, -- Per stat ["per (%d+) strength"] = function(num) return { tag = { type = "PerStat", stat = "Str", div = num } } end, ["per (%d+) dexterity"] = function(num) return { tag = { type = "PerStat", stat = "Dex", div = num } } end,