Merge pull request #845 from hillerstorm/prot-pala

sim/paladin/divine_protection.go

@@ -0,0 +1,76 @@
+package paladin
+
+import (
+	"time"
+
+	"github.com/wowsims/cata/sim/core"
+	"github.com/wowsims/cata/sim/core/proto"
+	"github.com/wowsims/cata/sim/core/stats"
+)
+
+func (paladin *Paladin) registerDivineProtectionSpell() {
+	glyphOfDivineProtection := paladin.HasMajorGlyph(proto.PaladinMajorGlyph_GlyphOfDivineProtection)
+
+	actionID := core.ActionID{SpellID: 498}
+	paladin.DivineProtectionAura = paladin.RegisterAura(core.Aura{
+		Label:    "Divine Protection",
+		ActionID: actionID,
+		Duration: time.Second * 10,
+
+		OnGain: func(aura *core.Aura, sim *core.Simulation) {
+			if glyphOfDivineProtection {
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexArcane] *= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexFire] *= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexFrost] *= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexHoly] *= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexNature] *= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexShadow] *= 0.6
+			} else {
+				paladin.PseudoStats.DamageTakenMultiplier *= 0.8
+			}
+		},
+		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
+			if glyphOfDivineProtection {
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexArcane] /= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexFire] /= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexFrost] /= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexHoly] /= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexNature] /= 0.6
+				paladin.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexShadow] /= 0.6
+			} else {
+				paladin.PseudoStats.DamageTakenMultiplier /= 0.8
+			}
+		},
+	})
+
+	paladin.DivineProtection = paladin.RegisterSpell(core.SpellConfig{
+		ActionID:       actionID,
+		Flags:          core.SpellFlagAPL,
+		ClassSpellMask: SpellMaskDivineProtection,
+
+		ManaCost: core.ManaCostOptions{
+			BaseCost: 0.03,
+		},
+		Cast: core.CastConfig{
+			DefaultCast: core.Cast{
+				NonEmpty: true,
+			},
+			CD: core.Cooldown{
+				Timer:    paladin.NewTimer(),
+				Duration: time.Minute * 1,
+			},
+		},
+
+		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) {
+			paladin.DivineProtectionAura.Activate(sim)
+		},
+	})
+
+	paladin.AddMajorCooldown(core.MajorCooldown{
+		Spell: paladin.DivineProtection,
+		Type:  core.CooldownTypeSurvival,
+		ShouldActivate: func(sim *core.Simulation, character *core.Character) bool {
+			return character.Spec == proto.Spec_SpecProtectionPaladin
+		},
+	})
+}

sim/paladin/paladin.go

@@ -42,6 +42,8 @@ const (
 	SpellMaskAncientFury
 	SpellMaskSealsOfCommand
 	SpellMaskShieldOfTheRighteous
+	SpellMaskHolyShield
+	SpellMaskArdentDefender
 
 	SpellMaskHolyShock
 	SpellMaskWordOfGlory
@@ -155,15 +157,12 @@ type Paladin struct {
 	SealOfJusticeAura       *core.Aura
 	AvengingWrathAura       *core.Aura
 	DivineProtectionAura    *core.Aura
-	ForbearanceAura         *core.Aura
 	ZealotryAura            *core.Aura
 	InquisitionAura         *core.Aura
 	DivinePurposeAura       *core.Aura
 	JudgementsOfThePureAura *core.Aura
-	GrandCrusaderAura		*core.Aura
-	SacredDutyAura			*core.Aura
-
-	SpiritualAttunementMetrics *core.ResourceMetrics
+	GrandCrusaderAura       *core.Aura
+	SacredDutyAura          *core.Aura
 }
 
 // Implemented by each Paladin spec.
@@ -231,6 +230,7 @@ func (paladin *Paladin) registerSpells() {
 	paladin.registerConsecrationSpell()
 	paladin.registerHolyWrath()
 	paladin.registerGuardianOfAncientKings()
+	paladin.registerDivineProtectionSpell()
 }
 
 func (paladin *Paladin) Reset(sim *core.Simulation) {
@@ -287,16 +287,9 @@ func NewPaladin(character *core.Character, talentsStr string, options *proto.Pal
 	paladin.AddStatDependency(stats.Agility, stats.MeleeCrit, core.CritPerAgiMaxLevel[character.Class]*core.CritRatingPerCritChance)
 	paladin.AddStat(stats.Parry, -paladin.GetBaseStats()[stats.Strength]*0.27) // Does not apply to base Strength
 	paladin.AddStatDependency(stats.Strength, stats.Parry, 0.27)
-
-	paladin.PseudoStats.BaseDodge += 0.034943
-	paladin.PseudoStats.BaseParry += 0.05
-	// TODO: figure out the exact tanking stat dependencies for prot pala
-	// // Paladins get 0.0167 dodge per agi. ~1% per 59.88
-	// paladin.AddStatDependency(stats.Agility, stats.Dodge, (1.0/59.88)*core.DodgeRatingPerDodgeChance)
-	// // Paladins get more melee haste from haste than other classes
-	// paladin.PseudoStats.MeleeHasteRatingPerHastePercent /= 1.3
-	// // Base dodge is unaffected by Diminishing Returns
 
+	paladin.PseudoStats.BaseDodge += 0.05
+	paladin.PseudoStats.BaseParry += 0.05
 
 	// Bonus Armor and Armor are treated identically for Paladins
 	paladin.AddStatDependency(stats.BonusArmor, stats.Armor, 1)

sim/paladin/protection/protection.go

@@ -31,8 +31,8 @@ func NewProtectionPaladin(character *core.Character, options *proto.Player) *Pro
 	protOptions := options.GetProtectionPaladin()
 
 	prot := &ProtectionPaladin{
-		Paladin: paladin.NewPaladin(character, options.TalentsString, protOptions.Options.ClassOptions),
-		Options: protOptions.Options,
+		Paladin:   paladin.NewPaladin(character, options.TalentsString, protOptions.Options.ClassOptions),
+		Options:   protOptions.Options,
 		vengeance: &core.VengeanceTracker{},
 	}