Commit before making another fix in master

wowsims · Jan 6, 2024 · f75c707 · f75c707
1 parent c097de6
commit f75c707
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 1,250 deletions.
diff --git a/sim/shaman/bloodlust.go b/sim/shaman/bloodlust.go
@@ -12,9 +12,6 @@ func (shaman *Shaman) BloodlustActionID() core.ActionID {
 }
 
 func (shaman *Shaman) registerBloodlustCD() {
-	if !shaman.SelfBuffs.Bloodlust && !shaman.IsUsingAPL {
-		return
-	}
 	actionID := shaman.BloodlustActionID()
 
 	blAuras := []*core.Aura{}
@@ -24,7 +21,7 @@ func (shaman *Shaman) registerBloodlustCD() {
 		}
 	}
 
-	bloodlustSpell := shaman.RegisterSpell(core.SpellConfig{
+	shaman.RegisterSpell(core.SpellConfig{
 		ActionID: actionID,
 		Flags:    core.SpellFlagAPL,
 
@@ -72,12 +69,4 @@ func (shaman *Shaman) registerBloodlustCD() {
 			}
 		},
 	})
-
-	if !shaman.IsUsingAPL {
-		shaman.AddMajorCooldown(core.MajorCooldown{
-			Spell:    bloodlustSpell,
-			Priority: core.CooldownPriorityBloodlust,
-			Type:     core.CooldownTypeDPS,
-		})
-	}
 }
diff --git a/sim/shaman/elemental/elemental.go b/sim/shaman/elemental/elemental.go
@@ -32,37 +32,16 @@ func NewElementalShaman(character *core.Character, options *proto.Player) *Eleme
 		Shield:    eleShamOptions.Options.Shield,
 	}
 
-	if eleShamOptions.Rotation.Bloodlust != proto.ElementalShaman_Rotation_UnsetBloodlust {
-		selfBuffs.Bloodlust = eleShamOptions.Rotation.Bloodlust == proto.ElementalShaman_Rotation_UseBloodlust
-	}
-
 	totems := &proto.ShamanTotems{}
 	if eleShamOptions.Options.Totems != nil {
 		totems = eleShamOptions.Options.Totems
 		totems.UseFireMcd = true // Control fire totems as MCD.
 	}
 
-	var rotation Rotation
-
-	switch eleShamOptions.Rotation.Type {
-	case proto.ElementalShaman_Rotation_Adaptive:
-		rotation = NewAdaptiveRotation(eleShamOptions.Rotation)
-	case proto.ElementalShaman_Rotation_Manual:
-		rotation = NewManualRotation(eleShamOptions.Rotation)
-	default:
-		rotation = NewAdaptiveRotation(eleShamOptions.Rotation)
-	}
-
-	inRange := eleShamOptions.Rotation.InThunderstormRange
-	if eleShamOptions.Options.ThunderstormRange != proto.ElementalShaman_Options_UnsetTSRange {
-		inRange = eleShamOptions.Options.ThunderstormRange == proto.ElementalShaman_Options_TSInRange
-	}
+	inRange := eleShamOptions.Options.ThunderstormRange == proto.ElementalShaman_Options_TSInRange
 	ele := &ElementalShaman{
-		Shaman:   shaman.NewShaman(character, options.TalentsString, totems, selfBuffs, inRange),
-		rotation: rotation,
-		has4pT6:  character.HasSetBonus(shaman.ItemSetSkyshatterRegalia, 4),
+		Shaman: shaman.NewShaman(character, options.TalentsString, totems, selfBuffs, inRange),
 	}
-	ele.EnableResumeAfterManaWait(ele.tryUseGCD)
 
 	if mh := ele.GetMHWeapon(); mh != nil {
 		ele.ApplyFlametongueImbueToItem(mh, false)
@@ -90,10 +69,6 @@ func NewElementalShaman(character *core.Character, options *proto.Player) *Eleme
 
 type ElementalShaman struct {
 	*shaman.Shaman
-
-	rotation Rotation
-
-	has4pT6 bool
 }
 
 func (eleShaman *ElementalShaman) GetShaman() *shaman.Shaman {
@@ -102,5 +77,4 @@ func (eleShaman *ElementalShaman) GetShaman() *shaman.Shaman {
 
 func (eleShaman *ElementalShaman) Reset(sim *core.Simulation) {
 	eleShaman.Shaman.Reset(sim)
-	eleShaman.rotation.Reset(eleShaman, sim)
 }
diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go
@@ -113,9 +113,8 @@ var PlayerOptionsAdaptive = &proto.Player_ElementalShaman{
 		Options: &proto.ElementalShaman_Options{
 			Shield:    proto.ShamanShield_WaterShield,
 			Bloodlust: true,
-			Totems:    BasicTotems,
+			Totems:    FireElementalBasicTotems,
 		},
-		Rotation: &proto.ElementalShaman_Rotation{},
 	},
 }
 
@@ -126,7 +125,6 @@ var PlayerOptionsAdaptiveFireElemental = &proto.Player_ElementalShaman{
 			Bloodlust: true,
 			Totems:    FireElementalBasicTotems,
 		},
-		Rotation: &proto.ElementalShaman_Rotation{},
 	},
 }