Merge pull request #314 from hypernormalisation/paladin

Paladin presets

sim/paladin/retribution/retribution.go

@@ -67,15 +67,15 @@ func (ret *RetributionPaladin) ApplyTalents() {
 func (ret *RetributionPaladin) Reset(sim *core.Simulation) {
 	ret.Paladin.Reset(sim)
 
-	switch ret.Seal {
-	case proto.PaladinSeal_Vengeance:
-		ret.CurrentSeal = ret.SealOfVengeanceAura
-		ret.SealOfVengeanceAura.Activate(sim)
-	case proto.PaladinSeal_Command:
-		ret.CurrentSeal = ret.SealOfCommandAura
-		ret.SealOfCommandAura.Activate(sim)
-	case proto.PaladinSeal_Righteousness:
-		ret.CurrentSeal = ret.SealOfRighteousnessAura
-		ret.SealOfRighteousnessAura.Activate(sim)
-	}
+	// switch ret.Seal {
+	// case proto.PaladinSeal_Vengeance:
+	// 	ret.CurrentSeal = ret.SealOfVengeanceAura
+	// 	ret.SealOfVengeanceAura.Activate(sim)
+	// case proto.PaladinSeal_Command:
+	// 	ret.CurrentSeal = ret.SealOfCommandAura
+	// 	ret.SealOfCommandAura.Activate(sim)
+	// case proto.PaladinSeal_Righteousness:
+	// 	ret.CurrentSeal = ret.SealOfRighteousnessAura
+	// 	ret.SealOfRighteousnessAura.Activate(sim)
+	// }
 }

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

@@ -0,0 +1,21 @@
+{
+	"items": [
+        {"id":65216,"enchant":4208,"gems":[68779,52240],"reforging":161},
+        {"id":60227,"gems":[52206],"reforging":122},
+        {"id":65142,"enchant":4202,"gems":[52206],"reforging":144},
+        {"id":65117,"enchant":4100},
+        {"id":60344,"enchant":4102,"gems":[52206,52213],"reforging":154},
+        {"id":60228,"enchant":4256,"gems":[52240,0],"reforging":154},
+        {"id":65215,"enchant":4106,"gems":[52206,0],"reforging":151},
+        {"id":65040,"gems":[52206,52206],"reforging":147},
+        {"id":65217,"enchant":4126,"gems":[52255,52255]},
+        {"id":65075,"enchant":4094,"gems":[52206],"reforging":159},
+        {"id":60226,"gems":[52240],"reforging":144},
+        {"id":65106,"reforging":161},
+        {"id":65072},
+        {"id":62469},
+        {"id":65003,"enchant":4099},
+        {},
+        {"id":64674,"gems":[52255],"reforging":158}
+      ]
+}

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

@@ -0,0 +1,21 @@
+{
+	"items": [
+        {"id":60346,"enchant":4208,"gems":[68779,52240],"reforging":154},
+        {"id":59442},
+        {"id":59471,"enchant":4202,"gems":[52206]},
+        {"id":59507,"enchant":4100,"reforging":151},
+        {"id":60344,"enchant":4102,"gems":[52206,52213]},
+        {"id":59118,"enchant":4256,"gems":[0]},
+        {"id":60345,"enchant":4106,"gems":[52206,0],"reforging":152},
+        {"id":62384,"gems":[52206,52206]},
+        {"id":60347,"enchant":4126,"gems":[52255,52255]},
+        {"id":59464,"enchant":4094,"gems":[52206]},
+        {"id":58185},
+        {"id":59518,"reforging":161},
+        {"id":59224,"reforging":158},
+        {"id":62469},
+        {"id":63679,"enchant":4099},
+        {},
+        {"id":64674,"gems":[52255],"reforging":158}
+      ]
+}

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

@@ -1,19 +1,21 @@
-{"items": [
-    {"id":41386,"enchant":3817,"gems":[41398,40022]},
-    {"id":40678},
-    {"id":34388,"enchant":3875,"gems":[39996,40037]},
-    {"id":37647,"enchant":3605},
-    {"id":39633,"enchant":3832,"gems":[39996,40038]},
-    {"id":41355,"enchant":3845,"gems":[0]},
-    {"id":39634,"enchant":3604,"gems":[39996,0]},
-    {"id":40694,"gems":[39996,39996]},
-    {"id":37193,"enchant":3326,"gems":[39996,39996]},
-    {"id":44297,"enchant":4223},
-    {"id":40586},
-    {"id":37685},
-    {"id":42987},
-    {"id":40684},
-    {"id":37852,"enchant":3789},
-    {},
-    {"id":37574}
-]}
+{
+	"items":  [
+        {"id":59359,"enchant":4208,"gems":[68779,59489,59480]},
+        {"id":62447,"reforging":154},
+        {"id":56318,"enchant":4202,"gems":[52206]},
+        {"id":56397,"enchant":4100,"reforging":147},
+        {"id":55060,"enchant":4102,"gems":[52206],"reforging":146},
+        {"id":57870,"enchant":4256,"gems":[52206,0]},
+        {"id":58099,"enchant":4106,"gems":[52206,0]},
+        {"id":62384,"gems":[52206,52255],"reforging":146},
+        {"id":56367,"enchant":4126,"gems":[52255,52213],"reforging":146},
+        {"id":62418,"enchant":4094,"gems":[52206],"reforging":129},
+        {"id":56388},
+        {"id":56365,"reforging":161},
+        {"id":56393,"reforging":154},
+        {"id":56285},
+        {"id":64377,"enchant":4099,"reforging":147},
+        {},
+        {"id":62243,"gems":[52255]}
+      ]
+}

ui/paladin/retribution/presets.ts

@@ -1,63 +1,46 @@
 import * as PresetUtils from '../../core/preset_utils.js';
-import { Conjured, Consumes, Flask, Food, Glyphs, Potions } from '../../core/proto/common.js';
+import { Consumes, Flask, Food, Glyphs, Potions, Profession, TinkerHands } from '../../core/proto/common.js';
 import {
 	PaladinAura as PaladinAura,
 	PaladinJudgement as PaladinJudgement,
 	PaladinMajorGlyph,
 	PaladinMinorGlyph,
+	PaladinPrimeGlyph,
 	RetributionPaladin_Options as RetributionPaladinOptions,
 } from '../../core/proto/paladin.js';
 import { SavedTalents } from '../../core/proto/ui.js';
 import DefaultApl from './apls/default.apl.json';
-import P1Gear from './gear_sets/p1.gear.json';
-import P2Gear from './gear_sets/p2.gear.json';
-import P3MaceGear from './gear_sets/p3_mace.gear.json';
-import P4Gear from './gear_sets/p4.gear.json';
-import P5Gear from './gear_sets/p5.gear.json';
-import PreraidGear from './gear_sets/preraid.gear.json';
+import P1_BisRetGear from './gear_sets/p1_bis.gear.json';
+import P1_NonHcRetGear from './gear_sets/p1_nonhc.gear.json';
+import PreraidRetGear from './gear_sets/preraid.gear.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_PRESET = PresetUtils.makePresetGear('PreRaid', PreraidGear);
-export const P1_PRESET = PresetUtils.makePresetGear('P1 Preset', P1Gear);
-export const P2_PRESET = PresetUtils.makePresetGear('P2 Preset', P2Gear);
-export const P3_PRESET = PresetUtils.makePresetGear('P3 Mace Preset', P3MaceGear);
-export const P4_PRESET = PresetUtils.makePresetGear('P4 Preset', P4Gear);
-export const P5_PRESET = PresetUtils.makePresetGear('P5 Preset', P5Gear);
+export const PRERAID_RET_PRESET = PresetUtils.makePresetGear('Preraid', PreraidRetGear);
+export const P1_NONHC_RET_PRESET = PresetUtils.makePresetGear('P1 non-Hc', P1_NonHcRetGear);
+export const P1_BIS_RET_PRESET = PresetUtils.makePresetGear('P1 BiS', P1_BisRetGear);
 
 export const ROTATION_PRESET_DEFAULT = PresetUtils.makePresetAPLRotation('Default', DefaultApl);
 
 // Default talents. Uses the wowhead calculator format, make the talents on
 // https://wowhead.com/cata/talent-calc and copy the numbers in the url.
-export const AuraMasteryTalents = {
-	name: 'Aura Mastery',
+export const RetTalents = {
+	name: 'Ret',
 	data: SavedTalents.create({
-		// talentsString: '050501-05-05232051203331302133231331',
-		// glyphs: Glyphs.create({
-		// 	major1: PaladinMajorGlyph.GlyphOfSealOfVengeance,
-		// 	major2: PaladinMajorGlyph.GlyphOfJudgement,
-		// 	major3: PaladinMajorGlyph.GlyphOfReckoning,
-		// 	minor1: PaladinMinorGlyph.GlyphOfSenseUndead,
-		// 	minor2: PaladinMinorGlyph.GlyphOfLayOnHands,
-		// 	minor3: PaladinMinorGlyph.GlyphOfBlessingOfKings,
-		// }),
-	}),
-};
-
-export const DivineSacTalents = {
-	name: 'Divine Sacrifice & Guardian',
-	data: SavedTalents.create({
-		// talentsString: '03-453201002-05222051203331302133201331',
-		// glyphs: Glyphs.create({
-		// 	major1: PaladinMajorGlyph.GlyphOfSealOfVengeance,
-		// 	major2: PaladinMajorGlyph.GlyphOfJudgement,
-		// 	major3: PaladinMajorGlyph.GlyphOfReckoning,
-		// 	minor1: PaladinMinorGlyph.GlyphOfSenseUndead,
-		// 	minor2: PaladinMinorGlyph.GlyphOfLayOnHands,
-		// 	minor3: PaladinMinorGlyph.GlyphOfBlessingOfKings,
-		// }),
+		talentsString: '203002-02-23203213211113002311',
+		glyphs: Glyphs.create({
+			prime1: PaladinPrimeGlyph.GlyphOfSealOfTruth,
+			prime2: PaladinPrimeGlyph.GlyphOfExorcism,
+			prime3: PaladinPrimeGlyph.GlyphOfTemplarSVerdict,
+			major1: PaladinMajorGlyph.GlyphOfTheAsceticCrusader,
+			major2: PaladinMajorGlyph.GlyphOfHammerOfWrath,
+			major3: PaladinMajorGlyph.GlyphOfConsecration,
+			minor1: PaladinMinorGlyph.GlyphOfRighteousness,
+			minor2: PaladinMinorGlyph.GlyphOfTruth,
+			minor3: PaladinMinorGlyph.GlyphOfBlessingOfMight,
+		}),
 	}),
 };
 
@@ -69,8 +52,15 @@ export const DefaultOptions = RetributionPaladinOptions.create({
 });
 
 export const DefaultConsumes = Consumes.create({
-	defaultPotion: Potions.PotionOfSpeed,
-	defaultConjured: Conjured.ConjuredDarkRune,
-	flask: Flask.FlaskOfEndlessRage,
-	food: Food.FoodDragonfinFilet,
+	flask: Flask.FlaskOfTitanicStrength,
+	food: Food.FoodBeerBasedCrocolisk,
+	defaultPotion: Potions.GolembloodPotion,
+	prepopPotion: Potions.GolembloodPotion,
+	tinkerHands: TinkerHands.TinkerHandsSynapseSprings,
 });
+
+export const OtherDefaults = {
+	profession1: Profession.Engineering,
+	profession2: Profession.Jewelcrafting,
+	distanceFromTarget: 5,
+};