diff --git a/proto/common.proto b/proto/common.proto index 0dcc66f0e..e50865cb9 100644 --- a/proto/common.proto +++ b/proto/common.proto @@ -477,15 +477,6 @@ message PetMiscConsumes { bool juju_flurry = 1; } -enum MageScroll { - MageScrollUnknown = 0; - MageScrollArcaneRecovery = 1; - MageScrollArcaneAccuracy = 2; - MageScrollArcanePower = 3; - MageScrollFireProtection = 4; - MageScrollFrostProtection = 5; -} - // NextIndex: 31 enum WeaponImbue { // Weapon Oils @@ -682,7 +673,6 @@ message Consumes { HealthElixir health_elixir = 23; Alcohol alcohol = 24; int32 pet_attack_power_consumable = 25; - MageScroll mage_scroll = 26; PetMiscConsumes pet_misc_consumes = 27; SapperExplosive sapper_explosive = 28; } diff --git a/sim/mage/TestP1Mage.results b/sim/mage/TestP1Mage.results index 84479bcaa..bb190e17f 100644 --- a/sim/mage/TestP1Mage.results +++ b/sim/mage/TestP1Mage.results @@ -1,33 +1,33 @@ character_stats_results: { key: "TestP1Mage-Phase1-CharacterStats-Default" value: { - final_stats: 151.8 - final_stats: 166.75 - final_stats: 353.1075 - final_stats: 414 - final_stats: 311.65 - final_stats: 173 + final_stats: 156.4 + final_stats: 171.35 + final_stats: 313.4325 + final_stats: 324.3 + final_stats: 241.5 + final_stats: 348 final_stats: 0 final_stats: 40 - final_stats: 15 + final_stats: 233 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 41.25 + final_stats: 45.25 + final_stats: 2 + final_stats: 30.64824 final_stats: 0 - final_stats: 28.1552 final_stats: 0 - final_stats: 0 - final_stats: 822.8 + final_stats: 827.4 final_stats: 0 final_stats: 16.2 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 7143 + final_stats: 5797.5 final_stats: 0 final_stats: 0 - final_stats: 1024.5 + final_stats: 871.7 final_stats: 440 final_stats: 0 final_stats: 5 @@ -35,15 +35,15 @@ character_stats_results: { 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: 4624.325 + final_stats: 27 + final_stats: 70 + final_stats: 80 + final_stats: 60 + final_stats: 60 final_stats: 384 final_stats: 0 - final_stats: 35 + final_stats: 65 final_stats: 0 } } @@ -53,18 +53,18 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 - weights: 0.01497 + weights: 0.04192 weights: 0 - weights: 0.16867 + weights: 0.43481 weights: 0 - weights: 0.16867 weights: 0 + weights: 0.43481 weights: 0 weights: 0 weights: 0 weights: 0 - weights: 0.92368 - weights: 1.32992 + weights: 6.10433 + weights: 3.80979 weights: 0 weights: 0 weights: 0 @@ -99,175 +99,175 @@ stat_weights_results: { dps_results: { key: "TestP1Mage-Phase1-AllItems-ArcanistRegalia" value: { - dps: 97.10096 - tps: 90.36367 + dps: 495.45355 + tps: 317.72457 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-Champion'sRegalia" value: { - dps: 84.10533 - tps: 91.33828 + dps: 479.60128 + tps: 355.60874 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-EnigmaVestments" value: { - dps: 107.96625 - tps: 114.91555 + dps: 539.88972 + tps: 397.69979 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-FieldMarshal'sRegalia" value: { - dps: 106.14672 - tps: 113.43537 + dps: 535.63237 + tps: 395.412 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-FrostfireRegalia" value: { - dps: 146.34232 - tps: 134.14575 + dps: 593.14888 + tps: 373.64559 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-Illusionist'sAttire" value: { - dps: 85.18755 - tps: 92.46523 + dps: 504.73068 + tps: 373.24509 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-IronweaveBattlesuit" value: { - dps: 65.51091 - tps: 72.7335 + dps: 416.2972 + tps: 311.0803 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-LieutenantCommander'sRegalia" value: { - dps: 84.10533 - tps: 91.33828 + dps: 479.60128 + tps: 355.60874 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-NetherwindRegalia" value: { - dps: 107.30217 - tps: 99.97337 + dps: 539.66406 + tps: 367.5271 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-Sorcerer'sRegalia" value: { - dps: 92.73649 - tps: 100.01821 + dps: 483.77372 + tps: 358.8505 } } dps_results: { key: "TestP1Mage-Phase1-AllItems-Warlord'sRegalia" value: { - dps: 106.14672 - tps: 113.43537 + dps: 535.63237 + tps: 395.412 } } dps_results: { key: "TestP1Mage-Phase1-Average-Default" value: { - dps: 70.94274 - tps: 78.17638 + dps: 524.55234 + tps: 385.65807 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 74.30928 - tps: 191.83395 + dps: 517.10316 + tps: 745.93549 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 74.30928 - tps: 80.18552 + dps: 517.10316 + tps: 381.17037 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 68.434 - tps: 74.07091 + dps: 517.28846 + tps: 387.85885 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 32.0808 - tps: 213.74748 + dps: 278.37179 + tps: 471.72354 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 32.0808 - tps: 41.16413 + dps: 278.37179 + tps: 208.70342 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Gnome-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 30.94654 - tps: 34.4117 + dps: 355.44513 + tps: 268.49421 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 72.40866 - tps: 202.61879 + dps: 520.50531 + tps: 734.3099 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 72.40866 - tps: 78.91916 + dps: 520.50531 + tps: 382.85153 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 66.62106 - tps: 73.20031 + dps: 542.59115 + tps: 405.85548 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget" value: { - dps: 31.90564 - tps: 215.80554 + dps: 277.84992 + tps: 471.04271 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget" value: { - dps: 31.90564 - tps: 41.10063 + dps: 277.84992 + tps: 208.32233 } } dps_results: { key: "TestP1Mage-Phase1-Settings-Troll-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget" value: { - dps: 30.74064 - tps: 34.20262 + dps: 374.54025 + tps: 281.95891 } } dps_results: { key: "TestP1Mage-Phase1-SwitchInFrontOfTarget-Default" value: { - dps: 71.56379 - tps: 78.79299 + dps: 526.15541 + tps: 386.88644 } } diff --git a/ui/core/components/individual_sim_ui/consumes_picker.ts b/ui/core/components/individual_sim_ui/consumes_picker.ts index c0104dc9f..89eafffed 100644 --- a/ui/core/components/individual_sim_ui/consumes_picker.ts +++ b/ui/core/components/individual_sim_ui/consumes_picker.ts @@ -237,13 +237,11 @@ export class ConsumesPicker extends Component { relevantStatOptions(ConsumablesInputs.ZANZA_BUFF_CONSUMES_CONFIG, this.simUI), 'Zanza Buffs', ); - const mageScrollOptions = ConsumablesInputs.makeMageScrollsInput(ConsumablesInputs.MAGE_SCROLL_CONSUMES_CONFIG, 'Mage Scrolls'); const miscOffensiveConsumesOptions = relevantStatOptions(ConsumablesInputs.MISC_OFFENSIVE_CONSUMES_CONFIG, this.simUI); const miscDefensiveConsumesOptions = relevantStatOptions(ConsumablesInputs.MISC_DEFENSIVE_CONSUMES_CONFIG, this.simUI); const pickers = [ buildIconInput(miscConsumesElem, this.simUI.player, zanzaBuffOptions), - buildIconInput(miscConsumesElem, this.simUI.player, mageScrollOptions), ConsumablesInputs.makeMiscOffensiveConsumesInput(miscConsumesElem, this.simUI.player, this.simUI, miscOffensiveConsumesOptions), ConsumablesInputs.makeMiscDefensiveConsumesInput(miscConsumesElem, this.simUI.player, this.simUI, miscDefensiveConsumesOptions), ]; diff --git a/ui/core/components/inputs/consumables.ts b/ui/core/components/inputs/consumables.ts index 98499193e..254730ac9 100644 --- a/ui/core/components/inputs/consumables.ts +++ b/ui/core/components/inputs/consumables.ts @@ -16,7 +16,6 @@ import { FrostPowerBuff, HealthElixir, ItemSlot, - MageScroll, ManaRegenElixir, Potions, Profession, @@ -561,41 +560,6 @@ export const makeMiscDefensiveConsumesInput = makeMultiIconConsumesInputFactory( tooltip: 'Misc Defensive', }); -export const MageScrollArcaneRecovery: ConsumableInputConfig = { - actionId: () => ActionId.fromItemId(211953), - value: MageScroll.MageScrollArcaneRecovery, - showWhen: player => player.isClass(Class.ClassMage), -}; -export const MageScrollArcaneAccuracy: ConsumableInputConfig = { - actionId: () => ActionId.fromItemId(211954), - value: MageScroll.MageScrollArcaneAccuracy, - showWhen: player => player.isClass(Class.ClassMage), -}; -export const MageScrollArcanePower: ConsumableInputConfig = { - actionId: () => ActionId.fromItemId(211957), - value: MageScroll.MageScrollArcanePower, - showWhen: player => player.isClass(Class.ClassMage), -}; -export const MageScrollFireProtection: ConsumableInputConfig = { - actionId: () => ActionId.fromItemId(211955), - value: MageScroll.MageScrollFireProtection, - showWhen: player => player.isClass(Class.ClassMage), -}; -export const MageScrollFrostProtection: ConsumableInputConfig = { - actionId: () => ActionId.fromItemId(211956), - value: MageScroll.MageScrollFrostProtection, - showWhen: player => player.isClass(Class.ClassMage), -}; - -export const MAGE_SCROLL_CONSUMES_CONFIG: ConsumableStatOption[] = [ - { config: MageScrollArcaneRecovery, stats: [] }, - { config: MageScrollArcaneAccuracy, stats: [] }, - { config: MageScrollArcanePower, stats: [] }, - { config: MageScrollFireProtection, stats: [] }, - { config: MageScrollFrostProtection, stats: [] }, -]; -export const makeMageScrollsInput = makeConsumeInputFactory({ consumesFieldName: 'mageScroll' }); - /////////////////////////////////////////////////////////////////////////// // PET /////////////////////////////////////////////////////////////////////////// diff --git a/ui/mage/apls/p1.apl.json b/ui/mage/apls/p1.apl.json index e4c9b7842..aaa473f75 100644 --- a/ui/mage/apls/p1.apl.json +++ b/ui/mage/apls/p1.apl.json @@ -1,8 +1,7 @@ { "type": "TypeAPL", - "prepullActions": [], "priorityList": [ - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"castSpell":{"spellId":{"spellId":133,"rank":1}}}} + {"action":{"autocastOtherCooldowns":{}}}, + {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}}} ] } diff --git a/ui/mage/gear_sets/p0.bis.gear.json b/ui/mage/gear_sets/p0.bis.gear.json index 314c15f7c..e4f3319dd 100644 --- a/ui/mage/gear_sets/p0.bis.gear.json +++ b/ui/mage/gear_sets/p0.bis.gear.json @@ -1,21 +1,21 @@ { "items": [ - {"id":16686}, - {}, - {"id":16689}, - {}, - {"id":16688}, - {"id":16683}, - {"id":16684}, - {"id":16685}, - {"id":16687}, - {"id":16682}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] + {"id":14332,"randomSuffix":1979,"enchant":1509}, + {"id":12103}, + {"id":11782}, + {"id":13386,"randomSuffix":1965}, + {"id":14152,"enchant":1891}, + {"id":11766,"randomSuffix":1965,"enchant":1883}, + {"id":13253}, + {"id":11662}, + {"id":13170,"enchant":1509}, + {"id":10247,"randomSuffix":1971,"enchant":911}, + {"id":942}, + {"id":942}, + {"id":13968}, + {"id":12930}, + {"id":13964,"enchant":2504}, + {"id":10796,"randomSuffix":1965}, + {"id":15283,"randomSuffix":1959} + ] } \ 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 index f77951798..3bee4c598 100644 --- a/ui/mage/gear_sets/p1.bis.gear.json +++ b/ui/mage/gear_sets/p1.bis.gear.json @@ -1,21 +1,21 @@ { "items": [ - {"id":16795}, - {}, - {"id":16797}, - {}, - {"id":16798}, - {"id":16799}, - {"id":16801}, - {"id":16802}, - {"id":16796}, - {"id":16800}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] + {"id":16795,"enchant":1509}, + {"id":18814}, + {"id":11782}, + {"id":13386,"randomSuffix":1965}, + {"id":14152,"enchant":1891}, + {"id":16799,"enchant":1883}, + {"id":13253}, + {"id":19136}, + {"id":16915,"enchant":1509}, + {"id":16800,"enchant":911}, + {"id":19147}, + {"id":19147}, + {"id":18820}, + {"id":12930}, + {"id":17103,"enchant":2504}, + {"id":10796,"randomSuffix":1965}, + {"id":15283,"randomSuffix":1959} + ] } \ No newline at end of file diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 117b2e6d4..c579276af 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -9,7 +9,6 @@ import { Food, FrostPowerBuff, IndividualBuffs, - MageScroll, ManaRegenElixir, Potions, Profession, @@ -58,7 +57,7 @@ export const DefaultAPL = APLPresets[Phase.Phase1][0]; // Default talents. Uses the wowhead calculator format, make the talents on // https://wowhead.com/classic/talent-calc and copy the numbers in the url. -export const TalentsP1DPS = PresetUtils.makePresetTalents('DPS', SavedTalents.create({ talentsString: '-0550320003021-2035020310035105' })); +export const TalentsP1DPS = PresetUtils.makePresetTalents('Frost DPS', SavedTalents.create({ talentsString: '230205021002--05353203102351001' })); export const TalentPresets = { [Phase.Phase1]: [TalentsP1DPS], @@ -81,7 +80,6 @@ export const DefaultConsumes = Consumes.create({ flask: Flask.FlaskOfSupremePower, food: Food.FoodRunnTumTuberSurprise, frostPowerBuff: FrostPowerBuff.ElixirOfFrostPower, - mageScroll: MageScroll.MageScrollArcanePower, mainHandImbue: WeaponImbue.BrilliantWizardOil, manaRegenElixir: ManaRegenElixir.MagebloodPotion,