From edffab03cf421057142aa4d557bbf97310301ad4 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Wed, 25 Sep 2024 11:45:33 -0400 Subject: [PATCH 1/5] update fire res enchants --- assets/database/db.bin | Bin 5992158 -> 5992158 bytes assets/database/db.json | 8 ++++---- assets/database/leftover_db.bin | Bin 903853 -> 903853 bytes assets/database/leftover_db.json | 4 ++-- tools/database/enchant_overrides.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/database/db.bin b/assets/database/db.bin index fa72a0d4b48b58d404dc55080d18173a97b450bd..dcb0b934d8d92962bd2b2eac39bfe6fd8f012b61 100644 GIT binary patch delta 267 zcmWN=M@~Xf7=Y2-r(#!Z*gGmx?4mv!3Kmr4V#kqj;5r<92?G-c2E)X}7uGRpc`YiyCUF!$my}G}1&fEws``J8nAYq>FBP@X$*i{R}Y35W|cx z${6EJFo~BbrkTOVEPet62{Fe!3oNq4GApbSW{q_=u-RmbZFblt!XEoXiE+RoM;sI9 zgj3E)a9&83swSayR+&;Y`KHXTr5``cm!sd6iGJ!=WuEf-C7g3Ie%l1TbxP%&2bY~G ambFaD3wbH8U zL=z9-8S4KfU-{?HD$6Viiz-}HQ$sCvxT&XsMw)2GLkq2VX~Rc59dyz~H$C*yM?V7$ zGQ=<=jN&K27~=#9F+rF~rkG}iS>~8$fkl>xu*?dp*sQV62AgaVWt$yh?6OCk1p6d8 z;E)t)jy{}X#W+eoDO0RCIc0t=ee+_z-t?m~u~+@9%-y?wh~%T69@~V!bw=g0x5~aR al(fvqV|gM^<(WK}7xGeGnL_D0nEMCUiEicq diff --git a/assets/database/db.json b/assets/database/db.json index 5399e1625f..fce998a2f6 100644 --- a/assets/database/db.json +++ b/assets/database/db.json @@ -10295,8 +10295,8 @@ {"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, -{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, +{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2}, @@ -10322,8 +10322,8 @@ {"effectId":1893,"spellId":20028,"name":"Enchant Chest - Major Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1894,"spellId":20029,"name":"Enchant Weapon - Icy Chill","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1896,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, -{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, +{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1898,"spellId":20032,"name":"Enchant Weapon - Lifestealing","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, {"effectId":1899,"spellId":20033,"name":"Enchant Weapon - Unholy Weapon","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1900,"spellId":20034,"name":"Enchant Weapon - Crusader","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, @@ -10358,8 +10358,8 @@ {"effectId":7325,"itemId":221322,"spellId":446459,"name":"Atal'ai Signet of Mojo","type":3,"stats":[0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, {"effectId":7326,"itemId":221323,"spellId":446472,"name":"Atal'ai Signet of Serenity","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0],"quality":3}, {"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, -{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0],"quality":3}, -{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0],"quality":3}, +{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0],"quality":3}, +{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0],"quality":3}, {"effectId":7603,"itemId":228982,"spellId":463871,"name":"Enchant Shield - Law of Nature","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,55,30,0],"quality":2}, {"effectId":7613,"itemId":231354,"spellId":468314,"name":"Animist's Caress","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0],"quality":3,"classAllowlist":[1],"requiresLevel":60}, {"effectId":7614,"itemId":231355,"spellId":468318,"name":"Animist's Balance","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,0,0,12,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"classAllowlist":[1],"requiresLevel":60}, diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin index 962137ad2e3b039cf2c6fa288da313edb4347dc6..fff904a9493ecfcc5e056fe6ceef3f5c5d940c09 100644 GIT binary patch delta 109 zcmV-z0FwW$l{c-GH-LlzgaU*Egam{Iga(8Mgb0KQgbIWUvN_f+;O*__6(H)w-faYivhPY_zY$zwxVz9}SKHx4a?^i#C^RSOhw^fmsbv P0hez_4LY|BTMeOadUq!X delta 109 zcmZ2G)qL$#^M)427N!>F7M2#)7Pc1l7LFFq7OocVEj)q^+ZQ+TOkvzE*uXQ1al3gl z&z-{UE57k`Gj13D$}^R5yYUa6H1+LzioAV{+h@x20!8*H@phX{*H>k++TIw+8^}0) N!FM2&Cz^L*J^*{CCw~9{ diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json index ba9051109b..ec951058b1 100644 --- a/assets/database/leftover_db.json +++ b/assets/database/leftover_db.json @@ -1619,8 +1619,8 @@ {"effectId":7325,"itemId":221322,"spellId":446459,"name":"Atal'ai Signet of Mojo","type":3,"stats":[0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, {"effectId":7326,"itemId":221323,"spellId":446472,"name":"Atal'ai Signet of Serenity","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0],"quality":3}, {"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, -{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0],"quality":3}, -{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0],"quality":3}, +{"effectId":7563,"itemId":227819,"spellId":460963,"name":"Blessed Flame Mantle of the Dawn","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0],"quality":3}, +{"effectId":7564,"itemId":227926,"spellId":461129,"name":"Hydraxian Coronation","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0],"quality":3}, {"effectId":7603,"itemId":228982,"spellId":463871,"name":"Enchant Shield - Law of Nature","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,55,30,0],"quality":2}, {"effectId":7613,"itemId":231354,"spellId":468314,"name":"Animist's Caress","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0],"quality":3,"classAllowlist":[1],"requiresLevel":60}, {"effectId":7614,"itemId":231355,"spellId":468318,"name":"Animist's Balance","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,0,0,12,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"classAllowlist":[1],"requiresLevel":60}, diff --git a/tools/database/enchant_overrides.go b/tools/database/enchant_overrides.go index d87433609e..f7e157cdee 100644 --- a/tools/database/enchant_overrides.go +++ b/tools/database/enchant_overrides.go @@ -85,7 +85,7 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 7326, ItemId: 221323, SpellId: 446472, Name: "Atal'ai Signet of Serenity", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.HealingPower: 18}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder}, // SoD Phase 4 Enchants {EffectId: 2483, ItemId: 18169, SpellId: 22593, Name: "Flame Mantle of the Dawn", Quality: proto.ItemQuality_ItemQualityUncommon, Stats: stats.Stats{stats.FireResistance: 5}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder}, - {EffectId: 7563, ItemId: 227819, SpellId: 460963, Name: "Blessed Flame Mantle of the Dawn", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FireResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder}, + {EffectId: 7563, ItemId: 227819, SpellId: 460963, Name: "Blessed Flame Mantle of the Dawn", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FireResistance: 25}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder}, // Drop in ZG {EffectId: 2604, ItemId: 20078, SpellId: 24420, Name: "Zandalar Signet of Serenity", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.HealingPower: 33}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder}, {EffectId: 2605, ItemId: 20076, SpellId: 24421, Name: "Zandalar Signet of Mojo", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.SpellPower: 18, stats.HealingPower: 18}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder}, @@ -111,7 +111,7 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 1888, SpellId: 20014, Name: "Enchant Cloak - Greater Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.ArcaneResistance: 5, stats.FireResistance: 5, stats.FrostResistance: 5, stats.NatureResistance: 5, stats.ShadowResistance: 5}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, {EffectId: 1889, SpellId: 20015, Name: "Enchant Cloak - Superior Defense", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.BonusArmor: 70}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // SoD Phase 4 Enchants - {EffectId: 7564, ItemId: 227926, SpellId: 461129, Name: "Hydraxian Coronation", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FireResistance: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, + {EffectId: 7564, ItemId: 227926, SpellId: 461129, Name: "Hydraxian Coronation", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FireResistance: 30}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, {EffectId: 2620, ItemId: 229009, SpellId: 25082, Name: "Enchant Cloak - Greater Nature Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.NatureResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, {EffectId: 2619, ItemId: 229008, SpellId: 25081, Name: "Enchant Cloak - Greater Fire Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.FireResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Drop in AQ From 859f96baca27f10c512884c01b8666f27d49c999 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Wed, 25 Sep 2024 12:37:22 -0400 Subject: [PATCH 2/5] update tests --- sim/druid/balance/TestBalance.results | 4 ++-- sim/druid/feral/TestFeral.results | 2 +- sim/paladin/protection/TestProtection.results | 2 +- sim/paladin/retribution/TestShockadin.results | 2 +- sim/priest/shadow/TestShadow.results | 2 +- sim/shaman/elemental/TestElemental.results | 2 +- sim/shaman/enhancement/TestEnhancement.results | 2 +- sim/shaman/warden/TestWardenShaman.results | 2 +- sim/warrior/dps_warrior/TestDualWieldWarrior.results | 2 +- sim/warrior/tank_warrior/TestTankWarrior.results | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results index 68ce3779e1..c34ce91fb1 100644 --- a/sim/druid/balance/TestBalance.results +++ b/sim/druid/balance/TestBalance.results @@ -184,7 +184,7 @@ character_stats_results: { final_stats: 0 final_stats: 6690.6525 final_stats: 27 - final_stats: 234 + final_stats: 254 final_stats: 60 final_stats: 70 final_stats: 60 @@ -233,7 +233,7 @@ character_stats_results: { final_stats: 0 final_stats: 7670.901 final_stats: 27 - final_stats: 90 + final_stats: 100 final_stats: 90 final_stats: 120 final_stats: 60 diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 557c344199..853207b3e7 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -184,7 +184,7 @@ character_stats_results: { final_stats: 0 final_stats: 6783.63 final_stats: 27 - final_stats: 216 + final_stats: 226 final_stats: 60 final_stats: 70 final_stats: 60 diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 731b1d453e..c3825debaf 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -37,7 +37,7 @@ character_stats_results: { final_stats: 0 final_stats: 9280.75 final_stats: 27 - final_stats: 188 + final_stats: 198 final_stats: 60 final_stats: 60 final_stats: 60 diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index db0091f344..a6535db01e 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -86,7 +86,7 @@ character_stats_results: { final_stats: 0 final_stats: 7974.6375 final_stats: 27 - final_stats: 80 + final_stats: 90 final_stats: 90 final_stats: 100 final_stats: 60 diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results index fa94d2bc0c..7a74d6386f 100644 --- a/sim/priest/shadow/TestShadow.results +++ b/sim/priest/shadow/TestShadow.results @@ -184,7 +184,7 @@ character_stats_results: { final_stats: 0 final_stats: 7749.655 final_stats: 27 - final_stats: 201 + final_stats: 211 final_stats: 60 final_stats: 60 final_stats: 80 diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results index 21716a42b8..deb0d1801c 100644 --- a/sim/shaman/elemental/TestElemental.results +++ b/sim/shaman/elemental/TestElemental.results @@ -184,7 +184,7 @@ character_stats_results: { final_stats: 0 final_stats: 6501.8 final_stats: 27 - final_stats: 226 + final_stats: 246 final_stats: 60 final_stats: 60 final_stats: 60 diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results index a486e547be..86028faea7 100644 --- a/sim/shaman/enhancement/TestEnhancement.results +++ b/sim/shaman/enhancement/TestEnhancement.results @@ -184,7 +184,7 @@ character_stats_results: { final_stats: 0 final_stats: 6312.05 final_stats: 27 - final_stats: 234 + final_stats: 254 final_stats: 60 final_stats: 60 final_stats: 60 diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results index a83095cf16..9841529d72 100644 --- a/sim/shaman/warden/TestWardenShaman.results +++ b/sim/shaman/warden/TestWardenShaman.results @@ -37,7 +37,7 @@ character_stats_results: { final_stats: 0 final_stats: 8815 final_stats: 27 - final_stats: 241 + final_stats: 251 final_stats: 60 final_stats: 60 final_stats: 60 diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results index 669ab5ef49..6cc9b7e7f6 100644 --- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results +++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results @@ -86,7 +86,7 @@ character_stats_results: { final_stats: 0 final_stats: 6919.6 final_stats: 27 - final_stats: 189 + final_stats: 209 final_stats: 60 final_stats: 60 final_stats: 60 diff --git a/sim/warrior/tank_warrior/TestTankWarrior.results b/sim/warrior/tank_warrior/TestTankWarrior.results index 594b03f956..48503ba1b7 100644 --- a/sim/warrior/tank_warrior/TestTankWarrior.results +++ b/sim/warrior/tank_warrior/TestTankWarrior.results @@ -37,7 +37,7 @@ character_stats_results: { final_stats: 0 final_stats: 10599 final_stats: 32 - final_stats: 251 + final_stats: 271 final_stats: 60 final_stats: 60 final_stats: 65 From e7a9e38211a10dc3b573377fc813852576ed34e2 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Wed, 25 Sep 2024 12:40:07 -0400 Subject: [PATCH 3/5] don't double-dip DW spec on OH autos --- .../dps_warrior/TestDualWieldWarrior.results | 250 +++++++++--------- sim/warrior/talents.go | 1 - 2 files changed, 125 insertions(+), 126 deletions(-) diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results index 6cc9b7e7f6..c57f85f47e 100644 --- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results +++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results @@ -148,8 +148,8 @@ character_stats_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-StatWeights-Default" value: { - weights: 1.26944 - weights: 0.68871 + weights: 0.94302 + weights: 1.01776 weights: 0 weights: 0 weights: 0 @@ -165,9 +165,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.72351 - weights: 8.05651 - weights: 8.52329 + weights: 0.58982 + weights: 7.17749 + weights: 8.54288 weights: 0 weights: 0 weights: 0 @@ -197,8 +197,8 @@ stat_weights_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.44557 - weights: 0.75975 + weights: 2.08894 + weights: 1.0931 weights: 0 weights: 0 weights: 0 @@ -214,9 +214,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.15496 - weights: 3.9663 - weights: 22.83592 + weights: 0.88147 + weights: 2.81365 + weights: 24.54815 weights: 0 weights: 0 weights: 0 @@ -246,8 +246,8 @@ stat_weights_results: { stat_weights_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.78728 - weights: 1.77663 + weights: 1.70501 + weights: 1.00876 weights: 0 weights: 0 weights: 0 @@ -263,9 +263,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.02428 - weights: 35.10679 - weights: 28.70964 + weights: 0.29549 + weights: 36.03048 + weights: 24.87437 weights: 0 weights: 0 weights: 0 @@ -295,15 +295,15 @@ stat_weights_results: { dps_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-AllItems-BattlegearofHeroism" value: { - dps: 580.70046 - tps: 515.49033 + dps: 548.19856 + tps: 487.19115 } } dps_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-Average-Default" value: { - dps: 640.30812 - tps: 566.13347 + dps: 608.16526 + tps: 537.4594 } } dps_results: { @@ -393,371 +393,371 @@ dps_results: { dps_results: { key: "TestDualWieldWarrior-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 597.12953 - tps: 533.5924 + dps: 569.57811 + tps: 504.09767 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 2771.16205 - tps: 2394.81678 + dps: 2639.76655 + tps: 2287.1778 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 2145.21946 - tps: 1887.02048 + dps: 1989.92848 + tps: 1756.64517 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 2534.84796 - tps: 2190.09272 + dps: 2383.14096 + tps: 2063.07283 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 2497.76979 - tps: 2159.97242 + dps: 2336.87499 + tps: 2025.53882 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 2534.84796 - tps: 2190.09272 + dps: 2383.14096 + tps: 2063.07283 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 2951.33365 - tps: 2542.63551 + dps: 2797.62709 + tps: 2413.38735 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Average-Default" value: { - dps: 3780.82527 - tps: 2969.55134 + dps: 3617.97964 + tps: 2841.24899 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1698.24475 - tps: 1620.53656 + dps: 1665.94355 + tps: 1596.17137 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 528.87014 - tps: 479.16424 + dps: 527.2622 + tps: 477.94961 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 724.87116 - tps: 633.50298 + dps: 721.71303 + tps: 631.12714 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 785.55175 - tps: 824.89671 + dps: 771.47964 + tps: 814.26555 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 268.64486 - tps: 271.25889 + dps: 267.89319 + tps: 270.69185 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 371.63673 - tps: 350.71587 + dps: 370.22181 + tps: 349.65945 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1819.28216 - tps: 1762.94487 + dps: 1782.44796 + tps: 1734.88847 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 547.79614 - tps: 493.84983 + dps: 546.02403 + tps: 492.49924 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 758.40854 - tps: 658.2435 + dps: 754.98822 + tps: 655.68534 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 823.68713 - tps: 873.71483 + dps: 808.0255 + tps: 861.77431 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 269.65906 - tps: 271.02188 + dps: 268.87524 + tps: 270.42504 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 386.16116 - tps: 360.68151 + dps: 384.58615 + tps: 359.50764 } } dps_results: { key: "TestDualWieldWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2954.15116 - tps: 2329.25548 + dps: 2840.1998 + tps: 2237.93399 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BanishedMartyr'sFullPlate" value: { - dps: 3156.98518 - tps: 2709.28457 + dps: 2983.8361 + tps: 2565.68699 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BattlegearofHeroism" value: { - dps: 2185.30128 - tps: 1913.32878 + dps: 2065.16729 + tps: 1812.30237 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-BloodGuard'sPlate" value: { - dps: 2692.94273 - tps: 2317.87726 + dps: 2525.35944 + tps: 2175.23509 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-EmeraldDreamPlate" value: { - dps: 2637.95786 - tps: 2269.60279 + dps: 2491.20194 + tps: 2147.10994 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-Knight-Lieutenant'sPlate" value: { - dps: 2692.94273 - tps: 2317.87726 + dps: 2525.35944 + tps: 2175.23509 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-AllItems-WailingBerserker'sPlateArmor" value: { - dps: 3367.37254 - tps: 2887.3852 + dps: 3198.42156 + tps: 2744.70651 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Average-Default" value: { - dps: 4404.0401 - tps: 3433.50062 + dps: 4210.88702 + tps: 3277.22592 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2030.40134 - tps: 1864.24056 + dps: 1984.37927 + tps: 1830.49648 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 534.01005 - tps: 460.85899 + dps: 531.65729 + tps: 459.07254 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 749.05218 - tps: 622.31599 + dps: 744.12193 + tps: 618.50168 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 878.20371 - tps: 889.07783 + dps: 859.51547 + tps: 875.43201 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 226.0136 - tps: 227.19164 + dps: 224.96729 + tps: 226.39952 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 336.99707 - tps: 309.67744 + dps: 334.39933 + tps: 307.68423 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1548.38745 - tps: 1495.57771 + dps: 1519.99206 + tps: 1474.72736 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 429.10967 - tps: 380.22539 + dps: 427.63699 + tps: 379.10516 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 556.09549 - tps: 487.27815 + dps: 554.2826 + tps: 485.8646 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 640.58626 - tps: 707.85338 + dps: 631.33409 + tps: 701.06045 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 171.6933 - tps: 185.48756 + dps: 171.2215 + tps: 185.13149 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 227.87067 - tps: 231.50143 + dps: 227.19188 + tps: 230.97275 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2126.46766 - tps: 1956.97045 + dps: 2077.36151 + tps: 1920.06936 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 539.867 - tps: 464.60903 + dps: 537.46016 + tps: 462.80481 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 794.92306 - tps: 649.38909 + dps: 789.56162 + tps: 645.46675 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 953.24787 - tps: 957.81632 + dps: 931.88481 + tps: 941.90068 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 233.97302 - tps: 231.7243 + dps: 232.93777 + tps: 230.95747 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 362.77363 - tps: 325.10561 + dps: 359.93651 + tps: 323.04532 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1318.11047 - tps: 1286.08779 + dps: 1297.32354 + tps: 1270.68014 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 430.12706 - tps: 376.45824 + dps: 428.93704 + tps: 375.57527 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 572.9679 - tps: 465.64933 + dps: 572.14908 + tps: 465.05196 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 543.85958 - tps: 620.1525 + dps: 536.97642 + tps: 615.03614 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 175.34198 - tps: 186.71206 + dps: 174.93958 + tps: 186.41504 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 241.78477 - tps: 230.66025 + dps: 241.4118 + tps: 230.39304 } } dps_results: { key: "TestDualWieldWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3481.49431 - tps: 2711.23901 + dps: 3349.17822 + tps: 2599.69152 } } diff --git a/sim/warrior/talents.go b/sim/warrior/talents.go index 19c7ada9fd..83146d1388 100644 --- a/sim/warrior/talents.go +++ b/sim/warrior/talents.go @@ -193,7 +193,6 @@ func (warrior *Warrior) applyDualWieldSpecialization() { } multiplier := 1 + 0.05*float64(warrior.Talents.DualWieldSpecialization) - warrior.AutoAttacks.OHConfig().DamageMultiplier *= multiplier warrior.OnSpellRegistered(func(spell *core.Spell) { if spell.ProcMask.Matches(core.ProcMaskMeleeOH) && spell.BonusCoefficient > 0 { spell.DamageMultiplier *= multiplier From 09a58f9967a9f30004c48e2eb5805c7d0f855187 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Wed, 25 Sep 2024 13:51:30 -0400 Subject: [PATCH 4/5] clever strikes should only activate when raptor strike hits --- sim/hunter/item_sets_pve.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/hunter/item_sets_pve.go b/sim/hunter/item_sets_pve.go index d4f86f1de6..8b126bda61 100644 --- a/sim/hunter/item_sets_pve.go +++ b/sim/hunter/item_sets_pve.go @@ -233,8 +233,8 @@ var ItemSetDragonstalkerProwess = core.NewItemSet(core.ItemSet{ core.MakePermanent(hunter.RegisterAura(core.Aura{ Label: "S03 - Item - T2 - Hunter - Melee 2P Bonus Trigger", - OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) { - if spell.SpellCode == SpellCode_HunterRaptorStrike { + OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + if spell.SpellCode == SpellCode_HunterRaptorStrikeHit { procAura.Activate(sim) } }, From 4352295c3546a215aba7980fc269dc8da9f21341 Mon Sep 17 00:00:00 2001 From: Kayla Glick Date: Wed, 25 Sep 2024 13:58:28 -0400 Subject: [PATCH 5/5] update balefire bolt --- sim/mage/TestArcane.results | 94 ++++++++++----------- sim/mage/TestFire.results | 148 ++++++++++++++++----------------- sim/mage/TestFrost.results | 90 ++++++++++---------- sim/mage/balefire_bolt.go | 16 ++-- ui/mage/apls/p4_frost.apl.json | 6 +- 5 files changed, 178 insertions(+), 176 deletions(-) diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results index 7a0cfd12d3..f6a326401a 100644 --- a/sim/mage/TestArcane.results +++ b/sim/mage/TestArcane.results @@ -298,18 +298,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -0.20439 + weights: -0.88337 weights: 0 - weights: 1.22546 - weights: 1.09824 - weights: 0.12722 + weights: 1.21892 + weights: 1.09189 + weights: 0.12703 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 13.72806 + weights: 14.07399 weights: 0 weights: 0 weights: 0 @@ -589,29 +589,29 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 684.20857 - tps: 690.8746 + dps: 684.08679 + tps: 692.8031 } } dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 629.34438 - tps: 635.48304 + dps: 629.22425 + tps: 637.11462 } } dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 679.84549 - tps: 686.46887 + dps: 679.72372 + tps: 688.41069 } } dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 628.95516 - tps: 634.85904 + dps: 628.68867 + tps: 637.05315 } } dps_results: { @@ -624,22 +624,22 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 684.20857 - tps: 690.8746 + dps: 684.08679 + tps: 692.8031 } } dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 629.34438 - tps: 635.48304 + dps: 629.22425 + tps: 637.11462 } } dps_results: { key: "TestArcane-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 1634.62893 - tps: 1655.93236 + dps: 1630.73808 + tps: 1652.48143 } } dps_results: { @@ -652,99 +652,99 @@ dps_results: { dps_results: { key: "TestArcane-Phase4-Lvl60-Average-Default" value: { - dps: 2069.08713 - tps: 2091.87855 + dps: 2054.82151 + tps: 2078.14061 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2088.13209 - tps: 2468.77138 + dps: 2081.4061 + tps: 2491.653 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2088.13209 - tps: 2107.16406 + dps: 2081.4061 + tps: 2101.91845 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2341.43891 - tps: 2358.31393 + dps: 2341.45102 + tps: 2359.2382 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1006.5327 - tps: 1247.45353 + dps: 980.09414 + tps: 1226.73852 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1006.5327 - tps: 1018.57875 + dps: 980.09414 + tps: 992.42635 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1250.69607 - tps: 1264.46516 + dps: 1250.73439 + tps: 1266.68376 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2092.00401 - tps: 2476.69454 + dps: 2090.03172 + tps: 2501.22251 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 2092.00401 - tps: 2111.23854 + dps: 2090.03172 + tps: 2110.59126 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 2371.01326 - tps: 2389.97336 + dps: 2371.02537 + tps: 2390.29165 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 995.81967 - tps: 1238.67995 + dps: 968.95013 + tps: 1216.33511 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 995.81967 - tps: 1007.96268 + dps: 968.95013 + tps: 981.31938 } } dps_results: { key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1264.6048 - tps: 1280.55417 + dps: 1264.62377 + tps: 1281.48918 } } dps_results: { key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2078.79733 - tps: 2101.5431 + dps: 2054.53651 + tps: 2077.89264 } } dps_results: { diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results index ab38f947d8..70d9328ca8 100644 --- a/sim/mage/TestFire.results +++ b/sim/mage/TestFire.results @@ -396,18 +396,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.55614 + weights: 3.40147 weights: 0 - weights: 2.06133 + weights: 1.98432 weights: 0 - weights: 2.06133 + weights: 1.98432 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 28.37501 + weights: 21.26948 weights: 0 weights: 0 weights: 0 @@ -445,18 +445,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.3624 + weights: 0.64024 weights: 0 - weights: 2.41782 + weights: 2.39253 weights: 0 - weights: 2.41782 + weights: 2.39253 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 31.43369 + weights: 33.06184 weights: 0 weights: 0 weights: 0 @@ -785,29 +785,29 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 2052.8836 - tps: 1343.87287 + dps: 1978.13588 + tps: 1295.26232 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 1865.47138 - tps: 1226.73077 + dps: 1840.53503 + tps: 1209.90291 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 2027.04391 - tps: 1327.91674 + dps: 1930.02845 + tps: 1266.50107 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 1854.99813 - tps: 1215.65549 + dps: 1768.03779 + tps: 1158.05177 } } dps_results: { @@ -820,22 +820,22 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 2052.8836 - tps: 1343.87287 + dps: 1978.13588 + tps: 1295.26232 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 1865.47138 - tps: 1226.73077 + dps: 1840.53503 + tps: 1209.90291 } } dps_results: { key: "TestFire-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments" value: { - dps: 2214.79775 - tps: 1453.99198 + dps: 2170.06198 + tps: 1425.62099 } } dps_results: { @@ -848,22 +848,22 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-Average-Default" value: { - dps: 3102.63722 - tps: 2039.63008 + dps: 3001.35682 + tps: 1972.31589 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3171.08389 - tps: 2643.77325 + dps: 3047.60889 + tps: 2549.63272 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3171.08389 - tps: 2080.47927 + dps: 3047.60889 + tps: 1998.57808 } } dps_results: { @@ -876,15 +876,15 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 877.65663 - tps: 919.30497 + dps: 834.74694 + tps: 884.25808 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 877.65663 - tps: 573.87449 + dps: 834.74694 + tps: 543.80302 } } dps_results: { @@ -897,15 +897,15 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3145.66314 - tps: 2627.24677 + dps: 3011.23011 + tps: 2525.06781 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3145.66314 - tps: 2068.73883 + dps: 3011.23011 + tps: 1980.07046 } } dps_results: { @@ -918,15 +918,15 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 822.94629 - tps: 876.09527 + dps: 763.26259 + tps: 830.3161 } } dps_results: { key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 822.94629 - tps: 536.43548 + dps: 763.26259 + tps: 495.25131 } } dps_results: { @@ -939,36 +939,36 @@ dps_results: { dps_results: { key: "TestFire-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3158.31838 - tps: 2077.66059 + dps: 3022.39287 + tps: 1987.29295 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 2318.19604 - tps: 1525.05723 + dps: 2295.68875 + tps: 1509.21895 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 2085.66316 - tps: 1373.02513 + dps: 2085.42728 + tps: 1372.47773 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 2294.67861 - tps: 1510.41697 + dps: 2264.64873 + tps: 1489.62535 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 2082.00722 - tps: 1369.81781 + dps: 2060.57681 + tps: 1354.97988 } } dps_results: { @@ -981,15 +981,15 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 2318.19604 - tps: 1525.05723 + dps: 2295.68875 + tps: 1509.21895 } } dps_results: { key: "TestFire-Phase5-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 2085.66316 - tps: 1373.02513 + dps: 2085.42728 + tps: 1372.47773 } } dps_results: { @@ -1009,22 +1009,22 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Average-Default" value: { - dps: 3745.69287 - tps: 2159.18464 + dps: 3703.34736 + tps: 2134.47055 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 16442.20747 - tps: 9734.60024 + dps: 16389.24084 + tps: 9703.17079 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3717.28333 - tps: 2146.68227 + dps: 3702.12666 + tps: 2138.63682 } } dps_results: { @@ -1037,15 +1037,15 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5170.85241 - tps: 3170.44887 + dps: 5163.17202 + tps: 3165.74673 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1044.54842 - tps: 616.99944 + dps: 1012.24735 + tps: 597.54798 } } dps_results: { @@ -1058,15 +1058,15 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 15846.03607 - tps: 9385.2093 + dps: 15853.19775 + tps: 9391.6087 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 3689.08823 - tps: 2133.40899 + dps: 3672.47039 + tps: 2122.22097 } } dps_results: { @@ -1079,15 +1079,15 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5239.54571 - tps: 3200.12025 + dps: 5220.12261 + tps: 3188.56792 } } dps_results: { key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1018.65681 - tps: 600.66592 + dps: 992.95873 + tps: 584.45098 } } dps_results: { @@ -1100,7 +1100,7 @@ dps_results: { dps_results: { key: "TestFire-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3768.4147 - tps: 2173.96669 + dps: 3750.62217 + tps: 2163.14984 } } diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results index c61ebd0bd0..3c865ff9b5 100644 --- a/sim/mage/TestFrost.results +++ b/sim/mage/TestFrost.results @@ -200,18 +200,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: -1.08136 + weights: 1.7351 weights: 0 - weights: 2.38746 + weights: 2.08131 weights: 0 - weights: 2.18655 - weights: 0.20091 + weights: 1.85582 + weights: 0.22549 weights: 0 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 41.84952 + weights: 26.33318 weights: 0 weights: 0 weights: 0 @@ -393,29 +393,29 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave" value: { - dps: 2465.13878 - tps: 1992.26127 + dps: 1735.03537 + tps: 1426.5872 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sSatin" value: { - dps: 2287.48098 - tps: 1845.60329 + dps: 1569.19276 + tps: 1289.56962 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments" value: { - dps: 2455.10498 - tps: 1985.21347 + dps: 1724.7375 + tps: 1417.97999 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldWovenGarb" value: { - dps: 2257.69071 - tps: 1821.26508 + dps: 1563.2498 + tps: 1284.01585 } } dps_results: { @@ -428,15 +428,15 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave" value: { - dps: 2465.13878 - tps: 1992.26127 + dps: 1735.03537 + tps: 1426.5872 } } dps_results: { key: "TestFrost-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin" value: { - dps: 2287.48098 - tps: 1845.60329 + dps: 1569.19276 + tps: 1289.56962 } } dps_results: { @@ -456,99 +456,99 @@ dps_results: { dps_results: { key: "TestFrost-Phase4-Lvl60-Average-Default" value: { - dps: 3442.95405 - tps: 2794.08843 + dps: 2904.19938 + tps: 2385.16958 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3530.58575 - tps: 3368.7 + dps: 2905.00949 + tps: 2889.65672 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3530.58575 - tps: 2866.16264 + dps: 2905.00949 + tps: 2385.63608 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3582.9833 - tps: 2907.06742 + dps: 3118.04811 + tps: 2551.77417 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 995.5606 - tps: 1124.01793 + dps: 929.23103 + tps: 1083.44585 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 995.5606 - tps: 805.41863 + dps: 929.23103 + tps: 759.24614 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1718.51793 - tps: 1376.79551 + dps: 1530.72229 + tps: 1243.34223 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3400.40562 - tps: 3253.02393 + dps: 2886.22441 + tps: 2870.17793 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 3400.40562 - tps: 2759.11328 + dps: 2886.22441 + tps: 2371.23334 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 3649.15751 - tps: 2958.32099 + dps: 3177.14381 + tps: 2598.68714 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 963.51627 - tps: 1095.51626 + dps: 918.08217 + tps: 1073.77909 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 963.51627 - tps: 777.76249 + dps: 918.08217 + tps: 749.84157 } } dps_results: { key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1732.26429 - tps: 1382.99594 + dps: 1584.81355 + tps: 1283.55869 } } dps_results: { key: "TestFrost-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3415.55891 - tps: 2769.99502 + dps: 2886.63881 + tps: 2370.72716 } } dps_results: { diff --git a/sim/mage/balefire_bolt.go b/sim/mage/balefire_bolt.go index 4911eb0945..3b8c73d25e 100644 --- a/sim/mage/balefire_bolt.go +++ b/sim/mage/balefire_bolt.go @@ -20,20 +20,22 @@ func (mage *Mage) registerBalefireBoltSpell() { castTime := time.Millisecond * 2500 buffDuration := time.Second * 30 manaCost := .20 + maxStacks := 5 + stackMultiplier := 0.20 - statDeps := make([]*stats.StatDependency, 11) // 10 stacks + zero conditions - for i := 1; i < 11; i++ { - statDeps[i] = mage.NewDynamicMultiplyStat(stats.Spirit, 1.0-.1*float64(i)) + statDeps := make([]*stats.StatDependency, maxStacks+1) // 5 stacks + zero conditions + for i := 1; i < maxStacks+1; i++ { + statDeps[i] = mage.NewDynamicMultiplyStat(stats.Spirit, 1.0-stackMultiplier*float64(i)) } balefireAura := mage.RegisterAura(core.Aura{ Label: "Balefire Bolt (Stacks)", ActionID: core.ActionID{SpellID: int32(proto.MageRune_RuneBracersBalefireBolt)}.WithTag(1), Duration: buffDuration, - MaxStacks: 5, + MaxStacks: int32(maxStacks), OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) { - mage.BalefireBolt.DamageMultiplierAdditive -= .2 * float64(oldStacks) - mage.BalefireBolt.DamageMultiplierAdditive += .2 * float64(newStacks) + mage.BalefireBolt.DamageMultiplierAdditive -= stackMultiplier * float64(oldStacks) + mage.BalefireBolt.DamageMultiplierAdditive += stackMultiplier * float64(newStacks) if oldStacks != 0 { aura.Unit.DisableDynamicStatDep(sim, statDeps[oldStacks]) @@ -42,7 +44,7 @@ func (mage *Mage) registerBalefireBoltSpell() { aura.Unit.EnableDynamicStatDep(sim, statDeps[newStacks]) } - if newStacks == 10 { + if newStacks == aura.MaxStacks { mage.RemoveHealth(sim, mage.CurrentHealth()) if sim.Log != nil { diff --git a/ui/mage/apls/p4_frost.apl.json b/ui/mage/apls/p4_frost.apl.json index 7d3a0325f5..90e0ed6524 100644 --- a/ui/mage/apls/p4_frost.apl.json +++ b/ui/mage/apls/p4_frost.apl.json @@ -7,9 +7,9 @@ "priorityList": [ {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, {"action":{"castSpell":{"spellId":{"spellId":440802}}}}, - {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456398,"tag":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"9"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":456398,"tag":2}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":2139}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456398,"tag":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":456398,"tag":2}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":2139}}}}, {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":400615}}},"castSpell":{"spellId":{"spellId":10199,"rank":7}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"9"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, + {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":401502}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":25304,"rank":11}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":10207,"rank":7}}}}, @@ -17,7 +17,7 @@ {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, {"action":{"autocastOtherCooldowns":{}}}, {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":12472}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"9"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}}, {"action":{"castSpell":{"spellId":{"spellId":401502}}}}, {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}}} ]