Skip to content

Commit

Permalink
Merge pull request #4035 from Horatio27/enh_presets
Browse files Browse the repository at this point in the history
Added P4 Presets for enh
  • Loading branch information
Horatio27 authored Nov 12, 2023
2 parents 6b7376c + b3992a1 commit 2cf9b60
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 1 deletion.
19 changes: 19 additions & 0 deletions ui/enhancement_shaman/gear_sets/p4_ft.gear.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{"items": [
{"id":51242,"enchant":3817,"gems":[41398,40118]},
{"id":50658,"gems":[42156]},
{"id":51240,"enchant":3808,"gems":[40128]},
{"id":50653,"enchant":3831,"gems":[40128]},
{"id":51244,"enchant":3832,"gems":[40118,49110]},
{"id":50687,"enchant":3845,"gems":[40128,0]},
{"id":50619,"enchant":3604,"gems":[40125,40118,0]},
{"id":50613,"enchant":3599,"gems":[40128,40118,40128]},
{"id":51241,"enchant":3823,"gems":[40118,40128]},
{"id":50711,"enchant":3606,"gems":[40128,40128]},
{"id":50604,"gems":[42156]},
{"id":50402,"gems":[42156]},
{"id":50343},
{"id":45609},
{"id":51939,"enchant":3789,"gems":[40118]},
{"id":50710,"enchant":3789,"gems":[40118]},
{"id":50458}
]}
19 changes: 19 additions & 0 deletions ui/enhancement_shaman/gear_sets/p4_wf.gear.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{"items": [
{"id":51242,"enchant":3817,"gems":[41398,40118]},
{"id":51890,"gems":[40118]},
{"id":51240,"enchant":3808,"gems":[40128]},
{"id":50653,"enchant":3831,"gems":[40128]},
{"id":51244,"enchant":3832,"gems":[40118,49110]},
{"id":51914,"enchant":3845,"gems":[40118,0]},
{"id":50619,"enchant":3604,"gems":[40128,40159,0]},
{"id":50993,"gems":[42150,42150,42150]},
{"id":51241,"enchant":3823,"gems":[40118,40159]},
{"id":50711,"enchant":3606,"gems":[40128,40128]},
{"id":50604,"gems":[40128]},
{"id":50402,"gems":[40128]},
{"id":50355},
{"id":50343},
{"id":50692,"enchant":3789,"gems":[40128]},
{"id":50710,"enchant":3789,"gems":[40128]},
{"id":50458}
]}
11 changes: 11 additions & 0 deletions ui/enhancement_shaman/presets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ import P2FtGear from './gear_sets/p2_ft.gear.json';
import P2WfGear from './gear_sets/p2_wf.gear.json';
import P3AllianceGear from './gear_sets/p3_alliance.gear.json';
import P3HordeGear from './gear_sets/p3_horde.gear.json';
import P4FtGear from './gear_sets/p4_ft.gear.json';
import P4WfGear from './gear_sets/p4_wf.gear.json';

import DefaultFt from './apls/default_ft.apl.json';
import DefaultWf from './apls/default_wf.apl.json';
import Phase3Apl from './apls/phase_3.apl.json';
import { TotemsSection } from 'ui/core/components/totem_inputs.js';

// Preset options for this spec.
// Eventually we will import these values for the raid sim too, so its good to
Expand All @@ -51,6 +54,8 @@ export const P2_PRESET_FT = PresetUtils.makePresetGear('P2 Preset FT', P2FtGear)
export const P2_PRESET_WF = PresetUtils.makePresetGear('P2 Preset WF', P2WfGear);
export const P3_PRESET_ALLIANCE = PresetUtils.makePresetGear('P3 Preset [A]', P3AllianceGear, { faction: Faction.Alliance });
export const P3_PRESET_HORDE = PresetUtils.makePresetGear('P3 Preset [H]', P3HordeGear, { faction: Faction.Horde });
export const P4_PRESET_FT = PresetUtils.makePresetGear('P4 Preset FT', P4FtGear);
export const P4_PRESET_WF = PresetUtils.makePresetGear('P4 Preset WF', P4WfGear);

export const DefaultRotation = EnhancementShamanRotation.create({
totems: ShamanTotems.create({
Expand Down Expand Up @@ -125,6 +130,12 @@ export const DefaultOptions = EnhancementShamanOptions.create({
imbueMh: ShamanImbue.WindfuryWeapon,
imbueOh: ShamanImbue.FlametongueWeapon,
syncType: ShamanSyncType.Auto,
totems: ShamanTotems.create({
earth: EarthTotem.StrengthOfEarthTotem,
fire: FireTotem.MagmaTotem,
water: WaterTotem.ManaSpringTotem,
air: AirTotem.WindfuryTotem,
})
});

export const DefaultConsumes = Consumes.create({
Expand Down
4 changes: 3 additions & 1 deletion ui/enhancement_shaman/sim.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class EnhancementShamanSimUI extends IndividualSimUI<Spec.SpecEnhancement

defaults: {
// Default equipped gear.
gear: Presets.P1_PRESET.gear,
gear: Presets.P4_PRESET_WF.gear,
// Default EP weights for sorting gear in the gear picker.
epWeights: Stats.fromMap({
[Stat.StatIntellect]: 1.48,
Expand Down Expand Up @@ -168,6 +168,8 @@ export class EnhancementShamanSimUI extends IndividualSimUI<Spec.SpecEnhancement
Presets.P2_PRESET_WF,
Presets.P3_PRESET_ALLIANCE,
Presets.P3_PRESET_HORDE,
Presets.P4_PRESET_FT,
Presets.P4_PRESET_WF,
],
},

Expand Down

0 comments on commit 2cf9b60

Please sign in to comment.