Skip to content

Commit 01b8604

Browse files
kayla-glickkayla-glick
authored
Merge pull request #121 from xorrbit/feral_bis_updates
Feral DPS gear set updates
2 parents d8a03ff + 472b88e commit 01b8604

File tree

9 files changed

+94
-16
lines changed

9 files changed

+94
-16
lines changed

‎ui/core/constants/other.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export enum Phase {
99
Phase6,
1010
}
1111

12-
export const CURRENT_PHASE = Phase.Phase2;
12+
export const CURRENT_PHASE = Phase.Phase4;
1313

1414
// Github pages serves our site under the /classic directory
1515
export const REPO_NAME = 'classic';

ui/feral_druid/apls/p2.apl.json renamed to ui/feral_druid/apls/feral.apl.json

File renamed without changes.

‎ui/feral_druid/apls/simple_vael.apl.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"type": "TypeAPL",
3+
"prepullActions": [
4+
{"action":{"castSpell":{"spellId":{"spellId":9846,"rank":4}}},"doAtValue":{"const":{"val":"-0s"}}},
5+
{"action":{"castSpell":{"spellId":{"spellId":13494}}},"doAtValue":{"const":{"val":"-0s"}}}
6+
],
7+
"priorityList": [
8+
{"action":{"autocastOtherCooldowns":{}}},
9+
{"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}}}},
10+
{"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":22829,"rank":4}}}},
11+
{"action":{"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}
12+
]
13+
}

‎ui/feral_druid/gear_sets/p4.bis.gear.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{"items": [
2+
{"id":8345,"enchant":1508},
3+
{"id":19377},
4+
{"id":16551,"enchant":2606},
5+
{"id":19436,"enchant":849},
6+
{"id":16549,"enchant":1891},
7+
{"id":19587,"enchant":1885},
8+
{"id":16555,"enchant":1887},
9+
{"id":20216},
10+
{"id":16552,"enchant":1508},
11+
{"id":19381,"enchant":1887},
12+
{"id":17063},
13+
{"id":19432},
14+
{"id":19406},
15+
{"id":13965},
16+
{"id":9449,"enchant":34},
17+
{},
18+
{}
19+
]}

‎ui/feral_druid/gear_sets/p5.bis.gear.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{"items": [
2+
{"id":8345,"enchant":1508},
3+
{"id":19377},
4+
{"id":21665,"enchant":2606},
5+
{"id":21710,"enchant":849},
6+
{"id":21680,"enchant":1891},
7+
{"id":21602,"enchant":1885},
8+
{"id":21672,"enchant":2564},
9+
{"id":21586},
10+
{"id":16552,"enchant":1508},
11+
{"id":21493,"enchant":1887},
12+
{"id":17063},
13+
{"id":21205},
14+
{"id":19406},
15+
{"id":23570},
16+
{"id":9449,"enchant":34},
17+
{},
18+
{"id":22397}
19+
]}

‎ui/feral_druid/gear_sets/p6.bis.gear.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{"items": [
2+
{"id":8345,"enchant":1508},
3+
{"id":19377},
4+
{"id":21665,"enchant":2717},
5+
{"id":21701,"enchant":849},
6+
{"id":21680,"enchant":1891},
7+
{"id":21602,"enchant":1885},
8+
{"id":21672,"enchant":2564},
9+
{"id":21586},
10+
{"id":23071,"enchant":1508},
11+
{"id":21493,"enchant":1887},
12+
{"id":23038},
13+
{"id":17063},
14+
{"id":22954},
15+
{"id":23206},
16+
{"id":9449,"enchant":34},
17+
{},
18+
{"id":22397}
19+
]}

‎ui/feral_druid/presets.ts‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ import {
2323
} from '../core/proto/common.js';
2424
import { FeralDruid_Options as FeralDruidOptions, FeralDruid_Rotation as FeralDruidRotation } from '../core/proto/druid.js';
2525
import { SavedTalents } from '../core/proto/ui.js';
26-
import P2APL from './apls/p2.apl.json';
26+
import FeralAPL from './apls/feral.apl.json';
27+
import SimpleVaelAPL from './apls/simple_vael.apl.json';
2728
import P2BISGear from './gear_sets/p2.bis.gear.json';
2829
import P2PreBISGear from './gear_sets/p2.pre-bis.gear.json';
2930
import P3BISGear from './gear_sets/p3.bis.gear.json';
31+
import P4BISGear from './gear_sets/p4.bis.gear.json';
32+
import P5BISGear from './gear_sets/p5.bis.gear.json';
33+
import P6BISGear from './gear_sets/p6.bis.gear.json';
3034

3135
// Preset options for this spec.
3236
// 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';
3640
// Gear Presets
3741
///////////////////////////////////////////////////////////////////////////
3842

