mage phase 6 presets

wowsims · Dec 26, 2024 · 7a689ec · 7a689ec
1 parent 4f65ba3
commit 7a689ec
Show file tree

Hide file tree

Showing 7 changed files with 266 additions and 70 deletions.
diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go
@@ -172,6 +172,24 @@ func TestFire(t *testing.T) {
 			Consumes:    Phase5Consumes,
 			SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire},
 
+			ItemFilter:      ItemFilters,
+			EPReferenceStat: proto.Stat_StatSpellPower,
+			StatsToWeigh:    Stats,
+		},
+		{
+			Class:      proto.Class_ClassMage,
+			Phase:      6,
+			Level:      60,
+			Race:       proto.Race_RaceTroll,
+			OtherRaces: []proto.Race{proto.Race_RaceGnome},
+
+			Talents:     Phase6TalentsFire,
+			GearSet:     core.GetGearSet("../../ui/mage/gear_sets", "p6_fire"),
+			Rotation:    core.GetAplRotation("../../ui/mage/apls", "p6_fire"),
+			Buffs:       core.FullBuffsPhase6,
+			Consumes:    Phase6Consumes,
+			SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire},
+
 			ItemFilter:      ItemFilters,
 			EPReferenceStat: proto.Stat_StatSpellPower,
 			StatsToWeigh:    Stats,
