update p4 fire

Author: Saji-Saji

ui/mage/fire/gear_sets/p4_bis.gear.json

@@ -1,20 +1,20 @@
 {
 	"items": [
-		{ "id": 96635, "gems": [95347, 76697], "reforging": 137, "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 96453, "reforging": 140, "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 96771, "gems": [95347, 76641], "reforging": 154, "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 96825, "reforging": 140, "upgradeStep": "UpgradeStepTwo" },
 		{ "id": 96638, "enchant": 4806, "gems": [76660, 76697], "reforging": 154, "upgradeStep": "UpgradeStepTwo" },
 		{ "id": 98150, "enchant": 4892, "gems": [76660], "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 96637, "enchant": 4419, "gems": [76660, 76697, 76641], "reforging": 137, "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 96637, "enchant": 4419, "gems": [76659, 76697, 76641], "reforging": 137, "upgradeStep": "UpgradeStepTwo" },
 		{ "id": 96452, "randomSuffix": -336, "enchant": 4414, "gems": [76697, 0], "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 96634, "enchant": 4433, "gems": [76660, 0], "upgradeStep": "UpgradeStepTwo", "tinker": 4898 },
+		{ "id": 96634, "enchant": 4433, "gems": [76659, 0], "upgradeStep": "UpgradeStepTwo", "tinker": 4898 },
 		{ "id": 94996, "gems": [76641, 76641, 76697], "reforging": 140, "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 95030, "enchant": 4825, "gems": [76660, 76697, 76697], "reforging": 152, "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 96636, "enchant": 4825, "gems": [76697, 76641], "reforging": 154, "upgradeStep": "UpgradeStepTwo" },
 		{ "id": 95004, "enchant": 4429, "gems": [76697, 76641], "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 96529, "gems": [76697], "reforging": 168, "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 95019, "gems": [76697], "reforging": 152, "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 96529, "gems": [76697], "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 95019, "gems": [76641], "reforging": 152, "upgradeStep": "UpgradeStepTwo" },
 		{ "id": 96516, "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 96413, "reforging": 137, "upgradeStep": "UpgradeStepTwo" },
+		{ "id": 96785, "reforging": 137, "upgradeStep": "UpgradeStepTwo" },
 		{ "id": 96610, "enchant": 4442, "gems": [76697, 76697], "reforging": 140, "upgradeStep": "UpgradeStepTwo" },
-		{ "id": 96562, "enchant": 4434, "gems": [76660], "reforging": 154, "upgradeStep": "UpgradeStepTwo" }
+		{ "id": 96562, "enchant": 4434, "gems": [76659], "reforging": 154, "upgradeStep": "UpgradeStepTwo" }
 	]
 }

ui/mage/fire/presets.ts

@@ -67,8 +67,16 @@ export const P3NoTrollDefaultSimpleRotation = FireMage_Rotation.create({
 	combustPostAlter: 10000000,
 });
 
-export const P3_SIMPLE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetSimpleRotation('P3 - Crit', Spec.SpecFireMage, P3TrollDefaultSimpleRotation);
-export const P3_SIMPLE_ROTATION_NO_TROLL = PresetUtils.makePresetSimpleRotation('P3 - Default (No Troll)', Spec.SpecFireMage, P3NoTrollDefaultSimpleRotation);
+export const P4TrollDefaultSimpleRotation = FireMage_Rotation.create({
+	combustAlwaysSend: 9100000,
+	combustBloodlust: 6100000,
+	combustPostAlter: 3100000,
+	combustNoAlter: 600000,
+	combustEndOfCombat: 245000,
+});
+
+export const P4_SIMPLE_ROTATION_PRESET_DEFAULT = PresetUtils.makePresetSimpleRotation('P4 - Crit', Spec.SpecFireMage, P4TrollDefaultSimpleRotation);
+export const P3_SIMPLE_ROTATION_NO_TROLL = PresetUtils.makePresetSimpleRotation('P4 - Default (No Troll)', Spec.SpecFireMage, P3NoTrollDefaultSimpleRotation);
 export const P1_ROTATION_PRESET_APL = PresetUtils.makePresetAPLRotation('APL', FireApl);
 export const MASTERY_ROTATION_PRESET_APL = PresetUtils.makePresetAPLRotation('Mastery APL', MasteryApl);
 
@@ -228,9 +236,9 @@ export const MASTERY_SETTINGS: PresetUtils.PresetSettings = {
 	playerOptions: OtherDefaults,
 };
 
-export const P3_CRIT_PRESET_BUILD = PresetUtils.makePresetBuild('P3 - Crit', {
+export const P4_CRIT_PRESET_BUILD = PresetUtils.makePresetBuild('P4 - Crit', {
 	gear: P4_BIS,
-	rotation: P3_SIMPLE_ROTATION_PRESET_DEFAULT,
+	rotation: P4_SIMPLE_ROTATION_PRESET_DEFAULT,
 	talents: FireTalents,
 	epWeights: DEFAULT_EP_PRESET,
 	encounter: ENCOUNTER_SINGLE_TARGET,

ui/mage/fire/sim.tsx

@@ -153,14 +153,14 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFireMage, {
 	presets: {
 		epWeights: [Presets.DEFAULT_EP_PRESET, Presets.P1_PREBIS_EP_PRESET, Presets.MASTERY_EP_PRESET],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.P1_ROTATION_PRESET_APL, Presets.P3_SIMPLE_ROTATION_PRESET_DEFAULT, Presets.MASTERY_ROTATION_PRESET_APL],
+		rotations: [Presets.P1_ROTATION_PRESET_APL, Presets.P4_SIMPLE_ROTATION_PRESET_DEFAULT, Presets.MASTERY_ROTATION_PRESET_APL],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.FireTalents, Presets.FireTalentsCleave, Presets.FireTalentsMastery],
 		// Preset gear configurations that the user can quickly select.
 		gear: [Presets.P3_MASTERY, Presets.P4_BIS],
 		// gear: [Presets.P1_PREBIS, Presets.P1_BIS, Presets.P2_BIS, Presets.P3_BIS, Presets.P3_MASTERY],
 
-		builds: [Presets.P3_CRIT_PRESET_BUILD, Presets.P3_MASTERY_PRESET_BUILD],
+		builds: [Presets.P4_CRIT_PRESET_BUILD, Presets.P3_MASTERY_PRESET_BUILD],
 
 		// Saved Encounter presets
 		encounters: [Presets.ENCOUNTER_SINGLE_TARGET, Presets.ENCOUNTER_MASTERY],
@@ -174,7 +174,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecFireMage, {
 		// if (numTargets >= 3) {
 		// 	return Presets.FIRE_ROTATION_PRESET_CLEAVE.rotation.rotation!;
 		// } else {
-		return Presets.P3_SIMPLE_ROTATION_PRESET_DEFAULT.rotation.rotation!;
+		return Presets.P4_SIMPLE_ROTATION_PRESET_DEFAULT.rotation.rotation!;
 		// }
 	},