fixes on buffs and warlock stats

wowsims · Feb 7, 2024 · 0b435b2 · 0b435b2
1 parent 09d02c2
commit 0b435b2
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 81 deletions.
diff --git a/sim/common/sod/item_sets/bfd.go b/sim/common/sod/item_sets/bfd.go
@@ -41,7 +41,6 @@ var ItemSetBlackfathomElementalistHide = core.NewItemSet(core.ItemSet{
 		2: func(agent core.Agent) {
 			c := agent.GetCharacter()
 			c.AddStat(stats.SpellPower, 9)
-			c.AddStat(stats.Healing, 9)
 		},
 		3: func(agent core.Agent) {
 			c := agent.GetCharacter()
@@ -57,7 +56,6 @@ var ItemSetBlackfathomInvokerVestaments = core.NewItemSet(core.ItemSet{
 		2: func(agent core.Agent) {
 			c := agent.GetCharacter()
 			c.AddStat(stats.SpellPower, 9)
-			c.AddStat(stats.Healing, 9)
 		},
 		3: func(agent core.Agent) {
 			c := agent.GetCharacter()

diff --git a/sim/common/sod/melee_items.go b/sim/common/sod/melee_items.go
@@ -153,12 +153,12 @@ func init() {
 			ActionID: core.ActionID{SpellID: 437698},
 			Duration: time.Second * 30,
 			OnGain: func(aura *core.Aura, sim *core.Simulation) {
-				character.AddStatDynamic(sim, stats.MeleeCrit, 10)
-				character.AddStatDynamic(sim, stats.SpellCrit, 10)
+				character.AddStatDynamic(sim, stats.MeleeCrit, 3)
+				character.AddStatDynamic(sim, stats.SpellCrit, 3)
 			},
 			OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-				character.AddStatDynamic(sim, stats.MeleeCrit, -10)
-				character.AddStatDynamic(sim, stats.SpellCrit, -10)
+				character.AddStatDynamic(sim, stats.MeleeCrit, -3)
+				character.AddStatDynamic(sim, stats.SpellCrit, -3)
 			},
 		})
 

diff --git a/sim/core/buffs.go b/sim/core/buffs.go
@@ -59,6 +59,20 @@ var BuffSpellByLevel = map[BuffName]map[int32]stats.Stats{
 			stats.Intellect: 31,
 		},
 	},
+	DivineSpirit: {
+		25: stats.Stats{
+			stats.Spirit: 0,
+		},
+		40: stats.Stats{
+			stats.Spirit: 23,
+		},
+		50: stats.Stats{
+			stats.Spirit: 33,
+		},
+		60: stats.Stats{
+			stats.Spirit: 40,
+		},
+	},
 	AspectOfTheWild: {
 		25: stats.Stats{
 			stats.NatureResistance: 0,

diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
@@ -42,7 +42,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 15
   final_stats: 21
-  final_stats: 31
+  final_stats: 22
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -354,21 +354,21 @@ dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_1-Adaptive-phase_1-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
   dps: 133.59356
-  tps: 377.0183
+  tps: 376.89395
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_1-Adaptive-phase_1-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
   dps: 133.59356
-  tps: 119.14158
+  tps: 119.13536
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_1-Adaptive-phase_1-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
   dps: 132.92251
-  tps: 115.97122
+  tps: 115.96279
  }
 }
 dps_results: {
@@ -395,22 +395,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_1-Adaptive-phase_2-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 159.71519
-  tps: 380.82224
+  dps: 162.44939
+  tps: 382.73332
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_1-Adaptive-phase_2-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 130.96162
-  tps: 114.86933
+  dps: 132.54935
+  tps: 117.17455
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_1-Adaptive-phase_2-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
   dps: 203.33255
-  tps: 176.43947
+  tps: 176.43736
  }
 }
 dps_results: {
@@ -438,21 +438,21 @@ dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_2-Adaptive-phase_1-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
   dps: 185.25115
-  tps: 374.06109
+  tps: 374.10219
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_2-Adaptive-phase_1-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
   dps: 185.25115
-  tps: 160.93977
+  tps: 160.94183
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_2-Adaptive-phase_1-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
   dps: 183.50437
-  tps: 154.81675
+  tps: 154.81464
  }
 }
 dps_results: {
@@ -479,15 +479,15 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_2-Adaptive-phase_2-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 224.14185
-  tps: 435.80259
+  dps: 224.41387
+  tps: 437.09046
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Orc-40-phase_2-Adaptive-phase_2-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 180.85348
-  tps: 155.55937
+  dps: 180.79836
+  tps: 154.84574
  }
 }
 dps_results: {
@@ -690,21 +690,21 @@ dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_1-Adaptive-phase_1-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
   dps: 133.55022
-  tps: 376.55766
+  tps: 375.92273
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_1-Adaptive-phase_1-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
   dps: 133.55022
-  tps: 119.07982
+  tps: 119.04808
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_1-Adaptive-phase_1-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
   dps: 132.81029
-  tps: 115.80682
+  tps: 115.83091
  }
 }
 dps_results: {
@@ -731,22 +731,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_1-Adaptive-phase_2-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 159.59303
-  tps: 378.4211
+  dps: 161.60266
+  tps: 380.78011
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_1-Adaptive-phase_2-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 131.12297
-  tps: 115.25377
+  dps: 134.87784
+  tps: 118.33564
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_1-Adaptive-phase_2-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
-  dps: 203.98888
-  tps: 176.99295
+  dps: 204.28053
+  tps: 177.29624
  }
 }
 dps_results: {
@@ -774,21 +774,21 @@ dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_2-Adaptive-phase_1-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
   dps: 185.25115
-  tps: 374.82432
+  tps: 374.83686
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_2-Adaptive-phase_1-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
   dps: 185.25115
-  tps: 160.97793
+  tps: 160.97856
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_2-Adaptive-phase_1-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
   dps: 183.50437
-  tps: 155.11997
+  tps: 155.11787
  }
 }
 dps_results: {
@@ -815,15 +815,15 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_2-Adaptive-phase_2-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 223.75038
-  tps: 433.91608
+  dps: 223.54043
+  tps: 434.11854
  }
 }
 dps_results: {
  key: "TestElemental-Settings-Troll-40-phase_2-Adaptive-phase_2-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 180.47914
-  tps: 154.35181
+  dps: 179.64553
+  tps: 154.38968
  }
 }
 dps_results: {

diff --git a/sim/warlock/chaos_bolt.go b/sim/warlock/chaos_bolt.go
@@ -31,7 +31,7 @@ func (warlock *Warlock) registerChaosBoltSpell() {
 		Cast: core.CastConfig{
 			DefaultCast: core.Cast{
 				GCD:      core.GCDDefault,
-				CastTime: time.Millisecond*2500 - (time.Millisecond * 100 * time.Duration(warlock.Talents.Bane)),
+				CastTime: time.Millisecond * 2500,
 			},
 			CD: core.Cooldown{
 				Timer:    warlock.NewTimer(),

diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
@@ -99,43 +99,43 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 191.33954
-  tps: 455.52806
+  dps: 186.0561
+  tps: 434.06405
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 191.33954
-  tps: 187.75472
+  dps: 186.0561
+  tps: 181.59205
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
-  dps: 227.39557
-  tps: 207.57761
+  dps: 214.77681
+  tps: 194.08594
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-NoBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 177.33926
-  tps: 486.53338
+  dps: 172.80757
+  tps: 465.91749
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-NoBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 177.33926
-  tps: 180.50671
+  dps: 172.80757
+  tps: 175.19215
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-NoBuffs-Full Consumes-ShortSingleTarget"
  value: {
-  dps: 206.83049
-  tps: 196.56277
+  dps: 204.72309
+  tps: 193.85028
  }
 }
 dps_results: {

diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
@@ -99,43 +99,43 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-FullBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 191.33954
-  tps: 455.52806
+  dps: 186.0561
+  tps: 434.06405
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-FullBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 191.33954
-  tps: 187.75472
+  dps: 186.0561
+  tps: 181.59205
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-FullBuffs-Full Consumes-ShortSingleTarget"
  value: {
-  dps: 227.39557
-  tps: 207.57761
+  dps: 214.77681
+  tps: 194.08594
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-NoBuffs-Full Consumes-LongMultiTarget"
  value: {
-  dps: 177.33926
-  tps: 486.53338
+  dps: 172.80757
+  tps: 465.91749
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-NoBuffs-Full Consumes-LongSingleTarget"
  value: {
-  dps: 177.33926
-  tps: 180.50671
+  dps: 172.80757
+  tps: 175.19215
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-NoBuffs-Full Consumes-ShortSingleTarget"
  value: {
-  dps: 206.83049
-  tps: 196.56277
+  dps: 204.72309
+  tps: 193.85028
  }
 }
 dps_results: {