Buff debuff clean up

wowsims · Dec 3, 2024 · 776c4c9 · 776c4c9
1 parent 04111e8
commit 776c4c9
Show file tree

Hide file tree

Showing 24 changed files with 435 additions and 484 deletions.
diff --git a/sim/core/buffs.go b/sim/core/buffs.go
@@ -1422,7 +1422,8 @@ func BattleShoutAura(unit *Unit, impBattleShout int32, boomingVoicePts int32) *A
 }
 
 func TrueshotAura(unit *Unit) *Aura {
-	rangedAP := 200.0
+	rangedAP := 100.0
+	meleeAP := 100.0
 
 	aura := MakePermanent(unit.RegisterAura(Aura{
 		Label:    "Trueshot Aura",
@@ -1432,7 +1433,8 @@ func TrueshotAura(unit *Unit) *Aura {
 	makeExclusiveBuff(aura, BuffConfig{
 		Category: "TrueshotAura",
 		Stats: []StatConfig{
-			{stats.RangedAttackPower, rangedAP, false},
+			{stats.AttackPower, rangedAP, false},
+			{stats.RangedAttackPower, meleeAP, false},
 		},
 	})
 

diff --git a/sim/core/debuffs.go b/sim/core/debuffs.go
@@ -179,40 +179,13 @@ func applyDebuffEffects(target *Unit, targetIdx int, debuffs *proto.Debuffs, rai
 }
 
 func StormstrikeAura(unit *Unit) *Aura {
-	return exclusiveNatureDamageTakenAura(unit, "Stormstrike", ActionID{SpellID: 17364})
-}
-
-func DreamstateAura(unit *Unit) *Aura {
-	aura := exclusiveNatureDamageTakenAura(unit, "Dreamstate", ActionID{SpellID: 408258})
-	aura.NewExclusiveEffect("ArcaneDamageTaken", false, ExclusiveEffect{
-		Priority: 20,
-		OnGain: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexArcane] *= 1.2
-		},
-		OnExpire: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexArcane] /= 1.2
-		},
-	})
-	return aura
-}
-
-func exclusiveNatureDamageTakenAura(unit *Unit, label string, actionID ActionID) *Aura {
 	aura := unit.GetOrRegisterAura(Aura{
-		Label:    label,
-		ActionID: actionID,
+		Label:    "Stormstrike",
+		ActionID: ActionID{SpellID: 17364},
 		Duration: time.Second * 12,
 	})
 
-	aura.NewExclusiveEffect("NatureDamageTaken", false, ExclusiveEffect{
-		Priority: 20,
-		OnGain: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexNature] *= 1.2
-		},
-		OnExpire: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexNature] /= 1.2
-		},
-	})
-
+	//Needs updating to classic version
 	return aura
 }
 

diff --git a/sim/druid/balance/TestP1Balance.results b/sim/druid/balance/TestP1Balance.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 28.1582
   final_stats: 0
   final_stats: 0
-  final_stats: 1130.5
+  final_stats: 1230.5
   final_stats: 0
   final_stats: 24.595
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 1989.8
-  final_stats: 566
+  final_stats: 466
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -53,18 +53,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.0447
+  weights: 0.03725
   weights: 0
-  weights: 0.59211
+  weights: 0.49343
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.8561
-  weights: 3.03194
+  weights: 3.21342
+  weights: 2.52661
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1Balance-Phase1-Average-Default"
  value: {
-  dps: 276.73234
-  tps: 290.20972
+  dps: 230.68705
+  tps: 244.16444
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 274.9889
-  tps: 517.73713
+  dps: 229.15741
+  tps: 471.90565
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 274.9889
-  tps: 287.12631
+  dps: 229.15741
+  tps: 241.29483
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 264.64341
-  tps: 273.23404
+  dps: 220.53617
+  tps: 229.12681
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 273.10499
-  tps: 540.13513
+  dps: 227.58749
+  tps: 494.61763
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 273.10499
-  tps: 286.45649
+  dps: 227.58749
+  tps: 240.939
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 262.72716
-  tps: 271.34635
+  dps: 218.9393
+  tps: 227.55849
  }
 }
 dps_results: {
@@ -190,7 +190,7 @@ dps_results: {
 dps_results: {
  key: "TestP1Balance-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 274.1419
-  tps: 287.5591
+  dps: 228.50071
+  tps: 241.9179
  }
 }