[Ret] More preset tweaks

Author: hillerstorm

ui/paladin/retribution/gear_sets/p1.gear.json

@@ -1,20 +1,20 @@
 {
 	"items": [
-		{ "id": 87101, "gems": [] },
-		{ "id": 90508 },
-		{ "id": 86986, "gems": [] },
-		{ "id": 86945 },
-		{ "id": 87099, "gems": [] },
-		{ "id": 90506, "gems": [] },
-		{ "id": 87100, "gems": [] },
-		{ "id": 86955, "gems": [] },
-		{ "id": 87102, "gems": [] },
-		{ "id": 86979094 },
-		{ "id": 87158 },
+		{ "id": 87101, "gems": [76886, 76684], "reforging": 138 },
+		{ "id": 90508, "reforging": 138 },
+		{ "id": 86986, "enchant": 4803, "gems": [76669], "reforging": 145 },
+		{ "id": 86945, "enchant": 4424, "reforging": 140 },
+		{ "id": 87099, "enchant": 4419, "gems": [76699, 76699], "reforging": 147 },
+		{ "id": 90506, "enchant": 4415, "gems": [76699], "reforging": 138 },
+		{ "id": 87100, "enchant": 4432, "gems": [76699], "reforging": 145 },
+		{ "id": 86955, "enchant": 4223, "gems": [76699, 76684, 76669], "reforging": 168 },
+		{ "id": 87102, "enchant": 4823, "gems": [76669], "reforging": 167 },
+		{ "id": 86979, "enchant": 4426, "gems": [76699] },
+		{ "id": 87158, "reforging": 138 },
 		{ "id": 86957 },
 		{ "id": 87172 },
 		{ "id": 87072 },
-		{ "id": 87176, "gems": [] },
+		{ "id": 87176, "enchant": 4444, "gems": [89881], "reforging": 145 },
 		{}
 	]
 }

ui/paladin/retribution/presets.ts

@@ -62,12 +62,13 @@ export const DefaultOptions = RetributionPaladinOptions.create({
 		seal: PaladinSeal.Truth,
 	},
 });
+
 export const DefaultConsumables = ConsumesSpec.create({
-	flaskId: 76088, // Flask of Winter's Bite
-	foodId: 74646, // Black Pepper Ribs and Shrimp
+	// flaskId: 76088, // Flask of Winter's Bite
+	// foodId: 74646, // Black Pepper Ribs and Shrimp
 	potId: 76095, // Potion of Mogu Power
 	prepotId: 76095, // Potion of Mogu Power
-	tinkerId: 126734, // Synapse Springs Mark II
+	// tinkerId: 126734, // Synapse Springs Mark II
 });
 
 export const OtherDefaults = {

ui/paladin/retribution/sim.ts

@@ -5,7 +5,7 @@ import { IndividualSimUI, registerSpecConfig } from '../../core/individual_sim_u
 import { Player } from '../../core/player.js';
 import { PlayerClasses } from '../../core/player_classes';
 import { APLRotation, APLRotation_Type } from '../../core/proto/apl.js';
-import { Debuffs, Faction, IndividualBuffs, ItemSlot, PartyBuffs, PseudoStat, Race, RaidBuffs, Spec, Stat } from '../../core/proto/common.js';
+import { Debuffs, Faction, IndividualBuffs, PartyBuffs, PseudoStat, Race, RaidBuffs, Spec, Stat, UnitStats } from '../../core/proto/common.js';
 import { Stats, UnitStat } from '../../core/proto_utils/stats.js';
 import * as PaladinInputs from '../inputs.js';
 import * as RetributionInputs from './inputs.js';
@@ -28,6 +28,31 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 	// List any known bugs / issues here and they'll be shown on the site.
 	knownIssues: [],
 
+	overwriteDisplayStats: (player: Player<Spec.SpecRetributionPaladin>) => {
+		const playerStats = player.getCurrentStats();
+
+		const statMod = (current: UnitStats, previous?: UnitStats) => {
+			return new Stats().withStat(Stat.StatSpellPower, Stats.fromProto(current).subtract(Stats.fromProto(previous)).getStat(Stat.StatAttackPower) * 0.5);
+		};
+
+		const base = statMod(playerStats.baseStats!);
+		const gear = statMod(playerStats.gearStats!, playerStats.baseStats);
+		const talents = statMod(playerStats.talentsStats!, playerStats.gearStats);
+		const buffs = statMod(playerStats.buffsStats!, playerStats.talentsStats);
+		const consumes = statMod(playerStats.consumesStats!, playerStats.buffsStats);
+		const final = new Stats().withStat(Stat.StatSpellPower, Stats.fromProto(playerStats.finalStats).getStat(Stat.StatAttackPower) * 0.5);
+
+		return {
+			base: base,
+			gear: gear,
+			talents: talents,
+			buffs: buffs,
+			consumes: consumes,
+			final: final,
+			stats: [Stat.StatSpellPower],
+		};
+	},
+
 	// All stats for which EP should be calculated.
 	epStats: [
 		Stat.StatStrength,
@@ -52,6 +77,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 			Stat.StatSpellPower,
 			Stat.StatMana,
 			Stat.StatHealth,
+			Stat.StatStamina,
 			Stat.StatMasteryRating,
 		],
 		[
@@ -83,7 +109,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 			arcaneBrilliance: true,
 			blessingOfKings: true,
 			blessingOfMight: true,
+			bloodlust: true,
 			elementalOath: true,
+			heroism: true,
 			powerWordFortitude: true,
 			serpentsSwiftness: true,
 			timeWarp: true,
@@ -109,16 +137,6 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 	otherInputs: {
 		inputs: [RetributionInputs.StartingHolyPower(), OtherInputs.InputDelay, OtherInputs.TankAssignment, OtherInputs.InFrontOfTarget],
 	},
-	itemSwapSlots: [
-		ItemSlot.ItemSlotHead,
-		ItemSlot.ItemSlotShoulder,
-		ItemSlot.ItemSlotChest,
-		ItemSlot.ItemSlotHands,
-		ItemSlot.ItemSlotLegs,
-		ItemSlot.ItemSlotTrinket1,
-		ItemSlot.ItemSlotTrinket2,
-		ItemSlot.ItemSlotMainHand,
-	],
 	encounterPicker: {
 		// Whether to include 'Execute Duration (%)' in the 'Encounter' section of the settings tab.
 		showExecuteProportion: false,
@@ -131,7 +149,6 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRetributionPaladin, {
 		talents: [Presets.DefaultTalents],
 		// Preset gear configurations that the user can quickly select.
 		gear: [Presets.P1_GEAR_PRESET],
-		itemSwaps: [],
 		builds: [Presets.P1_BUILD_PRESET],
 	},