Merge pull request #3745 from wowsims/apl

Move ele and enhance shaman to Beta APL
wowsims · Sep 24, 2023 · 3d68865 · 3d68865
2 parents 490fbea + da3d436
commit 3d68865
Show file tree

Hide file tree

Showing 9 changed files with 996 additions and 990 deletions.
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
diff --git a/sim/shaman/elemental/elemental_test.go b/sim/shaman/elemental/elemental_test.go
@@ -26,6 +26,7 @@ func TestElemental(t *testing.T) {
 		OtherSpecOptions: []core.SpecOptionsCombo{
 			{Label: "EleFireElemental", SpecOptions: PlayerOptionsAdaptiveFireElemental},
 		},
+		Rotation: core.RotationCombo{Label: "Default", Rotation: DefaultRotation},
 
 		ItemFilter: core.ItemFilter{
 			WeaponTypes: []proto.WeaponType{
@@ -104,32 +105,25 @@ var FireElementalBasicTotems = &proto.ShamanTotems{
 	UseFireElemental: true,
 }
 
-var eleShamOptionsFireElemental = &proto.ElementalShaman_Options{
-	Shield:    proto.ShamanShield_WaterShield,
-	Bloodlust: true,
-	Totems:    FireElementalBasicTotems,
-}
-
-var eleShamOptions = &proto.ElementalShaman_Options{
-	Shield:    proto.ShamanShield_WaterShield,
-	Bloodlust: true,
-	Totems:    BasicTotems,
-}
 var PlayerOptionsAdaptive = &proto.Player_ElementalShaman{
 	ElementalShaman: &proto.ElementalShaman{
-		Options: eleShamOptions,
-		Rotation: &proto.ElementalShaman_Rotation{
-			Type: proto.ElementalShaman_Rotation_Adaptive,
+		Options: &proto.ElementalShaman_Options{
+			Shield:    proto.ShamanShield_WaterShield,
+			Bloodlust: true,
+			Totems:    BasicTotems,
 		},
+		Rotation: &proto.ElementalShaman_Rotation{},
 	},
 }
 
 var PlayerOptionsAdaptiveFireElemental = &proto.Player_ElementalShaman{
 	ElementalShaman: &proto.ElementalShaman{
-		Options: eleShamOptionsFireElemental,
-		Rotation: &proto.ElementalShaman_Rotation{
-			Type: proto.ElementalShaman_Rotation_Adaptive,
+		Options: &proto.ElementalShaman_Options{
+			Shield:    proto.ShamanShield_WaterShield,
+			Bloodlust: true,
+			Totems:    FireElementalBasicTotems,
 		},
+		Rotation: &proto.ElementalShaman_Rotation{},
 	},
 }
 
@@ -141,90 +135,45 @@ var FullConsumes = &proto.Consumes{
 	DefaultConjured: proto.Conjured_ConjuredDarkRune,
 }
 
+var DefaultRotation = core.APLRotationFromJsonString(`{
+	"type": "TypeAPL",
+	"prepullActions": [
+		{"action":{"castSpell":{"spellId":{"spellId":66842}}},"doAtValue":{"const":{"val":"-3.5s"}}},
+		{"action":{"castSpell":{"spellId":{"spellId":58704}}},"doAtValue":{"const":{"val":"-2s"}}},
+		{"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1s"}}}
+	],
+	"priorityList": [
+        {"action":{"autocastOtherCooldowns":{}}},
+		{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":2825,"tag":-1}}}},
+		{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":2825}}}},
+		{"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":26297}}},{"castSpell":{"spellId":{"spellId":16166}}}]}}},
+		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":26297}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":16166}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":64701}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":26297}}}}}]}},"castSpell":{"spellId":{"spellId":54758}}}},
+		{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":2894}}},{"or":{"vals":[{"auraIsActive":{"auraId":{"itemId":40255}}},{"auraIsActive":{"auraId":{"itemId":40682}}},{"auraIsActive":{"auraId":{"itemId":37660}}},{"auraIsActive":{"auraId":{"itemId":45518}}},{"auraIsActive":{"auraId":{"itemId":54572}}},{"auraIsActive":{"auraId":{"itemId":54588}}},{"auraIsActive":{"auraId":{"itemId":47213}}},{"auraIsActive":{"auraId":{"itemId":45490}}},{"auraIsActive":{"auraId":{"itemId":50348}}},{"auraIsActive":{"auraId":{"itemId":50353}}},{"auraIsActive":{"auraId":{"itemId":50360}}},{"auraIsActive":{"auraId":{"itemId":50365}}},{"auraIsActive":{"auraId":{"itemId":50345}}},{"auraIsActive":{"auraId":{"itemId":50340}}},{"auraIsActive":{"auraId":{"itemId":50398}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":45308}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"itemId":40432}}},"rhs":{"const":{"val":"10"}}}},{"auraIsActive":{"auraId":{"spellId":55637}}}]}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":33697}}},{"castSpell":{"spellId":{"itemId":40212}}},{"castSpell":{"spellId":{"itemId":37873}}},{"castSpell":{"spellId":{"itemId":45148}}},{"castSpell":{"spellId":{"itemId":48724}}},{"castSpell":{"spellId":{"itemId":50357}}},{"castSpell":{"spellId":{"spellId":2894}}}]}}},
+		{"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"totemRemainingTime":{"totemType":"Water"}},"rhs":{"const":{"val":"20s"}}}},"castSpell":{"spellId":{"spellId":66842}}}},
+		{"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":2894}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":58704}}}}}]}},"castSpell":{"spellId":{"spellId":58704}}}},
+		{"action":{"multidot":{"spellId":{"spellId":49233},"maxDots":3,"maxOverlap":{"const":{"val":"0ms"}}}}},
+		{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":49271}}}},
+		{"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"dotRemainingTime":{"spellId":{"spellId":49233}}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":60043}}}},
+		{"action":{"castSpell":{"spellId":{"spellId":49238}}}}
+	]
+}`)
+
 var P1Gear = core.EquipmentSpecFromJsonString(`{"items": [
-	{
-		"id": 40516,
-		"enchant": 3820,
-		"gems": [
-			41285,
-			40027
-		]
-	},
-	{
-		"id": 44661,
-		"gems": [
-			39998
-		]
-	},
-	{
-		"id": 40286,
-		"enchant": 3810
-	},
-	{
-		"id": 44005,
-		"enchant": 3722,
-		"gems": [
-			40027
-		]
-	},
-	{
-		"id": 40514,
-		"enchant": 3832,
-		"gems": [
-			42144,
-			42144
-		]
-	},
-	{
-		"id": 40324,
-		"enchant": 2332,
-		"gems": [
-			42144,
-			0
-		]
-	},
-	{
-		"id": 40302,
-		"enchant": 3246,
-		"gems": [
-			0
-		]
-	},
-	{
-		"id": 40301,
-		"gems": [
-			40014
-		]
-	},
-	{
-		"id": 40560,
-		"enchant": 3721
-	},
-	{
-		"id": 40519,
-		"enchant": 3826
-	},
-	{
-		"id": 37694
-	},
-	{
-		"id": 40399
-	},
-	{
-		"id": 40432
-	},
-	{
-		"id": 40255
-	},
-	{
-		"id": 40395,
-		"enchant": 3834
-	},
-	{
-		"id": 40401,
-		"enchant": 1128
-	},
-	{
-		"id": 40267
-	}
+	{"id":40516,"enchant":3820,"gems":[41285,40027]},
+	{"id":44661,"gems":[39998]},
+	{"id":40286,"enchant":3810},
+	{"id":44005,"enchant":3722,"gems":[40027]},
+	{"id":40514,"enchant":3832,"gems":[42144,42144]},
+	{"id":40324,"enchant":2332,"gems":[42144,0]},
+	{"id":40302,"enchant":3246,"gems":[0]},
+	{"id":40301,"gems":[40014]},
+	{"id":40560,"enchant":3721},
+	{"id":40519,"enchant":3826},
+	{"id":37694},
+	{"id":40399},
+	{"id":40432},
+	{"id":40255},
+	{"id":40395,"enchant":3834},
+	{"id":40401,"enchant":1128},
+	{"id":40267}
 ]}`)