diff --git a/ui/core/constants/other.ts b/ui/core/constants/other.ts
index 08ee9c3eb..27ff59e00 100644
--- a/ui/core/constants/other.ts
+++ b/ui/core/constants/other.ts
@@ -9,7 +9,7 @@ export enum Phase {
Phase6,
}
-export const CURRENT_PHASE = Phase.Phase2;
+export const CURRENT_PHASE = Phase.Phase4;
// Github pages serves our site under the /classic directory
export const REPO_NAME = 'classic';
diff --git a/ui/feral_druid/apls/p2.apl.json b/ui/feral_druid/apls/feral.apl.json
similarity index 100%
rename from ui/feral_druid/apls/p2.apl.json
rename to ui/feral_druid/apls/feral.apl.json
diff --git a/ui/feral_druid/apls/simple_vael.apl.json b/ui/feral_druid/apls/simple_vael.apl.json
new file mode 100644
index 000000000..ddf88074d
--- /dev/null
+++ b/ui/feral_druid/apls/simple_vael.apl.json
@@ -0,0 +1,13 @@
+{
+ "type": "TypeAPL",
+ "prepullActions": [
+ {"action":{"castSpell":{"spellId":{"spellId":9846,"rank":4}}},"doAtValue":{"const":{"val":"-0s"}}},
+ {"action":{"castSpell":{"spellId":{"spellId":13494}}},"doAtValue":{"const":{"val":"-0s"}}}
+ ],
+ "priorityList": [
+ {"action":{"autocastOtherCooldowns":{}}},
+ {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":9846,"rank":4}}},"rhs":{"const":{"val":"3"}}}},{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":9846,"rank":4}}}},
+ {"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":22829,"rank":4}}}},
+ {"action":{"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}
+ ]
+}
\ No newline at end of file
diff --git a/ui/feral_druid/gear_sets/p4.bis.gear.json b/ui/feral_druid/gear_sets/p4.bis.gear.json
new file mode 100644
index 000000000..707c2249a
--- /dev/null
+++ b/ui/feral_druid/gear_sets/p4.bis.gear.json
@@ -0,0 +1,19 @@
+{"items": [
+ {"id":8345,"enchant":1508},
+ {"id":19377},
+ {"id":16551,"enchant":2606},
+ {"id":19436,"enchant":849},
+ {"id":16549,"enchant":1891},
+ {"id":19587,"enchant":1885},
+ {"id":16555,"enchant":1887},
+ {"id":20216},
+ {"id":16552,"enchant":1508},
+ {"id":19381,"enchant":1887},
+ {"id":17063},
+ {"id":19432},
+ {"id":19406},
+ {"id":13965},
+ {"id":9449,"enchant":34},
+ {},
+ {}
+]}
\ No newline at end of file
diff --git a/ui/feral_druid/gear_sets/p5.bis.gear.json b/ui/feral_druid/gear_sets/p5.bis.gear.json
new file mode 100644
index 000000000..f5153122e
--- /dev/null
+++ b/ui/feral_druid/gear_sets/p5.bis.gear.json
@@ -0,0 +1,19 @@
+{"items": [
+ {"id":8345,"enchant":1508},
+ {"id":19377},
+ {"id":21665,"enchant":2606},
+ {"id":21710,"enchant":849},
+ {"id":21680,"enchant":1891},
+ {"id":21602,"enchant":1885},
+ {"id":21672,"enchant":2564},
+ {"id":21586},
+ {"id":16552,"enchant":1508},
+ {"id":21493,"enchant":1887},
+ {"id":17063},
+ {"id":21205},
+ {"id":19406},
+ {"id":23570},
+ {"id":9449,"enchant":34},
+ {},
+ {"id":22397}
+]}
\ No newline at end of file
diff --git a/ui/feral_druid/gear_sets/p6.bis.gear.json b/ui/feral_druid/gear_sets/p6.bis.gear.json
new file mode 100644
index 000000000..35fee55a8
--- /dev/null
+++ b/ui/feral_druid/gear_sets/p6.bis.gear.json
@@ -0,0 +1,19 @@
+{"items": [
+ {"id":8345,"enchant":1508},
+ {"id":19377},
+ {"id":21665,"enchant":2717},
+ {"id":21701,"enchant":849},
+ {"id":21680,"enchant":1891},
+ {"id":21602,"enchant":1885},
+ {"id":21672,"enchant":2564},
+ {"id":21586},
+ {"id":23071,"enchant":1508},
+ {"id":21493,"enchant":1887},
+ {"id":23038},
+ {"id":17063},
+ {"id":22954},
+ {"id":23206},
+ {"id":9449,"enchant":34},
+ {},
+ {"id":22397}
+]}
\ No newline at end of file
diff --git a/ui/feral_druid/presets.ts b/ui/feral_druid/presets.ts
index 8075b52ee..8bad2bc0d 100644
--- a/ui/feral_druid/presets.ts
+++ b/ui/feral_druid/presets.ts
@@ -23,10 +23,14 @@ import {
} from '../core/proto/common.js';
import { FeralDruid_Options as FeralDruidOptions, FeralDruid_Rotation as FeralDruidRotation } from '../core/proto/druid.js';
import { SavedTalents } from '../core/proto/ui.js';
-import P2APL from './apls/p2.apl.json';
+import FeralAPL from './apls/feral.apl.json';
+import SimpleVaelAPL from './apls/simple_vael.apl.json';
import P2BISGear from './gear_sets/p2.bis.gear.json';
import P2PreBISGear from './gear_sets/p2.pre-bis.gear.json';
import P3BISGear from './gear_sets/p3.bis.gear.json';
+import P4BISGear from './gear_sets/p4.bis.gear.json';
+import P5BISGear from './gear_sets/p5.bis.gear.json';
+import P6BISGear from './gear_sets/p6.bis.gear.json';
// Preset options for this spec.
// Eventually we will import these values for the raid sim too, so its good to
@@ -36,27 +40,31 @@ import P3BISGear from './gear_sets/p3.bis.gear.json';
// Gear Presets
///////////////////////////////////////////////////////////////////////////
-export const GearP2BIS = PresetUtils.makePresetGear('P2 BiS', P2BISGear);
export const GearP2PreBIS = PresetUtils.makePresetGear('P2 Pre-BiS', P2PreBISGear);
+export const GearP2BIS = PresetUtils.makePresetGear('P2 BiS', P2BISGear);
export const GearP3BIS = PresetUtils.makePresetGear('P3 BiS', P3BISGear)
+export const GearP4BIS = PresetUtils.makePresetGear('P4 BiS', P4BISGear)
+export const GearP5BIS = PresetUtils.makePresetGear('P5 BiS', P5BISGear)
+export const GearP6BIS = PresetUtils.makePresetGear('P6 BiS', P6BISGear)
export const GearPresets = {
- [Phase.Phase2]: [GearP2PreBIS, GearP2BIS, GearP3BIS],
+ [Phase.Phase4]: [GearP2PreBIS, GearP2BIS, GearP3BIS, GearP4BIS, GearP5BIS, GearP6BIS],
};
-export const DefaultGear = GearP2BIS;
+export const DefaultGear = GearP4BIS;
///////////////////////////////////////////////////////////////////////////
// APL Presets
///////////////////////////////////////////////////////////////////////////
-export const APLP2Feral = PresetUtils.makePresetAPLRotation('Feral', P2APL);
+export const APLFeral = PresetUtils.makePresetAPLRotation('Feral', FeralAPL);
+export const APLSimpleVael = PresetUtils.makePresetAPLRotation('Simple Vaelastrasz', SimpleVaelAPL);
export const APLPresets = {
- [Phase.Phase2]: [APLP2Feral],
+ [Phase.Phase4]: [APLFeral, APLSimpleVael],
};
-export const DefaultAPL = APLPresets[Phase.Phase2][0];
+export const DefaultAPL = APLFeral;
export const DefaultRotation = FeralDruidRotation.create({
maintainFaerieFire: false,
@@ -72,13 +80,13 @@ export const SIMPLE_ROTATION_DEFAULT = PresetUtils.makePresetSimpleRotation('Sim
// Talent Presets
///////////////////////////////////////////////////////////////////////////
-export const TalentsP2Feral = PresetUtils.makePresetTalents('Feral', SavedTalents.create({ talentsString: '500005301-5500021323202151-05' }));
+export const TalentsFeral = PresetUtils.makePresetTalents('Feral', SavedTalents.create({ talentsString: '500005301-5500021323202151-05' }));
export const TalentPresets = {
- [Phase.Phase2]: [TalentsP2Feral],
+ [Phase.Phase4]: [TalentsFeral],
};
-export const DefaultTalents = TalentPresets[Phase.Phase2][0];
+export const DefaultTalents = TalentsFeral;
///////////////////////////////////////////////////////////////////////////
// Options
@@ -120,7 +128,7 @@ export const DefaultIndividualBuffs = IndividualBuffs.create({
rallyingCryOfTheDragonslayer: true,
saygesFortune: SaygesFortune.SaygesDamage,
songflowerSerenade: true,
- spiritOfZandalar: false,
+ spiritOfZandalar: true,
warchiefsBlessing: true,
});
diff --git a/ui/feral_druid/sim.ts b/ui/feral_druid/sim.ts
index 4295c3649..a0065c087 100644
--- a/ui/feral_druid/sim.ts
+++ b/ui/feral_druid/sim.ts
@@ -134,10 +134,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, {
presets: {
// Preset talents that the user can quickly select.
- talents: [...Presets.TalentPresets[Phase.Phase2]],
- rotations: [...Presets.APLPresets[Phase.Phase2]],
+ talents: [...Presets.TalentPresets[Phase.Phase4]],
+ rotations: [...Presets.APLPresets[Phase.Phase4]],
// Preset gear configurations that the user can quickly select.
- gear: [...Presets.GearPresets[Phase.Phase2]],
+ gear: [...Presets.GearPresets[Phase.Phase4]],
},
autoRotation: player => {
diff --git a/ui/index.html b/ui/index.html
index ed1521a59..9a3bbdd31 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -128,7 +128,7 @@ Classic
Druid
Feral DPS
- Phase 2 - Alpha
+ Phase 4 - Alpha