New Presets for Prot Warr

wowsims · Nov 11, 2023 · 6a11f78 · 6a11f78
1 parent c23707d
commit 6a11f78
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 4 deletions.
diff --git a/ui/protection_warrior/gear_sets/p3.gear.json b/ui/protection_warrior/gear_sets/p3.gear.json
@@ -0,0 +1,19 @@
+{"items": [
+        {"id":48433,"enchant":3818,"gems":[41380,40130]},
+        {"id":47133,"gems":[40130]},
+        {"id":48455,"enchant":3852,"gems":[40119]},
+        {"id":47549,"enchant":3605,"gems":[40119]},
+        {"id":46968,"enchant":3832,"gems":[40130,49110,36767]},
+        {"id":47111,"enchant":3850,"gems":[40130,0]},
+        {"id":48453,"enchant":3860,"gems":[40167,0]},
+        {"id":47076,"enchant":3599,"gems":[40130,36767,36767]},
+        {"id":48447,"enchant":3822,"gems":[40130,40119]},
+        {"id":47003,"enchant":3232,"gems":[40130,40119]},
+        {"id":45471,"gems":[40167]},
+        {"id":47157,"gems":[40130]},
+        {"id":45158},
+        {"id":47088},
+        {"id":47506,"enchant":3788,"gems":[40167]},
+        {"id":46964,"enchant":3849,"gems":[40119]},
+        {"id":47660}
+      ]}
diff --git a/ui/protection_warrior/gear_sets/p4.gear.json b/ui/protection_warrior/gear_sets/p4.gear.json
@@ -0,0 +1,19 @@
+{"items": [
+        {"id":50640,"enchant":3818,"gems":[41380,40130]},
+        {"id":50682,"gems":[40130]},
+        {"id":51224,"enchant":3852,"gems":[40130]},
+        {"id":50718,"enchant":3605,"gems":[40119]},
+        {"id":51220,"enchant":3832,"gems":[40130,40119]},
+        {"id":50611,"enchant":3850,"gems":[40119,0]},
+        {"id":51222,"enchant":3860,"gems":[40119,0]},
+        {"id":50691,"enchant":3599,"gems":[40130,36767,0]},
+        {"id":51223,"enchant":3822,"gems":[40167,40119]},
+        {"id":50625,"enchant":3232,"gems":[40167,40119]},
+        {"id":50622,"gems":[40130]},
+        {"id":50642,"gems":[40130]},
+        {"id":50364},
+        {"id":50344},
+        {"id":50738,"enchant":3788,"gems":[40119]},
+        {"id":50729,"enchant":3849,"gems":[40130]},
+        {"id":51834,"gems":[36767]}
+      ]}
diff --git a/ui/protection_warrior/gear_sets/p4_preraid.gear.json b/ui/protection_warrior/gear_sets/p4_preraid.gear.json
@@ -0,0 +1,19 @@
+{"items": [
+        {"id":48430,"enchant":3818,"gems":[41380,40130]},
+        {"id":47116},
+        {"id":48454,"enchant":3852,"gems":[40119]},
+        {"id":45496,"enchant":3605,"gems":[40130]},
+        {"id":48450,"enchant":3832,"gems":[40167,40119]},
+        {"id":47570,"enchant":3850,"gems":[40167,0]},
+        {"id":48452,"enchant":3860,"gems":[40167,0]},
+        {"id":47072,"enchant":3599,"gems":[40130,36767]},
+        {"id":49904,"enchant":3822,"gems":[40130,40167,36767]},
+        {"id":49907,"enchant":3232,"gems":[40167,36767]},
+        {"id":45471,"gems":[40167]},
+        {"id":47731},
+        {"id":47216},
+        {"id":47080},
+        {"id":45876,"enchant":3788,"gems":[40130]},
+        {"id":45877,"enchant":3849,"gems":[40119,40119]},
+        {"id":47660}
+      ]}
diff --git a/ui/protection_warrior/presets.ts b/ui/protection_warrior/presets.ts
@@ -26,18 +26,24 @@ import {
 import * as PresetUtils from '../core/preset_utils.js';
 
 import PreraidBalancedGear from './gear_sets/preraid_balanced.gear.json';
+import PreraidP4Gear from './gear_sets/p4_preraid.gear.json';
 import P1BalancedGear from './gear_sets/p1_balanced.gear.json';
 import P2SurvivalGear from './gear_sets/p2_survival.gear.json';
+import P3Gear from './gear_sets/p3.gear.json';
+import P4Gear from './gear_sets/p4.gear.json';
 
 import DefaultApl from './apls/default.apl.json';
 
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
 // keep them in a separate file.
 
-export const PRERAID_BALANCED_PRESET = PresetUtils.makePresetGear('PreRaid Balanced', PreraidBalancedGear);
-export const P1_BALANCED_PRESET = PresetUtils.makePresetGear('P1 Balanced Preset', P1BalancedGear);
-export const P2_SURVIVAL_PRESET = PresetUtils.makePresetGear('P2 Survival Preset', P2SurvivalGear);
+export const PRERAID_BALANCED_PRESET = PresetUtils.makePresetGear('P1 PreRaid Preset', PreraidBalancedGear);
+export const P4_PRERAID_PRESET = PresetUtils.makePresetGear('P4 PreRaid Preset', PreraidP4Gear);
+export const P1_BALANCED_PRESET = PresetUtils.makePresetGear('P1 Preset', P1BalancedGear);
+export const P2_SURVIVAL_PRESET = PresetUtils.makePresetGear('P2 Preset', P2SurvivalGear);
+export const P3_PRESET = PresetUtils.makePresetGear('P3 Preset', P3Gear);
+export const P4_PRESET = PresetUtils.makePresetGear('P4 Preset', P4Gear);
 
 export const DefaultRotation = ProtectionWarriorRotation.create({
 	customRotation: CustomRotation.create({

diff --git a/ui/protection_warrior/sim.ts b/ui/protection_warrior/sim.ts
@@ -94,7 +94,7 @@ export class ProtectionWarriorSimUI extends IndividualSimUI<Spec.SpecProtectionW
 
 			defaults: {
 				// Default equipped gear.
-				gear: Presets.P2_SURVIVAL_PRESET.gear,
+				gear: Presets.P3_PRESET.gear,
 				// Default EP weights for sorting gear in the gear picker.
 				epWeights: Stats.fromMap({
 					[Stat.StatArmor]: 0.174,
@@ -207,8 +207,11 @@ export class ProtectionWarriorSimUI extends IndividualSimUI<Spec.SpecProtectionW
 				// Preset gear configurations that the user can quickly select.
 				gear: [
 					Presets.PRERAID_BALANCED_PRESET,
+					Presets.P4_PRERAID_PRESET,
 					Presets.P1_BALANCED_PRESET,
 					Presets.P2_SURVIVAL_PRESET,
+					Presets.P3_PRESET,
+					Presets.P4_PRESET,
 				],
 			},