add mage p4 presets (#3771)

* add mage p4 presets * use p3 gear for mage tests * reduce number of DK tests
wowsims · Sep 28, 2023 · 96f09dd · 96f09dd
1 parent 9091cfe
commit 96f09dd
Show file tree

Hide file tree

Showing 12 changed files with 2,609 additions and 3,302 deletions.
diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results
diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results
diff --git a/sim/deathknight/dps/TestFrostUH.results b/sim/deathknight/dps/TestFrostUH.results
diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results
diff --git a/sim/deathknight/dps/dps_deathknight_test.go b/sim/deathknight/dps/dps_deathknight_test.go
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results
diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go
@@ -17,7 +17,7 @@ func TestArcane(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1Arcane", GearSet: P1ArcaneGear},
+		GearSet:     core.GearSetCombo{Label: "P3Arcane", GearSet: P3ArcaneGear},
 		Talents:     ArcaneTalents,
 		Glyphs:      ArcaneGlyphs,
 		Consumes:    FullArcaneConsumes,
@@ -47,7 +47,7 @@ func TestFire(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1Fire", GearSet: P1FireGear},
+		GearSet:     core.GearSetCombo{Label: "P3Fire", GearSet: P3FireGear},
 		Talents:     FireTalents,
 		Glyphs:      FireGlyphs,
 		Consumes:    FullFireConsumes,
@@ -77,7 +77,7 @@ func TestFrostFire(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1FrostFire", GearSet: P1FireGear},
+		GearSet:     core.GearSetCombo{Label: "P3FrostFire", GearSet: P3FireGear},
 		Talents:     FrostFireTalents,
 		Glyphs:      FrostFireGlyphs,
 		Consumes:    FullFireConsumes,
@@ -104,7 +104,7 @@ func TestFrost(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1Frost", GearSet: P1FrostGear},
+		GearSet:     core.GearSetCombo{Label: "P3Frost", GearSet: P3FrostGear},
 		Talents:     FrostTalents,
 		Glyphs:      FrostGlyphs,
 		Consumes:    FullFrostConsumes,
@@ -296,24 +296,24 @@ var FrostAOERotation = core.APLRotationFromJsonString(`{
 	]
 }`)
 
-var P1ArcaneGear = core.EquipmentSpecFromJsonString(`{"items": [
-	{"id":40416,"enchant":3820,"gems":[41285,39998]},
-	{"id":44661,"gems":[40026]},
-	{"id":40419,"enchant":3810,"gems":[40051]},
-	{"id":44005,"enchant":3722,"gems":[40026]},
-	{"id":44002,"enchant":3832,"gems":[39998,39998]},
-	{"id":44008,"enchant":2332,"gems":[39998,0]},
-	{"id":40415,"enchant":3604,"gems":[39998,0]},
-	{"id":40561,"gems":[39998]},
-	{"id":40417,"enchant":3719,"gems":[39998,40051]},
-	{"id":40558,"enchant":3606},
-	{"id":40719},
-	{"id":40399},
-	{"id":39229},
-	{"id":40255},
-	{"id":40396,"enchant":3834},
-	{"id":40273},
-	{"id":39426}
+var P3FireGear = core.EquipmentSpecFromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":54582,"enchant":2332,"gems":[40155,0]},
+        {"id":50722,"enchant":3604,"gems":[40153,40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40153]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40153]},
+        {"id":47188},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
 ]}`)
-var P1FrostGear = P1ArcaneGear
-var P1FireGear = P1ArcaneGear
+var P3FrostGear = P3FireGear
+var P3ArcaneGear = P3FireGear
diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts
@@ -680,6 +680,56 @@ export const FIRE_P3_PRESET_HORDE = {
     ]}`),
 };
 
+export const FIRE_P4_PRESET_ALLIANCE = {
+	name: 'Fire P4 Preset [A]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Alliance,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40152]},
+        {"id":50628,"enchant":3722,"gems":[40152]},
+        {"id":50629,"enchant":3832,"gems":[40113,40133,40155]},
+        {"id":50686,"enchant":2332,"gems":[40133,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
+    ]}`),
+};
+
+export const FIRE_P4_PRESET_HORDE = {
+	name: 'Fire P4 Preset [H]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Horde,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":50651,"enchant":2332,"gems":[40153,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
+    ]}`),
+};
+
 export const FIRE_P3_PRESET_ALLIANCE = {
 	name: 'Fire P3 Preset [A]',
 	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Alliance,
@@ -706,8 +756,6 @@ export const FIRE_P3_PRESET_ALLIANCE = {
 };
 
 
-
-
 export const FFB_P3_PRESET_HORDE = {
 	name: 'FFB P3 Preset [H]',
 	enableWhen: (player: Player<Spec.SpecMage>) => player.getFaction() == Faction.Horde && player.getTalentTree() == 1 && player.getTalents().icyVeins,
@@ -756,4 +804,104 @@ export const FFB_P3_PRESET_ALLIANCE = {
         {"id":47064},
         {"id":45294,"gems":[40155]}
     ]}`),
-};
+};
+
+export const FFB_P4_PRESET_HORDE = {
+	name: 'FFB P4 Preset [H]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getFaction() == Faction.Horde && player.getTalentTree() == 1 && player.getTalents().icyVeins,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40152]},
+        {"id":50628,"enchant":3722,"gems":[40152]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":50651,"enchant":2332,"gems":[40152,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40152]}
+    ]}`),
+};
+
+export const FFB_P4_PRESET_ALLIANCE = {
+	name: 'FFB P4 Preset [A]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getFaction() == Faction.Alliance && player.getTalentTree() == 1 && player.getTalents().icyVeins,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":50686,"enchant":2332,"gems":[40133,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40152]}
+    ]}`),
+};
+
+export const ARCANE_P4_PRESET_HORDE = {
+	name: 'Arcane P4 Preset [H]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 0 && player.getFaction() == Faction.Horde,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":54582,"enchant":2332,"gems":[40155,0]},
+        {"id":50722,"enchant":3604,"gems":[40153,40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40153]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40153]},
+        {"id":47188},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
+    ]}`),
+};
+
+export const ARCANE_P4_PRESET_ALLIANCE = {
+	name: 'Arcane P4 Preset [A]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 0 && player.getFaction() == Faction.Alliance,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":54582,"enchant":2332,"gems":[40155,0]},
+        {"id":50722,"enchant":3604,"gems":[40153,40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40155]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40155]},
+        {"id":47188},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40155]}
+    ]}`),
+};
diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts
@@ -186,6 +186,12 @@ export class MageSimUI extends IndividualSimUI<Spec.SpecMage> {
 					Presets.FIRE_P3_PRESET_HORDE,
 					Presets.FFB_P3_PRESET_ALLIANCE,
 					Presets.FFB_P3_PRESET_HORDE,
+					Presets.FIRE_P4_PRESET_HORDE,
+					Presets.FIRE_P4_PRESET_ALLIANCE,
+					Presets.FFB_P4_PRESET_HORDE,
+					Presets.FFB_P4_PRESET_ALLIANCE,
+					Presets.ARCANE_P4_PRESET_HORDE,
+					Presets.ARCANE_P4_PRESET_ALLIANCE,
 				],
 			},