39-
export const GearP2BIS = PresetUtils.makePresetGear('P2 BiS', P2BISGear);
4043
export const GearP2PreBIS = PresetUtils.makePresetGear('P2 Pre-BiS', P2PreBISGear);
44+
export const GearP2BIS = PresetUtils.makePresetGear('P2 BiS', P2BISGear);
4145
export const GearP3BIS = PresetUtils.makePresetGear('P3 BiS', P3BISGear)
46+
export const GearP4BIS = PresetUtils.makePresetGear('P4 BiS', P4BISGear)
47+
export const GearP5BIS = PresetUtils.makePresetGear('P5 BiS', P5BISGear)
48+
export const GearP6BIS = PresetUtils.makePresetGear('P6 BiS', P6BISGear)
4249

4350
export const GearPresets = {
44-
[Phase.Phase2]: [GearP2PreBIS, GearP2BIS, GearP3BIS],
51+
[Phase.Phase4]: [GearP2PreBIS, GearP2BIS, GearP3BIS, GearP4BIS, GearP5BIS, GearP6BIS],
4552
};
4653

47-
export const DefaultGear = GearP2BIS;
54+
export const DefaultGear = GearP4BIS;
4855

4956
///////////////////////////////////////////////////////////////////////////
5057
// APL Presets
5158
///////////////////////////////////////////////////////////////////////////
5259

53-
export const APLP2Feral = PresetUtils.makePresetAPLRotation('Feral', P2APL);
60+
export const APLFeral = PresetUtils.makePresetAPLRotation('Feral', FeralAPL);
61+
export const APLSimpleVael = PresetUtils.makePresetAPLRotation('Simple Vaelastrasz', SimpleVaelAPL);
5462

5563
export const APLPresets = {
56-
[Phase.Phase2]: [APLP2Feral],
64+
[Phase.Phase4]: [APLFeral, APLSimpleVael],
5765
};
5866

59-
export const DefaultAPL = APLPresets[Phase.Phase2][0];
67+
export const DefaultAPL = APLFeral;
6068

6169
export const DefaultRotation = FeralDruidRotation.create({
6270
maintainFaerieFire: false,
@@ -72,13 +80,13 @@ export const SIMPLE_ROTATION_DEFAULT = PresetUtils.makePresetSimpleRotation('Sim
7280
// Talent Presets
7381
///////////////////////////////////////////////////////////////////////////
7482

75-
export const TalentsP2Feral = PresetUtils.makePresetTalents('Feral', SavedTalents.create({ talentsString: '500005301-5500021323202151-05' }));
83+
export const TalentsFeral = PresetUtils.makePresetTalents('Feral', SavedTalents.create({ talentsString: '500005301-5500021323202151-05' }));
7684

7785
export const TalentPresets = {
78-
[Phase.Phase2]: [TalentsP2Feral],
86+
[Phase.Phase4]: [TalentsFeral],
7987
};
8088

81-
export const DefaultTalents = TalentPresets[Phase.Phase2][0];
89+
export const DefaultTalents = TalentsFeral;
8290

8391
///////////////////////////////////////////////////////////////////////////
8492
// Options
@@ -120,7 +128,7 @@ export const DefaultIndividualBuffs = IndividualBuffs.create({
120128
rallyingCryOfTheDragonslayer: true,
121129
saygesFortune: SaygesFortune.SaygesDamage,
122130
songflowerSerenade: true,
123-
spiritOfZandalar: false,
131+
spiritOfZandalar: true,
124132
warchiefsBlessing: true,
125133
});
126134

‎ui/feral_druid/sim.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFeralDruid, {
134134

135135
presets: {
136136
// Preset talents that the user can quickly select.
137-
talents: [...Presets.TalentPresets[Phase.Phase2]],
138-
rotations: [...Presets.APLPresets[Phase.Phase2]],
137+
talents: [...Presets.TalentPresets[Phase.Phase4]],
138+
rotations: [...Presets.APLPresets[Phase.Phase4]],
139139
// Preset gear configurations that the user can quickly select.
140-
gear: [...Presets.GearPresets[Phase.Phase2]],
140+
gear: [...Presets.GearPresets[Phase.Phase4]],
141141
},
142142

143143
autoRotation: player => {

‎ui/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ <h3 class="expansion-title w-100 mb-0">Classic</h3>
128128
<div class="d-flex flex-column">
129129
<span class="sim-link-label">Druid</span>
130130
<span class="sim-link-title">Feral DPS</span>
131-
<span class="launch-status-label text-brand">Phase 2 - Alpha</span>
131+
<span class="launch-status-label text-brand">Phase 4 - Alpha</span>
132132
</div>
133133
</div>
134134
</a>

0 commit comments

Comments
 (0)