From 4588d15d786520aa8fc717c2b41ba7fefb428134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= Date: Mon, 27 Jan 2025 14:52:31 +0100 Subject: [PATCH 1/3] Fix Iron Counterweight --- assets/database/db.bin | Bin 6455756 -> 6455756 bytes assets/database/db.json | 4 +- assets/database/leftover_db.bin | Bin 929541 -> 929541 bytes assets/database/leftover_db.json | 8 +-- sim/common/vanilla/enchant_effects.go | 8 +++ sim/druid/feral/TestFeral.results | 54 +++++++------- .../retribution/TestRetribution.results | 66 +++++++++--------- sim/paladin/retribution/TestShockadin.results | 30 ++++---- tools/database/enchant_overrides.go | 2 +- 9 files changed, 90 insertions(+), 82 deletions(-) diff --git a/assets/database/db.bin b/assets/database/db.bin index 17a96692c30949188a841ca87c05cb5bf03fbfe0..6e65235e9f2bb107b1e66e691b52747f36cca485 100644 GIT binary patch delta 236 zcmWN=MM{KW002;Q?C$RF?wql^9lLHK_&{*yG5)6OF5PeFw)pdrIXj2bg; z!lWtFX3Uy1Z^5D^%T}z4OIWjR!=^3UcI?`-@4%rW$4;C&bMC_BS27WO#(&<^Q8K&= Zufv=0HoOb(!-w!Odc*|?(P(Kr?}mMk%X6!Z~@NHorHvm19V~HFkSdBdCAxJNHTnp zCS62^Oj)u;<;ayMUx7kJij^o;rd)+eRjSpfRi|EqMopTvXw{}&hfZC(_2|{7-+)0w zhK(3CX555HQ>M+BHD}&}MN5{&tXQ>X-G)tDw(Z!pXWxNCM~{pt9!q@uJV(FZ eQi*tY5nhH@;dOWu-iCMKefSVQex(vmzkmNuB4Yml diff --git a/assets/database/db.json b/assets/database/db.json index 0834f33b5c..23538ad64f 100644 --- a/assets/database/db.json +++ b/assets/database/db.json @@ -10921,7 +10921,7 @@ {"effectId":30,"itemId":4405,"spellId":3974,"name":"Crude Scope","type":14,"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":32,"itemId":4406,"spellId":3975,"name":"Standard Scope","type":14,"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":33,"itemId":4407,"spellId":3976,"name":"Accurate Scope","type":14,"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":34,"spellId":7218,"name":"Iron Counterweight","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,3,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":34,"spellId":7218,"name":"Iron Counterweight","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":36,"spellId":6296,"name":"Fiery Blaze Enchantment","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":41,"spellId":7420,"name":"Enchant Chest - Minor Health","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,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":41,"spellId":7418,"name":"Enchant Bracer - Minor Health","type":6,"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,5,0,0,0,0,0,0,0,0,0],"quality":1}, @@ -10929,8 +10929,8 @@ {"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, -{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor 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":241,"spellId":13503,"name":"Enchant Weapon - Lesser 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":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor 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":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","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,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser 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,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin index b2a4244a1500a477ad747e2fd2bb5d3883d4fdf2..07101e0ba85489d2b7c09c8494e258a3dfc25198 100644 GIT binary patch delta 99 zcmV-p0G$7Y-Z+KcIDmu!gaU*Egam{Iga(8Mgb0KQgbIWUvw>B#d F&jTm@BcT8Q delta 101 zcmV-r0Gj`W-Z+KcIDmu!gaU*Egam{Iga(8Mgb0KQgbIWUvChE61} diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json index c79ce5fcec..5067dae1c0 100644 --- a/assets/database/leftover_db.json +++ b/assets/database/leftover_db.json @@ -1474,7 +1474,7 @@ {"effectId":30,"itemId":4405,"spellId":3974,"name":"Crude Scope","type":14,"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":32,"itemId":4406,"spellId":3975,"name":"Standard Scope","type":14,"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":33,"itemId":4407,"spellId":3976,"name":"Accurate Scope","type":14,"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":34,"spellId":7218,"name":"Iron Counterweight","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,3,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":34,"spellId":7218,"name":"Iron Counterweight","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":36,"spellId":6296,"name":"Fiery Blaze Enchantment","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":41,"spellId":7420,"name":"Enchant Chest - Minor Health","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,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":41,"spellId":7418,"name":"Enchant Bracer - Minor Health","type":6,"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,5,0,0,0,0,0,0,0,0,0],"quality":1}, @@ -1482,8 +1482,8 @@ {"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, -{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser 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":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor 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":241,"spellId":13503,"name":"Enchant Weapon - Lesser 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":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","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,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser 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,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, @@ -1558,8 +1558,8 @@ {"effectId":929,"itemId":16217,"spellId":20017,"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":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":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":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}, @@ -1585,8 +1585,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}, diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go index 0179ab637a..69c01327af 100644 --- a/sim/common/vanilla/enchant_effects.go +++ b/sim/common/vanilla/enchant_effects.go @@ -248,6 +248,14 @@ func init() { character.PseudoStats.RangedSpeedMultiplier *= 1.01 }) + // Weapon - Iron Counterweight + // Effect #34 explicitly does NOT affect ranged attack speed + core.NewEnchantEffect(34, func(agent core.Agent) { + character := agent.GetCharacter() + + character.PseudoStats.MeleeSpeedMultiplier *= 1.03 + }) + // Weapon - Striking core.AddWeaponEffect(943, func(agent core.Agent, slot proto.ItemSlot) { w := agent.GetCharacter().AutoAttacks.MH() diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 57ccaad717..3f97e6968e 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -70,7 +70,7 @@ character_stats_results: { final_stats: 1233.604 final_stats: 3 final_stats: 26.53165 - final_stats: 3 + final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 2101.24 @@ -119,7 +119,7 @@ character_stats_results: { final_stats: 1805.188 final_stats: 4 final_stats: 47.11661 - final_stats: 3 + final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 3100.6 @@ -295,8 +295,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.97845 - weights: 1.00589 + weights: 0.98971 + weights: 1.05302 weights: 0 weights: 0 weights: 0 @@ -312,9 +312,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.42767 - weights: 4.75686 - weights: 5.08153 + weights: 0.43259 + weights: 4.87186 + weights: 5.45987 weights: 0 weights: 0 weights: 0 @@ -344,8 +344,8 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.5653 - weights: 1.59043 + weights: 1.56974 + weights: 1.62001 weights: 0 weights: 0 weights: 0 @@ -361,9 +361,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.6588 - weights: 18.42844 - weights: 11.8643 + weights: 0.66067 + weights: 21.5586 + weights: 12.03091 weights: 0 weights: 0 weights: 0 @@ -764,15 +764,15 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-AllItems-FeralheartRaiment" value: { - dps: 527.96559 - tps: 385.15861 + dps: 536.85931 + tps: 391.70435 } } dps_results: { key: "TestFeral-Phase2-Lvl40-Average-Default" value: { - dps: 814.6095 - tps: 593.86451 + dps: 823.85449 + tps: 600.67871 } } dps_results: { @@ -1030,24 +1030,24 @@ dps_results: { dps_results: { key: "TestFeral-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 479.4728 - tps: 343.4147 + dps: 486.91357 + tps: 348.71109 } } dps_results: { key: "TestFeral-Phase3-Lvl50-AllItems-FeralheartRaiment" value: { - dps: 900.37324 - tps: 654.19596 - hps: 9.34784 + dps: 905.19855 + tps: 656.95156 + hps: 9.05555 } } dps_results: { key: "TestFeral-Phase3-Lvl50-Average-Default" value: { - dps: 1956.15088 - tps: 1399.47417 - hps: 10.35127 + dps: 1965.23757 + tps: 1405.95674 + hps: 10.25412 } } dps_results: { @@ -1341,9 +1341,9 @@ dps_results: { dps_results: { key: "TestFeral-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1224.0187 - tps: 872.58227 - hps: 9.83766 + dps: 1241.88294 + tps: 885.5957 + hps: 9.5411 } } dps_results: { diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index 5888452cc3..dc7479e572 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -70,7 +70,7 @@ character_stats_results: { final_stats: 1040 final_stats: 2 final_stats: 23.33405 - final_stats: 3 + final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 2043.5 @@ -119,7 +119,7 @@ character_stats_results: { final_stats: 1697.3968 final_stats: 4 final_stats: 36.51472 - final_stats: 3 + final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 2972.84 @@ -344,12 +344,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.65135 - weights: 0.30544 + weights: 0.66441 + weights: 0.56707 weights: 0 weights: 0 weights: 0 - weights: 0.21991 + weights: 0.2224 weights: 0 weights: 0 weights: 0 @@ -357,13 +357,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.6906 - weights: 0.06783 + weights: 2.00648 + weights: 0.07348 weights: 0 weights: 0 - weights: 0.29607 - weights: 4.99387 - weights: 4.96874 + weights: 0.302 + weights: 5.38824 + weights: 5.2359 weights: 0 weights: 0 weights: 0 @@ -393,12 +393,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.08854 - weights: 0.13613 + weights: 1.08273 + weights: 0.20907 weights: 0 weights: 0 weights: 0 - weights: 0.27426 + weights: 0.27632 weights: 0 weights: 0 weights: 0 @@ -406,13 +406,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.98218 - weights: 0.65841 + weights: 3.06189 + weights: 0.65055 weights: 0 weights: 0 - weights: 0.42197 - weights: 13.88005 - weights: 8.40518 + weights: 0.42483 + weights: 13.31632 + weights: 8.58759 weights: 0 weights: 0 weights: 0 @@ -694,15 +694,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase2-Lvl40-AllItems-SoulforgeArmor" value: { - dps: 321.45542 - tps: 329.17862 + dps: 327.96797 + tps: 335.78814 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Average-Default" value: { - dps: 541.02463 - tps: 554.51205 + dps: 549.5002 + tps: 563.00792 } } dps_results: { @@ -792,24 +792,24 @@ dps_results: { dps_results: { key: "TestRetribution-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 511.13706 - tps: 524.473 + dps: 519.2567 + tps: 532.69451 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-AllItems-SoulforgeArmor" value: { - dps: 774.01672 - tps: 808.84843 - hps: 10.24545 + dps: 785.10433 + tps: 819.89447 + hps: 10.05923 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Average-Default" value: { - dps: 1211.5131 - tps: 1252.70683 - hps: 10.98519 + dps: 1228.70721 + tps: 1270.1512 + hps: 11.13991 } } dps_results: { @@ -911,9 +911,9 @@ dps_results: { dps_results: { key: "TestRetribution-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1149.75437 - tps: 1190.25492 - hps: 10.65313 + dps: 1162.05591 + tps: 1202.88932 + hps: 11.21611 } } dps_results: { diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index add21bb49b..1bedeeda9e 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -21,7 +21,7 @@ character_stats_results: { final_stats: 1075.86 final_stats: 2 final_stats: 18.98613 - final_stats: 3 + final_stats: 0 final_stats: 0 final_stats: 0 final_stats: 2177.15 @@ -99,12 +99,12 @@ character_stats_results: { stat_weights_results: { key: "TestShockadin-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.75871 - weights: 0.22041 + weights: 0.77274 + weights: 0.33427 weights: 0 weights: 0 weights: 0 - weights: 0.18303 + weights: 0.18458 weights: 0 weights: 0 weights: 0 @@ -112,13 +112,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.73502 - weights: 0.13658 + weights: 1.66629 + weights: 0.16154 weights: 0 weights: 0 - weights: 0.31352 - weights: 5.58853 - weights: 4.41498 + weights: 0.31931 + weights: 5.67996 + weights: 4.93287 weights: 0 weights: 0 weights: 0 @@ -197,15 +197,15 @@ stat_weights_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-AllItems-SoulforgeArmor" value: { - dps: 413.1088 - tps: 434.46244 + dps: 423.02732 + tps: 444.993 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Average-Default" value: { - dps: 536.3322 - tps: 560.76609 + dps: 546.16947 + tps: 570.68707 } } dps_results: { @@ -295,8 +295,8 @@ dps_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 507.43859 - tps: 531.72671 + dps: 512.71559 + tps: 537.04384 } } dps_results: { diff --git a/tools/database/enchant_overrides.go b/tools/database/enchant_overrides.go index 392724c9eb..27a24bdd51 100644 --- a/tools/database/enchant_overrides.go +++ b/tools/database/enchant_overrides.go @@ -245,7 +245,7 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 1897, SpellId: 20031, Name: "Enchant Weapon - Superior Striking", Quality: proto.ItemQuality_ItemQualityUncommon, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeWeapon}, // 2H Weapon - {EffectId: 34, SpellId: 7218, Name: "Iron Counterweight", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.MeleeHaste: 3}.ToFloatArray(), Type: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, + {EffectId: 34, SpellId: 7218, Name: "Iron Counterweight", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, {EffectId: 723, SpellId: 7793, Name: "Enchant 2H Weapon - Lesser Intellect", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.Intellect: 3}.ToFloatArray(), Type: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, {EffectId: 241, SpellId: 7745, Name: "Enchant 2H Weapon - Minor Impact", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, {EffectId: 255, SpellId: 13380, Name: "Enchant 2H Weapon - Lesser Spirit", Quality: proto.ItemQuality_ItemQualityUncommon, Stats: stats.Stats{stats.Spirit: 3}.ToFloatArray(), Type: proto.ItemType_ItemTypeWeapon, EnchantType: proto.EnchantType_EnchantTypeTwoHand}, From 52f31edf65cca21ccf4097b258786ee456ec08fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= Date: Mon, 27 Jan 2025 15:09:32 +0100 Subject: [PATCH 2/3] [Warrior] Fix typo in zerk stance OnExpire --- sim/warrior/stances.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/warrior/stances.go b/sim/warrior/stances.go index d144798d93..4a4621223f 100644 --- a/sim/warrior/stances.go +++ b/sim/warrior/stances.go @@ -135,7 +135,7 @@ func (warrior *Warrior) registerBerserkerStanceAura() { }, OnExpire: func(ee *core.ExclusiveEffect, sim *core.Simulation) { ee.Aura.Unit.PseudoStats.ThreatMultiplier /= 0.8 - ee.Aura.Unit.PseudoStats.DamageTakenMultiplier *= 1.1 + ee.Aura.Unit.PseudoStats.DamageTakenMultiplier /= 1.1 ee.Aura.Unit.AddStatDynamic(sim, stats.MeleeCrit, -core.CritRatingPerCritChance*3) }, }) From e4721094e93fda3cd9e6a3e3a2a474dd4c3350c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= Date: Mon, 27 Jan 2025 16:37:23 +0100 Subject: [PATCH 3/3] [Paladin] Add spell batch delay to judgements and set lower priority --- sim/paladin/crusader_strike.go | 3 +- sim/paladin/divine_storm.go | 19 +- sim/paladin/protection/TestProtection.results | 96 ++-- sim/paladin/retribution/TestExodin.results | 180 +++---- .../retribution/TestRetribution.results | 474 +++++++++--------- .../retribution/TestSealStacking.results | 90 ++-- sim/paladin/retribution/TestShockadin.results | 140 +++--- sim/paladin/soc.go | 11 +- sim/paladin/som.go | 14 +- sim/paladin/sor.go | 20 +- 10 files changed, 541 insertions(+), 506 deletions(-) diff --git a/sim/paladin/crusader_strike.go b/sim/paladin/crusader_strike.go index e4311b399c..bc2db02483 100644 --- a/sim/paladin/crusader_strike.go +++ b/sim/paladin/crusader_strike.go @@ -45,7 +45,8 @@ func (paladin *Paladin) registerCrusaderStrike() { core.StartDelayedAction(sim, core.DelayedActionOptions{ DoAt: sim.CurrentTime + core.SpellBatchWindow, - OnAction: func(s *core.Simulation) { + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { spell.DealDamage(sim, result) }, }) diff --git a/sim/paladin/divine_storm.go b/sim/paladin/divine_storm.go index b096b6719a..728f05530c 100644 --- a/sim/paladin/divine_storm.go +++ b/sim/paladin/divine_storm.go @@ -17,7 +17,7 @@ func (paladin *Paladin) registerDivineStorm() { return } - results := make([]*core.SpellResult, min(4, paladin.Env.GetNumTargets())) + numTargets := min(4, paladin.Env.GetNumTargets()) healthMetrics := paladin.NewHealthMetrics(core.ActionID{SpellID: int32(proto.PaladinRune_RuneChestDivineStorm)}) @@ -46,6 +46,7 @@ func (paladin *Paladin) registerDivineStorm() { ThreatMultiplier: 1, ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + results := make([]*core.SpellResult, numTargets) for idx := range results { baseDamage := spell.Unit.MHWeaponDamage(sim, spell.MeleeAttackPower()) @@ -53,16 +54,16 @@ func (paladin *Paladin) registerDivineStorm() { target = sim.Environment.NextTargetUnit(target) } - for _, result := range results { - core.StartDelayedAction(sim, core.DelayedActionOptions{ - DoAt: sim.CurrentTime + core.SpellBatchWindow, - OnAction: func(s *core.Simulation) { + core.StartDelayedAction(sim, core.DelayedActionOptions{ + DoAt: sim.CurrentTime + core.SpellBatchWindow, + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { + for _, result := range results { spell.DealDamage(sim, result) paladin.GainHealth(sim, result.Damage*0.25, healthMetrics) - }, - }) - } - + } + }, + }) }, }) diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 4649e286e1..23c8bc4bc3 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -50,26 +50,26 @@ character_stats_results: { stat_weights_results: { key: "TestProtection-Phase4-Lvl60-StatWeights-Default" value: { - weights: 0.91087 - weights: 1.03274 + weights: 0.90963 + weights: 0.82612 weights: 0 weights: 0.00071 weights: 0 - weights: 0.17223 + weights: 0.17158 weights: 0 weights: 0 weights: 0 - weights: 0.0909 + weights: 0.09096 weights: 0 weights: 0 weights: 0 - weights: 2.66892 - weights: 1.61062 + weights: 2.18541 + weights: 1.40827 weights: 0 weights: 0 - weights: 0.40238 + weights: 0.40186 weights: 0 - weights: 15.5099 + weights: 14.21963 weights: 0 weights: 0 weights: 0 @@ -78,9 +78,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.95397 + weights: 1.95061 weights: 0 - weights: 0.74571 + weights: 0.74278 weights: 0 weights: 0 weights: 0 @@ -99,133 +99,133 @@ stat_weights_results: { dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1309.84314 - tps: 2329.80932 + dps: 1312.06471 + tps: 2338.43297 } } dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1310.04906 - tps: 2330.5869 + dps: 1312.27028 + tps: 2339.19501 } } dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1381.41684 - tps: 2452.59131 + dps: 1383.61858 + tps: 2461.42582 } } dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 1480.16542 - tps: 2946.56335 + dps: 1478.08143 + tps: 2946.28772 } } dps_results: { key: "TestProtection-Phase4-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1117.96862 - tps: 1689.22632 + dps: 1116.13019 + tps: 1687.34397 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Average-Default" value: { - dps: 1707.18079 - tps: 3459.31792 + dps: 1706.86076 + tps: 3459.44633 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 681.83431 - tps: 2070.54521 + dps: 684.75629 + tps: 2079.86905 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 269.39149 - tps: 826.88154 + dps: 267.83335 + tps: 819.17477 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 523.06955 - tps: 1502.34047 + dps: 524.64743 + tps: 1509.28315 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 164.92483 - tps: 440.62758 + dps: 165.0858 + tps: 441.33584 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 76.86067 - tps: 211.70163 + dps: 76.95504 + tps: 212.11686 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 180.90216 - tps: 488.34252 + dps: 181.37401 + tps: 490.41866 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 691.99183 - tps: 2102.47752 + dps: 688.27068 + tps: 2093.7375 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 276.60478 - tps: 842.72187 + dps: 274.34583 + tps: 834.63901 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 528.32577 - tps: 1515.64655 + dps: 530.04648 + tps: 1523.21768 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 149.45549 - tps: 372.38138 + dps: 149.616 + tps: 373.08764 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 82.31927 - tps: 209.51257 + dps: 82.41338 + tps: 209.92664 } } dps_results: { key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 185.6251 - tps: 486.11689 + dps: 186.09562 + tps: 488.18721 } } dps_results: { key: "TestProtection-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 1415.97022 - tps: 2865.5984 + dps: 1422.89957 + tps: 2883.17688 } } diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results index efd815caa2..43648c6d3c 100644 --- a/sim/paladin/retribution/TestExodin.results +++ b/sim/paladin/retribution/TestExodin.results @@ -99,12 +99,12 @@ character_stats_results: { stat_weights_results: { key: "TestExodin-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.09986 - weights: 0.96233 + weights: 2.09759 + weights: 1.49225 weights: 0 weights: 0 weights: 0 - weights: 0.71969 + weights: 0.71801 weights: 0 weights: 0 weights: 0 @@ -112,13 +112,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 9.18913 - weights: 2.2732 + weights: 9.16271 + weights: 1.95601 weights: 0 weights: 0 - weights: 0.86771 + weights: 0.86677 weights: 0 - weights: 25.95191 + weights: 22.95158 weights: 0 weights: 0 weights: 0 @@ -148,12 +148,12 @@ stat_weights_results: { stat_weights_results: { key: "TestExodin-Phase5-Lvl60-StatWeights-Default" value: { - weights: 2.95877 - weights: 1.00683 + weights: 2.95202 + weights: 1.44609 weights: 0 weights: 0 weights: 0 - weights: 0.94653 + weights: 0.94547 weights: 0 weights: 0 weights: 0 @@ -161,13 +161,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 14.96733 - weights: 2.6678 + weights: 17.69375 + weights: 4.86052 weights: 0 weights: 0 - weights: 1.06316 + weights: 1.06073 weights: 0 - weights: 32.3322 + weights: 27.52974 weights: 0 weights: 0 weights: 0 @@ -197,266 +197,266 @@ stat_weights_results: { dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1380.20004 - tps: 1415.40537 + dps: 1373.79416 + tps: 1409.00303 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1380.34412 - tps: 1416.40571 + dps: 1373.93825 + tps: 1410.00203 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1478.99654 - tps: 1516.32847 + dps: 1472.28753 + tps: 1509.61946 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 1631.59389 - tps: 1669.41814 + dps: 1632.47818 + tps: 1670.23549 } } dps_results: { key: "TestExodin-Phase4-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1251.19271 - tps: 1287.68687 + dps: 1246.75619 + tps: 1283.25646 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Average-Default" value: { - dps: 3340.97986 - tps: 3373.03383 + dps: 3336.41932 + tps: 3368.49068 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2440.43005 - tps: 2981.87062 + dps: 2418.67028 + tps: 2970.86794 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 856.2323 - tps: 883.52362 + dps: 864.01821 + tps: 891.65661 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 980.82779 - tps: 1011.77066 + dps: 980.46462 + tps: 1011.40749 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 887.15586 - tps: 1257.59902 + dps: 887.04713 + tps: 1257.49029 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 354.10561 - tps: 372.61732 + dps: 354.02563 + tps: 372.53734 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 502.37513 - tps: 525.70664 + dps: 499.16478 + tps: 522.49629 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 2487.80396 - tps: 3036.41879 + dps: 2489.28715 + tps: 3045.51831 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 872.99312 - tps: 900.48488 + dps: 870.26618 + tps: 897.90231 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 983.8861 - tps: 1014.87057 + dps: 983.5243 + tps: 1014.50876 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 899.56237 - tps: 1270.93036 + dps: 890.99519 + tps: 1262.78351 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 361.26706 - tps: 379.84597 + dps: 361.50788 + tps: 380.08679 } } dps_results: { key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 505.94397 - tps: 529.37677 + dps: 505.0558 + tps: 528.4886 } } dps_results: { key: "TestExodin-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2775.07294 - tps: 2810.20472 + dps: 2767.2818 + tps: 2802.08042 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1817.74231 - tps: 1857.86358 + dps: 1803.23634 + tps: 1843.25854 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1818.10521 - tps: 1859.17186 + dps: 1803.2488 + tps: 1844.21681 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1946.15454 - tps: 1988.63545 + dps: 1930.1908 + tps: 1972.59307 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 2298.7397 - tps: 2341.45847 + dps: 2295.4338 + tps: 2338.21122 } } dps_results: { key: "TestExodin-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1616.26797 - tps: 1657.95224 + dps: 1615.59858 + tps: 1657.18019 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Average-Default" value: { - dps: 4785.80969 - tps: 4824.15998 + dps: 4781.13395 + tps: 4819.53813 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4180.68455 - tps: 4797.58275 + dps: 4305.07151 + tps: 4949.33625 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1455.78066 - tps: 1488.30686 + dps: 1449.19655 + tps: 1481.75331 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1572.30179 - tps: 1611.0393 + dps: 1565.19655 + tps: 1604.14129 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1251.29825 - tps: 1618.51702 + dps: 1240.37406 + tps: 1607.77768 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 508.71292 - tps: 527.03761 + dps: 506.72977 + tps: 525.04177 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 709.87353 - tps: 734.11658 + dps: 701.83638 + tps: 725.91907 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4265.83821 - tps: 4885.55576 + dps: 4302.96975 + tps: 4949.69529 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1462.27463 - tps: 1494.9082 + dps: 1453.44493 + tps: 1486.01117 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1580.21116 - tps: 1619.17379 + dps: 1568.23298 + tps: 1607.40363 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1250.81769 - tps: 1618.05922 + dps: 1259.08511 + tps: 1627.67873 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 507.39812 - tps: 525.75322 + dps: 509.17814 + tps: 527.5883 } } dps_results: { key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 707.25382 - tps: 731.26162 + dps: 699.68307 + tps: 723.67344 } } dps_results: { key: "TestExodin-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3942.90338 - tps: 3984.98153 + dps: 3952.47044 + tps: 3994.67149 } } diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results index dc7479e572..9f9b5aa4be 100644 --- a/sim/paladin/retribution/TestRetribution.results +++ b/sim/paladin/retribution/TestRetribution.results @@ -295,12 +295,12 @@ character_stats_results: { stat_weights_results: { key: "TestRetribution-Phase1-Lvl25-StatWeights-Default" value: { - weights: 0.45448 - weights: 0.27056 + weights: 0.45743 + weights: 0.2657 weights: 0 weights: 0 weights: 0 - weights: 0.13776 + weights: 0.13798 weights: 0 weights: 0 weights: 0 @@ -308,13 +308,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.21068 + weights: 0.52882 weights: 0 weights: 0 weights: 0 - weights: 0.20658 - weights: 1.69537 - weights: 2.19509 + weights: 0.20792 + weights: 1.61792 + weights: 2.24632 weights: 0 weights: 0 weights: 0 @@ -344,8 +344,8 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.66441 - weights: 0.56707 + weights: 0.66443 + weights: 0.55502 weights: 0 weights: 0 weights: 0 @@ -357,13 +357,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.00648 + weights: 1.99628 weights: 0.07348 weights: 0 weights: 0 - weights: 0.302 - weights: 5.38824 - weights: 5.2359 + weights: 0.30201 + weights: 5.41004 + weights: 5.22083 weights: 0 weights: 0 weights: 0 @@ -393,12 +393,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase3-Lvl50-StatWeights-Default" value: { - weights: 1.08273 - weights: 0.20907 + weights: 1.10196 + weights: 0.31155 weights: 0 weights: 0 weights: 0 - weights: 0.27632 + weights: 0.2761 weights: 0 weights: 0 weights: 0 @@ -406,13 +406,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.06189 - weights: 0.65055 + weights: 3.22561 + weights: 0.65278 weights: 0 weights: 0 - weights: 0.42483 - weights: 13.31632 - weights: 8.58759 + weights: 0.42474 + weights: 13.50601 + weights: 8.77132 weights: 0 weights: 0 weights: 0 @@ -442,12 +442,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase4-Lvl60-StatWeights-Default" value: { - weights: 2.6423 - weights: 1.88901 + weights: 2.63099 + weights: 1.52041 weights: 0 weights: 0 weights: 0 - weights: 0.41079 + weights: 0.41216 weights: 0 weights: 0 weights: 0 @@ -455,13 +455,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 3.98879 - weights: 0.84267 + weights: 6.43455 + weights: 0.82563 weights: 0 weights: 0 - weights: 0.94944 - weights: 1.56475 - weights: 31.37844 + weights: 0.94538 + weights: 2.29903 + weights: 28.74367 weights: 0 weights: 0 weights: 0 @@ -491,12 +491,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase5-Lvl60-StatWeights-Default" value: { - weights: 3.28689 - weights: 2.83268 + weights: 2.92361 + weights: 3.22953 weights: 0 weights: 0 weights: 0 - weights: 0.28205 + weights: 0.28173 weights: 0 weights: 0 weights: 0 @@ -504,13 +504,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 4.41697 - weights: 0.456 + weights: 4.7071 + weights: 0.48413 weights: 0 weights: 0 - weights: 1.14563 - weights: 2.67906 - weights: 41.20888 + weights: 1.19739 + weights: 2.22821 + weights: 41.32741 weights: 0 weights: 0 weights: 0 @@ -540,12 +540,12 @@ stat_weights_results: { stat_weights_results: { key: "TestRetribution-Phase6-Lvl60-StatWeights-Default" value: { - weights: 3.53901 - weights: 3.13661 + weights: 3.65187 + weights: 3.48875 weights: 0 weights: 0 weights: 0 - weights: 0.29337 + weights: 0.29294 weights: 0 weights: 0 weights: 0 @@ -553,13 +553,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.85356 - weights: 0.36737 + weights: 3.48682 + weights: 0.48623 weights: 0 weights: 0 - weights: 1.27354 - weights: 2.75881 - weights: 48.1001 + weights: 1.30399 + weights: 2.43134 + weights: 47.08153 weights: 0 weights: 0 weights: 0 @@ -589,387 +589,387 @@ stat_weights_results: { dps_results: { key: "TestRetribution-Phase1-Lvl25-AllItems-SoulforgeArmor" value: { - dps: 196.34485 - tps: 198.08435 + dps: 197.02287 + tps: 198.76238 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Average-Default" value: { - dps: 250.06189 - tps: 256.87542 + dps: 250.87971 + tps: 257.69325 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1-ret-P1 Seal of Command Ret-p1-ret-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 167.50332 - tps: 306.6883 + dps: 173.34129 + tps: 312.52627 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1-ret-P1 Seal of Command Ret-p1-ret-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 93.30431 - tps: 100.26355 + dps: 93.46496 + tps: 100.42421 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1-ret-P1 Seal of Command Ret-p1-ret-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 107.1902 - tps: 116.24559 + dps: 107.3861 + tps: 116.44149 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1-ret-P1 Seal of Command Ret-p1-ret-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 101.60732 - tps: 206.79361 + dps: 100.03318 + tps: 205.21947 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1-ret-P1 Seal of Command Ret-p1-ret-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 52.72011 - tps: 57.97942 + dps: 52.75273 + tps: 58.01204 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Dwarf-p1-ret-P1 Seal of Command Ret-p1-ret-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 65.53939 - tps: 73.52817 + dps: 65.63786 + tps: 73.62664 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1-ret-P1 Seal of Command Ret-p1-ret-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 169.62065 - tps: 309.87873 + dps: 174.76701 + tps: 315.0251 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1-ret-P1 Seal of Command Ret-p1-ret-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 94.08671 - tps: 101.09961 + dps: 94.19169 + tps: 101.2046 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1-ret-P1 Seal of Command Ret-p1-ret-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 107.77021 - tps: 116.88029 + dps: 107.96478 + tps: 117.07486 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1-ret-P1 Seal of Command Ret-p1-ret-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 100.04509 - tps: 206.33357 + dps: 101.044 + tps: 207.33249 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1-ret-P1 Seal of Command Ret-p1-ret-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 53.07122 - tps: 58.38564 + dps: 53.15204 + tps: 58.46646 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-Settings-Human-p1-ret-P1 Seal of Command Ret-p1-ret-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 65.6961 - tps: 73.7386 + dps: 65.79355 + tps: 73.83604 } } dps_results: { key: "TestRetribution-Phase1-Lvl25-SwitchInFrontOfTarget-Default" value: { - dps: 233.26457 - tps: 240.27747 + dps: 233.87474 + tps: 240.88764 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-AllItems-SoulforgeArmor" value: { - dps: 327.96797 - tps: 335.78814 + dps: 328.20514 + tps: 336.0253 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Average-Default" value: { - dps: 549.5002 - tps: 563.00792 + dps: 549.58169 + tps: 563.08933 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2-retsoc-P2 Seal of Command Ret-p2-ret-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 628.08742 - tps: 866.95301 + dps: 639.68813 + tps: 884.34206 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2-retsoc-P2 Seal of Command Ret-p2-ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 252.5173 - tps: 264.37486 + dps: 252.49193 + tps: 264.3466 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2-retsoc-P2 Seal of Command Ret-p2-ret-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 278.09302 - tps: 289.72752 + dps: 277.75908 + tps: 289.37984 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2-retsoc-P2 Seal of Command Ret-p2-ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 340.00347 - tps: 499.34826 + dps: 345.71291 + tps: 507.41928 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2-retsoc-P2 Seal of Command Ret-p2-ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 132.50544 - tps: 140.5143 + dps: 132.55421 + tps: 140.56308 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2-retsoc-P2 Seal of Command Ret-p2-ret-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 168.17501 - tps: 178.8672 + dps: 167.98002 + tps: 178.67222 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2-retsoc-P2 Seal of Command Ret-p2-ret-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 625.04469 - tps: 860.45991 + dps: 638.02846 + tps: 882.76786 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2-retsoc-P2 Seal of Command Ret-p2-ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 252.31432 - tps: 264.11661 + dps: 252.42316 + tps: 264.22655 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2-retsoc-P2 Seal of Command Ret-p2-ret-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 278.43796 - tps: 290.09169 + dps: 277.87789 + tps: 289.50411 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2-retsoc-P2 Seal of Command Ret-p2-ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 341.58889 - tps: 502.32659 + dps: 344.60871 + tps: 505.84268 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2-retsoc-P2 Seal of Command Ret-p2-ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 132.86859 - tps: 140.91948 + dps: 132.90998 + tps: 140.96086 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2-retsoc-P2 Seal of Command Ret-p2-ret-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 168.35699 - tps: 179.10516 + dps: 168.13402 + tps: 178.88218 } } dps_results: { key: "TestRetribution-Phase2-Lvl40-SwitchInFrontOfTarget-Default" value: { - dps: 519.2567 - tps: 532.69451 + dps: 519.25717 + tps: 532.69222 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-AllItems-SoulforgeArmor" value: { - dps: 785.10433 - tps: 819.89447 - hps: 10.05923 + dps: 785.13506 + tps: 819.88014 + hps: 10.09421 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Average-Default" value: { - dps: 1228.70721 - tps: 1270.1512 - hps: 11.13991 + dps: 1228.71011 + tps: 1270.15302 + hps: 11.11189 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2746.69913 - tps: 3292.61718 - hps: 7.75205 + dps: 2805.79055 + tps: 3372.42699 + hps: 7.90615 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 494.35653 - tps: 522.49838 - hps: 6.28433 + dps: 492.29866 + tps: 520.4145 + hps: 6.15864 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 587.99078 - tps: 621.59445 - hps: 5.80629 + dps: 586.54284 + tps: 620.14652 + hps: 5.68607 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1060.64567 - tps: 1333.33467 - hps: 4.21333 + dps: 1068.51808 + tps: 1341.00663 + hps: 4.09333 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 206.84917 - tps: 220.50513 - hps: 3.17867 + dps: 206.63498 + tps: 220.29094 + hps: 3.19067 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 287.20845 - tps: 305.17488 - hps: 4.15333 + dps: 286.27225 + tps: 304.23867 + hps: 4.07333 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-FullBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 2740.74308 - tps: 3287.48466 - hps: 7.91024 + dps: 2816.4111 + tps: 3383.54414 + hps: 7.95469 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-FullBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 496.57506 - tps: 524.95742 - hps: 6.48187 + dps: 497.46675 + tps: 525.81667 + hps: 6.4305 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-FullBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 585.72219 - tps: 618.70201 - hps: 5.91416 + dps: 584.09862 + tps: 617.07845 + hps: 5.73929 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-NoBuffs-P3-Consumes-LongMultiTarget" value: { - dps: 1076.61969 - tps: 1350.6701 - hps: 4.15733 + dps: 1080.12766 + tps: 1354.45688 + hps: 4.22 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-NoBuffs-P3-Consumes-LongSingleTarget" value: { - dps: 209.03743 - tps: 222.73005 - hps: 3.24667 + dps: 209.02976 + tps: 222.72238 + hps: 3.24267 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3-retsom-P3 Seal of Martyrdom Ret-p3-ret-NoBuffs-P3-Consumes-ShortSingleTarget" value: { - dps: 288.11126 - tps: 306.13987 - hps: 4.12 + dps: 287.78011 + tps: 305.80872 + hps: 4.03333 } } dps_results: { key: "TestRetribution-Phase3-Lvl50-SwitchInFrontOfTarget-Default" value: { - dps: 1162.05591 - tps: 1202.88932 - hps: 11.21611 + dps: 1161.27 + tps: 1202.10023 + hps: 11.1026 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1767.82755 - tps: 1806.92123 + dps: 1769.56873 + tps: 1808.64849 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1765.43156 - tps: 1804.77246 + dps: 1761.01321 + tps: 1799.97952 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1870.91212 - tps: 1911.07409 + dps: 1869.47892 + tps: 1909.43739 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 2361.9986 - tps: 2413.35374 + dps: 2375.22718 + tps: 2426.33569 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1626.2051 - tps: 1665.31471 + dps: 1639.08702 + tps: 1678.35455 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Average-Default" value: { - dps: 3856.6274 - tps: 3905.89499 + dps: 3849.77549 + tps: 3899.08785 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 512.85392 - tps: 942.21086 + dps: 522.83562 + tps: 953.74232 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 334.66551 - tps: 356.13336 + dps: 339.9031 + tps: 361.45335 } } dps_results: { @@ -981,22 +981,22 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 337.96805 - tps: 673.26045 + dps: 335.99558 + tps: 671.28799 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 218.42316 - tps: 235.18778 + dps: 218.08835 + tps: 234.85297 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 78.84095 - tps: 97.19596 + dps: 75.61656 + tps: 93.97157 } } dps_results: { @@ -1043,43 +1043,43 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3379.21288 - tps: 3943.91705 + dps: 3454.26482 + tps: 4036.86602 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1260.0735 - tps: 1289.16582 + dps: 1260.65451 + tps: 1290.01874 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1466.22432 - tps: 1499.58392 + dps: 1438.38981 + tps: 1471.74941 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 1003.70529 - tps: 1375.20597 + dps: 996.62936 + tps: 1367.92112 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 438.86687 - tps: 457.42102 + dps: 436.73141 + tps: 455.28556 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 605.17233 - tps: 628.61153 + dps: 598.03762 + tps: 621.47682 } } dps_results: { @@ -1127,15 +1127,15 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 540.17975 - tps: 971.95972 + dps: 545.13494 + tps: 977.70158 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 344.52826 - tps: 366.13692 + dps: 346.97381 + tps: 368.59498 } } dps_results: { @@ -1147,22 +1147,22 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 335.49714 - tps: 671.27797 + dps: 337.13246 + tps: 672.91328 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 221.2978 - tps: 238.07621 + dps: 221.12097 + tps: 237.89938 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 80.09472 - tps: 98.46848 + dps: 76.22686 + tps: 94.60062 } } dps_results: { @@ -1209,43 +1209,43 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 3440.43559 - tps: 4007.29047 + dps: 3507.49105 + tps: 4093.68793 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 1261.50134 - tps: 1290.48506 + dps: 1265.0267 + tps: 1294.32894 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 1466.99833 - tps: 1500.43035 + dps: 1439.28134 + tps: 1472.71335 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 982.58038 - tps: 1355.00339 + dps: 986.1775 + tps: 1358.60051 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 438.34693 - tps: 456.99961 + dps: 435.11827 + tps: 453.77095 } } dps_results: { key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 612.7326 - tps: 636.21899 + dps: 605.57642 + tps: 629.06281 } } dps_results: { @@ -1293,50 +1293,50 @@ dps_results: { dps_results: { key: "TestRetribution-Phase4-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3163.42333 - tps: 3212.64175 + dps: 3138.26637 + tps: 3186.88688 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 2286.84207 - tps: 2311.60726 + dps: 2274.32745 + tps: 2298.99125 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 2286.84207 - tps: 2311.97467 + dps: 2274.32745 + tps: 2299.36081 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 2429.64825 - tps: 2455.52518 + dps: 2416.44652 + tps: 2442.22488 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 3662.54713 - tps: 3695.8091 + dps: 3634.85377 + tps: 3667.88281 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 2088.53122 - tps: 2112.00891 + dps: 2081.40991 + tps: 2104.87454 } } dps_results: { key: "TestRetribution-Phase5-Lvl60-Average-Default" value: { - dps: 5024.40309 - tps: 5071.10721 + dps: 5010.21305 + tps: 5056.87459 } } dps_results: { @@ -1424,56 +1424,56 @@ dps_results: { dps_results: { key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 4116.41785 - tps: 4162.00243 + dps: 4127.49544 + tps: 4173.37691 } } dps_results: { key: "TestRetribution-Phase6-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 2589.15069 - tps: 2612.35335 + dps: 2585.47879 + tps: 2608.76673 dtps: 2.05168 } } dps_results: { key: "TestRetribution-Phase6-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 2589.15069 - tps: 2612.66851 + dps: 2585.47879 + tps: 2609.08006 dtps: 2.05168 } } dps_results: { key: "TestRetribution-Phase6-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 2740.94227 - tps: 2765.02034 + dps: 2737.05022 + tps: 2761.20648 dtps: 2.05168 } } dps_results: { key: "TestRetribution-Phase6-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 3301.12059 - tps: 3326.71661 + dps: 3306.06781 + tps: 3331.63422 dtps: 2.1173 } } dps_results: { key: "TestRetribution-Phase6-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 2370.84011 - tps: 2392.83655 + dps: 2364.07138 + tps: 2386.0422 dtps: 1.94844 } } dps_results: { key: "TestRetribution-Phase6-Lvl60-Average-Default" value: { - dps: 5874.96939 - tps: 5921.93681 - dtps: 2.25472 + dps: 5859.82134 + tps: 5906.70523 + dtps: 2.25042 } } dps_results: { @@ -1563,8 +1563,8 @@ dps_results: { dps_results: { key: "TestRetribution-Phase6-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 5353.95431 - tps: 5400.14237 + dps: 5341.52105 + tps: 5387.81589 dtps: 2.05992 } } diff --git a/sim/paladin/retribution/TestSealStacking.results b/sim/paladin/retribution/TestSealStacking.results index ba7934f518..16932e04c5 100644 --- a/sim/paladin/retribution/TestSealStacking.results +++ b/sim/paladin/retribution/TestSealStacking.results @@ -50,12 +50,12 @@ character_stats_results: { stat_weights_results: { key: "TestSealStacking-Phase5-Lvl60-StatWeights-Default" value: { - weights: 3.1285 - weights: 2.24239 + weights: 3.12288 + weights: 2.65026 weights: 0 weights: 0 weights: 0 - weights: 0.52713 + weights: 0.52673 weights: 0 weights: 0 weights: 0 @@ -63,13 +63,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 9.34467 - weights: 0.84399 + weights: 8.49367 + weights: 0.94172 weights: 0 weights: 0 - weights: 1.12415 + weights: 1.12213 weights: 0 - weights: 33.692 + weights: 35.20872 weights: 0 weights: 0 weights: 0 @@ -99,133 +99,133 @@ stat_weights_results: { dps_results: { key: "TestSealStacking-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1723.29999 - tps: 1762.09338 + dps: 1730.5273 + tps: 1769.44432 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1736.69631 - tps: 1776.14093 + dps: 1744.39943 + tps: 1784.05372 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1823.82412 - tps: 1863.43107 + dps: 1818.60656 + tps: 1858.36235 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 2582.89785 - tps: 2637.90446 + dps: 2588.27786 + tps: 2643.05604 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1561.08057 - tps: 1599.4539 + dps: 1559.68508 + tps: 1598.02393 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Average-Default" value: { - dps: 4780.6579 - tps: 4828.47348 + dps: 4772.06838 + tps: 4819.65134 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 4917.25664 - tps: 5557.02804 + dps: 4979.58378 + tps: 5648.28194 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1737.33604 - tps: 1770.72247 + dps: 1739.66458 + tps: 1773.13073 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1839.79402 - tps: 1880.0033 + dps: 1837.53949 + tps: 1877.82252 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1282.59554 - tps: 1656.09553 + dps: 1245.34484 + tps: 1619.03875 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 528.96189 - tps: 547.66598 + dps: 526.77242 + tps: 545.47651 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 795.82159 - tps: 820.70118 + dps: 790.67853 + tps: 815.55812 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 5024.7911 - tps: 5668.66388 + dps: 5034.25872 + tps: 5705.36505 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1752.72434 - tps: 1786.2025 + dps: 1755.53536 + tps: 1789.10316 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 1854.33866 - tps: 1894.65158 + dps: 1850.06091 + tps: 1890.44759 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 1305.09317 - tps: 1679.44533 + dps: 1287.02616 + tps: 1661.96382 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 532.44923 - tps: 551.17659 + dps: 536.61869 + tps: 555.34606 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 793.94646 - tps: 818.83976 + dps: 791.98425 + tps: 816.87755 } } dps_results: { key: "TestSealStacking-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3871.34575 - tps: 3920.72381 + dps: 3865.28576 + tps: 3914.71013 } } diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results index 1bedeeda9e..9e4dc5fbf2 100644 --- a/sim/paladin/retribution/TestShockadin.results +++ b/sim/paladin/retribution/TestShockadin.results @@ -99,12 +99,12 @@ character_stats_results: { stat_weights_results: { key: "TestShockadin-Phase2-Lvl40-StatWeights-Default" value: { - weights: 0.77274 - weights: 0.33427 + weights: 0.77276 + weights: 0.33411 weights: 0 weights: 0 weights: 0 - weights: 0.18458 + weights: 0.18461 weights: 0 weights: 0 weights: 0 @@ -112,13 +112,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 1.66629 - weights: 0.16154 + weights: 1.67452 + weights: 0.16217 weights: 0 weights: 0 - weights: 0.31931 - weights: 5.67996 - weights: 4.93287 + weights: 0.31932 + weights: 5.68179 + weights: 4.93863 weights: 0 weights: 0 weights: 0 @@ -148,12 +148,12 @@ stat_weights_results: { stat_weights_results: { key: "TestShockadin-Phase5-Lvl60-StatWeights-Default" value: { - weights: 0.51264 - weights: 0.50408 + weights: 0.51274 + weights: 0.42135 weights: 0 weights: 0 weights: 0 - weights: 1.44786 + weights: 1.44834 weights: 0 weights: 0 weights: 0 @@ -161,13 +161,13 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 2.44674 - weights: 9.09872 + weights: 2.49615 + weights: 9.5081 weights: 0 weights: 0 - weights: 0.18421 - weights: 7.44886 - weights: 21.17216 + weights: 0.18424 + weights: 7.92223 + weights: 22.70916 weights: 0 weights: 0 weights: 0 @@ -197,99 +197,99 @@ stat_weights_results: { dps_results: { key: "TestShockadin-Phase2-Lvl40-AllItems-SoulforgeArmor" value: { - dps: 423.02732 - tps: 444.993 + dps: 422.58165 + tps: 444.50302 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Average-Default" value: { - dps: 546.16947 - tps: 570.68707 + dps: 546.17257 + tps: 570.69014 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 839.03321 - tps: 1117.4187 + dps: 848.31067 + tps: 1126.1909 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 184.79518 - tps: 198.68546 + dps: 183.16668 + tps: 197.03445 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 221.04753 - tps: 236.83925 + dps: 220.25101 + tps: 236.02898 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 395.28289 - tps: 580.24982 + dps: 395.41583 + tps: 580.38276 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 102.95064 - tps: 112.19899 + dps: 102.97521 + tps: 112.22355 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 140.46145 - tps: 151.3632 + dps: 140.70289 + tps: 151.60464 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-FullBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 861.099 - tps: 1139.92474 + dps: 871.0247 + tps: 1148.72829 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-FullBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 184.52332 - tps: 198.46461 + dps: 183.12305 + tps: 197.01566 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-FullBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 223.47804 - tps: 239.2978 + dps: 222.27603 + tps: 238.08204 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-NoBuffs-P2-Consumes-LongMultiTarget" value: { - dps: 402.93784 - tps: 589.10123 + dps: 402.91478 + tps: 589.07816 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-NoBuffs-P2-Consumes-LongSingleTarget" value: { - dps: 103.29759 - tps: 112.60576 + dps: 103.30995 + tps: 112.61812 } } dps_results: { key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2-retsom-P2 Seal of Martyrdom Shockadin-p2-ret-NoBuffs-P2-Consumes-ShortSingleTarget" value: { - dps: 143.30975 - tps: 154.272 + dps: 143.37153 + tps: 154.33378 } } dps_results: { @@ -302,64 +302,64 @@ dps_results: { dps_results: { key: "TestShockadin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate" value: { - dps: 1937.75204 - tps: 1992.03688 + dps: 1927.17298 + tps: 1981.10358 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate" value: { - dps: 1945.62167 - tps: 1998.88875 + dps: 1951.73849 + tps: 2005.21473 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate" value: { - dps: 1967.21865 - tps: 2019.71208 + dps: 1982.53606 + tps: 2035.74349 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate" value: { - dps: 2896.19097 - tps: 2983.02472 + dps: 2895.94956 + tps: 2982.86214 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-AllItems-SoulforgeArmor" value: { - dps: 1588.86569 - tps: 1628.59778 + dps: 1588.74149 + tps: 1628.42934 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Average-Default" value: { - dps: 4001.70247 - tps: 4086.75764 + dps: 4001.64761 + tps: 4086.69839 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3753.72737 - tps: 4534.88227 + dps: 3748.74467 + tps: 4533.8379 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1632.78555 - tps: 1672.18546 + dps: 1634.33965 + tps: 1673.90448 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2704.58106 - tps: 2776.13017 + dps: 2699.57784 + tps: 2771.10237 } } dps_results: { @@ -386,22 +386,22 @@ dps_results: { dps_results: { key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongMultiTarget" value: { - dps: 3804.49005 - tps: 4602.28495 + dps: 3739.01606 + tps: 4527.70262 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongSingleTarget" value: { - dps: 1657.60359 - tps: 1697.50558 + dps: 1651.94317 + tps: 1691.84025 } } dps_results: { key: "TestShockadin-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" value: { - dps: 2706.69208 - tps: 2777.85952 + dps: 2703.55989 + tps: 2774.70275 } } dps_results: { @@ -428,7 +428,7 @@ dps_results: { dps_results: { key: "TestShockadin-Phase5-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 3773.97992 - tps: 3859.29032 + dps: 3777.81174 + tps: 3863.12507 } } diff --git a/sim/paladin/soc.go b/sim/paladin/soc.go index c5cc73345d..9bc7fc98fa 100644 --- a/sim/paladin/soc.go +++ b/sim/paladin/soc.go @@ -90,7 +90,15 @@ func (paladin *Paladin) registerSealOfCommand() { dummyJudgeLanded := paladin.judgement.CalcOutcome(sim, target, paladin.judgement.OutcomeMagicHit).Landed() outcomeApplier := core.Ternary(dummyJudgeLanded, spell.OutcomeMeleeSpecialCritOnly, spell.OutcomeAlwaysMiss) - spell.CalcAndDealDamage(sim, target, baseDamage, outcomeApplier) + result := spell.CalcDamage(sim, target, baseDamage, outcomeApplier) + + core.StartDelayedAction(sim, core.DelayedActionOptions{ + DoAt: sim.CurrentTime + core.SpellBatchWindow, + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { + spell.DealDamage(sim, result) + }, + }) }, }) @@ -112,6 +120,7 @@ func (paladin *Paladin) registerSealOfCommand() { core.StartDelayedAction(sim, core.DelayedActionOptions{ DoAt: sim.CurrentTime + core.SpellBatchWindow, + Priority: core.ActionPriorityLow, OnAction: func(s *core.Simulation) { spell.DealDamage(sim, result) }, diff --git a/sim/paladin/som.go b/sim/paladin/som.go index a5899fd941..efe6b6fcfb 100644 --- a/sim/paladin/som.go +++ b/sim/paladin/som.go @@ -28,7 +28,15 @@ func (paladin *Paladin) registerSealOfMartyrdom() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { baseDamage := spell.Unit.MHWeaponDamage(sim, spell.MeleeAttackPower()) - spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialCritOnly) + result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialCritOnly) + + core.StartDelayedAction(sim, core.DelayedActionOptions{ + DoAt: sim.CurrentTime + core.SpellBatchWindow, + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { + spell.DealDamage(sim, result) + }, + }) }, }) @@ -44,13 +52,13 @@ func (paladin *Paladin) registerSealOfMartyrdom() { ThreatMultiplier: 1, ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { - baseDamage := spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialHitAndCrit) core.StartDelayedAction(sim, core.DelayedActionOptions{ DoAt: sim.CurrentTime + core.SpellBatchWindow, - OnAction: func(s *core.Simulation) { + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { spell.DealDamage(sim, result) // damages the paladin for 10% of rawDamage, then adds 133% of that for everyone in the raid diff --git a/sim/paladin/sor.go b/sim/paladin/sor.go index 85796cfd3e..da03c6b5b0 100644 --- a/sim/paladin/sor.go +++ b/sim/paladin/sor.go @@ -84,7 +84,15 @@ func (paladin *Paladin) registerSealOfRighteousness() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { baseDamage := sim.Roll(minDamage, maxDamage) * improvedSoR - spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) + result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHitAndCrit) + + core.StartDelayedAction(sim, core.DelayedActionOptions{ + DoAt: sim.CurrentTime + core.SpellBatchWindow, + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { + spell.DealDamage(sim, result) + }, + }) }, }) @@ -114,7 +122,15 @@ func (paladin *Paladin) registerSealOfRighteousness() { ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { // effectively scales with coeff x 2, and damage dealt multipliers affect half the damage taken bonus baseDamage := damage*improvedSoR + spell.BonusCoefficient*(spell.GetBonusDamage()+target.GetSchoolBonusDamageTaken(spell)) - spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialCritOnly) + result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialCritOnly) + + core.StartDelayedAction(sim, core.DelayedActionOptions{ + DoAt: sim.CurrentTime + core.SpellBatchWindow, + Priority: core.ActionPriorityLow, + OnAction: func(sim *core.Simulation) { + spell.DealDamage(sim, result) + }, + }) }, })