diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results deleted file mode 100644 index 017e8f275..000000000 --- a/sim/mage/TestArcane.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestArcane-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 172.5 - final_stats: 179.4 - final_stats: 265.8225 - final_stats: 221.95 - final_stats: 220.8 - final_stats: 150 - final_stats: 0 - final_stats: 40 - final_stats: 15 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 0 - final_stats: 24.92876 - final_stats: 0 - final_stats: 0 - final_stats: 792.5 - final_stats: 0 - final_stats: 16.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4688.475 - final_stats: 0 - final_stats: 0 - final_stats: 358.8 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 4148.225 - final_stats: 52 - final_stats: 85 - final_stats: 85 - final_stats: 85 - final_stats: 85 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestArcane-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.28967 - weights: 0 - weights: 0.43631 - weights: 0 - weights: 0.05906 - weights: 0.37724 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 4.93705 - weights: 2.55452 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Average-Default" - value: { - dps: 372.01945 - tps: 386.74766 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 371.0616 - tps: 648.00894 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 371.0616 - tps: 384.90897 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 388.44813 - tps: 404.27494 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 197.61902 - tps: 439.20185 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 197.61902 - tps: 209.69816 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 250.03264 - tps: 265.51076 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 369.74627 - tps: 635.6476 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 369.74627 - tps: 383.04134 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 399.77203 - tps: 416.03702 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 198.01526 - tps: 437.80854 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 198.01526 - tps: 210.00492 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-Settings-Troll-blank-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 253.36293 - tps: 268.84104 - } -} -dps_results: { - key: "TestArcane-Phase5-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 369.60437 - tps: 383.11611 - } -} diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results deleted file mode 100644 index 1899b21a0..000000000 --- a/sim/mage/TestFire.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestFire-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 172.5 - final_stats: 179.4 - final_stats: 265.8225 - final_stats: 221.95 - final_stats: 220.8 - final_stats: 150 - final_stats: 0 - final_stats: 40 - final_stats: 15 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 0 - final_stats: 24.92876 - final_stats: 0 - final_stats: 0 - final_stats: 792.5 - final_stats: 0 - final_stats: 16.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4262.25 - final_stats: 0 - final_stats: 0 - final_stats: 358.8 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 4148.225 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestFire-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.61344 - weights: 0 - weights: 0.30638 - weights: 0 - weights: 0.30638 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 4.0745 - weights: 3.00611 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Average-Default" - value: { - dps: 315.27056 - tps: 237.16454 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 336.04823 - tps: 563.87387 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 336.04823 - tps: 251.66577 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 414.69838 - tps: 302.05805 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 138.88639 - tps: 316.15109 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 138.88639 - tps: 108.167 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 252.45459 - tps: 182.18519 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 306.44466 - tps: 540.41754 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 306.44466 - tps: 230.80658 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 402.4679 - tps: 293.46973 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 134.49457 - tps: 313.10452 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 134.49457 - tps: 105.09412 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-Settings-Troll-blank-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 257.27987 - tps: 185.73789 - } -} -dps_results: { - key: "TestFire-Phase5-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 306.69984 - tps: 230.9943 - } -} diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results deleted file mode 100644 index fbbdfca19..000000000 --- a/sim/mage/TestFrost.results +++ /dev/null @@ -1,196 +0,0 @@ -character_stats_results: { - key: "TestFrost-Phase5-Lvl60-CharacterStats-Default" - value: { - final_stats: 172.5 - final_stats: 179.4 - final_stats: 265.8225 - final_stats: 221.95 - final_stats: 220.8 - final_stats: 150 - final_stats: 0 - final_stats: 40 - final_stats: 15 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 41.25 - final_stats: 0 - final_stats: 24.92876 - final_stats: 0 - final_stats: 0 - final_stats: 792.5 - final_stats: 0 - final_stats: 16.2 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 4262.25 - final_stats: 0 - final_stats: 0 - final_stats: 358.8 - final_stats: 540 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 3.2 - final_stats: 5 - final_stats: 0 - final_stats: 4148.225 - final_stats: 31 - final_stats: 64 - final_stats: 64 - final_stats: 64 - final_stats: 64 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestFrost-Phase5-Lvl60-StatWeights-Default" - value: { - weights: 0 - weights: 0 - weights: 0 - weights: 0.10653 - weights: 0 - weights: 0.46322 - weights: 0 - weights: 0.06157 - weights: 0.40165 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 5.49189 - weights: 2.56205 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Average-Default" - value: { - dps: 392.75219 - tps: 315.3999 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 399.58783 - tps: 587.87827 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 399.58783 - tps: 318.94962 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 400.34254 - tps: 322.31659 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 225.11332 - tps: 404.6202 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 225.11332 - tps: 183.3459 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 268.33572 - tps: 220.57852 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 390.98053 - tps: 580.85367 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 390.98053 - tps: 313.15673 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 396.72646 - tps: 322.21705 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 224.67699 - tps: 406.5577 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 224.67699 - tps: 182.93016 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-Settings-Troll-blank-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 267.36261 - tps: 219.59609 - } -} -dps_results: { - key: "TestFrost-Phase5-Lvl60-SwitchInFrontOfTarget-Default" - value: { - dps: 389.92099 - tps: 313.27487 - } -} diff --git a/sim/mage/TestP1Mage.results b/sim/mage/TestP1Mage.results new file mode 100644 index 000000000..960c03606 --- /dev/null +++ b/sim/mage/TestP1Mage.results @@ -0,0 +1,196 @@ +character_stats_results: { + key: "TestP1Mage-Phase1-Lvl60-CharacterStats-Default" + value: { + final_stats: 172.5 + final_stats: 179.4 + final_stats: 353.1075 + final_stats: 414 + final_stats: 311.65 + final_stats: 173 + final_stats: 0 + final_stats: 40 + final_stats: 15 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 41.25 + final_stats: 0 + final_stats: 28.1552 + final_stats: 0 + final_stats: 0 + final_stats: 792.5 + final_stats: 0 + final_stats: 16.2 + final_stats: 0 + final_stats: 0 + final_stats: 0 + final_stats: 7143 + final_stats: 0 + final_stats: 0 + final_stats: 1049.8 + final_stats: 540 + final_stats: 0 + final_stats: 5 + final_stats: 0 + final_stats: 3.2 + final_stats: 5 + final_stats: 0 + final_stats: 5021.075 + final_stats: 35 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 68 + final_stats: 384 + final_stats: 0 + final_stats: 35 + final_stats: 0 + } +} +stat_weights_results: { + key: "TestP1Mage-Phase1-Lvl60-StatWeights-Default" + value: { + weights: 0 + weights: 0 + weights: 0 + weights: 0.01055 + weights: 0 + weights: 0.13055 + weights: 0 + weights: 0.13055 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0.64435 + weights: 0.5321 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + weights: 0 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Average-Default" + value: { + dps: 54.83156 + tps: 62.0652 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 55.33731 + tps: 167.06291 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 55.33731 + tps: 60.92359 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 52.21493 + tps: 57.57093 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Gnome-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 30.66147 + tps: 212.32815 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Gnome-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 30.66147 + tps: 39.7448 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Gnome-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 29.57362 + tps: 33.03878 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 54.53749 + tps: 184.74762 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 54.53749 + tps: 61.048 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 51.44671 + tps: 58.02596 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Troll-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget" + value: { + dps: 30.54926 + tps: 214.44915 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Troll-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget" + value: { + dps: 30.54926 + tps: 39.74425 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-Settings-Troll-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget" + value: { + dps: 29.45515 + tps: 32.91712 + } +} +dps_results: { + key: "TestP1Mage-Phase1-Lvl60-SwitchInFrontOfTarget-Default" + value: { + dps: 54.63154 + tps: 61.86075 + } +} diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go index 47b9863fd..964413bc5 100644 --- a/sim/mage/mage_test.go +++ b/sim/mage/mage_test.go @@ -12,21 +12,21 @@ func init() { RegisterMage() } -func TestArcane(t *testing.T) { +func TestP1Mage(t *testing.T) { core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ { Class: proto.Class_ClassMage, - Phase: 5, + Phase: 1, Level: 60, Race: proto.Race_RaceTroll, OtherRaces: []proto.Race{proto.Race_RaceGnome}, - Talents: Phase5TalentsArcane, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p5_spellfrost"), + Talents: P1Talents, + GearSet: core.GetGearSet("../../ui/mage/gear_sets", "p0.bis"), + Rotation: core.GetAplRotation("../../ui/mage/apls", "p1"), Buffs: core.FullBuffs, - Consumes: Phase5Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Arcane", SpecOptions: PlayerOptionsArcane}, + Consumes: P1Consumes, + SpecOptions: core.SpecOptionsCombo{Label: "DPS", SpecOptions: PlayerOptions}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatSpellPower, @@ -35,79 +35,9 @@ func TestArcane(t *testing.T) { })) } -func TestFire(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassMage, - Phase: 5, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: Phase5TalentsFire, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p5_fire"), - Buffs: core.FullBuffs, - Consumes: Phase5Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Fire", SpecOptions: PlayerOptionsFire}, - - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - })) -} - -func TestFrost(t *testing.T) { - core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{ - { - Class: proto.Class_ClassMage, - Phase: 5, - Level: 60, - Race: proto.Race_RaceTroll, - OtherRaces: []proto.Race{proto.Race_RaceGnome}, - - Talents: phase5talentsfrost, - GearSet: core.GetGearSet("../../ui/mage/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../ui/mage/apls", "p5_spellfrost"), - Buffs: core.FullBuffs, - Consumes: Phase5Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "Frost", SpecOptions: PlayerOptionsFrost}, +var P1Talents = "-0550320003021-2035020310035105" - ItemFilter: ItemFilters, - EPReferenceStat: proto.Stat_StatSpellPower, - StatsToWeigh: Stats, - }, - })) -} - -var Phase1TalentsArcane = "22500502" -var Phase1TalentsFire = "-5050020121" - -var Phase2TalentsArcane = "2250050310031531" -var Phase2TalentsFire = "-5050020123033151" -var Phase2TalentsFrostfire = Phase2TalentsFire - -var Phase3TalentsFire = "-0550020123033151-2035" -var Phase3TalentsFrost = "-055-20350203100351051" - -var Phase4TalentsArcane = "0550050210031531-054-203500001" -var Phase4TalentsFire = "21-5052300123033151-203500031" -var Phase4TalentsFrost = "-0550320003021-2035020310035105" - -var Phase5TalentsArcane = "2500550010031531--2035020310004" -var Phase5TalentsFire = "21-5052300123033151-203500031" -var phase5talentsfrost = "250025001002--05350203100351051" - -var PlayerOptionsArcane = &proto.Player_Mage{ - Mage: &proto.Mage{ - Options: &proto.Mage_Options{ - Armor: proto.Mage_Options_MageArmor, - }, - }, -} - -var PlayerOptionsFire = &proto.Player_Mage{ +var PlayerOptions = &proto.Player_Mage{ Mage: &proto.Mage{ Options: &proto.Mage_Options{ Armor: proto.Mage_Options_MoltenArmor, @@ -115,16 +45,8 @@ var PlayerOptionsFire = &proto.Player_Mage{ }, } -var PlayerOptionsFrost = &proto.Player_Mage{ - Mage: &proto.Mage{ - Options: &proto.Mage_Options{ - Armor: proto.Mage_Options_IceArmor, - }, - }, -} - -var Phase5Consumes = core.ConsumesCombo{ - Label: "P5-Consumes", +var P1Consumes = core.ConsumesCombo{ + Label: "P1-Consumes", Consumes: &proto.Consumes{ DefaultPotion: proto.Potions_MajorManaPotion, Flask: proto.Flask_FlaskOfSupremePower, diff --git a/ui/mage/apls/p1.apl.json b/ui/mage/apls/p1.apl.json new file mode 100644 index 000000000..e4c9b7842 --- /dev/null +++ b/ui/mage/apls/p1.apl.json @@ -0,0 +1,8 @@ +{ + "type": "TypeAPL", + "prepullActions": [], + "priorityList": [ + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"castSpell":{"spellId":{"spellId":133,"rank":1}}}} + ] +} diff --git a/ui/mage/apls/p1_arcane.apl.json b/ui/mage/apls/p1_arcane.apl.json deleted file mode 100644 index d550cb271..000000000 --- a/ui/mage/apls/p1_arcane.apl.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":400574}}},"doAtValue":{"const":{"val":"-2.5s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":400573}}},"rhs":{"const":{"val":"4"}}}},{"spellIsReady":{"spellId":{"spellId":401556}}}]}},"castSpell":{"spellId":{"spellId":400574}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"castSpell":{"spellId":{"spellId":400574}}}}, - {"hide":true,"action":{"castSpell":{"spellId":{"spellId":5145}}}} - ] -} diff --git a/ui/mage/apls/p1_fire.apl.json b/ui/mage/apls/p1_fire.apl.json deleted file mode 100644 index 65829fe56..000000000 --- a/ui/mage/apls/p1_fire.apl.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":12505}}},"doAtValue":{"const":{"val":"-6s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":2948}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":8400}}}} - ] -} diff --git a/ui/mage/apls/p2_arcane.apl.json b/ui/mage/apls/p2_arcane.apl.json deleted file mode 100644 index 5aa42909e..000000000 --- a/ui/mage/apls/p2_arcane.apl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":400574}}},"doAtValue":{"const":{"val":"-2.5s"}}} - ], - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425124}}}}}]}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":400573}}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"spellIsReady":{"spellId":{"spellId":401556}}},{"spellIsReady":{"spellId":{"spellId":425124}}}]}}]}},"castSpell":{"spellId":{"spellId":400574}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"castSpell":{"spellId":{"spellId":425124}}}}, - {"action":{"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"condition":{"auraIsActiveWithReactionTime":{"auraId":{"spellId":400589}}},"castSpell":{"spellId":{"spellId":8417,"rank":5}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":400573}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":400574}}}}, - {"action":{"castSpell":{"spellId":{"spellId":8417,"rank":5}}}} - ] -} diff --git a/ui/mage/apls/p2_fire.apl.json b/ui/mage/apls/p2_fire.apl.json deleted file mode 100644 index b700d9f3d..000000000 --- a/ui/mage/apls/p2_fire.apl.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":12523,"rank":4}}},"doAtValue":{"const":{"val":"-6s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":8446,"rank":4}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400624}}},{"auraIsActive":{"auraId":{"spellId":48108}}}]}},"castSpell":{"spellId":{"spellId":12523,"rank":4}}}}, - {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":401502}}},"castSpell":{"spellId":{"spellId":401502}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":11129}}},{"auraIsActive":{"auraId":{"spellId":425121}}}]}},"castSpell":{"spellId":{"spellId":8402,"rank":7}}}}, - {"action":{"castSpell":{"spellId":{"spellId":8413,"rank":5}}}}, - {"action":{"castSpell":{"spellId":{"spellId":8446,"rank":4}}}} - ] -} diff --git a/ui/mage/apls/p3_arcane.apl.json b/ui/mage/apls/p3_arcane.apl.json deleted file mode 100644 index 7073167fc..000000000 --- a/ui/mage/apls/p3_arcane.apl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":400574}}},"doAtValue":{"const":{"val":"-2.5s"}}} - ], - "priorityList": [ - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425124}}}}}]}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":400573}}},"rhs":{"const":{"val":"4"}}}},{"or":{"vals":[{"spellIsReady":{"spellId":{"spellId":401556}}},{"spellIsReady":{"spellId":{"spellId":425124}}}]}}]}},"castSpell":{"spellId":{"spellId":400574}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"castSpell":{"spellId":{"spellId":425124}}}}, - {"action":{"castSpell":{"spellId":{"spellId":26297}}}}, - {"action":{"condition":{"auraIsActiveWithReactionTime":{"auraId":{"spellId":400589}}},"castSpell":{"spellId":{"spellId":10211,"rank":6}}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":400573}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":400574}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10211,"rank":6}}}} - ] -} diff --git a/ui/mage/apls/p3_fire.apl.json b/ui/mage/apls/p3_fire.apl.json deleted file mode 100644 index 8a1c3eda3..000000000 --- a/ui/mage/apls/p3_fire.apl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":12525,"rank":6}}},"doAtValue":{"const":{"val":"-6s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":10205,"rank":5}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400624}}},{"auraIsActive":{"auraId":{"spellId":48108}}}]}},"castSpell":{"spellId":{"spellId":12523,"rank":4}}}}, - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"8"}}}},"castSpell":{"spellId":{"spellId":428878}}}}, - {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":401502}}},"castSpell":{"spellId":{"spellId":401502}}}}, - {"action":{"condition":{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":11129}}},{"auraIsActive":{"auraId":{"spellId":425121}}}]}},"castSpell":{"spellId":{"spellId":10149,"rank":9}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10197,"rank":6}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10205,"rank":5}}}} - ] -} diff --git a/ui/mage/apls/p3_frost.apl.json b/ui/mage/apls/p3_frost.apl.json deleted file mode 100644 index b51343d4f..000000000 --- a/ui/mage/apls/p3_frost.apl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":401502}}},"doAtValue":{"const":{"val":"-3s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"hide":true,"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":12472}}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"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}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":412532}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":401502}}}}},{"not":{"val":{"runeIsEquipped":{"runeId":{"spellId":412532}}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":10180,"rank":9}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"hide":true,"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"8"}}}},"castSpell":{"spellId":{"spellId":428878}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401502}}}}, - {"action":{"castSpell":{"spellId":{"spellId":412532}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10180,"rank":9}}}} - ] -} diff --git a/ui/mage/apls/p4_arcane.apl.json b/ui/mage/apls/p4_arcane.apl.json deleted file mode 100644 index 97ae39e3b..000000000 --- a/ui/mage/apls/p4_arcane.apl.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":400574}}},"doAtValue":{"const":{"val":"-2.5s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"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":{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},"castSpell":{"spellId":{"spellId":12472}}}}, - {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":400615}}},"castSpell":{"spellId":{"spellId":10199,"rank":7}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":428878}}}}, - {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":400589}}},"castSpell":{"spellId":{"spellId":10212,"rank":7}}}}, - {"action":{"castSpell":{"spellId":{"spellId":400574}}}} - ] -} diff --git a/ui/mage/apls/p4_fire.apl.json b/ui/mage/apls/p4_fire.apl.json deleted file mode 100644 index 90e0ed652..000000000 --- a/ui/mage/apls/p4_fire.apl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":401502}}},"doAtValue":{"const":{"val":"-3s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":25304,"rank":11}}},"doAtValue":{"const":{"val":"-3s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"castSpell":{"spellId":{"spellId":440802}}}}, - {"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":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"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"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"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}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":25304,"rank":11}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":10207,"rank":7}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425121}}}}}]}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":12472}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401502}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}}} - ] -} diff --git a/ui/mage/apls/p4_frost.apl.json b/ui/mage/apls/p4_frost.apl.json deleted file mode 100644 index 90e0ed652..000000000 --- a/ui/mage/apls/p4_frost.apl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":401502}}},"doAtValue":{"const":{"val":"-3s"}}}, - {"action":{"castSpell":{"spellId":{"spellId":25304,"rank":11}}},"doAtValue":{"const":{"val":"-3s"}}} - ], - "priorityList": [ - {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}}, - {"action":{"castSpell":{"spellId":{"spellId":440802}}}}, - {"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":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"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"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"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}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":25304,"rank":11}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":10207,"rank":7}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425121}}}}}]}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":12472}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401502}}}}, - {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}}} - ] -} diff --git a/ui/mage/apls/p5_fire.apl.json b/ui/mage/apls/p5_fire.apl.json deleted file mode 100644 index cc1d3478b..000000000 --- a/ui/mage/apls/p5_fire.apl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - {"action":{"castSpell":{"spellId":{"spellId":10150,"rank":10}}},"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":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"1"}}}},{"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":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"1"}}}},"castSpell":{"spellId":{"spellId":11129}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"action":{"castSpell":{"spellId":{"spellId":401556}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"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":10207,"rank":7}}}} - ] -} diff --git a/ui/mage/apls/p5_spellfrost.apl.json b/ui/mage/apls/p5_spellfrost.apl.json deleted file mode 100644 index da79c2421..000000000 --- a/ui/mage/apls/p5_spellfrost.apl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "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":{"castSpell":{"spellId":{"itemId":230243}}}}, - {"action":{"condition":{"or":{"vals":[{"not":{"val":{"auraIsKnown":{"auraId":{"itemId":231282}}}}},{"auraIsActive":{"auraId":{"itemId":231282}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"itemId":231282}}},"rhs":{"const":{"val":"45s"}}}}]}},"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":[{"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"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"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":412532}}},{"runeIsEquipped":{"runeId":{"spellId":428739}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":412532}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"runeIsEquipped":{"runeId":{"spellId":428739}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":10181,"rank":10}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}}, - {"hide":true,"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":10207,"rank":7}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":400613}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":425121}}}}}]}},"castSpell":{"spellId":{"spellId":400613}}}}, - {"hide":true,"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/blank.gear.json b/ui/mage/gear_sets/blank.gear.json deleted file mode 100644 index 4bcab0861..000000000 --- a/ui/mage/gear_sets/blank.gear.json +++ /dev/null @@ -1 +0,0 @@ -{"items": []} \ No newline at end of file diff --git a/ui/mage/gear_sets/p0.bis.gear.json b/ui/mage/gear_sets/p0.bis.gear.json new file mode 100644 index 000000000..314c15f7c --- /dev/null +++ b/ui/mage/gear_sets/p0.bis.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":16686}, + {}, + {"id":16689}, + {}, + {"id":16688}, + {"id":16683}, + {"id":16684}, + {"id":16685}, + {"id":16687}, + {"id":16682}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] +} \ No newline at end of file diff --git a/ui/mage/gear_sets/p1.bis.gear.json b/ui/mage/gear_sets/p1.bis.gear.json new file mode 100644 index 000000000..f77951798 --- /dev/null +++ b/ui/mage/gear_sets/p1.bis.gear.json @@ -0,0 +1,21 @@ +{ + "items": [ + {"id":16795}, + {}, + {"id":16797}, + {}, + {"id":16798}, + {"id":16799}, + {"id":16801}, + {"id":16802}, + {"id":16796}, + {"id":16800}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] +} \ No newline at end of file diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 1861ae391..34dc1da3f 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -22,106 +22,35 @@ import { } from '../core/proto/common'; import { Mage_Options as MageOptions, Mage_Options_ArmorType as ArmorType } from '../core/proto/mage'; import { SavedTalents } from '../core/proto/ui'; -import Phase1APLArcane from './apls/p1_arcane.apl.json'; -import Phase1APLFire from './apls/p1_fire.apl.json'; -import Phase2APLArcane from './apls/p2_arcane.apl.json'; -import Phase2APLFire from './apls/p2_fire.apl.json'; -// import Phase3APLArcane from './apls/p3_arcane.apl.json'; -import Phase3APLFire from './apls/p3_fire.apl.json'; -import Phase3APLFrost from './apls/p3_frost.apl.json'; -import Phase4APLArcane from './apls/p4_arcane.apl.json'; -import Phase4APLFire from './apls/p4_fire.apl.json'; -import Phase4APLFrost from './apls/p4_frost.apl.json'; -import Phase5APLFire from './apls/p5_fire.apl.json'; -import Phase5APLSpellFrost from './apls/p5_spellfrost.apl.json'; -import BlankGear from './gear_sets/blank.gear.json'; +import P1APL from './apls/p1.apl.json'; +import P0BISGear from './gear_sets/p0.bis.gear.json'; +import P1BISGear from './gear_sets/p1.bis.gear.json'; /////////////////////////////////////////////////////////////////////////// // Gear Presets /////////////////////////////////////////////////////////////////////////// -export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear); +export const GearP0BIS = PresetUtils.makePresetGear('Pre-BiS', P0BISGear); +export const GearP1BIS = PresetUtils.makePresetGear('P1 BiS', P1BISGear); -export const GearPresets = {}; +export const GearPresets = { + [Phase.Phase1]: [GearP0BIS, GearP1BIS], +}; -export const DefaultGear = GearBlank; +export const DefaultGear = GearP0BIS; /////////////////////////////////////////////////////////////////////////// // APL Presets /////////////////////////////////////////////////////////////////////////// -export const APLArcanePhase1 = PresetUtils.makePresetAPLRotation('P1 Arcane', Phase1APLArcane, { - customCondition: player => player.getLevel() === 25, -}); -export const APLFirePhase1 = PresetUtils.makePresetAPLRotation('P1 Fire', Phase1APLFire, { - customCondition: player => player.getLevel() === 25, -}); - -export const APLArcanePhase2 = PresetUtils.makePresetAPLRotation('P2 Arcane', Phase2APLArcane, { - customCondition: player => player.getLevel() === 40, -}); -export const APLFirePhase2 = PresetUtils.makePresetAPLRotation('P2 Fire', Phase2APLFire, { - customCondition: player => player.getLevel() === 40, -}); - -// No new Phase 3 Arcane presets at the moment -export const APLArcanePhase3 = APLArcanePhase2; -export const APLFirePhase3 = PresetUtils.makePresetAPLRotation('P3 Fire', Phase3APLFire, { - customCondition: player => player.getLevel() === 50, -}); -export const APLFrostPhase3 = PresetUtils.makePresetAPLRotation('P3 Frost', Phase3APLFrost, { - customCondition: player => player.getLevel() === 50, -}); - -export const APLArcanePhase4 = PresetUtils.makePresetAPLRotation('P4 Arcane', Phase4APLArcane, { - customCondition: player => player.getLevel() >= 60, -}); -export const APLFirePhase4 = PresetUtils.makePresetAPLRotation('P4 Fire', Phase4APLFire, { - customCondition: player => player.getLevel() >= 60, -}); -export const APLFrostPhase4 = PresetUtils.makePresetAPLRotation('P4 Frost', Phase4APLFrost, { - customCondition: player => player.getLevel() >= 60, -}); - -export const APLFirePhase5 = PresetUtils.makePresetAPLRotation('P5 Fire', Phase5APLFire, { - customCondition: player => player.getLevel() >= 60, -}); -export const APLSpellfrostPhase5 = PresetUtils.makePresetAPLRotation('P5 Frost', Phase5APLSpellFrost, { - customCondition: player => player.getLevel() >= 60, -}); +export const APLP1DPS = PresetUtils.makePresetAPLRotation('DPS', P1APL, { customCondition: player => player.getLevel() === 60 }); export const APLPresets = { - [Phase.Phase1]: [APLArcanePhase1, APLFirePhase1, APLFirePhase1], - [Phase.Phase2]: [APLArcanePhase2, APLFirePhase2, APLFirePhase2], - [Phase.Phase3]: [APLArcanePhase3, APLFirePhase3, APLFrostPhase3], - [Phase.Phase4]: [APLArcanePhase4, APLFirePhase4, APLFrostPhase4], - [Phase.Phase5]: [APLFirePhase5, APLSpellfrostPhase5], + [Phase.Phase1]: [APLP1DPS], }; -export const DefaultAPLs: Record> = { - 25: { - 0: APLPresets[Phase.Phase1][0], - 1: APLPresets[Phase.Phase1][1], - 2: APLPresets[Phase.Phase1][2], - }, - 40: { - 0: APLPresets[Phase.Phase2][0], - 1: APLPresets[Phase.Phase2][1], - // Normally frost but frost is unfortunately just too bad to warrant including for now - 2: APLPresets[Phase.Phase2][2], - // Frostfire - 3: APLPresets[Phase.Phase2][2], - }, - 50: { - 0: APLPresets[Phase.Phase3][0], - 1: APLPresets[Phase.Phase3][1], - 2: APLPresets[Phase.Phase3][2], - }, - 60: { - 0: APLPresets[Phase.Phase5][1], - 1: APLPresets[Phase.Phase5][0], - 2: APLPresets[Phase.Phase5][1], - }, +export const DefaultAPLs: Record = { + 60: APLPresets[Phase.Phase1][0], }; /////////////////////////////////////////////////////////////////////////// @@ -131,68 +60,15 @@ export const DefaultAPLs: Record player.getLevel() === 25, -}); -export const TalentsFirePhase1 = PresetUtils.makePresetTalents('25 Fire', SavedTalents.create({ talentsString: '-5050020121' }), { - customCondition: player => player.getLevel() === 25, -}); - -export const TalentsArcanePhase2 = PresetUtils.makePresetTalents('40 Arcane', SavedTalents.create({ talentsString: '2250050310031531' }), { - customCondition: player => player.getLevel() === 40, -}); -export const TalentsFirePhase2 = PresetUtils.makePresetTalents('40 Fire', SavedTalents.create({ talentsString: '-5050020123033151' }), { - customCondition: player => player.getLevel() === 40, -}); - -// No new Phase 3 Arcane presets at the moment -export const TalentsArcanePhase3 = TalentsArcanePhase2; -export const TalentsFirePhase3 = PresetUtils.makePresetTalents('50 Fire', SavedTalents.create({ talentsString: '-0550020123033151-2035' }), { - customCondition: player => player.getLevel() === 50, -}); -export const TalentsFrostPhase3 = PresetUtils.makePresetTalents('50 Frost', SavedTalents.create({ talentsString: '-055-20350203100351051' }), { - customCondition: player => player.getLevel() === 50, -}); - -export const TalentsArcanePhase4 = PresetUtils.makePresetTalents('60 Arcane', SavedTalents.create({ talentsString: '0550050210031531-054-203500001' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsFirePhase4 = PresetUtils.makePresetTalents('60 Fire', SavedTalents.create({ talentsString: '21-5052300123033151-203500031' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsFrostfirePhase4 = PresetUtils.makePresetTalents('60 Frostfire', SavedTalents.create({ talentsString: '-0550320003021-2035020310035105' }), { - customCondition: player => player.getLevel() === 60, -}); - -export const TalentsArcanePhase5 = PresetUtils.makePresetTalents('60 Arcane', SavedTalents.create({ talentsString: '2500550010031531--2035020310004' }), { - customCondition: player => player.getLevel() === 60, -}); -export const TalentsFrostPhase5 = PresetUtils.makePresetTalents('60 Frost', SavedTalents.create({ talentsString: '250025001002--05350203100351051' }), { +export const TalentsP1DPS = PresetUtils.makePresetTalents('DPS', SavedTalents.create({ talentsString: '-0550320003021-2035020310035105' }), { customCondition: player => player.getLevel() === 60, }); export const TalentPresets = { - [Phase.Phase1]: [TalentsArcanePhase1, TalentsFirePhase1, TalentsFirePhase1], - [Phase.Phase2]: [TalentsArcanePhase2, TalentsFirePhase2, TalentsFirePhase2], - [Phase.Phase3]: [TalentsArcanePhase3, TalentsFirePhase3, TalentsFrostPhase3], - [Phase.Phase4]: [TalentsFrostfirePhase4], - [Phase.Phase5]: [TalentsArcanePhase5, TalentsFirePhase4, TalentsFrostPhase5], + [Phase.Phase1]: [TalentsP1DPS], }; -export const DefaultTalentsArcane = TalentPresets[Phase.Phase5][0]; -export const DefaultTalentsFire = TalentPresets[Phase.Phase5][1]; -export const DefaultTalentsFrostfire = TalentPresets[Phase.Phase4][0]; -export const DefaultTalentsFrost = TalentPresets[Phase.Phase5][2]; - -export const DefaultTalents = DefaultTalentsFire; - -export const PresetBuildArcane = PresetUtils.makePresetBuild('Arcane', { - gear: DefaultGear, - talents: DefaultTalentsArcane, - rotation: DefaultAPLs[60][0], -}); -export const PresetBuildFire = PresetUtils.makePresetBuild('Fire', { gear: DefaultGear, talents: DefaultTalentsFire, rotation: DefaultAPLs[60][1] }); -export const PresetBuildFrost = PresetUtils.makePresetBuild('Frost', { gear: DefaultGear, talents: DefaultTalentsFrost, rotation: DefaultAPLs[60][2] }); +export const DefaultTalents = TalentPresets[Phase.Phase1][0]; /////////////////////////////////////////////////////////////////////////// // Options diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts index a8b0ca889..57a60af85 100644 --- a/ui/mage/sim.ts +++ b/ui/mage/sim.ts @@ -114,30 +114,21 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { presets: { rotations: [ - ...Presets.APLPresets[Phase.Phase5], - ...Presets.APLPresets[Phase.Phase4], - ...Presets.APLPresets[Phase.Phase3], - ...Presets.APLPresets[Phase.Phase2], ...Presets.APLPresets[Phase.Phase1], ], talents: [ - ...Presets.TalentPresets[Phase.Phase5], - ...Presets.TalentPresets[Phase.Phase4], - ...Presets.TalentPresets[Phase.Phase3], - ...Presets.TalentPresets[Phase.Phase2], ...Presets.TalentPresets[Phase.Phase1], ], gear: [ - Presets.DefaultGear, + ...Presets.GearPresets[Phase.Phase1], ], - builds: [Presets.PresetBuildArcane, Presets.PresetBuildFire, Presets.PresetBuildFrost], }, autoRotation: player => { const specNumber = player.getTalentTree(); const level = player.getLevel(); - return Presets.DefaultAPLs[level][specNumber].rotation.rotation!; + return Presets.DefaultAPLs[level].rotation.rotation!; }, raidSimPresets: [ @@ -147,7 +138,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { defaultName: 'Arcane', iconUrl: getSpecIcon(Class.ClassMage, 0), - talents: Presets.DefaultTalentsArcane.data, + talents: Presets.DefaultTalents.data, specOptions: Presets.DefaultOptions, consumes: Presets.DefaultConsumes, otherDefaults: Presets.OtherDefaults, @@ -172,7 +163,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { defaultName: 'Fire', iconUrl: getSpecIcon(Class.ClassMage, 1), - talents: Presets.DefaultTalentsFire.data, + talents: Presets.DefaultTalents.data, specOptions: Presets.DefaultOptions, consumes: Presets.DefaultConsumes, otherDefaults: Presets.OtherDefaults, @@ -197,7 +188,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMage, { defaultName: 'Frost', iconUrl: getSpecIcon(Class.ClassMage, 2), - talents: Presets.DefaultTalentsFrostfire.data, + talents: Presets.DefaultTalents.data, specOptions: Presets.DefaultOptions, consumes: Presets.DefaultConsumes, otherDefaults: Presets.OtherDefaults,