@@ -230,6 +248,24 @@ func TestFrost(t *testing.T) {
 			Consumes:    Phase5Consumes,
 			SpecOptions: core.SpecOptionsCombo{Label: "Frost", SpecOptions: PlayerOptionsFrost},
 
+			ItemFilter:      ItemFilters,
+			EPReferenceStat: proto.Stat_StatSpellPower,
+			StatsToWeigh:    Stats,
+		},
+		{
+			Class:      proto.Class_ClassMage,
+			Phase:      6,
+			Level:      60,
+			Race:       proto.Race_RaceTroll,
+			OtherRaces: []proto.Race{proto.Race_RaceGnome},
+
+			Talents:     phase6talentsfrost,
+			GearSet:     core.GetGearSet("../../ui/mage/gear_sets", "p6_frost"),
+			Rotation:    core.GetAplRotation("../../ui/mage/apls", "p6_spellfrost"),
+			Buffs:       core.FullBuffsPhase6,
+			Consumes:    Phase6Consumes,
+			SpecOptions: core.SpecOptionsCombo{Label: "Frost", SpecOptions: PlayerOptionsFrost},
+
 			ItemFilter:      ItemFilters,
 			EPReferenceStat: proto.Stat_StatSpellPower,
 			StatsToWeigh:    Stats,
@@ -255,6 +291,9 @@ var Phase5TalentsArcane = "2500550010031531--2035020310004"
 var Phase5TalentsFire = "21-5052300123033151-203500031"
 var phase5talentsfrost = "250025001002--05350203100351051"
 
+var Phase6TalentsFire = "-0552323121033151-203500031"
+var phase6talentsfrost = "005055001--20350203110351351"
+
 var PlayerOptionsArcane = &proto.Player_Mage{
 	Mage: &proto.Mage{
 		Options: &proto.Mage_Options{
@@ -339,6 +378,19 @@ var Phase5Consumes = core.ConsumesCombo{
 	},
 }
 
+var Phase6Consumes = core.ConsumesCombo{
+	Label: "P6-Consumes",
+	Consumes: &proto.Consumes{
+		DefaultPotion:  proto.Potions_MajorManaPotion,
+		Flask:          proto.Flask_FlaskOfAncientKnowledge,
+		FirePowerBuff:  proto.FirePowerBuff_ElixirOfGreaterFirepower,
+		FrostPowerBuff: proto.FrostPowerBuff_ElixirOfFrostPower,
+		Food:           proto.Food_FoodDarkclawBisque,
+		MainHandImbue:  proto.WeaponImbue_EnchantedRepellent,
+		SpellPowerBuff: proto.SpellPowerBuff_ElixirOfTheMageLord,
+	},
+}
+
 var ItemFilters = core.ItemFilter{
 	WeaponTypes: []proto.WeaponType{
 		proto.WeaponType_WeaponTypeDagger,

diff --git a/ui/mage/apls/p6_fire.apl.json b/ui/mage/apls/p6_fire.apl.json
@@ -0,0 +1,27 @@
+{
+    "type": "TypeAPL",
+    "prepullActions": [
+      {"action":{"castSpell":{"spellId":{"spellId":25306,"rank":12}}},"doAtValue":{"const":{"val":"-3s"}},"hide":true},
+      {"action":{"castSpell":{"spellId":{"spellId":401502}}},"doAtValue":{"const":{"val":"-3s"}},"hide":true},
+      {"action":{"castSpell":{"spellId":{"spellId":428878}}},"doAtValue":{"const":{"val":"-2.5s"}}}
+    ],
+    "priorityList": [
+      {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}},
+      {"action":{"condition":{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},"castSpell":{"spellId":{"spellId":12472}}}},
+      {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456398,"tag":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":456398,"tag":2}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":2139}}}},
+      {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400624}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":400615}}}}},{"auraIsActive":{"auraId":{"spellId":48108,"tag":1}}}]}},{"runeIsEquipped":{"runeId":{"spellId":400615}}}]}},"castSpell":{"spellId":{"spellId":10199,"rank":7}}}},
+      {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":469237}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"move":{"rangeFromTarget":{"const":{"val":"15"}}}},{"castSpell":{"spellId":{"spellId":13021,"rank":5}}}]}}},
+      {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":400613}}}},
+      {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"2"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":10207,"rank":7}}}},
+      {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400624}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":48108}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":11129}}}}}]}},"castSpell":{"spellId":{"spellId":18809,"rank":8}}}},
+      {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":428878}}}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"1"}}}}]}}]}},"castSpell":{"spellId":{"spellId":11129}}}},
+      {"action":{"castSpell":{"spellId":{"spellId":401556}}}},
+      {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":12472}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":26297}}}}}]}},"castSpell":{"spellId":{"itemId":230243}}}},
+      {"action":{"autocastOtherCooldowns":{}}},
+      {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"spellCastTime":{"spellId":{"spellId":428878}}}}}]}}]}},"castSpell":{"spellId":{"spellId":428878}}}},
+      {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":467399}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10151,"rank":11}}}}},{"not":{"val":{"spellInFlight":{"spellId":{"spellId":10151,"rank":11}}}}}]}},"castSpell":{"spellId":{"spellId":10151,"rank":11}}}},
+      {"action":{"castSpell":{"spellId":{"spellId":401502}}}},
+      {"action":{"castSpell":{"spellId":{"spellId":25306,"rank":12}}}},
+      {"action":{"castSpell":{"spellId":{"spellId":10207,"rank":7}}}}
+    ]
+}
diff --git a/ui/mage/apls/p6_spellfrost.apl.json b/ui/mage/apls/p6_spellfrost.apl.json
@@ -0,0 +1,35 @@
+{
+  "type": "TypeAPL",
+  "prepullActions": [
+    {"action":{"castSpell":{"spellId":{"spellId":13033,"rank":4}}},"doAtValue":{"const":{"val":"-4.5s"}}},
+    {"action":{"castSpell":{"spellId":{"spellId":401502}}},"doAtValue":{"const":{"val":"-3s"}}},
+    {"action":{"castSpell":{"spellId":{"spellId":428878}}},"doAtValue":{"const":{"val":"-3s"}}},
+    {"action":{"castSpell":{"spellId":{"spellId":412532}}},"doAtValue":{"const":{"val":"-2.5s"}}},
+    {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}},"doAtValue":{"const":{"val":"-2.5s"}}}
+  ],
+  "priorityList": [
+    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":469238}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":13033,"rank":4}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15s"}}}}]}},"castSpell":{"spellId":{"spellId":13033,"rank":4}}}},
+    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}},
+    {"action":{"castSpell":{"spellId":{"itemId":231282}}}},
+    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":26297}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425121}}}}}]}},"castSpell":{"spellId":{"itemId":230243}}}},
+    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":440802}}}},
+    {"action":{"autocastOtherCooldowns":{}}},
+    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456398,"tag":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":456398,"tag":2}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":2139}}}},
+    {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":400615}}},"castSpell":{"spellId":{"spellId":10199,"rank":7}}}},
+    {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":400647}}},{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":1218345}}},"rhs":{"const":{"val":"3"}}}}]}},"castSpell":{"spellId":{"spellId":400640}}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":428878}}},{"runeIsEquipped":{"runeId":{"spellId":428739}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":428878}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":428878}}},{"runeIsEquipped":{"runeId":{"spellId":400640}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":428878}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":400640}}}]}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":401502}}},{"runeIsEquipped":{"runeId":{"spellId":428739}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":401502}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":401502}}},{"runeIsEquipped":{"runeId":{"spellId":400640}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":401502}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":401502}}},{"castSpell":{"spellId":{"spellId":400640}}}]}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":412532}}},{"runeIsEquipped":{"runeId":{"spellId":428739}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":412532}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":412532}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":412532}}},{"runeIsEquipped":{"runeId":{"spellId":400640}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":412532}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":412532}}},{"castSpell":{"spellId":{"spellId":400640}}}]}}},
+    {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":428739}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":25304,"rank":11}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":10181,"rank":10}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
+    {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":400640}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":25304,"rank":11}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":10181,"rank":10}}},{"castSpell":{"spellId":{"spellId":400640}}}]}}},
+    {"action":{"castSpell":{"spellId":{"spellId":401556}}}},
+    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}},{"or":{"vals":[{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":440802}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":440802}}}}}]}}]}},"castSpell":{"spellId":{"spellId":12472}}}},
+    {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"spellCastTime":{"spellId":{"spellId":428878}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}},
+    {"action":{"castSpell":{"spellId":{"spellId":412532}}}},
+    {"action":{"castSpell":{"spellId":{"spellId":401502}}}},
+    {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}}}
+  ]
+}
diff --git a/ui/mage/gear_sets/p6_fire.gear.json b/ui/mage/gear_sets/p6_fire.gear.json
@@ -0,0 +1,21 @@
+{
+    "items": [
+      {"id":233404,"enchant":7634,"rune":400624},
+      {"id":233620},
+      {"id":233403,"enchant":2605},
+      {"id":233424,"enchant":2463,"rune":400615},
+      {"id":233402,"enchant":7648,"rune":412324},
+      {"id":234114,"enchant":7655,"rune":428878},
+      {"id":233631,"enchant":2616,"rune":400613},
+      {"id":233633,"rune":401502},
+      {"id":233574,"enchant":7634,"rune":425121},
+      {"id":233405,"enchant":7648,"rune":412322},
+      {"id":234032,"rune":442894},
+      {"id":233425,"rune":442895},
+      {"id":230243},
+      {"id":233991},
+      {"id":233423,"enchant":2504},
+      {"id":19311},
+      {"id":233571}
+    ]
+}
diff --git a/ui/mage/gear_sets/p6_frost.gear.json b/ui/mage/gear_sets/p6_frost.gear.json
@@ -0,0 +1,22 @@
+{
+    "items": [
+      {"id":233624,"enchant":7634,"rune":428739},
+      {"id":231324},
+      {"id":231325,"enchant":2605},
+      {"id":233630,"enchant":2463,"rune":440802},
+      {"id":231327,"enchant":7648,"rune":400647},
+      {"id":231326,"enchant":7655,"rune":428741},
+      {"id":233631,"enchant":2615,"rune":400640},
+      {"id":233633,"rune":412532},
+      {"id":234108,"enchant":7634,"rune":425121},
+      {"id":233611,"enchant":7648,"rune":412322},
+      {"id":234463,"rune":442894},
+      {"id":234032,"rune":442895},
+      {"id":231282},
+      {"id":230243},
+      {"id":229972,"enchant":2504},
+      {},
+      {"id":228381}
+    ]
+  }
+