Merge pull request #828 from wowsims/feature/add-stat-cap-defaults

[UI] Tweak mage dropdown with BL options
wowsims · Jul 9, 2024 · 0cd26bd · 0cd26bd
2 parents 2af20ec + c8a7837
commit 0cd26bd
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 41 deletions.
diff --git a/ui/mage/fire/presets.ts b/ui/mage/fire/presets.ts
@@ -35,50 +35,12 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 		[Stat.StatIntellect]: 1.33,
 		[Stat.StatSpellPower]: 1.0,
 		[Stat.StatSpellHit]: 1.09,
-		[Stat.StatSpellCrit]: 0.61,
-		[Stat.StatSpellHaste]: 0.69,
+		[Stat.StatSpellCrit]: 0.62,
+		[Stat.StatSpellHaste]: 0.82,
 		[Stat.StatMastery]: 0.46,
 	}),
 );
 
-export const FIRE_BREAKPOINTS = new Map([
-	[
-		Stat.StatSpellHaste,
-		// Picked from Mage Discord
-		// Sources:
-		// https://docs.google.com/spreadsheets/d/17cJJUReg2uz-XxBB3oDWb1kCncdH_-X96mSb0HAu4Ko/edit?gid=0#gid=0
-		// https://docs.google.com/spreadsheets/d/1WLOZ1YevGPw_WZs0JhGzVVy906W5y0i9UqHa3ejyBkE/htmlview?gid=19
-		new Map([
-			['5-tick LvB/Pyro', 1602],
-			['12-tick Combust', 1922],
-			['13-tick Combust', 3212],
-			['14-tick Combust', 4488],
-			['6-tick LvB/Pyro', 4805],
-			['15-tick Combust', 5767],
-			['16-tick Combust', 7033],
-			['7-tick LvB/Pyro', 8000],
-			['17-tick Combust', 8309],
-			['18-tick Combust', 9602],
-			['19-tick Combust', 10887],
-			['8-tick LvB/Pyro', 11198],
-			['20-tick Combust', 12182],
-			['21-tick Combust', 13463],
-			['9-tick LvB/Pyro', 14412],
-			['22-tick Combust', 14704],
-			// ['23-tick Combust', 16004],
-			// ['24-tick Combust', 17290],
-			// ['10-tick LvB/Pyro', 17600],
-			// ['25-tick Combust', 18543],
-			// ['26-tick Combust', 19821],
-			// ['11-tick LvB/Pyro', 20820],
-			// ['27-tick Combust', 21117],
-			// ['28-tick Combust', 22424],
-			// ['29-tick Combust', 23730],
-			// ['12-tick LvB/Pyro', 24010],
-		]),
-	],
-]);
-
 // Default talents. Uses the wowhead calculator format, make the talents on
 // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url.
 export const FireTalents = {
@@ -137,3 +99,45 @@ export const OtherDefaults = {
 	profession1: Profession.Engineering,
 	profession2: Profession.Tailoring,
 };
+
+export const FIRE_BREAKPOINTS = new Map([
+	[
+		Stat.StatSpellHaste,
+		// Picked from Mage Discord
+		// Sources:
+		// https://docs.google.com/spreadsheets/d/17cJJUReg2uz-XxBB3oDWb1kCncdH_-X96mSb0HAu4Ko/edit?gid=0#gid=0
+		// https://docs.google.com/spreadsheets/d/1WLOZ1YevGPw_WZs0JhGzVVy906W5y0i9UqHa3ejyBkE/htmlview?gid=19
+		new Map([
+			['BL - 15-tick Combust', 1481],
+			['5-tick LvB/Pyro', 1602],
+			['12-tick Combust', 1922],
+			['BL - 16-tick Combust', 2455],
+			['BL - 7-tick LvB/Pyro', 3199],
+			['13-tick Combust', 3212],
+			['BL - 17-tick Combust', 3436],
+			['14-tick Combust', 4488],
+			['6-tick LvB/Pyro', 4805],
+			['15-tick Combust', 5767],
+			// ['16-tick Combust', 7033],
+			// ['7-tick LvB/Pyro', 8000],
+			// ['17-tick Combust', 8309],
+			// ['18-tick Combust', 9602],
+			// ['19-tick Combust', 10887],
+			// ['8-tick LvB/Pyro', 11198],
+			// ['20-tick Combust', 12182],
+			// ['21-tick Combust', 13463],
+			// ['9-tick LvB/Pyro', 14412],
+			// ['22-tick Combust', 14704],
+			// ['23-tick Combust', 16004],
+			// ['24-tick Combust', 17290],
+			// ['10-tick LvB/Pyro', 17600],
+			// ['25-tick Combust', 18543],
+			// ['26-tick Combust', 19821],
+			// ['11-tick LvB/Pyro', 20820],
+			// ['27-tick Combust', 21117],
+			// ['28-tick Combust', 22424],
+			// ['29-tick Combust', 23730],
+			// ['12-tick LvB/Pyro', 24010],
+		]),
+	],
+]);
diff --git a/ui/mage/fire/sim.ts b/ui/mage/fire/sim.ts
@@ -62,13 +62,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFireMage, {
 				breakpoints: [
 					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('5-tick LvB/Pyro')!,
 					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('12-tick Combust')!,
+					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('BL - 16-tick Combust')!,
 					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('13-tick Combust')!,
 					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('14-tick Combust')!,
 					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('6-tick LvB/Pyro')!,
 					Presets.FIRE_BREAKPOINTS.get(Stat.StatSpellHaste)!.get('15-tick Combust')!,
 				],
 				capType: StatCapType.TypeSoftCap,
-				postCapEPs: [0.86, 0.77, 0.77, 1.17, 0.76, 0.65, 0.64],
+				postCapEPs: [0.8, 0.76, 0.73, 0.78, 0.95, 0.84, 0.67],
 			};
 
 			return [hasteSoftCapConfig];