Merge with master

wowsims · Aug 13, 2023 · b5535fb · b5535fb
2 parents 3ff9bac + 834804a
commit b5535fb
Show file tree

Hide file tree

Showing 25 changed files with 952 additions and 643 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
diff --git a/proto/apl.proto b/proto/apl.proto
@@ -44,6 +44,7 @@ message APLAction {
         // Misc
         APLActionAutocastOtherCooldowns autocast_other_cooldowns = 7;
         APLActionChangeTarget change_target = 9;
+        APLActionActivateAura activate_aura = 13;
         APLActionCancelAura cancel_aura = 10;
         APLActionTriggerICD trigger_icd = 11;
         APLActionWait wait = 4;
@@ -162,6 +163,10 @@ message APLActionCancelAura {
     ActionID aura_id = 1;
 }
 
+message APLActionActivateAura {
+    ActionID aura_id = 1;
+}
+
 message APLActionTriggerICD {
     ActionID aura_id = 1;
 }

diff --git a/proto/ui.proto b/proto/ui.proto
@@ -249,6 +249,7 @@ message SimSettings {
 	bool show_threat_metrics = 4;
 	bool show_healing_metrics = 7;
 	bool show_experimental = 5;
+	bool show_ep_values = 11;
 	string language = 9;
 	Faction faction = 6;
 	DatabaseFilters filters = 10;

diff --git a/sim/core/apl_action.go b/sim/core/apl_action.go
@@ -101,6 +101,8 @@ func (rot *APLRotation) newAPLActionImpl(config *proto.APLAction) APLActionImpl
 		return rot.newActionAutocastOtherCooldowns(config.GetAutocastOtherCooldowns())
 	case *proto.APLAction_ChangeTarget:
 		return rot.newActionChangeTarget(config.GetChangeTarget())
+	case *proto.APLAction_ActivateAura:
+		return rot.newActionActivateAura(config.GetActivateAura())
 	case *proto.APLAction_CancelAura:
 		return rot.newActionCancelAura(config.GetCancelAura())
 	case *proto.APLAction_TriggerIcd:

diff --git a/sim/core/apl_actions_misc.go b/sim/core/apl_actions_misc.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-
 	"github.com/wowsims/wotlk/sim/core/proto"
 )
 
@@ -39,6 +38,11 @@ type APLActionCancelAura struct {
 	aura *Aura
 }
 
+type APLActionActivateAura struct {
+	defaultAPLActionImpl
+	aura *Aura
+}
+
 func (rot *APLRotation) newActionCancelAura(config *proto.APLActionCancelAura) APLActionImpl {
 	aura := rot.aplGetAura(rot.getSourceUnit(&proto.UnitReference{Type: proto.UnitReference_Self}), config.AuraId)
 	if aura.Get() == nil {
@@ -48,6 +52,17 @@ func (rot *APLRotation) newActionCancelAura(config *proto.APLActionCancelAura) A
 		aura: aura.Get(),
 	}
 }
+
+func (rot *APLRotation) newActionActivateAura(config *proto.APLActionActivateAura) APLActionImpl {
+	aura := rot.aplGetAura(rot.getSourceUnit(&proto.UnitReference{Type: proto.UnitReference_Self}), config.AuraId)
+	if aura.Get() == nil {
+		return nil
+	}
+	return &APLActionActivateAura{
+		aura: aura.Get(),
+	}
+}
+
 func (action *APLActionCancelAura) IsReady(sim *Simulation) bool {
 	return action.aura.IsActive()
 }
@@ -61,6 +76,21 @@ func (action *APLActionCancelAura) String() string {
 	return fmt.Sprintf("Cancel Aura(%s)", action.aura.ActionID)
 }
 
+func (action *APLActionActivateAura) IsReady(sim *Simulation) bool {
+	return true
+}
+
+func (action *APLActionActivateAura) Execute(sim *Simulation) {
+	if sim.Log != nil {
+		action.aura.Unit.Log(sim, "Activating aura %s", action.aura.ActionID)
+	}
+	action.aura.Activate(sim)
+}
+
+func (action *APLActionActivateAura) String() string {
+	return fmt.Sprintf("Activate Aura(%s)", action.aura.ActionID)
+}
+
 type APLActionTriggerICD struct {
 	defaultAPLActionImpl
 	aura *Aura

diff --git a/sim/core/aura.go b/sim/core/aura.go
@@ -325,6 +325,9 @@ func (at *auraTracker) GetAura(label string) *Aura {
 	}
 	return nil
 }
+func (at *auraTracker) GetAuras() []*Aura {
+	return at.auras
+}
 func (at *auraTracker) GetAuraByID(actionID ActionID) *Aura {
 	for _, aura := range at.auras {
 		if aura.ActionID.SameAction(actionID) {

diff --git a/sim/core/debuffs.go b/sim/core/debuffs.go
@@ -429,7 +429,7 @@ func GiftOfArthasAura(target *Unit) *Aura {
 func MangleAura(target *Unit) *Aura {
 	return bleedDamageAura(target, Aura{
 		Label:    "Mangle",
-		ActionID: ActionID{SpellID: 33876},
+		ActionID: ActionID{SpellID: 48566},
 		Duration: time.Minute,
 	}, 1.3)
 }

diff --git a/sim/deathknight/deathknight.go b/sim/deathknight/deathknight.go
@@ -305,7 +305,6 @@ func (dk *Deathknight) Initialize() {
 	dk.registerArmyOfTheDeadCD()
 	dk.registerDancingRuneWeaponCD()
 	dk.registerDeathPactSpell()
-
 	dk.registerUnholyFrenzyCD()
 
 	dk.RegisterAura(core.Aura{
@@ -470,6 +469,8 @@ func NewDeathknight(character core.Character, inputs DeathknightInputs, talents
 	}
 
 	dk.RotationSequence = &Sequence{}
+	// done here so enchants that modify stats are applied before stats are calculated
+	dk.registerItems()
 
 	return dk
 }

diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results
@@ -207,13 +207,6 @@ dps_results: {
   tps: 3056.65868
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-DeadlyGladiator'sSigilofStrife-42620"
- value: {
-  dps: 7310.694
-  tps: 3614.97286
- }
-}
 dps_results: {
  key: "TestBlood-AllItems-Death'sChoice-47464"
  value: {
@@ -368,13 +361,6 @@ dps_results: {
   tps: 3595.99061
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-FuriousGladiator'sSigilofStrife-42621"
- value: {
-  dps: 7312.07604
-  tps: 3615.45198
- }
-}
 dps_results: {
  key: "TestBlood-AllItems-FuryoftheFiveFlights-40431"
  value: {
@@ -410,13 +396,6 @@ dps_results: {
   tps: 3551.08226
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-HatefulGladiator'sSigilofStrife-42619"
- value: {
-  dps: 7305.81839
-  tps: 3613.64772
- }
-}
 dps_results: {
  key: "TestBlood-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
@@ -572,13 +551,6 @@ dps_results: {
   tps: 3671.42095
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-RelentlessGladiator'sSigilofStrife-42622"
- value: {
-  dps: 7313.68843
-  tps: 3616.01095
- }
-}
 dps_results: {
  key: "TestBlood-AllItems-RevitalizingSkyflareDiamond"
  value: {
@@ -593,13 +565,6 @@ dps_results: {
   tps: 3475.9395
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-SavageGladiator'sSigilofStrife-42618"
- value: {
-  dps: 7305.58806
-  tps: 3613.52654
- }
-}
 dps_results: {
  key: "TestBlood-AllItems-ScourgeborneBattlegear"
  value: {
@@ -649,55 +614,6 @@ dps_results: {
   tps: 3475.9395
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-SigilofDeflection-45144"
- value: {
-  dps: 7303.78378
-  tps: 3612.57727
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-SigilofHauntedDreams-40715"
- value: {
-  dps: 7331.86443
-  tps: 3628.1546
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-SigilofInsolence-47672"
- value: {
-  dps: 7303.78378
-  tps: 3612.57727
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-SigilofVirulence-47673"
- value: {
-  dps: 7637.06987
-  tps: 3780.59019
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-SigiloftheBoneGryphon-50462"
- value: {
-  dps: 7303.78378
-  tps: 3612.57727
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-SigiloftheHangedMan-50459"
- value: {
-  dps: 7641.29245
-  tps: 3785.73995
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-SigiloftheUnfalteringKnight-40714"
- value: {
-  dps: 7303.78378
-  tps: 3612.57727
- }
-}
 dps_results: {
  key: "TestBlood-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
@@ -894,13 +810,6 @@ dps_results: {
   tps: 3475.9395
  }
 }
-dps_results: {
- key: "TestBlood-AllItems-WrathfulGladiator'sSigilofStrife-51417"
- value: {
-  dps: 7315.53115
-  tps: 3616.64977
- }
-}
 dps_results: {
  key: "TestBlood-Average-Default"
  value: {