Skip to content

Feral DPS gear set updates #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kayla-glick merged 3 commits into from
Apr 30, 2025
Merged

Feral DPS gear set updates #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
677a678
Update current phase to phase 4 for default gear filter.
xorrbit Apr 24, 2025
c9a07a5
Added P4, P5, and P6 BiS gear sets.
xorrbit Apr 24, 2025
472b88e
Update feral sim link
xorrbit Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/core/constants/other.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
0 ui/feral_druid/apls/p2.apl.json → ui/feral_druid/apls/feral.apl.json
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions ui/feral_druid/apls/simple_vael.apl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}}}
]
}
19 changes: 19 additions & 0 deletions ui/feral_druid/gear_sets/p4.bis.gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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},
{},
{}
]}
19 changes: 19 additions & 0 deletions ui/feral_druid/gear_sets/p5.bis.gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
]}
19 changes: 19 additions & 0 deletions ui/feral_druid/gear_sets/p6.bis.gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
]}
30 changes: 19 additions & 11 deletions ui/feral_druid/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -120,7 +128,7 @@ export const DefaultIndividualBuffs = IndividualBuffs.create({
rallyingCryOfTheDragonslayer: true,
saygesFortune: SaygesFortune.SaygesDamage,
songflowerSerenade: true,
spiritOfZandalar: false,
spiritOfZandalar: true,
warchiefsBlessing: true,
});

Expand Down
6 changes: 3 additions & 3 deletions ui/feral_druid/sim.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
2 changes: 1 addition & 1 deletion ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h3 class="expansion-title w-100 mb-0">Classic</h3>
<div class="d-flex flex-column">
<span class="sim-link-label">Druid</span>
<span class="sim-link-title">Feral DPS</span>
<span class="launch-status-label text-brand">Phase 2 - Alpha</span>
<span class="launch-status-label text-brand">Phase 4 - Alpha</span>
</div>
</div>
</a>
Expand Down
Loading