Merge pull request #106 from wowsims/guardian

Rage mechanics update + more Guardian work

Author: NerdEgghead

sim/core/character.go

@@ -720,8 +720,7 @@ func (character *Character) MeetsArmorSpecializationRequirement(armorType proto.
 	return true
 }
 
-func (character *Character) ApplyArmorSpecializationEffect(primaryStat stats.Stat, armorType proto.ArmorType, spellID int32) *Aura {
-	armorSpecializationDependency := character.NewDynamicMultiplyStat(primaryStat, 1.05)
+func (character *Character) RegisterArmorSpecializationTracker(armorType proto.ArmorType, spellID int32) *Aura {
 	isEnabled := character.MeetsArmorSpecializationRequirement(armorType)
 
 	aura := character.RegisterAura(Aura{
@@ -731,8 +730,6 @@ func (character *Character) ApplyArmorSpecializationEffect(primaryStat stats.Sta
 		Duration:   NeverExpires,
 	})
 
-	aura.AttachStatDependency(armorSpecializationDependency)
-
 	if isEnabled {
 		aura = MakePermanent(aura)
 	}
@@ -750,3 +747,10 @@ func (character *Character) ApplyArmorSpecializationEffect(primaryStat stats.Sta
 
 	return aura
 }
+
+func (character *Character) ApplyArmorSpecializationEffect(primaryStat stats.Stat, armorType proto.ArmorType, spellID int32) *Aura {
+	armorSpecializationDependency := character.NewDynamicMultiplyStat(primaryStat, 1.05)
+	trackerAura := character.RegisterArmorSpecializationTracker(armorType, spellID)
+	trackerAura.AttachStatDependency(armorSpecializationDependency)
+	return trackerAura
+}

sim/core/rage.go

@@ -9,35 +9,27 @@ import (
 const MaxRage = 100.0
 const ThreatPerRageGained = 5
 
-type OnRageGainCB func(sim *Simulation, spell *Spell, result *SpellResult, rage float64) float64
-
 type rageBar struct {
 	unit *Unit
 
 	startingRage float64
 	currentRage  float64
 
+	// hitFactor is the quantity which multiplies the base swing speed of a
+	// MH weapon when calculating the Rage generated by that weapon's
+	// swings. For OH weapons, hitFactor / 2 is used.
+	startingHitFactor float64
+	currentHitFactor  float64
+
 	RageRefundMetrics *ResourceMetrics
 }
 
 type RageBarOptions struct {
-	StartingRage   float64
-	MHSwingSpeed   float64
-	OHSwingSpeed   float64
-	RageMultiplier float64
-
-	// Called when rage is calculated from an OnSpellHitDealt event
-	// but before it has been applied to the unit
-	OnHitDealtRageGain OnRageGainCB
-
-	// Called when rage is calculated from an OnSpellHitTaken event
-	// but before it has been applied to the unit
-	OnHitTakenRageGain OnRageGainCB
+	StartingRage  float64
+	BaseHitFactor float64
 }
 
 func (unit *Unit) EnableRageBar(options RageBarOptions) {
-	rageFromDamageTakenMetrics := unit.NewRageMetrics(ActionID{OtherID: proto.OtherAction_OtherActionDamageTaken})
-
 	unit.SetCurrentPowerBar(RageBar)
 	unit.RegisterAura(Aura{
 		Label:    "RageBar",
@@ -49,42 +41,24 @@ func (unit *Unit) EnableRageBar(options RageBarOptions) {
 			if unit.GetCurrentPowerBar() != RageBar {
 				return
 			}
-			if result.Outcome.Matches(OutcomeMiss) {
+			if !result.Landed() {
 				return
 			}
 
-			hitFactor := 6.5
+			hitFactor := unit.rageBar.currentHitFactor
 			var speed float64
 			if spell.ProcMask == ProcMaskMeleeMHAuto {
-				speed = options.MHSwingSpeed
+				speed = unit.AutoAttacks.MH().SwingSpeed
 			} else if spell.ProcMask == ProcMaskMeleeOHAuto {
 				// OH hits generate 50% of the rage they would if they were MH hits
 				hitFactor /= 2
-				speed = options.OHSwingSpeed
+				speed = unit.AutoAttacks.OH().SwingSpeed
 			} else {
 				return
 			}
 
-			// Currently, rage does not get doubled for crits in cataclysm
-			// Leaving the code here for reference with a note.
-			//if result.Outcome.Matches(OutcomeCrit) {
-			//	hitFactor *= 2
-			//}
-
-			// TODO: Cataclysm dodge/parry behavior
-			// damage := result.Damage
-			// if result.Outcome.Matches(OutcomeDodge | OutcomeParry) {
-			// 	// Rage is still generated for dodges/parries, based on the damage it WOULD have done.
-			// 	damage = result.PreOutcomeDamage
-			// }
-
 			// rage in mop is normalized so it only depends on weapon swing speed and some multipliers
 			generatedRage := hitFactor * speed
-			generatedRage *= options.RageMultiplier
-
-			if options.OnHitDealtRageGain != nil {
-				generatedRage = options.OnHitDealtRageGain(sim, spell, result, generatedRage)
-			}
 
 			var metrics *ResourceMetrics
 			if spell.Cost != nil {
@@ -97,26 +71,6 @@ func (unit *Unit) EnableRageBar(options RageBarOptions) {
 			}
 			unit.AddRage(sim, generatedRage, metrics)
 		},
-		OnSpellHitTaken: func(aura *Aura, sim *Simulation, spell *Spell, result *SpellResult) {
-			if unit.GetCurrentPowerBar() != RageBar {
-				return
-			}
-
-			// Formula taken from simc and verified using in-game
-			// measurements. The in-game measurements agree closely for
-			// incoming melee attacks but not for spells, so more work is
-			// required to determine whether spells use a different formula or
-			// whether Beta is simply bugged for spell Rage calculations. Note
-			// that the below formula delivers full Rage even on missed
-			// attacks! This is intentional and matches in-game behavior.
-			generatedRage := result.PreOutcomeDamage / result.ResistanceMultiplier * 18.92 / unit.MaxHealth()
-
-			if options.OnHitTakenRageGain != nil {
-				generatedRage = options.OnHitTakenRageGain(sim, spell, result, generatedRage)
-			}
-
-			unit.AddRage(sim, generatedRage, rageFromDamageTakenMetrics)
-		},
 	})
 
 	// Not a real spell, just holds metrics from rage gain threat.
@@ -127,6 +81,7 @@ func (unit *Unit) EnableRageBar(options RageBarOptions) {
 	unit.rageBar = rageBar{
 		unit:              unit,
 		startingRage:      max(0, min(options.StartingRage, MaxRage)),
+		startingHitFactor: options.BaseHitFactor,
 		RageRefundMetrics: unit.NewRageMetrics(ActionID{OtherID: proto.OtherAction_OtherActionRefund}),
 	}
 }
@@ -139,6 +94,12 @@ func (rb *rageBar) CurrentRage() float64 {
 	return rb.currentRage
 }
 
+// Call this within the OnGain and OnExpire callbacks for Battle Stance, Raging
+// Whirlwind, etc.
+func (rb *rageBar) MultiplyAutoAttackRageGen(multiplier float64) {
+	rb.currentHitFactor *= multiplier
+}
+
 func (rb *rageBar) AddRage(sim *Simulation, amount float64, metrics *ResourceMetrics) {
 	if amount < 0 {
 		panic("Trying to add negative rage!")
@@ -178,6 +139,7 @@ func (rb *rageBar) reset(_ *Simulation) {
 	}
 
 	rb.currentRage = rb.startingRage
+	rb.currentHitFactor = rb.startingHitFactor
 }
 
 func (rb *rageBar) doneIteration() {

sim/druid/barkskin.go

@@ -8,10 +8,6 @@ import (
 )
 
 func (druid *Druid) registerBarkskinCD() {
-	if !druid.InForm(Bear) {
-		return
-	}
-
 	actionId := core.ActionID{SpellID: 22812}
 	hasGlyph := druid.HasMajorGlyph(proto.DruidMajorGlyph_GlyphOfBarkskin)
 
@@ -30,10 +26,6 @@ func (druid *Druid) registerBarkskinCD() {
 			if hasGlyph {
 				druid.PseudoStats.ReducedCritTakenChance -= 0.25
 			}
-
-			if druid.T12Feral4pBonus.IsActive() {
-				druid.SmokescreenAura.Activate(sim)
-			}
 		},
 	})
 
@@ -43,7 +35,7 @@ func (druid *Druid) registerBarkskinCD() {
 		Cast: core.CastConfig{
 			CD: core.Cooldown{
 				Timer:    druid.NewTimer(),
-				Duration: time.Second * 60.0,
+				Duration: core.TernaryDuration(druid.Spec == proto.Spec_SpecGuardianDruid, time.Second * 30, time.Second * 60),
 			},
 		},
 		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {

sim/druid/druid.go

@@ -33,9 +33,6 @@ type Druid struct {
 
 	MHAutoSpell *core.Spell
 
-	HotWCatDep  *stats.StatDependency
-	HotWBearDep *stats.StatDependency
-
 	Barkskin              *DruidSpell
 	Berserk               *DruidSpell
 	CatCharge             *DruidSpell
@@ -94,18 +91,12 @@ type Druid struct {
 	MoonkinT84PCAura         *core.Aura
 	NaturesGraceProcAura     *core.Aura
 	OwlkinFrenzyAura         *core.Aura
-	PredatoryInstinctsAura   *core.Aura
 	PrimalMadnessAura        *core.Aura
-	PulverizeAura            *core.Aura
 	SavageDefenseAura        *core.DamageAbsorptionAura
-	SavageRoarAura           *core.Aura
-	SmokescreenAura          *core.Aura
 	SolarEclipseProcAura     *core.Aura
 	StampedeCatAura          *core.Aura
 	StampedeBearAura         *core.Aura
-	StrengthOfThePantherAura *core.Aura
 	SurvivalInstinctsAura    *core.Aura
-	// TigersFuryAura           *core.Aura
 
 	BleedCategories core.ExclusiveCategoryArray
 
@@ -123,13 +114,13 @@ type Druid struct {
 	form         DruidForm
 	disabledMCDs []*core.MajorCooldown
 
-	// Leather specialization tracker
-	LeatherSpec *core.Aura
+	// Guardian leather specialization is form-specific
+	GuardianLeatherSpecTracker *core.Aura
+	GuardianLeatherSpecDep     *stats.StatDependency
 
 	// Item sets
 	T11Feral2pBonus *core.Aura
 	T11Feral4pBonus *core.Aura
-	T12Feral4pBonus *core.Aura
 	T13Feral4pBonus *core.Aura
 }
 
@@ -282,11 +273,10 @@ func (druid *Druid) Initialize() {
 		}
 	})
 
-	// druid.registerFaerieFireSpell()
+	druid.registerFaerieFireSpell()
 	// druid.registerRebirthSpell()
 	// druid.registerInnervateCD()
 	druid.registerTranquilityCD()
-	druid.applyOmenOfClarity()
 }
 
 func (druid *Druid) RegisterBalanceSpells() {
@@ -319,8 +309,8 @@ func (druid *Druid) RegisterFeralCatSpells() {
 	// druid.registerRipSpell()
 	// druid.registerSavageRoarSpell()
 	// druid.registerShredSpell()
-	druid.registerSwipeBearSpell()
-	druid.registerSwipeCatSpell()
+	//druid.registerSwipeBearSpell()
+	//druid.registerSwipeCatSpell()
 	// druid.registerThrashBearSpell()
 	// druid.registerTigersFurySpell()
 }
@@ -329,33 +319,21 @@ func (druid *Druid) RegisterFeralTankSpells() {
 	druid.registerBarkskinCD()
 	druid.registerBearFormSpell()
 	// druid.registerBerserkCD()
-	druid.registerDemoralizingRoarSpell()
+	//druid.registerDemoralizingRoarSpell()
 	// druid.registerEnrageSpell()
-	druid.registerFrenziedRegenerationCD()
+	//druid.registerFrenziedRegenerationCD()
 	// druid.registerMangleBearSpell()
 	// druid.registerMaulSpell()
 	// druid.registerLacerateSpell()
 	// druid.registerPulverizeSpell()
 	// druid.registerRakeSpell()
 	// druid.registerRipSpell()
-	druid.registerSavageDefensePassive()
+	//druid.registerSavageDefensePassive()
 	// druid.registerSurvivalInstinctsCD()
-	druid.registerSwipeBearSpell()
+	//druid.registerSwipeBearSpell()
 	// druid.registerThrashBearSpell()
 }
 
-func (druid *Druid) RegisterLeatherSpecialization() {
-	// Druid armor spec behaves differently from other classes because the boosted stats are linked to form rather
-	// than talents. For this reason, we modify the default tracker Aura to activate at BuildPhaseGear rather than
-	// BuildPhaseTalents, and also add custom handlers for the cat Agi bonus and the bear Stam bonus in forms.go (the
-	// Int bonus applies in all forms).
-	druid.LeatherSpec = druid.ApplyArmorSpecializationEffect(stats.Intellect, proto.ArmorType_ArmorTypeLeather, 87505)
-
-	if druid.LeatherSpec.BuildPhase == core.CharacterBuildPhaseTalents {
-		druid.LeatherSpec.BuildPhase = core.CharacterBuildPhaseGear
-	}
-}
-
 func (druid *Druid) Reset(_ *core.Simulation) {
 	// druid.eclipseEnergyBar.reset()
 	druid.BleedsActive = 0
@@ -388,20 +366,6 @@ func New(char *core.Character, form DruidForm, selfBuffs SelfBuffs, talents stri
 	// Base dodge is unaffected by Diminishing Returns
 	druid.PseudoStats.BaseDodgeChance += 0.03
 
-	druid.RegisterLeatherSpecialization()
-
-	// if druid.Talents.ForceOfNature {
-	// 	druid.Treants = &Treants{
-	// 		Treant1: druid.NewTreant(),
-	// 		Treant2: druid.NewTreant(),
-	// 		Treant3: druid.NewTreant(),
-	// 	}
-	// }
-
-	// if druid.CouldHaveSetBonus(ItemSetObsidianArborweaveRegalia, 2) {
-	// 	druid.BurningTreant = druid.NewBurningTreant()
-	// }
-
 	return druid
 }
 

sim/druid/_faerie_fire.go sim/druid/faerie_fire.gosim/druid/_faerie_fire.go renamed to sim/druid/faerie_fire.go

@@ -9,31 +9,31 @@ import (
 func (druid *Druid) registerFaerieFireSpell() {
 	actionID := core.ActionID{SpellID: 770}
 	manaCostOptions := core.ManaCostOptions{
-		BaseCostPercent: 8,
+		BaseCostPercent: 7.5,
 	}
 	gcd := core.GCDDefault
 	ignoreHaste := false
 	cd := core.Cooldown{}
 	flatThreatBonus := 48.
-	flags := SpellFlagOmenTrigger
+	flags := core.SpellFlagAPL
 	formMask := Humanoid | Moonkin
 
 	if druid.InForm(Cat | Bear) {
-		actionID = core.ActionID{SpellID: 16857}
 		manaCostOptions = core.ManaCostOptions{}
-		gcd = time.Second
-		ignoreHaste = true
-		flags = core.SpellFlagNone
 		formMask = Cat | Bear
 		cd = core.Cooldown{
 			Timer:    druid.NewTimer(),
 			Duration: time.Second * 6,
 		}
 	}
-	flags |= core.SpellFlagAPL
+
+	if druid.InForm(Cat) {
+		gcd = time.Second
+		ignoreHaste = true
+	}
 
 	druid.FaerieFireAuras = druid.NewEnemyAuraArray(func(target *core.Unit) *core.Aura {
-		return core.FaerieFireAura(target)
+		return core.WeakenedArmorAura(target)
 	})
 
 	druid.FaerieFire = druid.RegisterSpell(formMask, core.SpellConfig{
@@ -60,7 +60,7 @@ func (druid *Druid) registerFaerieFireSpell() {
 			baseDamage := 0.0
 			outcome := spell.OutcomeMagicHit
 			if druid.InForm(Bear) {
-				baseDamage = 2950 + 0.108*spell.MeleeAttackPower()
+				baseDamage = 10.0 + 0.302*spell.MeleeAttackPower()
 				outcome = spell.OutcomeMagicHitAndCrit
 			}
 
@@ -84,7 +84,7 @@ func (druid *Druid) TryApplyFaerieFireEffect(sim *core.Simulation, target *core.
 		aura.Activate(sim)
 
 		if aura.IsActive() {
-			aura.SetStacks(sim, aura.GetStacks()+1+druid.Talents.FeralAggression)
+			aura.SetStacks(sim, 3)
 		}
 	}
 }