From 4f7ffcbe9fbd08fe3d085afe81489dfabf152645 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Sat, 23 Mar 2024 19:59:51 -0500 Subject: [PATCH 1/9] Fix Manastorm buff tooltip --- src/Modules/ConfigOptions.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index f044ec7485..e284947d06 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -1437,7 +1437,7 @@ Huge sets the radius to 11. modList:NewMod("Condition:HaveAvatarOfFire", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) modList:NewMod("Keystone", "LIST", "Avatar of Fire", "Config") end }, - { var = "conditionHaveManaStorm", type = "check", label = "Do you have Manastorm's Buff?", ifFlag = "Condition:HaveManaStorm", tooltip = "This option enables Manastorm's ^xADAA47Lightning ^7Damage Buff.\n(When you cast a Spell, Sacrifice all ^x7070FFMana ^7to gain Added Maximum ^xADAA47Lightning ^7Damage\nequal to 25% of Sacrificed ^x7070FFMana ^7for 4 seconds)", apply = function(val, modList, enemyModList) + { var = "conditionHaveManaStorm", type = "check", label = "Do you have Manastorm's Buff?", ifFlag = "Condition:HaveManaStorm", tooltip = "This option enables Manastorm's ^xADAA47Lightning ^7Damage Buff.\n(When you cast a Spell, Sacrifice all ^x7070FFMana ^7to gain Added Maximum ^xADAA47Lightning ^7Damage\nequal to 50% of Sacrificed ^x7070FFMana ^7for 4 seconds)", apply = function(val, modList, enemyModList) modList:NewMod("Condition:SacrificeManaForLightning", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) end }, { var = "GamblesprintMovementSpeed", type = "list", label = "Gamblesprint Movement Speed", defaultIndex=5, list={{val=-40,label="-40%"},{val=-20,label="-20%"},{val=0,label="0%"},{val=20,label="20%"},{val=30,label="30%"},{val=40,label="40%"},{val=60,label="60%"},{val=80,label="80%"},{val=100,label="100%"}}, ifFlag = "Condition:HaveGamblesprint", tooltip = "This option sets the Movement Speed from Gamblesprint boots.", apply = function(val, modList, enemyModList) From eb27e9ff1ccef83d114bffd49140e54366e619a2 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Sun, 24 Mar 2024 03:54:48 -0500 Subject: [PATCH 2/9] Stop sorting unique item list when added item isn't equipped (#7418) --- src/Classes/ItemListControl.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Classes/ItemListControl.lua b/src/Classes/ItemListControl.lua index 40260af50f..f3bce38c19 100644 --- a/src/Classes/ItemListControl.lua +++ b/src/Classes/ItemListControl.lua @@ -151,7 +151,6 @@ function ItemListClass:ReceiveDrag(type, value, source) self.itemsTab:AddItem(newItem, true, self.selDragIndex) self.itemsTab:PopulateSlots() self.itemsTab:AddUndoState() - self.itemsTab.build.buildFlag = true end end From 3b4f3d1a767432fc2830ad57a137e94a58214fec Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:11:00 +1100 Subject: [PATCH 3/9] Fix Shield Crush of the Chieftain gem scaling (#7430) The stat was only changed for the level 21 gem instead of all of them Co-authored-by: LocalIdentity --- src/Data/Skills/act_str.lua | 70 ++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Data/Skills/act_str.lua b/src/Data/Skills/act_str.lua index 10597bc939..95bb2035d6 100644 --- a/src/Data/Skills/act_str.lua +++ b/src/Data/Skills/act_str.lua @@ -9124,41 +9124,41 @@ skills["ShieldCrushAltX"] = { [3] = { 0.80000001192093, 1.2000000476837, 5, 7, 54, attackTime = 1000, critChance = 5, levelRequirement = 4, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, [4] = { 0.80000001192093, 1.2000000476837, 5, 7, 56, attackTime = 1000, critChance = 5, levelRequirement = 7, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, [5] = { 0.80000001192093, 1.2000000476837, 5, 7, 58, attackTime = 1000, critChance = 5, levelRequirement = 11, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [6] = { 0.80000001192093, 1.2000000476837, 5, 7, 60, attackTime = 1000, critChance = 5, levelRequirement = 16, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [7] = { 0.80000001192093, 1.2000000476837, 5, 7, 62, attackTime = 1000, critChance = 5, levelRequirement = 20, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [8] = { 0.80000001192093, 1.2000000476837, 5, 7, 64, attackTime = 1000, critChance = 5, levelRequirement = 24, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [9] = { 0.80000001192093, 1.2000000476837, 5, 8, 66, attackTime = 1000, critChance = 5, levelRequirement = 28, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [10] = { 0.80000001192093, 1.2000000476837, 5, 8, 68, attackTime = 1000, critChance = 5, levelRequirement = 32, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [11] = { 0.80000001192093, 1.2000000476837, 5, 8, 70, attackTime = 1000, critChance = 5, levelRequirement = 36, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [12] = { 0.80000001192093, 1.2000000476837, 5, 8, 72, attackTime = 1000, critChance = 5, levelRequirement = 40, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [13] = { 0.80000001192093, 1.2000000476837, 5, 8, 74, attackTime = 1000, critChance = 5, levelRequirement = 44, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [14] = { 0.80000001192093, 1.2000000476837, 5, 8, 76, attackTime = 1000, critChance = 5, levelRequirement = 48, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [15] = { 0.80000001192093, 1.2000000476837, 5, 8, 78, attackTime = 1000, critChance = 5, levelRequirement = 52, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [16] = { 0.80000001192093, 1.2000000476837, 7, 9, 80, attackTime = 1000, critChance = 5, levelRequirement = 56, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [17] = { 0.80000001192093, 1.2000000476837, 7, 9, 82, attackTime = 1000, critChance = 5, levelRequirement = 60, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [18] = { 0.80000001192093, 1.2000000476837, 7, 9, 84, attackTime = 1000, critChance = 5, levelRequirement = 64, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [19] = { 0.80000001192093, 1.2000000476837, 7, 9, 86, attackTime = 1000, critChance = 5, levelRequirement = 67, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [20] = { 0.80000001192093, 1.2000000476837, 7, 9, 88, attackTime = 1000, critChance = 5, levelRequirement = 70, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [21] = { 0.80000001192093, 1.2000000476837, 8, 12, 90, attackTime = 1000, critChance = 5, levelRequirement = 72, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [22] = { 0.80000001192093, 1.2000000476837, 8, 10, 92, attackTime = 1000, critChance = 5, levelRequirement = 74, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [23] = { 0.80000001192093, 1.2000000476837, 8, 10, 94, attackTime = 1000, critChance = 5, levelRequirement = 76, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [24] = { 0.80000001192093, 1.2000000476837, 8, 10, 96, attackTime = 1000, critChance = 5, levelRequirement = 78, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [25] = { 0.80000001192093, 1.2000000476837, 8, 10, 98, attackTime = 1000, critChance = 5, levelRequirement = 80, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [26] = { 0.80000001192093, 1.2000000476837, 8, 10, 100, attackTime = 1000, critChance = 5, levelRequirement = 82, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [27] = { 0.80000001192093, 1.2000000476837, 8, 10, 102, attackTime = 1000, critChance = 5, levelRequirement = 84, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [28] = { 0.80000001192093, 1.2000000476837, 8, 10, 104, attackTime = 1000, critChance = 5, levelRequirement = 86, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [29] = { 0.80000001192093, 1.2000000476837, 8, 10, 106, attackTime = 1000, critChance = 5, levelRequirement = 88, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [30] = { 0.80000001192093, 1.2000000476837, 8, 10, 108, attackTime = 1000, critChance = 5, levelRequirement = 90, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [31] = { 0.80000001192093, 1.2000000476837, 9, 12, 109, attackTime = 1000, critChance = 5, levelRequirement = 91, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [32] = { 0.80000001192093, 1.2000000476837, 9, 12, 110, attackTime = 1000, critChance = 5, levelRequirement = 92, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [33] = { 0.80000001192093, 1.2000000476837, 9, 12, 111, attackTime = 1000, critChance = 5, levelRequirement = 93, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [34] = { 0.80000001192093, 1.2000000476837, 9, 12, 112, attackTime = 1000, critChance = 5, levelRequirement = 94, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [35] = { 0.80000001192093, 1.2000000476837, 9, 12, 113, attackTime = 1000, critChance = 5, levelRequirement = 95, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [36] = { 0.80000001192093, 1.2000000476837, 10, 14, 114, attackTime = 1000, critChance = 5, levelRequirement = 96, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [37] = { 0.80000001192093, 1.2000000476837, 10, 14, 115, attackTime = 1000, critChance = 5, levelRequirement = 97, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [38] = { 0.80000001192093, 1.2000000476837, 10, 14, 116, attackTime = 1000, critChance = 5, levelRequirement = 98, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [39] = { 0.80000001192093, 1.2000000476837, 10, 14, 117, attackTime = 1000, critChance = 5, levelRequirement = 99, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, - [40] = { 0.80000001192093, 1.2000000476837, 10, 14, 118, attackTime = 1000, critChance = 5, levelRequirement = 100, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [6] = { 0.80000001192093, 1.2000000476837, 6, 9, 60, attackTime = 1000, critChance = 5, levelRequirement = 16, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [7] = { 0.80000001192093, 1.2000000476837, 6, 9, 62, attackTime = 1000, critChance = 5, levelRequirement = 20, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [8] = { 0.80000001192093, 1.2000000476837, 6, 9, 64, attackTime = 1000, critChance = 5, levelRequirement = 24, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [9] = { 0.80000001192093, 1.2000000476837, 6, 9, 66, attackTime = 1000, critChance = 5, levelRequirement = 28, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [10] = { 0.80000001192093, 1.2000000476837, 7, 10, 68, attackTime = 1000, critChance = 5, levelRequirement = 32, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [11] = { 0.80000001192093, 1.2000000476837, 7, 10, 70, attackTime = 1000, critChance = 5, levelRequirement = 36, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [12] = { 0.80000001192093, 1.2000000476837, 7, 10, 72, attackTime = 1000, critChance = 5, levelRequirement = 40, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [13] = { 0.80000001192093, 1.2000000476837, 7, 10, 74, attackTime = 1000, critChance = 5, levelRequirement = 44, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [14] = { 0.80000001192093, 1.2000000476837, 7, 10, 76, attackTime = 1000, critChance = 5, levelRequirement = 48, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [15] = { 0.80000001192093, 1.2000000476837, 7, 10, 78, attackTime = 1000, critChance = 5, levelRequirement = 52, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [16] = { 0.80000001192093, 1.2000000476837, 8, 12, 80, attackTime = 1000, critChance = 5, levelRequirement = 56, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [17] = { 0.80000001192093, 1.2000000476837, 8, 12, 82, attackTime = 1000, critChance = 5, levelRequirement = 60, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [18] = { 0.80000001192093, 1.2000000476837, 8, 12, 84, attackTime = 1000, critChance = 5, levelRequirement = 64, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [19] = { 0.80000001192093, 1.2000000476837, 8, 12, 86, attackTime = 1000, critChance = 5, levelRequirement = 67, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [20] = { 0.80000001192093, 1.2000000476837, 8, 12, 88, attackTime = 1000, critChance = 5, levelRequirement = 70, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [21] = { 0.80000001192093, 1.2000000476837, 9, 13, 90, attackTime = 1000, critChance = 5, levelRequirement = 72, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [22] = { 0.80000001192093, 1.2000000476837, 9, 13, 92, attackTime = 1000, critChance = 5, levelRequirement = 74, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [23] = { 0.80000001192093, 1.2000000476837, 9, 13, 94, attackTime = 1000, critChance = 5, levelRequirement = 76, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [24] = { 0.80000001192093, 1.2000000476837, 9, 13, 96, attackTime = 1000, critChance = 5, levelRequirement = 78, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [25] = { 0.80000001192093, 1.2000000476837, 9, 13, 98, attackTime = 1000, critChance = 5, levelRequirement = 80, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [26] = { 0.80000001192093, 1.2000000476837, 9, 13, 100, attackTime = 1000, critChance = 5, levelRequirement = 82, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [27] = { 0.80000001192093, 1.2000000476837, 9, 13, 102, attackTime = 1000, critChance = 5, levelRequirement = 84, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [28] = { 0.80000001192093, 1.2000000476837, 9, 13, 104, attackTime = 1000, critChance = 5, levelRequirement = 86, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [29] = { 0.80000001192093, 1.2000000476837, 9, 13, 106, attackTime = 1000, critChance = 5, levelRequirement = 88, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [30] = { 0.80000001192093, 1.2000000476837, 9, 13, 108, attackTime = 1000, critChance = 5, levelRequirement = 90, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [31] = { 0.80000001192093, 1.2000000476837, 10, 15, 109, attackTime = 1000, critChance = 5, levelRequirement = 91, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [32] = { 0.80000001192093, 1.2000000476837, 10, 15, 110, attackTime = 1000, critChance = 5, levelRequirement = 92, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [33] = { 0.80000001192093, 1.2000000476837, 10, 15, 111, attackTime = 1000, critChance = 5, levelRequirement = 93, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [34] = { 0.80000001192093, 1.2000000476837, 10, 15, 112, attackTime = 1000, critChance = 5, levelRequirement = 94, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [35] = { 0.80000001192093, 1.2000000476837, 10, 15, 113, attackTime = 1000, critChance = 5, levelRequirement = 95, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [36] = { 0.80000001192093, 1.2000000476837, 11, 17, 114, attackTime = 1000, critChance = 5, levelRequirement = 96, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [37] = { 0.80000001192093, 1.2000000476837, 11, 17, 115, attackTime = 1000, critChance = 5, levelRequirement = 97, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [38] = { 0.80000001192093, 1.2000000476837, 11, 17, 116, attackTime = 1000, critChance = 5, levelRequirement = 98, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [39] = { 0.80000001192093, 1.2000000476837, 11, 17, 117, attackTime = 1000, critChance = 5, levelRequirement = 99, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, + [40] = { 0.80000001192093, 1.2000000476837, 11, 17, 118, attackTime = 1000, critChance = 5, levelRequirement = 100, statInterpolation = { 3, 3, 1, 1, 1, }, cost = { Mana = 10, }, }, }, } skills["ShockwaveTotem"] = { From f853cbccf225aa4a8b453c9fc5108001fb950428 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:14:55 +1100 Subject: [PATCH 4/9] Fix Replica Replica Hyrri's Ire not appearing in unique list (#7426) The unique was left out when we were implementing all the new uniques and moving last leagues ones to their respective files Co-authored-by: LocalIdentity --- src/Data/Uniques/body.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Data/Uniques/body.lua b/src/Data/Uniques/body.lua index 53564cbb11..99897ae3e5 100644 --- a/src/Data/Uniques/body.lua +++ b/src/Data/Uniques/body.lua @@ -338,6 +338,16 @@ Implicits: 0 {variant:1,2}Acrobatics {variant:3,4,5,6}30% chance to Suppress Spell Damage ]],[[ +Replica Hyrri's Ire +Zodiac Leather +League: Heist +Source: Steal from a unique{Curio Display} during a Grand Heist ++30% chance to Suppress Spell Damage ++(40–50) to Dexterity +(140–220)% increased Evasion Rating +25% increased Shock Duration on Enemies +(12–18) to (231–347) Added Lightning Damage with Wand Attacks +]],[[ Kintsugi Exquisite Leather Variant: Pre 3.19.0 From a47f73654d30783668c1c250c831a5dde7c7f5d8 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:15:40 +1100 Subject: [PATCH 5/9] Fix Devouring Diadem missing Mana Reservation mod (#7423) Devouring Diadem was missing the mod on the last variant which was the default one to display in the unique list Co-authored-by: LocalIdentity --- src/Data/Uniques/helmet.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data/Uniques/helmet.lua b/src/Data/Uniques/helmet.lua index 5365eae126..9dbb18b3bb 100644 --- a/src/Data/Uniques/helmet.lua +++ b/src/Data/Uniques/helmet.lua @@ -459,7 +459,7 @@ Variant: Focus Ailment Duration Variant: Avoid Elemental Damage +1 to Level of Socketed Gems {variant:1,2,3,4,5,6,7,8,9,10,11,12,13}Socketed Gems have 40% increased Mana Reservation Efficiency -{variant:14,15,16,17,18,19,20,21,22,23,24}Socketed Gems have 25% increased Reservation Efficiency +{variant:14,15,16,17,18,19,20,21,22,23,24,25}Socketed Gems have 25% increased Reservation Efficiency Trigger Level 15 Feast of Flesh every 5 seconds (180-220)% increased Energy Shield 10% chance for Energy Shield Recharge to start when you use a Skill From f601efbd37c7c89e3878e59effa0d37bc543ab05 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:16:18 +1100 Subject: [PATCH 6/9] Fix Wraithlord not giving global Minion levels (#7425) Co-authored-by: LocalIdentity --- src/Data/Uniques/helmet.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data/Uniques/helmet.lua b/src/Data/Uniques/helmet.lua index 9dbb18b3bb..d8ed166547 100644 --- a/src/Data/Uniques/helmet.lua +++ b/src/Data/Uniques/helmet.lua @@ -705,7 +705,7 @@ Variant: Current Requires Level: 34, 73 Int {variant:3}Has 4 Abyssal Sockets {variant:1,2}+2 to Level of Socketed Minion Gems -{variant:3}+(1-2) to Level of Socketed Minion Gems +{variant:3}+(1-2) to Level of all Minion Skill Gems (120-150)% increased Energy Shield {variant:1}Minions Regenerate 1% Life per second {variant:1}+1000 to Spectre maximum Life From 03ce9bf39574f85ace4c572d03899be7d6b5fc90 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:18:03 +1100 Subject: [PATCH 7/9] Add support for new ES Stun mastery (#7429) Co-authored-by: LocalIdentity --- src/Data/ModCache.lua | 2 +- src/Modules/CalcDefence.lua | 5 +++++ src/Modules/ModParser.lua | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index ea7bf51a62..5eecd2bf47 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -5316,7 +5316,7 @@ c["50% of Physical Damage Converted to Lightning during Effect"]={{[1]={[1]={typ c["50% of Physical Damage from Hits taken as Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageFromHitsTakenAsLightning",type="BASE",value=50}},nil} c["50% of Physical Damage from Hits with this Weapon is Converted to a random Element"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToRandom",type="BASE",value=50}},nil} c["50% of Physical, Cold and Lightning Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageConvertToFire",type="BASE",value=50},[2]={flags=0,keywordFlags=0,name="LightningDamageConvertToFire",type="BASE",value=50},[3]={flags=0,keywordFlags=0,name="ColdDamageConvertToFire",type="BASE",value=50}},nil} -c["50% of your Energy Shield is added to your Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=50}}," your is added to your Stun Threshold "} +c["50% of your Energy Shield is added to your Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="AddESToStunThreshold",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="ESToStunThresholdPercent",type="BASE",value=50}},nil} c["50% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-50}},nil} c["50% reduced Damage when on Low Life"]={{[1]={[1]={type="Condition",var="LowLife"},flags=0,keywordFlags=0,name="Damage",type="INC",value=-50}},nil} c["50% reduced Duration"]={{[1]={flags=0,keywordFlags=0,name="Duration",type="INC",value=-50}},nil} diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua index f458f57e2d..960eccf60b 100644 --- a/src/Modules/CalcDefence.lua +++ b/src/Modules/CalcDefence.lua @@ -1841,6 +1841,11 @@ function calcs.buildDefenceEstimations(env, actor) stunThresholdBase = output.Life stunThresholdSource = "Life" end + if modDB:Flag(nil, "AddESToStunThreshold") then + local ESMult = modDB:Sum("BASE", nil, "ESToStunThresholdPercent") + stunThresholdBase = stunThresholdBase + output.EnergyShield * ESMult / 100 + stunThresholdSource = stunThresholdSource.." and "..ESMult.."% of Energy Shield" + end local StunThresholdMod = (1 + modDB:Sum("INC", nil, "StunThreshold") / 100) output.StunThreshold = stunThresholdBase * StunThresholdMod diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 675ee15054..600ea237b7 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -4169,6 +4169,10 @@ local specialModList = { flag("StunThresholdBasedOnManaInsteadOfLife"), mod("StunThresholdManaPercent", "BASE", num), } end, + ["(%d+)%% of your energy shield is added to your stun threshold"] = function(num) return { + flag("AddESToStunThreshold"), + mod("ESToStunThresholdPercent", "BASE", num), + } end, ["(%d+)%% increased armour per second you've been stationary, up to a maximum of (%d+)%%"] = function(num, _, limit) return { mod("Armour", "INC", num, { type = "Multiplier", var = "StationarySeconds", limit = tonumber(limit / num) }, { type = "Condition", var = "Stationary" }), } end, From 790881d90ad9a8c249e90a15fc87f2a708c223e0 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Mon, 25 Mar 2024 05:41:23 +1100 Subject: [PATCH 8/9] Fix Wither stacks not working with Unholy Might (#7427) For some reason the CanWither flag isn't working to enable to the wither stack effects. This is kinda messy but I couldn't think of a cleaner way Co-authored-by: LocalIdentity --- src/Data/ModCache.lua | 51 ++++++++++++++++++----------------- src/Modules/ConfigOptions.lua | 2 ++ src/Modules/ModParser.lua | 11 +++++--- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index 5eecd2bf47..88e3974273 100755 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -1845,6 +1845,7 @@ c["1 Added Passive Skill is Wizardry"]={{[1]={flags=0,keywordFlags=0,name="Clust c["1 Added Passive Skill is Wound Aggravation"]={{[1]={flags=0,keywordFlags=0,name="ClusterJewelNotable",type="LIST",value="Wound Aggravation"}},nil} c["1 Added Passive Skill is Wrapped in Flame"]={{[1]={flags=0,keywordFlags=0,name="ClusterJewelNotable",type="LIST",value="Wrapped in Flame"}},nil} c["1 Rage Regenerated for every 25 Mana Regeneration per Second"]={{[1]={[1]={div=25,stat="ManaRegen",type="PerStat"},flags=0,keywordFlags=0,name="RageRegen",type="BASE",value=1},[2]={flags=0,keywordFlags=0,name="Condition:CanGainRage",type="FLAG",value=true}},nil} +c["1 to 18 Lightning Damage per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="LightningMin",type="BASE",value=1},[2]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="LightningMax",type="BASE",value=18}},nil} c["1 to 4 Added Physical Damage with Bow Attacks"]={{[1]={flags=131076,keywordFlags=0,name="PhysicalMin",type="BASE",value=1},[2]={flags=131076,keywordFlags=0,name="PhysicalMax",type="BASE",value=4}},nil} c["1 to 6 Added Attack Lightning Damage per 200 Accuracy Rating"]={{[1]={[1]={div=200,stat="Accuracy",type="PerStat"},flags=0,keywordFlags=65536,name="LightningMin",type="BASE",value=1},[2]={[1]={div=200,stat="Accuracy",type="PerStat"},flags=0,keywordFlags=65536,name="LightningMax",type="BASE",value=6}},nil} c["1% Chance to Block Spell Damage"]={{[1]={flags=0,keywordFlags=0,name="SpellBlockChance",type="BASE",value=1}},nil} @@ -2033,7 +2034,7 @@ c["10% chance to gain Onslaught for 4 seconds on Kill"]={{[1]={[1]={type="Condit c["10% chance to gain Phasing for 4 seconds on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:Phasing",type="FLAG",value=true}},nil} c["10% chance to gain Unholy Might for 4 seconds on Critical Strike"]={{[1]={[1]={type="Condition",var="CriticalStrike"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}},nil} c["10% chance to gain a Frenzy Charge on Hit"]={nil,"a Frenzy Charge on Hit "} -c["10% chance to gain a Frenzy Charge on Hit Gain Onslaught for 4 seconds on Hit while at maximum Frenzy Charges"]={{[1]={[1]={stat="FrenzyCharges",thresholdStat="FrenzyChargesMax",type="StatThreshold"},[2]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=4,keywordFlags=0,name="Condition:Onslaught",type="FLAG",value=true}},"aCharge Gain on Hit "} +c["10% chance to gain a Frenzy Charge on Hit Gain a Flask Charge when you deal a Critical Strike while at maximum Frenzy Charges"]={nil,"a Frenzy Charge on Hit Gain a Flask Charge "} c["10% chance to gain a Frenzy Charge on Kill"]={nil,"a Frenzy Charge "} c["10% chance to gain a Frenzy Charge on Kill 10% chance to gain a Power Charge on Kill"]={nil,"a Frenzy Charge 10% chance to gain a Power Charge "} c["10% chance to gain a Frenzy Charge when you Hit a Rare or Unique Enemy"]={nil,"a Frenzy Charge when you Hit a Rare or Unique Enemy "} @@ -3369,7 +3370,7 @@ c["20% chance to gain a Frenzy Charge when you Block Attack Damage"]={nil,"a Fre c["20% chance to gain a Frenzy Charge when you Hit a Rare or Unique Enemy"]={nil,"a Frenzy Charge when you Hit a Rare or Unique Enemy "} c["20% chance to gain a Frenzy Charge when you Hit a Rare or Unique Enemy +1 to Maximum Frenzy Charges"]={nil,"a Frenzy Charge when you Hit a Rare or Unique Enemy +1 to Maximum Frenzy Charges "} c["20% chance to gain a Power Charge on Critical Strike"]={nil,"a Power Charge "} -c["20% chance to gain a Power Charge on Critical Strike You have Mind over Matter while at maximum Power Charges"]={nil,"a Power Charge You have Mind over Matter "} +c["20% chance to gain a Power Charge on Critical Strike Gain Arcane Surge on Hit with Spells while at maximum Power Charges"]={{[1]={[1]={type="Condition",var="CriticalStrike"},[2]={type="Condition",var="HitSpellRecently"},flags=0,keywordFlags=0,name="Condition:ArcaneSurge",type="FLAG",value=true}},"a Power Charge Gain while at "} c["20% chance to gain a Power Charge on Hit"]={nil,"a Power Charge on Hit "} c["20% chance to gain a Power Charge on Hit 6% increased Spell Damage per Power Charge"]={nil,"a Power Charge on Hit 6% increased Spell Damage "} c["20% chance to gain a Power Charge on Kill"]={nil,"a Power Charge "} @@ -3823,7 +3824,7 @@ c["25% chance to Blind Enemies on hit"]={{}," to Blind Enemies "} c["25% chance to Blind Enemies on hit 139% increased Physical Damage"]={{[1]={flags=4,keywordFlags=0,name="PhysicalDamage",type="BASE",value=25}}," to Blind Enemies 139% increased "} c["25% chance to Blind with Hits against Bleeding Enemies"]={{}," to Blind "} c["25% chance to Blind with Hits against Bleeding Enemies Enemies Maimed by you take 10% increased Physical Damage"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Bleeding"},flags=0,keywordFlags=262144,name="PhysicalDamage",type="BASE",value=25}}," to Blind Enemies Maimed by you take 10% increased "} -c["25% chance to Curse Enemies with Vulnerability on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Vulnerability",triggered=true}}},nil} +c["25% chance to Curse Enemies with Vulnerability on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="MonsterVulnerabilityOnHit1",triggered=true}}},nil} c["25% chance to Curse Non-Cursed Enemies with Enfeeble on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Enfeeble",triggered=true}}},nil} c["25% chance to Freeze, Shock and Ignite"]={{[1]={flags=0,keywordFlags=0,name="EnemyFreezeChance",type="BASE",value=25},[2]={flags=0,keywordFlags=0,name="EnemyShockChance",type="BASE",value=25},[3]={flags=0,keywordFlags=0,name="EnemyIgniteChance",type="BASE",value=25}},nil} c["25% chance to Ignite"]={{[1]={flags=0,keywordFlags=0,name="EnemyIgniteChance",type="BASE",value=25}},nil} @@ -4175,7 +4176,6 @@ c["3% increased Damage per Frenzy Charge with Hits against Enemies on Low Life"] c["3% increased Damage taken per Frenzy Charge"]={{[1]={[1]={type="Multiplier",var="FrenzyCharge"},flags=0,keywordFlags=0,name="DamageTaken",type="INC",value=3}},nil} c["3% increased Defences from Equipped Shield per 10 Devotion"]={{[1]={[1]={slotName="Weapon 2",type="SlotName"},[2]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="Defences",type="INC",value=3}},nil} c["3% increased Effect of non-Damaging Ailments on Enemies per 10 Devotion"]={{[1]={[1]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="EnemyShockEffect",type="INC",value=3},[2]={[1]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="EnemyChillEffect",type="INC",value=3},[3]={[1]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="EnemyFreezeEffect",type="INC",value=3},[4]={[1]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="EnemyScorchEffect",type="INC",value=3},[5]={[1]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="EnemyBrittleEffect",type="INC",value=3},[6]={[1]={actor="parent",div=10,stat="Devotion",type="PerStat"},flags=0,keywordFlags=0,name="EnemySapEffect",type="INC",value=3}},nil} -c["3% increased Energy Shield per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="EnergyShield",type="INC",value=3}},nil} c["3% increased Experience gain"]={{}," Experience gain "} c["3% increased Experience gain 2% increased Experience gain"]={{}," Experience gain 2% increased Experience gain "} c["3% increased Experience gain 20% increased Elemental Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamage",type="INC",value=3}}," Experience gain 20% increased "} @@ -4263,7 +4263,7 @@ c["30% chance to gain a Power Charge when you Stun Gain Unholy Might for 4 secon c["30% chance to gain an Endurance Charge on Hitting an Enemy with no Armour"]={nil,"an Endurance Charge on Hitting an Enemy with no Armour "} c["30% chance to gain an Endurance Charge on Hitting an Enemy with no Armour 30% chance to gain a Frenzy Charge on Hitting an Enemy with no Evasion Rating"]={nil,"an Endurance Charge on Hitting an Enemy with no Armour 30% chance to gain a Frenzy Charge on Hitting an Enemy with no Evasion Rating "} c["30% chance to gain an Endurance Charge on Kill"]={nil,"an Endurance Charge "} -c["30% chance to gain an Endurance Charge on Kill 27 to 42 Fire Damage per Endurance Charge"]={nil,"an Endurance Charge 27 to 42 Fire Damage "} +c["30% chance to gain an Endurance Charge on Kill 15% increased Damage per Endurance Charge"]={nil,"an Endurance Charge 15% increased Damage "} c["30% chance to gain an Endurance Charge when you Stun an Enemy"]={nil,"an Endurance Charge when you Stun an Enemy "} c["30% chance to gain an Endurance Charge when you Stun an Enemy Enemies in your Link Beams cannot apply Elemental Ailments"]={nil,"an Endurance Charge when you Stun an Enemy Enemies in your Link Beams cannot apply Elemental Ailments "} c["30% chance to gain an Endurance Charge when you are Hit"]={nil,"an Endurance Charge when you are Hit "} @@ -4274,7 +4274,7 @@ c["30% chance to gain an Endurance Charge when you are Hit 30% chance to gain an c["30% chance to gain an Frenzy Charge on Kill"]={nil,"an Frenzy Charge "} c["30% chance to gain an Frenzy Charge on Kill 15% increased Damage per Frenzy Charge"]={nil,"an Frenzy Charge 15% increased Damage "} c["30% chance to gain an Power Charge on Kill"]={nil,"an Power Charge "} -c["30% chance to gain an Power Charge on Kill 15% increased Damage per Power Charge"]={nil,"an Power Charge 15% increased Damage "} +c["30% chance to gain an Power Charge on Kill 9% increased Energy Shield per Power Charge"]={nil,"an Power Charge 9% increased Energy Shield "} c["30% chance to gain an additional Vaal Soul on Kill"]={nil,"an additional Vaal Soul "} c["30% chance to gain an additional Vaal Soul on Kill Corrupted"]={nil,"an additional Vaal Soul Corrupted "} c["30% chance to inflict Corrosion on Hit with Attacks"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanCorrode",type="FLAG",value=true}},nil} @@ -4917,11 +4917,11 @@ c["43% increased Chill Duration on Enemies"]={{[1]={flags=0,keywordFlags=0,name= c["43% increased Mana Regeneration Rate"]={{[1]={flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=43}},nil} c["43% reduced Recovery rate"]={{[1]={flags=0,keywordFlags=0,name="FlaskRecoveryRate",type="INC",value=-43}},nil} c["45% chance that if you would gain Endurance Charges, you instead gain up to your maximum number of Endurance Charges"]={{}," that if you would gain Endurance Charges, you instead gain up to your maximum number of Endurance Charges "} -c["45% chance that if you would gain Endurance Charges, you instead gain up to your maximum number of Endurance Charges 10% chance to gain a Frenzy Charge on Hit"]={{}," that if you would gain Endurance Charges, you instead gain up to your maximum number of Endurance Charges 10% chance to gain aCharge "} +c["45% chance that if you would gain Endurance Charges, you instead gain up to your maximum number of Endurance Charges 30% chance to gain an Endurance Charge on Kill"]={{}," that if you would gain Endurance Charges, you instead gain up to your maximum number of Endurance Charges 30% chance to gain an Endurance Charge "} c["45% chance that if you would gain Frenzy Charges, you instead gain up to your maximum number of Frenzy Charges"]={{}," that if you would gainCharges, you instead gain up to your maximum number of Frenzy Charges "} -c["45% chance that if you would gain Frenzy Charges, you instead gain up to your maximum number of Frenzy Charges 120% increased Frenzy Charge Duration"]={{[1]={[1]={includeTransfigured=true,skillName="Frenzy",type="SkillName"},flags=0,keywordFlags=0,name="FrenzyChargesDuration",type="BASE",value=45}}," that if you would gainCharges, you instead gain up to your maximum number of Frenzy Charges 120% increased "} +c["45% chance that if you would gain Frenzy Charges, you instead gain up to your maximum number of Frenzy Charges You have Mind over Matter while at maximum Power Charges"]={{}," that if you would gainCharges, you instead gain up to your maximum number of Frenzy Charges You have Mind over Matter "} c["45% chance that if you would gain Power Charges, you instead gain up to your maximum number of Power Charges"]={{}," that if you would gain Power Charges, you instead gain up to your maximum number of Power Charges "} -c["45% chance that if you would gain Power Charges, you instead gain up to your maximum number of Power Charges 6 to 60 Lightning Damage per Power Charge"]={{[1]={[1]={type="Multiplier",var="PowerCharge"},flags=0,keywordFlags=0,name="LightningDamage",type="BASE",value=45}}," that if you would gain Power Charges, you instead gain up to your maximum number of Power Charges 6 to 60 "} +c["45% chance that if you would gain Power Charges, you instead gain up to your maximum number of Power Charges 30% chance to gain an Power Charge on Kill"]={{}," that if you would gain Power Charges, you instead gain up to your maximum number of Power Charges 30% chance to gain an Power Charge "} c["45% chance to avoid Bleeding"]={{[1]={flags=0,keywordFlags=0,name="AvoidBleed",type="BASE",value=45}},nil} c["45% increased Area Damage"]={{[1]={flags=512,keywordFlags=0,name="Damage",type="INC",value=45}},nil} c["45% increased Area of Effect"]={{[1]={flags=0,keywordFlags=0,name="AreaOfEffect",type="INC",value=45}},nil} @@ -5000,8 +5000,8 @@ c["5% chance to gain Onslaught for 10 seconds on Kill"]={{[1]={[1]={type="Condit c["5% chance to gain a Frenzy Charge on Kill while Dual Wielding"]={nil,"a Frenzy Charge "} c["5% chance to grant Onslaught to nearby Enemies on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:Onslaught",type="BASE",value=5}}," to grant to nearby Enemies "} c["5% chance to grant Onslaught to nearby Enemies on Kill 5% chance to gain Chaotic Might for 10 seconds on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:Onslaught",type="BASE",value=5}}," to grant to nearby Enemies 5% chance to gain Chaotic Might on Kill "} -c["5% chance to grant Unholy Might to nearby Enemies on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="BASE",value=5}}," to grant to nearby Enemies "} -c["5% chance to grant Unholy Might to nearby Enemies on Kill 5% chance to grant Onslaught to nearby Enemies on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},[2]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="BASE",value=5}}," to grant to nearby Enemies 5% chance to grant Onslaught to nearby Enemies "} +c["5% chance to grant Unholy Might to nearby Enemies on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="BASE",value=5},[2]={[1]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:CanWither",type="BASE",value=5}}," to grant to nearby Enemies "} +c["5% chance to grant Unholy Might to nearby Enemies on Kill 5% chance to grant Onslaught to nearby Enemies on Kill"]={{[1]={[1]={type="Condition",var="KilledRecently"},[2]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="BASE",value=5},[2]={[1]={type="Condition",var="KilledRecently"},[2]={type="Condition",var="KilledRecently"},flags=0,keywordFlags=0,name="Condition:CanWither",type="BASE",value=5}}," to grant to nearby Enemies 5% chance to grant Onslaught to nearby Enemies "} c["5% chance to grant a Frenzy Charge to nearby Allies on Hit"]={{}," to grant aCharge to nearby Allies "} c["5% chance to grant an Endurance Charge to nearby Allies on Hit"]={{}," to grant an Endurance Charge to nearby Allies "} c["5% chance to grant an Endurance Charge to nearby Allies on Hit 10% chance to grant a Frenzy Charge to nearby Allies on Kill"]={{}," to grant an Endurance Charge to nearby Allies 10% chance to grant aCharge to nearby Allies "} @@ -7424,8 +7424,8 @@ c["Curse Enemies with Socketed Hex Curse Gem on Hit"]={{},nil} c["Curse Enemies with Temporal Chains on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="TemporalChains",triggered=true}}},nil} c["Curse Enemies with Temporal Chains when you Block their Projectile Attack Damage, ignoring Curse Limit"]={nil,"Curse Enemies with Temporal Chains when you Block their Projectile Attack Damage, ignoring Curse Limit "} c["Curse Enemies with Temporal Chains when you Block their Projectile Attack Damage, ignoring Curse Limit Curse Enemies with Elemental Weakness when you Block their Spell Damage, ignoring Curse Limit"]={nil,"Curse Enemies with Temporal Chains when you Block their Projectile Attack Damage, ignoring Curse Limit Curse Enemies with Elemental Weakness when you Block their Spell Damage, ignoring Curse Limit "} -c["Curse Enemies with Vulnerability on Block"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Vulnerability",triggered=true}}},nil} -c["Curse Enemies with Vulnerability on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="Vulnerability",triggered=true}}},nil} +c["Curse Enemies with Vulnerability on Block"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="MonsterVulnerabilityOnHit1",triggered=true}}},nil} +c["Curse Enemies with Vulnerability on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="MonsterVulnerabilityOnHit1",triggered=true}}},nil} c["Curse Skills have 10% increased Cast Speed"]={{[1]={flags=16,keywordFlags=2,name="Speed",type="INC",value=10}},nil} c["Curse Skills have 100% increased Skill Effect Duration"]={{[1]={flags=0,keywordFlags=2,name="Duration",type="INC",value=100}},nil} c["Curse Skills have 12% increased Cast Speed"]={{[1]={flags=16,keywordFlags=2,name="Speed",type="INC",value=12}},nil} @@ -7993,6 +7993,7 @@ c["Gain 35% of Missing Unreserved Life before being Hit by an Enemy"]={{[1]={fla c["Gain 35% of Physical Attack Damage as Extra Fire Damage"]={{[1]={flags=1,keywordFlags=0,name="PhysicalDamageGainAsFire",type="BASE",value=35}},nil} c["Gain 35% of Physical Damage as Extra Chaos Damage"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageGainAsChaos",type="BASE",value=35}},nil} c["Gain 35% of Physical Damage as Extra Damage of a random Element while you are Ignited"]={{[1]={[1]={type="Condition",var="Ignited"},flags=0,keywordFlags=0,name="PhysicalDamageGainAsRandom",type="BASE",value=35}},nil} +c["Gain 35% of Physical Damage as a Random Element if you've cast Elemental Weakness in the past 10 seconds"]={{[1]={[1]={type="Condition",var="SelfCastElementalWeakness"},flags=0,keywordFlags=0,name="PhysicalDamageGainAsRandom",type="BASE",value=35}},nil} c["Gain 4 Life per Enemy Hit with Attacks"]={{[1]={flags=4,keywordFlags=65536,name="LifeOnHit",type="BASE",value=4}},nil} c["Gain 4 Mana per Enemy Hit with Attacks if you've used a Mana Flask in the past 10 seconds"]={{[1]={[1]={type="Condition",var="UsingManaFlask"},flags=4,keywordFlags=65536,name="ManaOnHit",type="BASE",value=4}},nil} c["Gain 4% of Elemental Damage as Extra Chaos Damage per Shaper Item Equipped"]={{[1]={[1]={type="Multiplier",var="ShaperItem"},flags=0,keywordFlags=0,name="ElementalDamageGainAsChaos",type="BASE",value=4}},nil} @@ -8166,7 +8167,7 @@ c["Gain a Void Charge every second"]={nil,"a Void Charge every second "} c["Gain a Void Charge every second Gain a Void Charge every 0.5 seconds"]={nil,"a Void Charge every second Gain a Void Charge every 0.5 seconds "} c["Gain additional Elemental Damage Reduction equal to half your Chaos Resistance"]={{[1]={[1]={div=2,stat="ChaosResist",type="PerStat"},flags=0,keywordFlags=0,name="FireDamageReduction",type="BASE",value=1},[2]={[1]={div=2,stat="ChaosResist",type="PerStat"},flags=0,keywordFlags=0,name="ColdDamageReduction",type="BASE",value=1},[3]={[1]={div=2,stat="ChaosResist",type="PerStat"},flags=0,keywordFlags=0,name="LightningDamageReduction",type="BASE",value=1}},nil} c["Gain an Endurance Charge every second if you've been Hit Recently"]={nil,"an Endurance Charge every second "} -c["Gain an Endurance Charge every second if you've been Hit Recently You cannot be Stunned while at maximum Endurance Charges"]={nil,"an Endurance Charge every second You cannot be Stunned "} +c["Gain an Endurance Charge every second if you've been Hit Recently +1 to Maximum Endurance Charges"]={nil,"an Endurance Charge every second +1 to Maximum Endurance Charges "} c["Gain an Endurance Charge if an Attack Freezes an Enemy"]={nil,"an Endurance Charge if an Attack Freezes an Enemy "} c["Gain an Endurance Charge if an Attack Freezes an Enemy Culling Strike against Frozen Enemies"]={nil,"an Endurance Charge if an Attack Freezes an Enemy Culling Strike "} c["Gain an Endurance Charge when a Power Charge expires or is consumed"]={nil,"an Endurance Charge when a Power Charge expires or is consumed "} @@ -8302,7 +8303,7 @@ c["Grants Level 20 Summon Sentinel of Radiance Skill"]={{[1]={flags=0,keywordFla c["Grants Level 20 Thirst for Blood Skill"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="VampiricIcon"}}},nil} c["Grants Level 20 Unhinge Skill"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="Unhinge"}}},nil} c["Grants Level 21 Despair Curse Aura during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={level=21,skillId="Despair"}}},nil} -c["Grants Level 21 Vulnerability Curse Aura during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={level=21,skillId="Vulnerability"}}},nil} +c["Grants Level 21 Vulnerability Curse Aura during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={level=21,skillId="MonsterVulnerabilityOnHit1"}}},nil} c["Grants Level 22 Blight Skill"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=22,skillId="Blight"}}},nil} c["Grants Level 22 Hatred Skill"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=22,skillId="Hatred"}}},nil} c["Grants Level 22 Precision Skill"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=22,skillId="AccuracyAndCritsAura"}}},nil} @@ -8508,7 +8509,7 @@ c["Immune to Ignite while affected by Purity of Fire"]={nil,"Immune to Ignite wh c["Immune to Ignite while affected by Purity of Fire 10% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Fire"]={nil,"Immune to Ignite while affected by Purity of Fire 10% of Physical Damage from Hits taken as Fire Damage while affected by Purity of Fire "} c["Immune to Poison if Equipped Helmet has higher Evasion Rating than Armour"]={{[1]={[1]={type="Condition",var="HelmetEvasionHigherThanArmour"},flags=0,keywordFlags=0,name="PoisonImmune",type="FLAG",value=true}},nil} c["Immune to Reflected Damage if you've cast Punishment in the past 10 seconds"]={nil,"Immune to Reflected Damage if you've cast Punishment in the past 10 seconds "} -c["Immune to Reflected Damage if you've cast Punishment in the past 10 seconds +40% to Critical Strike Multiplier if you've cast Enfeeble in the past 10 seconds"]={nil,"Immune to Reflected Damage if you've cast Punishment in the past 10 seconds +40% to Critical Strike Multiplier if you've cast Enfeeble in the past 10 seconds "} +c["Immune to Reflected Damage if you've cast Punishment in the past 10 seconds Intimidate Enemies on Hit if you've cast Punishment in the past 10 seconds"]={nil,"Immune to Reflected Damage if you've cast Punishment in the past 10 seconds Intimidate Enemies on Hit if you've cast Punishment in the past 10 seconds "} c["Immune to Shock while affected by Purity of Lightning"]={nil,"Immune to Shock while affected by Purity of Lightning "} c["Immune to Shock while affected by Purity of Lightning 10% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Lightning"]={nil,"Immune to Shock while affected by Purity of Lightning 10% of Physical Damage from Hits taken as Lightning Damage while affected by Purity of Lightning "} c["Immunity to Freeze, Chill, Curses and Stuns during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="FreezeImmune",type="FLAG",value=true},[2]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="ChillImmune",type="FLAG",value=true},[3]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="CurseImmune",type="FLAG",value=true},[4]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="StunImmune",type="FLAG",value=true}},nil} @@ -9048,7 +9049,7 @@ c["Minions have 8% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name=" c["Minions have 80% increased Flask Effect Duration"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="FlaskDuration",type="INC",value=80}}}},nil} c["Minions have 80% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Life",type="INC",value=80}}}},nil} c["Minions have 90% increased Movement Speed"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="MovementSpeed",type="INC",value=90}}}},nil} -c["Minions have Unholy Might"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}}}},nil} +c["Minions have Unholy Might"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}}},[2]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="Condition:CanWither",type="FLAG",value=true}}}},nil} c["Minions have a 12% chance to Impale on Hit with Attacks"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="ImpaleChance",type="BASE",value=12}}}},nil} c["Minions' Accuracy Rating is equal to yours"]={{[1]={flags=0,keywordFlags=0,name="MinionAccuracyEqualsAccuracy",type="FLAG",value=true}},nil} c["Minions' Base Attack Critical Strike Chance is equal to the Critical Strike Chance of your Main Hand Weapon"]={{[1]={flags=0,keywordFlags=0,name="MinionModifier",type="LIST",value={mod={flags=1,keywordFlags=0,name="AttackCritIsEqualToParentMainHand",type="FLAG",value=true}}}},nil} @@ -10905,7 +10906,7 @@ c["Treats Enemy Monster Elemental Resistance values as inverted"]={{[1]={[1]={ty c["Trigger Commandment of Inferno on Critical Strike"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,noSupports=true,skillId="UniqueEnchantmentOfInfernoOnCrit",triggered=true}},[2]={[1]={skillId="UniqueEnchantmentOfInfernoOnCrit",type="SkillId"},flags=0,keywordFlags=0,name="ExtraSkillMod",type="LIST",value={mod={flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="triggerOnCrit",value=true}}}}},nil} c["Trigger Level 1 Create Lesser Shrine when you Kill an Enemy"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,skillId="TriggeredSummonLesserShrine",triggered=true}}},nil} c["Trigger Level 1 Gore Shockwave on Melee Hit if you have at least 150 Strength"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,skillId="GoreShockwave",triggered=true}}},nil} -c["Trigger Level 1 Intimidating Cry on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,skillId="IntimidatingCry",triggered=true}}},nil} +c["Trigger Level 1 Intimidating Cry on Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,skillId="CatsStealthTriggeredIntimidatingCry",triggered=true}}},nil} c["Trigger Level 1 Stalking Pustule on Kill"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=1,skillId="VolatileDeadChaos",triggered=true}}},nil} c["Trigger Level 10 Assassin's Mark when you Hit a Rare or Unique Enemy"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=10,skillId="AssassinsMark",triggered=true}}},nil} c["Trigger Level 10 Consecrate when you deal a Critical Strike"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=10,skillId="TriggeredConsecrate",triggered=true}}},nil} @@ -10926,7 +10927,7 @@ c["Trigger Level 20 Fiery Impact on Melee Hit with this Weapon"]={{[1]={flags=0, c["Trigger Level 20 Fog of War when your Trap is triggered"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="CreateSmokeCloud",triggered=true}}},nil} c["Trigger Level 20 Glimpse of Eternity when Hit"]={{},nil} c["Trigger Level 20 Icicle Burst when you Hit a Frozen Enemy"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="TriggeredIcicleNova",triggered=true}}},nil} -c["Trigger Level 20 Intimidating Cry when you lose Cat's Stealth"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="IntimidatingCry",triggered=true}}},nil} +c["Trigger Level 20 Intimidating Cry when you lose Cat's Stealth"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="CatsStealthTriggeredIntimidatingCry",triggered=true}}},nil} c["Trigger Level 20 Lightning Bolt when you deal a Critical Strike"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="LightningSpell",triggered=true}}},nil} c["Trigger Level 20 Shade Form when Hit"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="ShadeForm",triggered=true}}},nil} c["Trigger Level 20 Shield Shatter when you Block"]={{[1]={flags=0,keywordFlags=0,name="ExtraSkill",type="LIST",value={level=20,skillId="ShieldShatter",triggered=true}}},nil} @@ -11041,8 +11042,8 @@ c["Unaffected by Temporal Chains while affected by Haste Adds 70 to 104 Cold Dam c["Unaffected by Vulnerability while affected by Determination"]={nil,"Unaffected by Vulnerability while affected by Determination "} c["Unaffected by Vulnerability while affected by Determination +8% Chance to Block Spell Damage while affected by Discipline"]={nil,"Unaffected by Vulnerability while affected by Determination +8% Chance to Block Spell Damage while affected by Discipline "} c["Unattached Brands gain 20% increased Brand Attachment Range per second, up to 100%"]={nil,"Unattached Brands gain 20% increased Brand Attachment Range per second, up to 100% "} -c["Unholy Might"]={{[1]={flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}},nil} -c["Unholy Might during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}},nil} +c["Unholy Might"]={{[1]={flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="Condition:CanWither",type="FLAG",value=true}},nil} +c["Unholy Might during Effect"]={{[1]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true},[2]={[1]={type="Condition",var="UsingFlask"},flags=0,keywordFlags=0,name="Condition:CanWither",type="FLAG",value=true}},nil} c["Unnerve Enemies for 4 seconds on Hit with Wands"]={nil,"Unnerve Enemies for 4 seconds on Hit with Wands "} c["Unwavering Stance"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Unwavering Stance"}},nil} c["Uses both hand slots"]={{[1]={[1]={slotName="Weapon 2",type="DisablesItem"},[2]={num=1,type="SlotNumber"},flags=0,keywordFlags=0,name="CanNotUseRightWeapon",type="Flag",value=1},[2]={[1]={slotName="Weapon 1",type="DisablesItem"},[2]={num=2,type="SlotNumber"},flags=0,keywordFlags=0,name="CanNotUseLeftWeapon",type="Flag",value=1}},nil} @@ -11060,8 +11061,8 @@ c["Vaal Skills used during effect have 10% reduced Soul Gain Prevention Duration c["Vaal Skills used during effect have 40% reduced Soul Gain Prevention Duration"]={{[1]={[1]={type="Condition",var="UsingFlask"},[2]={skillType=42,type="SkillType"},flags=0,keywordFlags=0,name="SoulGainPreventionDuration",type="INC",value=-40}},nil} c["Versatile Combatant"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Versatile Combatant"}},nil} c["Vitality has no Reservation"]={{[1]={[1]={skillId="Vitality",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationFlat",value=0}},[2]={[1]={skillId="Vitality",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationFlat",value=0}},[3]={[1]={skillId="Vitality",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationPercent",value=0}},[4]={[1]={skillId="Vitality",type="SkillId"},[2]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationPercent",value=0}}},nil} -c["Vulnerability can affect Hexproof Enemies"]={{[1]={[1]={skillId="Vulnerability",type="SkillId"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="ignoreHexproof",value=true}}},nil} -c["Vulnerability has no Reservation if Cast as an Aura"]={{[1]={[1]={skillId="Vulnerability",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationFlat",value=0}},[2]={[1]={skillId="Vulnerability",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationFlat",value=0}},[3]={[1]={skillId="Vulnerability",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationPercent",value=0}},[4]={[1]={skillId="Vulnerability",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationPercent",value=0}}},nil} +c["Vulnerability can affect Hexproof Enemies"]={{[1]={[1]={skillId="MonsterVulnerabilityOnHit1",type="SkillId"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="ignoreHexproof",value=true}}},nil} +c["Vulnerability has no Reservation if Cast as an Aura"]={{[1]={[1]={skillId="MonsterVulnerabilityOnHit1",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationFlat",value=0}},[2]={[1]={skillId="MonsterVulnerabilityOnHit1",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationFlat",value=0}},[3]={[1]={skillId="MonsterVulnerabilityOnHit1",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="manaReservationPercent",value=0}},[4]={[1]={skillId="MonsterVulnerabilityOnHit1",type="SkillId"},[2]={skillType=43,type="SkillType"},[3]={neg=true,skillType=119,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="lifeReservationPercent",value=0}}},nil} c["Wand Attacks deal 12% increased Damage with Ailments"]={{[1]={flags=8390656,keywordFlags=0,name="Damage",type="INC",value=12}},nil} c["Wand Attacks deal 12% increased Damage with Hits and Ailments"]={{[1]={flags=8388608,keywordFlags=786432,name="Damage",type="INC",value=12}},nil} c["Wand Attacks deal 16% increased Damage with Hits and Ailments"]={{[1]={flags=8388608,keywordFlags=786432,name="Damage",type="INC",value=16}},nil} @@ -11269,7 +11270,7 @@ c["You are Blind"]={{[1]={[1]={neg=true,type="Condition",var="CannotBeBlinded"}, c["You are Chilled while you are Bleeding"]={{[1]={[1]={type="Condition",var="Bleeding"},flags=0,keywordFlags=0,name="Condition:Chilled",type="FLAG",value=true}},nil} c["You are Chilled while you are Poisoned"]={{[1]={[1]={type="Condition",var="Poisoned"},flags=0,keywordFlags=0,name="Condition:Chilled",type="FLAG",value=true}},nil} c["You are Crushed"]={{[1]={flags=0,keywordFlags=0,name="Condition:Crushed",type="FLAG",value=true}},nil} -c["You are Cursed with Vulnerability"]={{[1]={flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={applyToPlayer=true,level=1,skillId="Vulnerability"}}},nil} +c["You are Cursed with Vulnerability"]={{[1]={flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={applyToPlayer=true,level=1,skillId="MonsterVulnerabilityOnHit1"}}},nil} c["You are Hexproof if you have a Magic Ring in right slot"]={{[1]={[1]={type="Condition",var="MagicItemInRing 2"},flags=0,keywordFlags=0,name="CurseEffectOnSelf",type="MORE",value=-100}},nil} c["You are Shocked during Effect, causing 50% increased Damage taken"]={nil,"Shocked , causing 50% increased Damage taken "} c["You are Shocked during Effect, causing 50% increased Damage taken Damage Penetrates 10% Lightning Resistance during Effect"]={nil,"Shocked , causing 50% increased Damage taken Damage Penetrates 10% Lightning Resistance "} @@ -11280,7 +11281,7 @@ c["You are Unaffected by Ignite if you've cast Flammability in the past 10 secon c["You are Unaffected by Shock if you've cast Conductivity in the past 10 seconds"]={{[1]={[1]={type="Condition",var="SelfCastConductivity"},[2]={effectType="Global",type="GlobalEffect",unscalable=true},flags=0,keywordFlags=0,name="SelfShockEffect",type="MORE",value=-100}},nil} c["You are at Maximum Chance to Block Attack Damage if you have not Blocked Recently"]={{[1]={[1]={neg=true,type="Condition",var="BlockedRecently"},flags=0,keywordFlags=0,name="MaxBlockIfNotBlockedRecently",type="FLAG",value=true}},nil} c["You are at Maximum Chance to Block Spell Damage if you have not Blocked Recently"]={{[1]={[1]={neg=true,type="Condition",var="BlockedRecently"},flags=0,keywordFlags=0,name="MaxSpellBlockIfNotBlockedRecently",type="FLAG",value=true}},nil} -c["You are cursed with Vulnerability"]={{[1]={flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={applyToPlayer=true,level=1,skillId="Vulnerability"}}},nil} +c["You are cursed with Vulnerability"]={{[1]={flags=0,keywordFlags=0,name="ExtraCurse",type="LIST",value={applyToPlayer=true,level=1,skillId="MonsterVulnerabilityOnHit1"}}},nil} c["You can Cast 2 additional Brands"]={{[1]={flags=0,keywordFlags=0,name="ActiveBrandLimit",type="BASE",value=2}},nil} c["You can Cast an additional Brand"]={{[1]={flags=0,keywordFlags=0,name="ActiveBrandLimit",type="BASE",value=1}},nil} c["You can apply an additional Curse"]={{[1]={flags=0,keywordFlags=0,name="EnemyCurseLimit",type="BASE",value=1}},nil} diff --git a/src/Modules/ConfigOptions.lua b/src/Modules/ConfigOptions.lua index e284947d06..0f28c96aa4 100644 --- a/src/Modules/ConfigOptions.lua +++ b/src/Modules/ConfigOptions.lua @@ -850,9 +850,11 @@ Huge sets the radius to 11. end }, { var = "buffUnholyMight", type = "check", label = "Do you have Unholy Might?", tooltip = "This will enable the Unholy Might buff.\n(Grants 100% of Physical Damage converted to ^xD02090Chaos ^7Damage)\n(25% chance to apply Wither on Hit)", apply = function(val, modList, enemyModList) modList:NewMod("Condition:UnholyMight", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) + modList:NewMod("Condition:CanWither", "FLAG", true, "Unholy Might", { type = "Condition", var = "Combat" }) end }, { var = "minionbuffUnholyMight", type = "check", label = "Do your minions have Unholy Might?", ifFlag = "haveMinion", tooltip = "This will enable the Unholy Might buff on your minions.\n(Grants 100% of Physical Damage converted to ^xD02090Chaos ^7Damage)\n(25% chance to apply Wither on Hit)", apply = function(val, modList, enemyModList) modList:NewMod("MinionModifier", "LIST", { mod = modLib.createMod("Condition:UnholyMight", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) }) + modList:NewMod("MinionModifier", "LIST", { mod = modLib.createMod("Condition:CanWither", "FLAG", true, "Unholy Might", { type = "Condition", var = "Combat" }) }) end }, { var = "buffChaoticMight", type = "check", label = "Do you have Chaotic Might?", tooltip = "This will enable the Chaotic Might buff.\n(Grants 30% of Physical Damage as Extra ^xD02090Chaos ^7Damage)", apply = function(val, modList, enemyModList) modList:NewMod("Condition:ChaoticMight", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 600ea237b7..281bb9144b 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -777,7 +777,7 @@ local modNameList = { ["soul eater"] = "Condition:CanHaveSoulEater", ["phasing"] = "Condition:Phasing", ["arcane surge"] = "Condition:ArcaneSurge", - ["unholy might"] = "Condition:UnholyMight", + ["unholy might"] = { "Condition:UnholyMight", "Condition:CanWither" }, ["chaotic might"] = "Condition:ChaoticMight", ["lesser brutal shrine buff"] = "Condition:LesserBrutalShrine", ["lesser massive shrine buff"] = "Condition:LesserMassiveShrine", @@ -3308,7 +3308,7 @@ local specialModList = { ["onslaught"] = { flag("Condition:Onslaught") }, ["rampage"] = { flag("Condition:Rampage") }, ["soul eater"] = { flag("Condition:CanHaveSoulEater") }, - ["unholy might"] = { flag("Condition:UnholyMight") }, + ["unholy might"] = { flag("Condition:UnholyMight"), flag("Condition:CanWither"), }, ["chaotic might"] = { flag("Condition:ChaoticMight") }, ["elusive"] = { flag("Condition:CanBeElusive") }, ["adrenaline"] = { flag("Condition:Adrenaline") }, @@ -3745,7 +3745,10 @@ local specialModList = { ["minions have (%d+)%% increased movement speed for each herald affecting you"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", num, { type = "Multiplier", var = "Herald", actor = "parent" }) }) } end, ["minions deal (%d+)%% increased damage while you are affected by a herald"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("Damage", "INC", num, { type = "ActorCondition", actor = "parent", var = "AffectedByHerald" }) }) } end, ["minions have (%d+)%% increased attack and cast speed while you are affected by a herald"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("Speed", "INC", num, { type = "ActorCondition", actor = "parent", var = "AffectedByHerald" }) }) } end, - ["minions have unholy might"] = { mod("MinionModifier", "LIST", { mod = flag("Condition:UnholyMight") }), }, + ["minions have unholy might"] = { + mod("MinionModifier", "LIST", { mod = flag("Condition:UnholyMight") }), + mod("MinionModifier", "LIST", { mod = flag("Condition:CanWither") }), + }, ["summoned skeleton warriors a?n?d? ?s?o?l?d?i?e?r?s? ?deal triple damage with this weapon if you've hit with this weapon recently"] = { mod("Dummy", "DUMMY", 1, { type = "Condition", var = "HitRecentlyWithWeapon" }), -- Make the Configuration option appear mod("MinionModifier", "LIST", { mod = mod("TripleDamageChance", "BASE", 100, { type = "ActorCondition", actor = "parent", var = "HitRecentlyWithWeapon" }) }, { type = "SkillName", skillName = "Summon Skeletons" }), @@ -4233,7 +4236,7 @@ local specialModList = { ["removes freeze and chill on use"] = { }, ["removes poison on use"] = { }, ["removes shock on use"] = { }, - ["g?a?i?n? ?unholy might during f?l?a?s?k? ?effect"] = { flag("Condition:UnholyMight", { type = "Condition", var = "UsingFlask" }) }, + ["g?a?i?n? ?unholy might during f?l?a?s?k? ?effect"] = { flag("Condition:UnholyMight", { type = "Condition", var = "UsingFlask" }), flag("Condition:CanWither", { type = "Condition", var = "UsingFlask" }), }, ["zealot's oath during f?l?a?s?k? ?effect"] = { flag("ZealotsOath", { type = "Condition", var = "UsingFlask" }) }, ["grants level (%d+) (.+) curse aura during f?l?a?s?k? ?effect"] = function(num, _, skill) return { mod("ExtraCurse", "LIST", { skillId = gemIdLookup[skill:gsub(" skill","")] or "Unknown", level = num }, { type = "Condition", var = "UsingFlask" }) } end, ["shocks nearby enemies during f?l?a?s?k? ?effect, causing (%d+)%% increased damage taken"] = function(num) return { From 1c37464219ca45a81a34813dedf2734bce387820 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Mon, 25 Mar 2024 17:17:40 +1100 Subject: [PATCH 9/9] Changelogs --- CHANGELOG.md | 20 ++++++++++++++++++++ changelog.txt | 14 ++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4a1a46e59..e8ab70ba10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [v2.41.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.41.0) (2024/03/25) + +[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.40.1...v2.41.0) + + + +## What's Changed +### New to Path of Building +- Add support for new ES Stun mastery [\#7429](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7429) ([LocalIdentity](https://github.com/LocalIdentity)) + +### Fixed Bugs +- Stop sorting unique item list when added item isn't equipped [\#7418](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7418) ([Wires77](https://github.com/Wires77)) +- Fix Wither stacks not working with Unholy Might [\#7427](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7427) ([LocalIdentity](https://github.com/LocalIdentity)) +- Fix Shield Crush of the Chieftain gem scaling [\#7430](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7430) ([LocalIdentity](https://github.com/LocalIdentity)) +- Fix Replica Hyrri's Ire not appearing in unique list [\#7426](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7426) ([LocalIdentity](https://github.com/LocalIdentity)) +- Fix Devouring Diadem missing Mana Reservation mod [\#7423](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7423) ([LocalIdentity](https://github.com/LocalIdentity)) +- Fix Wraithlord not giving global Minion levels [\#7425](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7425) ([LocalIdentity](https://github.com/LocalIdentity)) + + + ## [v2.40.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.40.1) (2024/03/24) [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.40.0...v2.40.1) diff --git a/changelog.txt b/changelog.txt index 550153a5a2..2b6d934f73 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,17 @@ +VERSION[2.41.0][2024/03/25] + +--- New to Path of Building --- +* Add support for new ES Stun mastery (LocalIdentity) + +--- Fixed Bugs --- +* Stop sorting unique item list when added item isn't equipped (Wires77) +* Fix Wither stacks not working with Unholy Might (LocalIdentity) +* Fix Shield Crush of the Chieftain gem scaling (LocalIdentity) +* Fix Replica Hyrri's Ire not appearing in unique list (LocalIdentity) +* Fix Devouring Diadem missing Mana Reservation mod (LocalIdentity) +* Fix Wraithlord not giving global Minion levels (LocalIdentity) + + VERSION[2.40.1][2024/03/24] --- Fixed Bugs ---