Skip to content

Commit d28c22f

Browse files
jimmyt857jimmyt857
authored
Merge pull request #4076 from wowsims/apl
Add all missing p3 and p4 presets, update raid sim to use them
2 parents 6232005 + 5ed4562 commit d28c22f

File tree

48 files changed

+837
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+837
-369
lines changed

‎ui/balance_druid/presets.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,30 @@ import {
2929

3030
import * as PresetUtils from '../core/preset_utils.js';
3131

32-
import PreraidGear from './gear_sets/preraid.gear.json';
33-
import P1Gear from './gear_sets/p1.gear.json';
34-
import P2Gear from './gear_sets/p2.gear.json';
35-
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
36-
import P3HordeGear from './gear_sets/p3_horde.gear.json';
37-
import P4HordeGear from './gear_sets/p4_horde.gear.json';
38-
import P4AllianceGear from './gear_sets/p4_alliance.gear.json';
39-
40-
import BasicP3AplJson from './apls/basic_p3.apl.json';
41-
import P4FocusAplJson from './apls/p4_focus_glyph.apl.json';
42-
import P4StarfireAplJson from './apls/p4_starfire_glyph.apl.json';
43-
4432
// Preset options for this spec.
4533
// Eventually we will import these values for the raid sim too, so its good to
4634
// keep them in a separate file.
4735

36+
import PreraidGear from './gear_sets/preraid.gear.json';
4837
export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear);
38+
import P1Gear from './gear_sets/p1.gear.json';
4939
export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
40+
import P2Gear from './gear_sets/p2.gear.json';
5041
export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear);
42+
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
5143
export const P3_PRESET_ALLI = PresetUtils.makePresetGear('P3 Preset [A]', P3AllianceGear, { faction: Faction.Alliance });
44+
import P3HordeGear from './gear_sets/p3_horde.gear.json';
5245
export const P3_PRESET_HORDE = PresetUtils.makePresetGear('P3 Preset [H]', P3HordeGear, { faction: Faction.Horde });
46+
import P4AllianceGear from './gear_sets/p4_alliance.gear.json';
5347
export const P4_PRESET_ALLI = PresetUtils.makePresetGear('P4 Preset [A]', P4AllianceGear, { faction: Faction.Alliance });
48+
import P4HordeGear from './gear_sets/p4_horde.gear.json';
5449
export const P4_PRESET_HORDE = PresetUtils.makePresetGear('P4 Preset [H]', P4HordeGear, { faction: Faction.Horde });
5550

51+
import BasicP3AplJson from './apls/basic_p3.apl.json';
5652
export const ROTATION_PRESET_P3_APL = PresetUtils.makePresetAPLRotation('P3', BasicP3AplJson);
53+
import P4FocusAplJson from './apls/p4_focus_glyph.apl.json';
5754
export const ROTATION_PRESET_P4_FOCUS_APL = PresetUtils.makePresetAPLRotation('P4 Focus Glyph', P4FocusAplJson);
55+
import P4StarfireAplJson from './apls/p4_starfire_glyph.apl.json';
5856
export const ROTATION_PRESET_P4_STARFIRE_APL = PresetUtils.makePresetAPLRotation('P4 Starfire Glyph', P4StarfireAplJson);
5957

6058
// Default talents. Uses the wowhead calculator format, make the talents on

‎ui/core/launched_sims.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export enum LaunchStatus {
1111
Launched,
1212
}
1313

14-
export const raidSimStatus: LaunchStatus = LaunchStatus.Beta;
14+
export const raidSimStatus: LaunchStatus = LaunchStatus.Launched;
1515

