diff --git a/Data/New.lua b/Data/New.lua index 6ee089b3..21bde3bf 100644 --- a/Data/New.lua +++ b/Data/New.lua @@ -37,6 +37,17 @@ Requires Level 68, 62 Str, 91 Int 12% increased maximum Life if you wear no Corrupted items Regenerate 100 Life per second if you wear no Corrupted items ]],[[ +Malachai's Vision +Praetor Crown +Unreleased: true +Adds 16 to 35 Chaos Damage ++226 to maximum Energy Shield ++32% to Cold Resistance ++20% to Lightning Resistance +Regenerate 100 Energy Shield per second if all worn items are Corrupted +Regenerate 35 Mana per second if all worn items are Corrupted +Corrupted +]],[[ Tukohama's Fortress Ebony Tower Shield Unreleased: true diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua index da18fdd9..c7f283ae 100644 --- a/Modules/Calcs.lua +++ b/Modules/Calcs.lua @@ -658,6 +658,7 @@ local function mergeMainMods(env, repSlotName, repItem) -- Build and merge item modifiers, and create list of radius jewels env.radiusJewelList = wipeTable(env.radiusJewelList) env.itemList = { } + env.modDB.conditions["UsingAllCorruptedItems"] = true for slotName, slot in pairs(build.itemsTab.slots) do local item if slotName == repSlotName then @@ -714,6 +715,8 @@ local function mergeMainMods(env, repSlotName, repItem) env.modDB.multipliers[key] = (env.modDB.multipliers[key] or 0) + 1 if item.corrupted then env.modDB.multipliers.CorruptedItem = (env.modDB.multipliers.CorruptedItem or 0) + 1 + else + env.modDB.conditions["UsingAllCorruptedItems"] = false end end end diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index 2ec7356c..9633c39d 100644 --- a/Modules/ModParser.lua +++ b/Modules/ModParser.lua @@ -335,6 +335,7 @@ local modTagList = { ["with a rare item equipped"] = { tag = { type = "Condition", var = "UsingRareItem" } }, ["with a unique item equipped"] = { tag = { type = "Condition", var = "UsingUniqueItem" } }, ["if you wear no corrupted items"] = { tag = { type = "Condition", var = "NotUsingCorruptedItem" } }, + ["if all worn items are corrupted"] = { tag = { type = "Condition", var = "UsingAllCorruptedItems" } }, ["with main hand"] = { tag = { type = "Condition", var = "MainHandAttack" } }, ["with off hand"] = { tag = { type = "Condition", var = "OffHandAttack" } }, -- Player status conditions diff --git a/README.md b/README.md index 22aaa63e..90383eb1 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases) ## Changelog ### 1.2.20 - 2016/12/02 - * Added 'The Pandemonius', 'Light of Lunaris' and 'The Surrender' + * Added 'The Pandemonius', 'Light of Lunaris', 'The Surrender' and 'Malachai's Vision' * Added support for the Minion and Totem Elemental Resistances gem * The new elemental damage multiplier has been added to this gem * Added support for the Spell Damage->Attack Damage modifier on Crown of Eyes diff --git a/changelog.txt b/changelog.txt index ed2ab3fd..57997953 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ VERSION[1.2.20][2016/12/02] - * Added 'The Pandemonius', 'Light of Lunaris' and 'The Surrender' + * Added 'The Pandemonius', 'Light of Lunaris', 'The Surrender' and 'Malachai's Vision' * Added support for the Minion and Totem Elemental Resistances gem * The new elemental damage multiplier has been added to this gem * Added support for the Spell Damage->Attack Damage modifier on Crown of Eyes diff --git a/manifest.xml b/manifest.xml index ff9f3c48..1c600c32 100644 --- a/manifest.xml +++ b/manifest.xml @@ -7,7 +7,7 @@ - + @@ -44,17 +44,17 @@ - + - + - +