Merge pull request #3261 from wowsims/apl

Move cooldown delays into apl config
wowsims · Jul 7, 2023 · f3cec49 · f3cec49
2 parents 5b9047c + 7c7fcf2
commit f3cec49
Show file tree

Hide file tree

Showing 7 changed files with 259 additions and 246 deletions.
diff --git a/sim/core/character.go b/sim/core/character.go
@@ -99,6 +99,7 @@ func NewCharacter(party *Party, partyIndex int, player *proto.Player) Character
 			StatDependencyManager: stats.NewStatDependencyManager(),
 
 			DistanceFromTarget: player.DistanceFromTarget,
+			IsUsingAPL:         player.Rotation != nil && player.Rotation.Enabled,
 		},
 
 		Name:  player.Name,
@@ -517,7 +518,7 @@ func (character *Character) FillPlayerStats(playerStats *proto.PlayerStats) {
 	})
 	playerStats.Auras = MapSlice(aplAuras, func(aura *Aura) *proto.AuraStats {
 		return &proto.AuraStats{
-			Id: aura.ActionID.ToProto(),
+			Id:        aura.ActionID.ToProto(),
 			MaxStacks: aura.MaxStacks,
 		}
 	})

diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -110,7 +110,8 @@ type Unit struct {
 	// Must be enabled to use, with "EnableAutoAttacks()".
 	AutoAttacks AutoAttacks
 
-	Rotation *APLRotation
+	IsUsingAPL bool // Used for checks before the finalize() stage, when apl rotations are created.
+	Rotation   *APLRotation
 
 	// Statistics describing the results of the sim.
 	Metrics UnitMetrics