Merge pull request #3741 from wowsims/apl

Move smite priest and all healing sims to Beta APL
wowsims · Sep 23, 2023 · 9084e7d · 9084e7d
2 parents d3641c6 + ac4df00
commit 9084e7d
Show file tree

Hide file tree

Showing 21 changed files with 1,058 additions and 1,570 deletions.
diff --git a/sim/core/dot.go b/sim/core/dot.go
@@ -192,8 +192,8 @@ func (dot *Dot) TickOnce(sim *Simulation) {
 	dot.OnTick(sim, dot.Unit, dot)
 
 	if dot.isChanneled && dot.Spell.Unit.IsUsingAPL {
+		// Note: even if the clip delay is 0ms, need a WaitUntil so that APL is called after the channel aura fully fades.
 		if dot.MaxTicksRemaining() == 0 {
-			// If this was the last tick, wait 0ms to call the APL after the channel aura fully fades.
 			dot.Spell.Unit.WaitUntil(sim, sim.CurrentTime+dot.Spell.Unit.ChannelClipDelay)
 		} else if dot.Spell.Unit.Rotation.shouldInterruptChannel(sim) {
 			dot.Cancel(sim)

diff --git a/sim/druid/restoration/restoration_test.go b/sim/druid/restoration/restoration_test.go
@@ -22,6 +22,7 @@ func TestRestoration(t *testing.T) {
 		Glyphs:      StandardGlyphs,
 		Consumes:    FullConsumes,
 		SpecOptions: core.SpecOptionsCombo{Label: "Standard", SpecOptions: PlayerOptionsStandard},
+		Rotation:    core.RotationCombo{Label: "Default", Rotation: DefaultRotation},
 
 		ItemFilter: core.ItemFilter{
 			WeaponTypes: []proto.WeaponType{
@@ -63,92 +64,29 @@ var PlayerOptionsStandard = &proto.Player_RestorationDruid{
 	},
 }
 
+var DefaultRotation = core.APLRotationFromJsonString(`{
+	"type": "TypeAPL",
+	"priorityList": [
+		{"action":{"autocastOtherCooldowns":{}}}
+	]
+}`)
+
 var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [
-	{
-		"id": 44007,
-		"enchant": 3819,
-		"gems": [
-			41401,
-			40017
-		]
-	},
-	{
-		"id": 40071
-	},
-	{
-		"id": 39719,
-		"enchant": 3809,
-		"gems": [
-			39998
-		]
-	},
-	{
-		"id": 40723,
-		"enchant": 3859
-	},
-	{
-		"id": 44002,
-		"enchant": 3832,
-		"gems": [
-			39998,
-			40026
-		]
-	},
-	{
-		"id": 44008,
-		"enchant": 2332,
-		"gems": [
-			39998,
-			0
-		]
-	},
-	{
-		"id": 40460,
-		"enchant": 3246,
-		"gems": [
-			40017,
-			0
-		]
-	},
-	{
-		"id": 40561,
-		"enchant": 3601,
-		"gems": [
-			39998
-		]
-	},
-	{
-		"id": 40379,
-		"enchant": 3719,
-		"gems": [
-			39998,
-			40017
-		]
-	},
-	{
-		"id": 40558,
-		"enchant": 3606
-	},
-	{
-		"id": 40719
-	},
-	{
-		"id": 40375
-	},
-	{
-		"id": 37111
-	},
-	{
-		"id": 40432
-	},
-	{
-		"id": 40395,
-		"enchant": 3834
-	},
-	{
-		"id": 39766
-	},
-	{
-		"id": 40342
-	}
+	{"id":44007,"enchant":3819,"gems":[41401,40017]},
+	{"id":40071},
+	{"id":39719,"enchant":3809,"gems":[39998]},
+	{"id":40723,"enchant":3859},
+	{"id":44002,"enchant":3832,"gems":[39998,40026]},
+	{"id":44008,"enchant":2332,"gems":[39998,0]},
+	{"id":40460,"enchant":3246,"gems":[40017,0]},
+	{"id":40561,"enchant":3601,"gems":[39998]},
+	{"id":40379,"enchant":3719,"gems":[39998,40017]},
+	{"id":40558,"enchant":3606},
+	{"id":40719},
+	{"id":40375},
+	{"id":37111},
+	{"id":40432},
+	{"id":40395,"enchant":3834},
+	{"id":39766},
+	{"id":40342}
 ]}`)
diff --git a/sim/paladin/holy/holy_test.go b/sim/paladin/holy/holy_test.go
@@ -23,6 +23,7 @@ func TestHoly(t *testing.T) {
 		Glyphs:      StandardGlyphs,
 		Consumes:    FullConsumes,
 		SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: BasicOptions},
+		Rotation:    core.RotationCombo{Label: "Default", Rotation: DefaultRotation},
 
 		IsHealer:        true,
 		InFrontOfTarget: true,
@@ -79,8 +80,6 @@ var StandardGlyphs = &proto.Glyphs{
 	Minor2: int32(proto.PaladinMinorGlyph_GlyphOfSenseUndead),
 }
 
-var defaultProtRotation = &proto.HolyPaladin_Rotation{}
-
 var defaultProtOptions = &proto.HolyPaladin_Options{
 	Judgement: proto.PaladinJudgement_JudgementOfWisdom,
 	Aura:      proto.PaladinAura_DevotionAura,
@@ -89,7 +88,7 @@ var defaultProtOptions = &proto.HolyPaladin_Options{
 var BasicOptions = &proto.Player_HolyPaladin{
 	HolyPaladin: &proto.HolyPaladin{
 		Options:  defaultProtOptions,
-		Rotation: defaultProtRotation,
+		Rotation: &proto.HolyPaladin_Rotation{},
 	},
 }
 
@@ -101,98 +100,29 @@ var FullConsumes = &proto.Consumes{
 	DefaultConjured: proto.Conjured_ConjuredDarkRune,
 }
 
+var DefaultRotation = core.APLRotationFromJsonString(`{
+	"type": "TypeAPL",
+	"priorityList": [
+		{"action":{"autocastOtherCooldowns":{}}}
+	]
+}`)
+
 var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [
-	{
-		"id": 40298,
-		"enchant": 3819,
-		"gems": [
-			41401,
-			40012
-		]
-	},
-	{
-		"id": 44662,
-		"gems": [
-			40012
-		]
-	},
-	{
-		"id": 40573,
-		"enchant": 3809,
-		"gems": [
-			40012
-		]
-	},
-	{
-		"id": 44005,
-		"enchant": 3831,
-		"gems": [
-			40012
-		]
-	},
-	{
-		"id": 40569,
-		"enchant": 3832,
-		"gems": [
-			40012,
-			40012
-		]
-	},
-	{
-		"id": 40332,
-		"enchant": 1119,
-		"gems": [
-			40012,
-			0
-		]
-	},
-	{
-		"id": 40570,
-		"enchant": 3604,
-		"gems": [
-			40012,
-			0
-		]
-	},
-	{
-		"id": 40259,
-		"gems": [
-			40012
-		]
-	},
-	{
-		"id": 40572,
-		"enchant": 3721,
-		"gems": [
-			40027,
-			40012
-		]
-	},
-	{
-		"id": 40592,
-		"enchant": 3606
-	},
-	{
-		"id": 40399
-	},
-	{
-		"id": 40375
-	},
-	{
-		"id": 44255
-	},
-	{
-		"id": 37111
-	},
-	{
-		"id": 40395,
-		"enchant": 2666
-	},
-	{
-		"id": 40401,
-		"enchant": 1128
-	},
-	{
-		"id": 40705
-	}
+	{"id":40298,"enchant":3819,"gems":[41401,40012]},
+	{"id":44662,"gems":[40012]},
+	{"id":40573,"enchant":3809,"gems":[40012]},
+	{"id":44005,"enchant":3831,"gems":[40012]},
+	{"id":40569,"enchant":3832,"gems":[40012,40012]},
+	{"id":40332,"enchant":1119,"gems":[40012,0]},
+	{"id":40570,"enchant":3604,"gems":[40012,0]},
+	{"id":40259,"gems":[40012]},
+	{"id":40572,"enchant":3721,"gems":[40027,40012]},
+	{"id":40592,"enchant":3606},
+	{"id":40399},
+	{"id":40375},
+	{"id":44255},
+	{"id":37111},
+	{"id":40395,"enchant":2666},
+	{"id":40401,"enchant":1128},
+	{"id":40705}
 ]}`)