1616
// This list controls which links are shown in the top-left dropdown menu.
1717
export const simLaunchStatuses: Record<Spec, LaunchStatus> = {

‎ui/deathknight/presets.ts

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,54 +29,45 @@ import {
2929

3030
import * as PresetUtils from '../core/preset_utils.js';
3131

32-
import P1BloodGear from './gear_sets/p1_blood.gear.json';
33-
import P2BloodGear from './gear_sets/p2_blood.gear.json';
34-
import P3BloodGear from './gear_sets/p3_blood.gear.json';
35-
import P4BloodGear from './gear_sets/p4_blood.gear.json';
36-
import PreraidUh2hGear from './gear_sets/preraid_uh_2h.gear.json';
37-
import P1Uh2hGear from './gear_sets/p1_uh_2h.gear.json';
38-
import P4Uh2hGear from './gear_sets/p4_uh_2h.gear.json';
39-
import PreraidUhDwGear from './gear_sets/preraid_uh_dw.gear.json';
40-
import P1UhDwGear from './gear_sets/p1_uh_dw.gear.json';
41-
import P2UhDwGear from './gear_sets/p2_uh_dw.gear.json';
42-
import P3UhDwGear from './gear_sets/p3_uh_dw.gear.json';
43-
import P4UhDwGear from './gear_sets/p4_uh_dw.gear.json';
44-
import PreraidFrostGear from './gear_sets/preraid_frost.gear.json';
45-
import P1FrostGear from './gear_sets/p1_frost.gear.json';
46-
import P2FrostGear from './gear_sets/p2_frost.gear.json';
47-
import P3FrostGear from './gear_sets/p3_frost.gear.json';
48-
import P4FrostGear from './gear_sets/p4_frost.gear.json';
49-
import P1FrostSubUhGear from './gear_sets/p1_frost_subUh.gear.json';
50-
51-
import BloodDPSApl from './apls/blood_dps.apl.json';
52-
import BloodPestiAoeApl from './apls/blood_pesti_aoe.apl.json';
53-
import FrostBlPestiApl from './apls/frost_bl_pesti.apl.json';
54-
import FrostUhPestiApl from './apls/frost_uh_pesti.apl.json';
55-
import UhDwSsApl from './apls/unholy_dw_ss.apl.json';
56-
import Uh2hSsApl from './apls/uh_2h_ss.apl.json';
57-
import UhDndAoeApl from './apls/uh_dnd_aoe.apl.json';
58-
5932
// Preset options for this spec.
6033
// Eventually we will import these values for the raid sim too, so its good to
6134
// keep them in a separate file.
6235

36+
import P1BloodGear from './gear_sets/p1_blood.gear.json';
6337
export const P1_BLOOD_PRESET = PresetUtils.makePresetGear('P1 Blood', P1BloodGear, { talentTree: 0 });
38+
import P2BloodGear from './gear_sets/p2_blood.gear.json';
6439
export const P2_BLOOD_PRESET = PresetUtils.makePresetGear('P2 Blood', P2BloodGear, { talentTree: 0 });
40+
import P3BloodGear from './gear_sets/p3_blood.gear.json';
6541
export const P3_BLOOD_PRESET = PresetUtils.makePresetGear('P3 Blood', P3BloodGear, { talentTree: 0 });
42+
import P4BloodGear from './gear_sets/p4_blood.gear.json';
6643
export const P4_BLOOD_PRESET = PresetUtils.makePresetGear('P4 Blood', P4BloodGear, { talentTree: 0 });
44+
import PreraidFrostGear from './gear_sets/preraid_frost.gear.json';
6745
export const PRERAID_FROST_PRESET = PresetUtils.makePresetGear('Pre-Raid Frost', PreraidFrostGear, { talentTree: 1 });
46+
import P1FrostGear from './gear_sets/p1_frost.gear.json';
6847
export const P1_FROST_PRESET = PresetUtils.makePresetGear('P1 Frost', P1FrostGear, { talentTree: 1 });
48+
import P2FrostGear from './gear_sets/p2_frost.gear.json';
6949
export const P2_FROST_PRESET = PresetUtils.makePresetGear('P2 Frost', P2FrostGear, { talentTree: 1 });
50+
import P3FrostGear from './gear_sets/p3_frost.gear.json';
7051
export const P3_FROST_PRESET = PresetUtils.makePresetGear('P3 Frost', P3FrostGear, { talentTree: 1 });
52+
import P4FrostGear from './gear_sets/p4_frost.gear.json';
7153
export const P4_FROST_PRESET = PresetUtils.makePresetGear('P4 Frost', P4FrostGear, { talentTree: 1 });
54+
import P1FrostSubUhGear from './gear_sets/p1_frost_subUh.gear.json';
7255
export const P1_FROSTSUBUNH_PRESET = PresetUtils.makePresetGear('P1 Frost Sub Unh', P1FrostSubUhGear, { talentTree: 1 });
56+
import PreraidUh2hGear from './gear_sets/preraid_uh_2h.gear.json';
7357
export const PRERAID_UNHOLY_2H_PRESET = PresetUtils.makePresetGear('Pre-Raid 2H Unholy', PreraidUh2hGear, { talentTree: 2 });
58+
import P1Uh2hGear from './gear_sets/p1_uh_2h.gear.json';
7459
export const P1_UNHOLY_2H_PRESET = PresetUtils.makePresetGear('P1 2H Unholy', P1Uh2hGear, { talentTree: 2 });
60+
import P4Uh2hGear from './gear_sets/p4_uh_2h.gear.json';
7561
export const P4_UNHOLY_2H_PRESET = PresetUtils.makePresetGear('P4 2H Unholy', P4Uh2hGear, { talentTree: 2 });
62+
import PreraidUhDwGear from './gear_sets/preraid_uh_dw.gear.json';
7663
export const PRERAID_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('Pre-Raid DW Unholy', PreraidUhDwGear, { talentTree: 2 });
64+
import P1UhDwGear from './gear_sets/p1_uh_dw.gear.json';
7765
export const P1_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P1 DW Unholy', P1UhDwGear, { talentTree: 2 });
66+
import P2UhDwGear from './gear_sets/p2_uh_dw.gear.json';
7867
export const P2_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P2 DW Unholy', P2UhDwGear, { talentTree: 2 });
68+
import P3UhDwGear from './gear_sets/p3_uh_dw.gear.json';
7969
export const P3_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P3 DW Unholy', P3UhDwGear, { talentTree: 2 });
70+
import P4UhDwGear from './gear_sets/p4_uh_dw.gear.json';
8071
export const P4_UNHOLY_DW_PRESET = PresetUtils.makePresetGear('P4 DW Unholy', P4UhDwGear, { talentTree: 2 });
8172

8273
export const DefaultUnholyRotation = DeathKnightRotation.create({
@@ -147,12 +138,19 @@ export const BLOOD_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacy
147138
export const FROST_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Frost Legacy', Spec.SpecDeathknight, DefaultFrostRotation, { talentTree: 1 });
148139
export const UNHOLY_DW_ROTATION_PRESET_LEGACY_DEFAULT = PresetUtils.makePresetLegacyRotation('Unholy DW Legacy', Spec.SpecDeathknight, DefaultUnholyRotation, { talentTree: 2 });
149140

141+
import BloodDPSApl from './apls/blood_dps.apl.json';
150142
export const BLOOD_DPS_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood DPS', BloodDPSApl, { talentTree: 0 });
143+
import BloodPestiAoeApl from './apls/blood_pesti_aoe.apl.json';
151144
export const BLOOD_PESTI_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Blood Pesti AOE', BloodPestiAoeApl, { talentTree: 0 });
145+
import FrostBlPestiApl from './apls/frost_bl_pesti.apl.json';
152146
export const FROST_BL_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost BL Pesti', FrostBlPestiApl, { talentTree: 1 });
147+
import FrostUhPestiApl from './apls/frost_uh_pesti.apl.json';
153148
export const FROST_UH_PESTI_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Frost UH Pesti', FrostUhPestiApl, { talentTree: 1 });
149+
import UhDwSsApl from './apls/unholy_dw_ss.apl.json';
154150
export const UNHOLY_DW_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy DW SS', UhDwSsApl, { talentTree: 2 });
151+
import Uh2hSsApl from './apls/uh_2h_ss.apl.json';
155152
export const UNHOLY_2H_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy 2H SS', Uh2hSsApl, { talentTree: 2 });
153+
import UhDndAoeApl from './apls/uh_dnd_aoe.apl.json';
156154
export const UNHOLY_DND_AOE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Unholy DND AOE', UhDndAoeApl, { talentTree: 2 });
157155

158156
// Default talents. Uses the wowhead calculator format, make the talents on

‎ui/elemental_shaman/presets.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,21 @@ import {
2626

2727
import * as PresetUtils from '../core/preset_utils.js';
2828

29-
import PreraidGear from './gear_sets/preraid.gear.json';
30-
import P1Gear from './gear_sets/p1.gear.json';
31-
import P2Gear from './gear_sets/p2.gear.json';
32-
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
33-
import P3HordeGear from './gear_sets/p3_horde.gear.json';
34-
import P4Gear from './gear_sets/p4.gear.json';
35-
36-
import DefaultApl from './apls/default.apl.json';
37-
import AdvancedApl from './apls/advanced.apl.json';
38-
3929
// Preset options for this spec.
4030
// Eventually we will import these values for the raid sim too, so its good to
4131
// keep them in a separate file.
4232

33+
import PreraidGear from './gear_sets/preraid.gear.json';
4334
export const PRERAID_PRESET = PresetUtils.makePresetGear('Pre-raid Preset', PreraidGear);
35+
import P1Gear from './gear_sets/p1.gear.json';
4436
export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
37+
import P2Gear from './gear_sets/p2.gear.json';
4538
export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear);
39+
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
4640
export const P3_PRESET_ALLI = PresetUtils.makePresetGear('P3 Preset [A]', P3AllianceGear, { faction: Faction.Alliance });
41+
import P3HordeGear from './gear_sets/p3_horde.gear.json';
4742
export const P3_PRESET_HORDE = PresetUtils.makePresetGear('P3 Preset [H]', P3HordeGear, { faction: Faction.Horde });
43+
import P4Gear from './gear_sets/p4.gear.json';
4844
export const P4_PRESET = PresetUtils.makePresetGear('P4 Preset', P4Gear);
4945

5046
export const DefaultRotation = ElementalShamanRotation.create({
@@ -64,7 +60,9 @@ export const DefaultRotation = ElementalShamanRotation.create({
6460
});
6561

6662
export const ROTATION_PRESET_LEGACY = PresetUtils.makePresetLegacyRotation('Legacy', Spec.SpecElementalShaman, DefaultRotation);
63+
import DefaultApl from './apls/default.apl.json';
6764
export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl);
65+
import AdvancedApl from './apls/advanced.apl.json';
6866
export const ROTATION_PRESET_ADVANCED = PresetUtils.makePresetAPLRotation('Advanced', AdvancedApl);
6967

7068
// Default talents. Uses the wowhead calculator format, make the talents on

‎ui/enhancement_shaman/presets.ts

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,25 @@ import {
3030

3131
import * as PresetUtils from '../core/preset_utils.js';
3232

33-
import PreraidGear from './gear_sets/preraid.gear.json';
34-
import P1Gear from './gear_sets/p1.gear.json';
35-
import P2FtGear from './gear_sets/p2_ft.gear.json';
36-
import P2WfGear from './gear_sets/p2_wf.gear.json';
37-
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
38-
import P3HordeGear from './gear_sets/p3_horde.gear.json';
39-
import P4FtGear from './gear_sets/p4_ft.gear.json';
40-
import P4WfGear from './gear_sets/p4_wf.gear.json';
41-
42-
import DefaultFt from './apls/default_ft.apl.json';
43-
import DefaultWf from './apls/default_wf.apl.json';
44-
import Phase3Apl from './apls/phase_3.apl.json';
45-
import { TotemsSection } from 'ui/core/components/totem_inputs.js';
46-
4733
// Preset options for this spec.
4834
// Eventually we will import these values for the raid sim too, so its good to
4935
// keep them in a separate file.
5036

37+
import PreraidGear from './gear_sets/preraid.gear.json';
5138
export const PRERAID_PRESET = PresetUtils.makePresetGear('Preraid Preset', PreraidGear);
39+
import P1Gear from './gear_sets/p1.gear.json';
5240
export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
41+
import P2FtGear from './gear_sets/p2_ft.gear.json';
5342
export const P2_PRESET_FT = PresetUtils.makePresetGear('P2 Preset FT', P2FtGear);
43+
import P2WfGear from './gear_sets/p2_wf.gear.json';
5444
export const P2_PRESET_WF = PresetUtils.makePresetGear('P2 Preset WF', P2WfGear);
45+
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
5546
export const P3_PRESET_ALLIANCE = PresetUtils.makePresetGear('P3 Preset [A]', P3AllianceGear, { faction: Faction.Alliance });
47+
import P3HordeGear from './gear_sets/p3_horde.gear.json';
5648
export const P3_PRESET_HORDE = PresetUtils.makePresetGear('P3 Preset [H]', P3HordeGear, { faction: Faction.Horde });
49+
import P4FtGear from './gear_sets/p4_ft.gear.json';
5750
export const P4_PRESET_FT = PresetUtils.makePresetGear('P4 Preset FT', P4FtGear);
51+
import P4WfGear from './gear_sets/p4_wf.gear.json';
5852
export const P4_PRESET_WF = PresetUtils.makePresetGear('P4 Preset WF', P4WfGear);
5953

6054
export const DefaultRotation = EnhancementShamanRotation.create({
@@ -92,8 +86,12 @@ export const DefaultRotation = EnhancementShamanRotation.create({
9286
}),
9387
});
9488

89+
90+
import DefaultFt from './apls/default_ft.apl.json';
9591
export const ROTATION_FT_DEFAULT = PresetUtils.makePresetAPLRotation('Default FT', DefaultFt);
92+
import DefaultWf from './apls/default_wf.apl.json';
9693
export const ROTATION_WF_DEFAULT = PresetUtils.makePresetAPLRotation('Default WF', DefaultWf);
94+
import Phase3Apl from './apls/phase_3.apl.json';
9795
export const ROTATION_PHASE_3 = PresetUtils.makePresetAPLRotation('Phase 3', Phase3Apl);
9896

9997
// Default talents. Uses the wowhead calculator format, make the talents on

‎ui/feral_druid/presets.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ import {
2020

2121
import * as PresetUtils from '../core/preset_utils.js';
2222

23-
import PreraidGear from './gear_sets/preraid.gear.json';
24-
import P1Gear from './gear_sets/p1.gear.json';
25-
import P2Gear from './gear_sets/p2.gear.json';
26-
import P3Gear from './gear_sets/p3.gear.json';
27-
import P4Gear from './gear_sets/p4.gear.json';
28-
import DefaultApl from './apls/default.apl.json';
29-
3023
// Preset options for this spec.
3124
// Eventually we will import these values for the raid sim too, so its good to
3225
// keep them in a separate file.
3326

27+
import PreraidGear from './gear_sets/preraid.gear.json';
3428
export const PRERAID_PRESET = PresetUtils.makePresetGear('Preraid Preset', PreraidGear);
29+
import P1Gear from './gear_sets/p1.gear.json';
3530
export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
31+
import P2Gear from './gear_sets/p2.gear.json';
3632
export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear);
33+
import P3Gear from './gear_sets/p3.gear.json';
3734
export const P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3Gear);
35+
import P4Gear from './gear_sets/p4.gear.json';
3836
export const P4_PRESET = PresetUtils.makePresetGear('P4 Preset', P4Gear);
37+
38+
import DefaultApl from './apls/default.apl.json';
3939
export const APL_ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('APL Default', DefaultApl);
4040

4141
export const DefaultRotation = FeralDruidRotation.create({

‎ui/feral_tank_druid/gear_sets/p3.gear.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{"items": [
2+
{"id":48204,"enchant":3878,"gems":[41339,40169]},
3+
{"id":47133,"gems":[49110]},
4+
{"id":48207,"enchant":3852,"gems":[40119]},
5+
{"id":47545,"enchant":3294,"gems":[40119]},
6+
{"id":47004,"enchant":3832,"gems":[40119,40119,40119]},
7+
{"id":45611,"enchant":3850,"gems":[40119,0]},
8+
{"id":48203,"enchant":3860,"gems":[40119,0]},
9+
{"id":47112,"gems":[40119,40119,40119]},
10+
{"id":46975,"enchant":3822,"gems":[40119,40119,40119]},
11+
{"id":47077,"enchant":3606,"gems":[40119,40119]},
12+
{"id":47955,"gems":[40119]},
13+
{"id":47075,"gems":[40119]},
14+
{"id":47088},
15+
{"id":47131},
16+
{"id":47130,"enchant":3870,"gems":[40119,40119]},
17+
{},
18+
{"id":45509}
19+
]}

‎ui/feral_tank_druid/gear_sets/p4.gear.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{"items": [
2+
{"id":51296,"enchant":3878,"gems":[41380,40119]},
3+
{"id":50682,"gems":[40130]},
4+
{"id":51299,"enchant":3852,"gems":[40119]},
5+
{"id":50466,"enchant":3294,"gems":[40119]},
6+
{"id":50656,"enchant":3330,"gems":[40119,40119,40119]},
7+
{"id":50670,"enchant":3850,"gems":[40119,0]},
8+
{"id":51295,"enchant":3860,"gems":[40119,0]},
9+
{"id":50707,"gems":[40119,40119,40119]},
10+
{"id":51297,"enchant":3822,"gems":[40119,40119]},
11+
{"id":50607,"enchant":3606,"gems":[40119,40119]},
12+
{"id":50622,"gems":[40119]},
13+
{"id":50404,"gems":[40119]},
14+
{"id":47088},
15+
{"id":50364},
16+
{"id":51432,"enchant":3870,"gems":[40119,40119]},
17+
{},
18+
{"id":50456}
19+
]}

‎ui/feral_tank_druid/presets.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,26 @@ import {
2121

2222
import * as PresetUtils from '../core/preset_utils.js';
2323

24-
import P1Gear from './gear_sets/p1.gear.json';
25-
import P2Gear from './gear_sets/p2.gear.json';
26-
27-
import DefaultApl from './apls/default.apl.json';
28-
2924
// Preset options for this spec.
3025
// Eventually we will import these values for the raid sim too, so its good to
3126
// keep them in a separate file.
3227

33-
export const P1_PRESET = PresetUtils.makePresetGear('P1 Boss Tanking', P1Gear);
34-
export const P2_PRESET = PresetUtils.makePresetGear('P2 Boss Tanking', P2Gear);
28+
import P1Gear from './gear_sets/p1.gear.json';
29+
export const P1_PRESET = PresetUtils.makePresetGear('P1', P1Gear);
30+
import P2Gear from './gear_sets/p2.gear.json';
31+
export const P2_PRESET = PresetUtils.makePresetGear('P2', P2Gear);
32+
import P3Gear from './gear_sets/p3.gear.json';
33+
export const P3_PRESET = PresetUtils.makePresetGear('P3', P3Gear);
34+
import P4Gear from './gear_sets/p4.gear.json';
35+
export const P4_PRESET = PresetUtils.makePresetGear('P4', P4Gear);
3536

3637
export const DefaultSimpleRotation = DruidRotation.create({
3738
maulRageThreshold: 25,
3839
maintainDemoralizingRoar: true,
3940
lacerateTime: 8.0,
4041
});
4142

43+
import DefaultApl from './apls/default.apl.json';
4244
export const ROTATION_DEFAULT = PresetUtils.makePresetAPLRotation('APL Default', DefaultApl);
4345

4446
export const ROTATION_PRESET_SIMPLE = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecFeralTankDruid, DefaultSimpleRotation);

‎ui/feral_tank_druid/sim.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralTankDruid, {
189189
],
190190
// Preset gear configurations that the user can quickly select.
191191
gear: [
192-
Presets.P1_PRESET, Presets.P2_PRESET
192+
Presets.P1_PRESET,
193+
Presets.P2_PRESET,
194+
Presets.P3_PRESET,
195+
Presets.P4_PRESET,
193196
],
194197
},
195198

‎ui/healing_priest/gear_sets/p3_disc.gear.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{"items": [
2+
{"id":46197,"enchant":3820,"gems":[41401,40113]},
3+
{"id":47930,"gems":[40113]},
4+
{"id":46190,"enchant":3810,"gems":[40113]},
5+
{"id":47490,"enchant":3859,"gems":[40134]},
6+
{"id":46193,"enchant":3832,"gems":[40113,40113]},
7+
{"id":47587,"enchant":3758,"gems":[40113,0]},
8+
{"id":46188,"enchant":3246,"gems":[40113,0]},
9+
{"id":45619,"gems":[40113,40113,40113]},
10+
{"id":47189,"enchant":3721,"gems":[40113,40113,40113]},
11+
{"id":46050,"enchant":3606,"gems":[40113,40113]},
12+
{"id":46096,"gems":[40113]},
13+
{"id":47224,"gems":[40151]},
14+
{"id":40432},
15+
{"id":47059},
16+
{"id":47206,"enchant":3834},
17+
{"id":47146},
18+
{"id":45294,"gems":[40113]}
19+
]}

0 commit comments

Comments
 (0)