From 7c96cd5cb4ae3484a0f4f4a06799a0be919da5a7 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Thu, 7 Dec 2023 01:55:15 +1100 Subject: [PATCH 1/6] Spec update --- src/Export/spec.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 356f261896..1b2c94bad1 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -9496,6 +9496,13 @@ return { refTo="ItemExperienceTypes", type="Key", width=150 + }, + [25]={ + list=true, + name="MtxSlotTypes", + refTo="MicrotransactionSkillGemEffectSlotTypes", + type="Key", + width=150 } }, skillmines={ From da5743d41d994acca5fa4dd8aa0edd37b3655536 Mon Sep 17 00:00:00 2001 From: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com> Date: Thu, 7 Dec 2023 01:58:51 +1100 Subject: [PATCH 2/6] Fix Vortex base damage over time values (#6945) I forgot to update the DoT values when I change the effectiveness values Co-authored-by: LocalIdentity --- src/Data/Skills/act_int.lua | 82 ++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua index 38ad115030..ab0b4333ff 100644 --- a/src/Data/Skills/act_int.lua +++ b/src/Data/Skills/act_int.lua @@ -11639,7 +11639,7 @@ skills["VoltaxicBurst"] = { skills["FrostBoltNova"] = { name = "Vortex", color = 3, - baseEffectiveness = 1.65, + baseEffectiveness = 1.6505, incrementalEffectiveness = 0.05532, description = "An icy blast explodes around the caster, dealing cold damage to enemies, and leaving behind a whirling vortex which deals cold damage over time and chills enemies caught in it. If the caster targets near their Frostbolt projectiles, it will explode from a number of those projectiles instead, destroying them.", skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Cold] = true, [SkillType.Triggerable] = true, [SkillType.Duration] = true, [SkillType.ChillingArea] = true, [SkillType.AreaSpell] = true, [SkillType.Instant] = true, [SkillType.Nova] = true, [SkillType.Cooldown] = true, }, @@ -11691,46 +11691,46 @@ skills["FrostBoltNova"] = { "spell_damage_modifiers_apply_to_skill_dot", }, levels = { - [1] = { 0.40000000596046, 0.60000002384186, 67.166671664765, 0, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 28, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 13, }, }, - [2] = { 0.40000000596046, 0.60000002384186, 65.500002576659, 4, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 31, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 14, }, }, - [3] = { 0.40000000596046, 0.60000002384186, 63.666666977108, 8, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 34, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 15, }, }, - [4] = { 0.40000000596046, 0.60000002384186, 62.000001862645, 12, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 37, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 16, }, }, - [5] = { 0.40000000596046, 0.60000002384186, 60.33333277454, 16, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 40, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 16, }, }, - [6] = { 0.40000000596046, 0.60000002384186, 59.166667194416, 20, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 42, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 17, }, }, - [7] = { 0.40000000596046, 0.60000002384186, 58.166668125739, 24, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 44, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 18, }, }, - [8] = { 0.40000000596046, 0.60000002384186, 57.166669057061, 28, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 46, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 18, }, }, - [9] = { 0.40000000596046, 0.60000002384186, 56.166666014741, 32, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 48, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 19, }, }, - [10] = { 0.40000000596046, 0.60000002384186, 55.166666946063, 36, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 50, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 19, }, }, - [11] = { 0.40000000596046, 0.60000002384186, 54.166667877386, 40, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 52, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 20, }, }, - [12] = { 0.40000000596046, 0.60000002384186, 53.166668808709, 44, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 54, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 20, }, }, - [13] = { 0.40000000596046, 0.60000002384186, 52.166669740031, 48, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 56, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 21, }, }, - [14] = { 0.40000000596046, 0.60000002384186, 51.166666697711, 52, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 58, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 22, }, }, - [15] = { 0.40000000596046, 0.60000002384186, 50.33333414048, 56, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 60, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 22, }, }, - [16] = { 0.40000000596046, 0.60000002384186, 49.333335071802, 60, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 62, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 23, }, }, - [17] = { 0.40000000596046, 0.60000002384186, 48.500002514571, 64, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 64, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 24, }, }, - [18] = { 0.40000000596046, 0.60000002384186, 47.666665983697, 68, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 66, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 24, }, }, - [19] = { 0.40000000596046, 0.60000002384186, 46.833333426466, 72, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 68, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 25, }, }, - [20] = { 0.40000000596046, 0.60000002384186, 46.000000869234, 76, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 70, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 25, }, }, - [21] = { 0.40000000596046, 0.60000002384186, 45.166668312003, 80, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 72, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 26, }, }, - [22] = { 0.40000000596046, 0.60000002384186, 44.333335754772, 84, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 74, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 26, }, }, - [23] = { 0.40000000596046, 0.60000002384186, 43.499999223898, 88, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 76, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 27, }, }, - [24] = { 0.40000000596046, 0.60000002384186, 42.666666666667, 92, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 78, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 27, }, }, - [25] = { 0.40000000596046, 0.60000002384186, 42.000000620882, 96, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 80, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 28, }, }, - [26] = { 0.40000000596046, 0.60000002384186, 41.166668063651, 100, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 82, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 28, }, }, - [27] = { 0.40000000596046, 0.60000002384186, 40.500002017866, 104, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 84, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 29, }, }, - [28] = { 0.40000000596046, 0.60000002384186, 39.833335972081, 108, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 86, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 30, }, }, - [29] = { 0.40000000596046, 0.60000002384186, 38.999999441206, 112, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 88, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 29, }, }, - [30] = { 0.40000000596046, 0.60000002384186, 38.333333395422, 116, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 90, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 29, }, }, - [31] = { 0.40000000596046, 0.60000002384186, 38.000000372529, 120, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 91, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 30, }, }, - [32] = { 0.40000000596046, 0.60000002384186, 37.666667349637, 124, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 92, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, - [33] = { 0.40000000596046, 0.60000002384186, 37.333334326744, 128, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 93, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, - [34] = { 0.40000000596046, 0.60000002384186, 37.000001303852, 132, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 94, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, - [35] = { 0.40000000596046, 0.60000002384186, 36.666668280959, 136, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 95, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, - [36] = { 0.40000000596046, 0.60000002384186, 36.333335258067, 140, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 96, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 32, }, }, - [37] = { 0.40000000596046, 0.60000002384186, 36.000002235174, 144, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 97, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 32, }, }, - [38] = { 0.40000000596046, 0.60000002384186, 35.666669212282, 148, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 98, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 32, }, }, - [39] = { 0.40000000596046, 0.60000002384186, 35.333332215746, 152, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 99, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 33, }, }, - [40] = { 0.40000000596046, 0.60000002384186, 34.999999192854, 156, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 100, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 33, }, }, + [1] = { 0.40000000596046, 0.60000002384186, 72.33333277454, 0, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 28, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 13, }, }, + [2] = { 0.40000000596046, 0.60000002384186, 72.33333277454, 4, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 31, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 14, }, }, + [3] = { 0.40000000596046, 0.60000002384186, 72.33333277454, 8, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 34, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 15, }, }, + [4] = { 0.40000000596046, 0.60000002384186, 72.33333277454, 12, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 37, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 16, }, }, + [5] = { 0.40000000596046, 0.60000002384186, 72.33333277454, 16, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 40, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 16, }, }, + [6] = { 0.40000000596046, 0.60000002384186, 72.000002235174, 20, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 42, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 17, }, }, + [7] = { 0.40000000596046, 0.60000002384186, 72.000002235174, 24, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 44, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 18, }, }, + [8] = { 0.40000000596046, 0.60000002384186, 72.000002235174, 28, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 46, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 18, }, }, + [9] = { 0.40000000596046, 0.60000002384186, 72.000002235174, 32, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 48, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 19, }, }, + [10] = { 0.40000000596046, 0.60000002384186, 71.666669212282, 36, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 50, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 19, }, }, + [11] = { 0.40000000596046, 0.60000002384186, 71.666669212282, 40, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 52, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 20, }, }, + [12] = { 0.40000000596046, 0.60000002384186, 71.666669212282, 44, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 54, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 20, }, }, + [13] = { 0.40000000596046, 0.60000002384186, 71.666669212282, 48, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 56, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 21, }, }, + [14] = { 0.40000000596046, 0.60000002384186, 71.666669212282, 52, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 58, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 22, }, }, + [15] = { 0.40000000596046, 0.60000002384186, 71.666669212282, 56, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 60, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 22, }, }, + [16] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 60, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 62, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 23, }, }, + [17] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 64, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 64, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 24, }, }, + [18] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 68, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 66, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 24, }, }, + [19] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 72, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 68, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 25, }, }, + [20] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 76, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 70, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 25, }, }, + [21] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 80, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 72, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 26, }, }, + [22] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 84, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 74, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 26, }, }, + [23] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 88, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 76, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 27, }, }, + [24] = { 0.40000000596046, 0.60000002384186, 71.330000869234, 92, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 78, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 27, }, }, + [25] = { 0.40000000596046, 0.60000002384186, 71.000002235174, 96, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 80, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 28, }, }, + [26] = { 0.40000000596046, 0.60000002384186, 71.000002235174, 100, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 82, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 28, }, }, + [27] = { 0.40000000596046, 0.60000002384186, 71.000002235174, 104, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 84, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 29, }, }, + [28] = { 0.40000000596046, 0.60000002384186, 71.000002235174, 108, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 86, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 30, }, }, + [29] = { 0.40000000596046, 0.60000002384186, 71.000002235174, 112, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 88, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 29, }, }, + [30] = { 0.40000000596046, 0.60000002384186, 71.000002235174, 116, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 90, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 29, }, }, + [31] = { 0.40000000596046, 0.60000002384186, 70.666669212282, 120, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 91, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 30, }, }, + [32] = { 0.40000000596046, 0.60000002384186, 70.666669212282, 124, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 92, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, + [33] = { 0.40000000596046, 0.60000002384186, 70.666669212282, 128, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 93, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, + [34] = { 0.40000000596046, 0.60000002384186, 70.666669212282, 132, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 94, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, + [35] = { 0.40000000596046, 0.60000002384186, 70.666669212282, 136, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 95, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 31, }, }, + [36] = { 0.40000000596046, 0.60000002384186, 70.666669212282, 140, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 96, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 32, }, }, + [37] = { 0.40000000596046, 0.60000002384186, 70.330000869234, 144, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 97, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 32, }, }, + [38] = { 0.40000000596046, 0.60000002384186, 70.330000869234, 148, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 98, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 32, }, }, + [39] = { 0.40000000596046, 0.60000002384186, 70.330000869234, 152, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 99, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 33, }, }, + [40] = { 0.40000000596046, 0.60000002384186, 70.330000869234, 156, critChance = 6, damageEffectiveness = 2.7, storedUses = 1, levelRequirement = 100, statInterpolation = { 3, 3, 3, 1, }, cost = { Mana = 33, }, }, }, } skills["Purge"] = { From 02b0898d701811e6913f9b23eb6993b68e142cdc Mon Sep 17 00:00:00 2001 From: Lily Date: Wed, 6 Dec 2023 16:00:55 +0100 Subject: [PATCH 3/6] Fix Evasion ES Mastery (#6944) --- src/Modules/ModParser.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua index 309b4bdb29..e5a5bd6e4d 100644 --- a/src/Modules/ModParser.lua +++ b/src/Modules/ModParser.lua @@ -1423,7 +1423,7 @@ local modTagList = { ["while you are unencumbered"] = { tag = { type = "Condition", var = "Unencumbered" } }, ["equipped bow"] = { tag = { type = "Condition", var = "UsingBow" } }, ["if equipped ([%a%s]+) has an ([%a%s]+) modifier"] = function (_, itemSlotName, conditionSubstring) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName } } end, - ["if both equipped ([%a%s]+) have ([%a%s]+) modifiers"] = function (_, itemSlotName, conditionSubstring) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName:sub(1, #itemSlotName - 1), bothSlots = true } } end, + ["if both equipped ([%a%s]+) have a?n? ?([%a%s]+) modifiers?"] = function (_, itemSlotName, conditionSubstring) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName:sub(1, #itemSlotName - 1), bothSlots = true } } end, ["if there are no ([%a%s]+) modifiers on equipped ([%a%s]+)"] = function (_, conditionSubstring, itemSlotName) return { tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = itemSlotName, neg = true } } end, ["if there are no (%a+) modifiers on other equipped items"] = function(_, conditionSubstring) return {tag = { type = "ItemCondition", searchCond = conditionSubstring, itemSlot = "{SlotName}", allSlots = true, excludeSelf = true, neg = true }} end, ["if corrupted"] = {tag = { type = "ItemCondition", itemSlot = "{SlotName}", corruptedCond = true}}, From 7dc7a6611ab7ee37901998ea935124e6f55aa3cd Mon Sep 17 00:00:00 2001 From: henbe Date: Wed, 6 Dec 2023 20:05:26 +0500 Subject: [PATCH 4/6] Reap+Vaal Reap 3.23 quality (#6942) * Reap new Qualty * vaal reap quality * Update act_str.lua * Update act_str.lua * Remove unneeded line * Add stat to export script --------- Co-authored-by: LocalIdentity --- src/Data/Skills/act_str.lua | 9 ++++++--- src/Export/Skills/act_str.txt | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Data/Skills/act_str.lua b/src/Data/Skills/act_str.lua index 452a5b9a85..8f8a14aab6 100644 --- a/src/Data/Skills/act_str.lua +++ b/src/Data/Skills/act_str.lua @@ -7655,7 +7655,7 @@ skills["Bloodreap"] = { }, qualityStats = { Default = { - { "base_skill_area_of_effect_+%", 0.5 }, + { "blood_scythe_damage_+%_final_per_charge", 0.25 }, }, Alternate1 = { { "critical_strike_chance_+%", 3 }, @@ -7730,6 +7730,9 @@ skills["VaalReap"] = { statDescriptionScope = "debuff_skill_stat_descriptions", castTime = 0.8, statMap = { + ["blood_scythe_damage_+%_final_per_charge"] = { + mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "BloodCharge" }), + }, ["vaal_reap_additional_maximum_blood_charges"] = { mod("BloodChargesMax", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }), }, @@ -7750,7 +7753,7 @@ skills["VaalReap"] = { }, qualityStats = { Default = { - { "base_skill_area_of_effect_+%", 0.5 }, + { "blood_scythe_damage_+%_final_per_charge", 0.25 }, }, }, constantStats = { @@ -9161,4 +9164,4 @@ skills["BloodstainedBanner"] = { [39] = { 27, 14, storedUses = 1, manaReservationPercent = 10, cooldown = 1, levelRequirement = 99, statInterpolation = { 1, 1, }, }, [40] = { 28, 14, storedUses = 1, manaReservationPercent = 10, cooldown = 1, levelRequirement = 100, statInterpolation = { 1, 1, }, }, }, -} \ No newline at end of file +} diff --git a/src/Export/Skills/act_str.txt b/src/Export/Skills/act_str.txt index f954cbef18..837f566fba 100644 --- a/src/Export/Skills/act_str.txt +++ b/src/Export/Skills/act_str.txt @@ -1431,6 +1431,9 @@ end, #skill VaalReap #flags spell area duration statMap = { + ["blood_scythe_damage_+%_final_per_charge"] = { + mod("Damage", "MORE", nil, 0, 0, { type = "Multiplier", var = "BloodCharge" }), + }, ["vaal_reap_additional_maximum_blood_charges"] = { mod("BloodChargesMax", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }), }, From 446aa880dff32842abad0bc73f73475e8f94b296 Mon Sep 17 00:00:00 2001 From: Sida Wang <42928828+sida-wang@users.noreply.github.com> Date: Thu, 7 Dec 2023 02:08:23 +1100 Subject: [PATCH 5/6] Fix socketed gems calculation and add socket limit warning (#6937) * feat: add warning for too many gems in slot * fix: exclude item provided skill groups from socket calc --- src/Modules/Build.lua | 5 +++++ src/Modules/CalcSetup.lua | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Modules/Build.lua b/src/Modules/Build.lua index e286c23668..71b3124fca 100644 --- a/src/Modules/Build.lua +++ b/src/Modules/Build.lua @@ -1460,6 +1460,11 @@ function buildMode:InsertItemWarnings() InsertIfNew(self.controls.warnings.lines, "You are exceeding jewel limit with the jewel "..warning) end end + if self.calcsTab.mainEnv.itemWarnings.socketLimitWarning then + for _, warning in ipairs(self.calcsTab.mainEnv.itemWarnings.socketLimitWarning) do + InsertIfNew(self.controls.warnings.lines, "You have too many gems in your "..warning.." slot") + end + end end -- Build list of side bar stats diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua index f63aea6ede..dbbb71f5a4 100644 --- a/src/Modules/CalcSetup.lua +++ b/src/Modules/CalcSetup.lua @@ -994,7 +994,7 @@ function calcs.initEnv(build, mode, override, specEnv) local socketedGems = 0 -- Loop through socket groups to calculate number of socketed gems for _, socketGroup in pairs(env.build.skillsTab.socketGroupList) do - if (socketGroup.enabled and socketGroup.slot and socketGroup.slot == slotName and socketGroup.gemList) then + if (not socketGroup.source and socketGroup.enabled and socketGroup.slot and socketGroup.slot == slotName and socketGroup.gemList) then for _, gem in pairs(socketGroup.gemList) do if (gem.gemData and gem.enabled) then socketedGems = socketedGems + 1 @@ -1017,6 +1017,11 @@ function calcs.initEnv(build, mode, override, specEnv) env.itemModDB.multipliers.EmptyGreenSocketsInAnySlot = (env.itemModDB.multipliers.EmptyGreenSocketsInAnySlot or 0) + slotEmptySocketsCount.G env.itemModDB.multipliers.EmptyBlueSocketsInAnySlot = (env.itemModDB.multipliers.EmptyBlueSocketsInAnySlot or 0) + slotEmptySocketsCount.B env.itemModDB.multipliers.EmptyWhiteSocketsInAnySlot = (env.itemModDB.multipliers.EmptyWhiteSocketsInAnySlot or 0) + slotEmptySocketsCount.W + -- Warn if socketed gems over socket limit + if socketedGems > slotGemSocketsCount then + env.itemWarnings.socketLimitWarning = env.itemWarnings.socketLimitWarning or { } + t_insert(env.itemWarnings.socketLimitWarning, slotName) + end end end end From 449f9d81dbac416db7d64b304cfc9bc3195553af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 02:20:58 +1100 Subject: [PATCH 6/6] Release 2.35.4 (#6947) * Prepare release 2.35.4 * Update Changelogs --------- Co-authored-by: LocalIdentity Co-authored-by: LocalIdentity --- CHANGELOG.md | 22 +++++++++++++++++++--- changelog.txt | 13 +++++++++++++ manifest.xml | 2 +- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 150d864e6c..901f318b8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [v2.35.4](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.4) (2023/12/07) + +[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.3...v2.35.4) + + + +## What's Changed +### New to Path of Building +- Add socket limit warning [\#6937](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6937) ([sida-wang](https://github.com/sida-wang)) + +### Fixed Bugs +- Fix Vortex base damage over time values [\#6945](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6945) ([LocalIdentity](https://github.com/LocalIdentity)) + +### Accuracy Improvements +- Fix socketed gem count calculation [\#6937](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6937) ([sida-wang](https://github.com/sida-wang)) +- Fix Evasion ES Mastery mod for ES on rings [\#6944](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6944) ([Lilylicious](https://github.com/Lilylicious)) +- Update Reap + Vaal Reap quality mods [\#6942](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6942) ([henbe](https://github.com/henbe)) + + ## [v2.35.3](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.3) (2023/12/06) [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.2...v2.35.3) @@ -14,8 +33,6 @@ - Update Splitting Steel quality mod [\#6927](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6927) ([kayokalinauskas](https://github.com/kayokalinauskas)) - - ## [v2.35.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.2) (2023/12/06) [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.1...v2.35.2) @@ -32,7 +49,6 @@ - Remove dead Divine Ire mods [\#6922](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/6922) ([LocalIdentity](https://github.com/LocalIdentity)) - ## [v2.35.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.35.1) (2023/12/06) [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.0...v2.35.1) diff --git a/changelog.txt b/changelog.txt index 9cc093dc4d..efd65236ba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,16 @@ +VERSION[2.35.4][2023/12/07] + +--- New to Path of Building --- +* Add socket limit warning (sida-wang) + +--- Fixed Bugs --- +* Fix Vortex base damage over time values (LocalIdentity) + +--- Accuracy Improvements --- +* Fix socketed gem count calculation (sida-wang) +* Fix Evasion ES Mastery mod for ES on rings (Lilylicious) +* Update Reap + Vaal Reap quality mods (henbe) + VERSION[2.35.3][2023/12/06] --- Fixed Bugs --- diff --git a/manifest.xml b/manifest.xml index d9e8297e15..51987bd5d2 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,6 +1,6 @@ - +