From b7b916f0bd82777040a6705ef0dae8fa2da12f11 Mon Sep 17 00:00:00 2001 From: Openarl Date: Wed, 2 Jan 2019 13:47:50 +1300 Subject: [PATCH] Release 1.4.123 - Fixed condition detection for config options - Fixed error when adding crafting bench mods --- CHANGELOG.md | 4 +++ Data/3_0/ModMaster.lua | 12 ++++----- Modules/Calcs.lua | 57 ++++++++++++++++++++++++++---------------- changelog.txt | 3 +++ manifest.xml | 8 +++--- 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a320c5c52..1ecc4cef2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.4.123 - 2019/01/02 + * Fixed issue causing Configuration tab options to sometimes fail to appear when appropriate + * Fixed error when adding crafted modifiers to items + ### 1.4.122 - 2019/01/01 * Updated the crafting bench options for 3.5 * Added support for most of the new craft modifiers diff --git a/Data/3_0/ModMaster.lua b/Data/3_0/ModMaster.lua index 96bea4861..9447c1b05 100644 --- a/Data/3_0/ModMaster.lua +++ b/Data/3_0/ModMaster.lua @@ -636,12 +636,12 @@ return { { type = "Suffix", affix = "of Riker", "(8-10)% increased Fire Damage", "(8-10)% increased Lightning Damage", statOrder = { 498, 514 }, level = 25, group = "IncreasedFireAndLightningDamage", types = { ["Ring"] = true, }, }, { type = "Suffix", affix = "of Riker", "(11-13)% increased Fire Damage", "(11-13)% increased Lightning Damage", statOrder = { 498, 514 }, level = 50, group = "IncreasedFireAndLightningDamage", types = { ["Ring"] = true, }, }, { type = "Suffix", affix = "of Riker", "(14-16)% increased Fire Damage", "(14-16)% increased Lightning Damage", statOrder = { 498, 514 }, level = 75, group = "IncreasedFireAndLightningDamage", types = { ["Ring"] = true, }, }, - { type = "Suffix", affix = "of the Order", "3% of Life Regenerated per second during Flask Effect", statOrder = { 3991 }, level = 1, group = "LocalFlaskLifeRegenerationPerMinuteDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, }, - { type = "Suffix", affix = "of the Order", "(8-12)% increased Movement Speed during Flask effect", "50% Chance to avoid being Stunned during Flask Effect", statOrder = { 351, 3986 }, level = 1, group = "LocalFlaskAvoidStunChanceAndMovementSpeedDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, }, - { type = "Suffix", affix = "of the Order", "(20-25)% reduced Mana Cost of Skills during Flask Effect", statOrder = { 366 }, level = 1, group = "LocalFlaskSkillManaCostDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, }, - { type = "Suffix", affix = "of the Order", "(20-30)% increased Rarity of Items found during Flask Effect", statOrder = { 3989 }, level = 1, group = "LocalFlaskItemFoundRarityDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, }, - { type = "Suffix", affix = "of the Order", "(60-80)% increased Critical Strike Chance during Flask Effect", statOrder = { 3987 }, level = 1, group = "LocalFlaskCriticalStrikeChanceDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, }, - { type = "Suffix", affix = "of the Order", "15% of Damage Taken from Hits is Leeched as Life during Flask Effect", statOrder = { 3990 }, level = 1, group = "LocalFlaskLifeLeechOnDamageTakenPermyriadDuringFlaskEffect", types = { ["Flask:Life"] = true, ["Flask:Mana"] = true, ["Flask:Hybrid"] = true, ["Flask:Utility"] = true, ["Flask:Utility"] = true, }, }, + { type = "Suffix", affix = "of the Order", "3% of Life Regenerated per second during Flask Effect", statOrder = { 3991 }, level = 1, group = "LocalFlaskLifeRegenerationPerMinuteDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, }, + { type = "Suffix", affix = "of the Order", "(8-12)% increased Movement Speed during Flask effect", "50% Chance to avoid being Stunned during Flask Effect", statOrder = { 351, 3986 }, level = 1, group = "LocalFlaskAvoidStunChanceAndMovementSpeedDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, }, + { type = "Suffix", affix = "of the Order", "(20-25)% reduced Mana Cost of Skills during Flask Effect", statOrder = { 366 }, level = 1, group = "LocalFlaskSkillManaCostDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, }, + { type = "Suffix", affix = "of the Order", "(20-30)% increased Rarity of Items found during Flask Effect", statOrder = { 3989 }, level = 1, group = "LocalFlaskItemFoundRarityDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, }, + { type = "Suffix", affix = "of the Order", "(60-80)% increased Critical Strike Chance during Flask Effect", statOrder = { 3987 }, level = 1, group = "LocalFlaskCriticalStrikeChanceDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, }, + { type = "Suffix", affix = "of the Order", "15% of Damage Taken from Hits is Leeched as Life during Flask Effect", statOrder = { 3990 }, level = 1, group = "LocalFlaskLifeLeechOnDamageTakenPermyriadDuringFlaskEffect", types = { ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, ["Flask"] = true, }, }, { type = "Suffix", affix = "of the Order", "(8-10)% increased Attack Speed", "+(7-12)% to Quality", statOrder = { 546, 3996 }, level = 1, group = "IncreasedAttackSpeed", types = { ["Dagger"] = true, ["One Handed Axe"] = true, ["One Handed Mace"] = true, ["One Handed Sword"] = true, ["Claw"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, ["Wand"] = true, ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Bow"] = true, }, }, { type = "Suffix", affix = "of the Order", "(13-16)% increased Attack Speed", "+(13-18)% to Quality", statOrder = { 546, 3996 }, level = 75, group = "IncreasedAttackSpeed", types = { ["Dagger"] = true, ["One Handed Axe"] = true, ["One Handed Mace"] = true, ["One Handed Sword"] = true, ["Claw"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, }, }, { type = "Suffix", affix = "of the Order", "(15-20)% increased Critical Strike Chance", "+(7-12)% to Quality", statOrder = { 595, 3996 }, level = 1, group = "CriticalStrikeChanceIncrease", types = { ["Dagger"] = true, ["One Handed Axe"] = true, ["One Handed Mace"] = true, ["One Handed Sword"] = true, ["Claw"] = true, ["Sceptre"] = true, ["Thrusting One Handed Sword"] = true, ["Wand"] = true, ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Bow"] = true, }, }, diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index 66b5edc04..abbd4f1ab 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -184,33 +184,48 @@ function calcs.buildOutput(build, mode) addMult(out, tag.var, mod) end end + local function addModTags(mod) + for _, tag in ipairs(mod) do + if tag.type == "IgnoreCond" then + break + elseif tag.type == "Condition" then + if actor == env.player then + addCondTag(env.conditionsUsed, tag, mod) + else + addCondTag(env.minionConditionsUsed, tag, mod) + end + elseif tag.type == "ActorCondition" and tag.actor == "enemy" then + addCondTag(env.enemyConditionsUsed, tag, mod) + elseif tag.type == "Multiplier" or tag.type == "MultiplierThreshold" then + if not tag.actor then + if actor == env.player then + addMultTag(env.multipliersUsed, tag, mod) + end + elseif tag.actor == "enemy" then + addMultTag(env.enemyMultipliersUsed, tag, mod) + end + end + end + end for _, actor in ipairs({env.player, env.minion}) do for modName, modList in pairs(actor.modDB.mods) do for _, mod in ipairs(modList) do - for _, tag in ipairs(mod) do - if tag.type == "IgnoreCond" then - break - elseif tag.type == "Condition" then - if actor == env.player then - addCondTag(env.conditionsUsed, tag, mod) - else - addCondTag(env.minionConditionsUsed, tag, mod) - end - elseif tag.type == "ActorCondition" and tag.actor == "enemy" then - addCondTag(env.enemyConditionsUsed, tag, mod) - elseif tag.type == "Multiplier" or tag.type == "MultiplierThreshold" then - if not tag.actor then - if actor == env.player then - addMultTag(env.multipliersUsed, tag, mod) - end - elseif tag.actor == "enemy" then - addMultTag(env.enemyMultipliersUsed, tag, mod) - end - end - end + addModTags(mod) end end end + for _, activeSkill in pairs(env.activeSkillList) do + for _, mod in ipairs(activeSkill.skillModList) do + addModTags(mod) + end + if activeSkill.minion then + for _, activeSkill in pairs(activeSkill.minion.activeSkillList) do + for _, mod in ipairs(activeSkill.skillModList) do + addModTags(mod) + end + end + end + end for modName, modList in pairs(env.enemyDB.mods) do for _, mod in ipairs(modList) do for _, tag in ipairs(mod) do diff --git a/changelog.txt b/changelog.txt index b8c2cc726..b7d0a44f6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +VERSION[1.4.123][2019/01/02] + * Fixed issue causing Configuration tab options to sometimes fail to appear when appropriate + * Fixed error when adding crafted modifiers to items VERSION[1.4.122][2019/01/01] * Updated the crafting bench options for 3.5 * Added support for most of the new craft modifiers diff --git a/manifest.xml b/manifest.xml index a6b4f7fa2..6065630ab 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -62,7 +62,7 @@ - + @@ -157,7 +157,7 @@ - +