Merge branch 'master' into feature/aoe-cap-multiplier-flag

Author: 1337LutZ

sim/core/TestProtoVersioning.results

@@ -1201,7 +1201,7 @@ func StormLashAura(character *Character, actionTag int32) *Aura {
 		}
 
 		baseMultiplierExtension := getStormLashSpellOverride(spell)
-		ap := Ternary(spell.IsMelee(), stormlashSpell.MeleeAttackPower(), stormlashSpell.RangedAttackPower())
+		ap := Ternary(spell.IsRanged(), stormlashSpell.RangedAttackPower(), stormlashSpell.MeleeAttackPower())
 		sp := stormlashSpell.SpellPower()
 		scaledAP := ap * 0.2
 		scaledSP := sp * 0.3

sim/core/buffs.go

@@ -210,6 +210,19 @@ func (raid *Raid) GetFirstEmptyRaidIndex() (*Party, int) {
 	panic("Raid is full")
 }
 
+func (raid *Raid) GetTargetDummies() []*TargetDummy {
+	var targetDummies = []*TargetDummy{}
+	for _, party := range raid.Parties {
+		for _, player := range party.Players {
+			dummy, ok := player.(*TargetDummy)
+			if ok {
+				targetDummies = append(targetDummies, dummy)
+			}
+		}
+	}
+	return targetDummies
+}
+
 func (raid *Raid) GetFirstTargetDummy() *TargetDummy {
 	for _, party := range raid.Parties {
 		for _, player := range party.Players {

sim/core/raid.go

@@ -690,30 +690,6 @@ func (druid *Druid) applyStampede() {
 	})
 }
 
-// Modifies the Bleed aura to apply the bonus.
-func (druid *Druid) applyRendAndTear(aura core.Aura) core.Aura {
-	if druid.FerociousBite == nil || druid.Talents.RendAndTear == 0 || druid.AssumeBleedActive {
-		return aura
-	}
-
-	bonusCritPercent := []float64{0.0, 8.0, 17.0, 25.0}[druid.Talents.RendAndTear]
-
-	aura.ApplyOnGain(func(aura *core.Aura, sim *core.Simulation) {
-		if druid.BleedsActive == 0 {
-			druid.FerociousBite.BonusCritPercent += bonusCritPercent
-		}
-		druid.BleedsActive++
-	})
-	aura.ApplyOnExpire(func(aura *core.Aura, sim *core.Simulation) {
-		druid.BleedsActive--
-		if druid.BleedsActive == 0 {
-			druid.FerociousBite.BonusCritPercent -= bonusCritPercent
-		}
-	})
-
-	return aura
-}
-
 // func (druid *Druid) applyEclipse() {
 // 	druid.SolarICD = core.Cooldown{Timer: druid.NewTimer(), Duration: 0}
 // 	druid.LunarICD = core.Cooldown{Timer: druid.NewTimer(), Duration: 0}

sim/druid/_lacerate.go

@@ -50,9 +50,7 @@ type Druid struct {
 	MangleBear            *DruidSpell
 	MangleCat             *DruidSpell
 	Maul                  *DruidSpell
-	MaulQueueSpell        *DruidSpell
 	Moonfire              *DruidSpell
-	Pulverize             *DruidSpell
 	Rebirth               *DruidSpell
 	Rake                  *DruidSpell
 	Ravage                *DruidSpell
@@ -79,8 +77,8 @@ type Druid struct {
 	BarkskinAura             *core.Aura
 	BlazeOfGloryAura         *core.Aura
 	BearFormAura             *core.Aura
-	BerserkAura              *core.Aura
-	BerserkProcAura          *core.Aura
+	BerserkBearAura          *core.Aura
+	BerserkCatAura           *core.Aura
 	CatFormAura              *core.Aura
 	ClearcastingAura         *core.Aura
 	DemoralizingRoarAuras    core.AuraArray
@@ -98,11 +96,7 @@ type Druid struct {
 	StampedeBearAura         *core.Aura
 	SurvivalInstinctsAura    *core.Aura
 
-	BleedCategories core.ExclusiveCategoryArray
-
-	PrimalMadnessRageMetrics       *core.ResourceMetrics
-	PrimalPrecisionRecoveryMetrics *core.ResourceMetrics
-	SavageRoarDurationTable        [6]time.Duration
+	SavageRoarDurationTable [6]time.Duration
 
 	ProcOoc func(sim *core.Simulation)
 
@@ -119,8 +113,6 @@ type Druid struct {
 	GuardianLeatherSpecDep     *stats.StatDependency
 
 	// Item sets
-	T11Feral2pBonus *core.Aura
-	T11Feral4pBonus *core.Aura
 	T13Feral4pBonus *core.Aura
 }
 
@@ -298,15 +290,14 @@ func (druid *Druid) RegisterFeralCatSpells() {
 	// druid.registerBerserkCD()
 	// druid.registerCatCharge()
 	druid.registerCatFormSpell()
-	// druid.registerEnrageSpell()
-	// druid.registerFerociousBiteSpell()
-	// druid.registerLacerateSpell()
-	// druid.registerMangleBearSpell()
-	// druid.registerMangleCatSpell()
-	// druid.registerMaulSpell()
+	druid.registerFerociousBiteSpell()
+	druid.registerLacerateSpell()
+	druid.registerMangleBearSpell()
+	druid.registerMangleCatSpell()
+	druid.registerMaulSpell()
 	// druid.registerRakeSpell()
 	// druid.registerRavageSpell()
-	// druid.registerRipSpell()
+	druid.registerRipSpell()
 	// druid.registerSavageRoarSpell()
 	// druid.registerShredSpell()
 	//druid.registerSwipeBearSpell()
@@ -321,11 +312,10 @@ func (druid *Druid) RegisterFeralTankSpells() {
 	// druid.registerBerserkCD()
 	//druid.registerDemoralizingRoarSpell()
 	// druid.registerEnrageSpell()
-	//druid.registerFrenziedRegenerationCD()
-	// druid.registerMangleBearSpell()
-	// druid.registerMaulSpell()
-	// druid.registerLacerateSpell()
-	// druid.registerPulverizeSpell()
+	druid.registerFrenziedRegenerationSpell()
+	druid.registerMangleBearSpell()
+	druid.registerMaulSpell()
+	druid.registerLacerateSpell()
 	// druid.registerRakeSpell()
 	// druid.registerRipSpell()
 	//druid.registerSavageDefensePassive()
@@ -403,11 +393,6 @@ func (ds *DruidSpell) IsEqual(s *core.Spell) bool {
 func (druid *Druid) UpdateBleedPower(bleedSpell *DruidSpell, sim *core.Simulation, target *core.Unit, updateCurrent bool, updateNew bool) {
 	snapshotPower := bleedSpell.ExpectedTickDamage(sim, target)
 
-	// Assume that Mangle will be up soon if not currently active.
-	if !druid.BleedCategories.Get(target).AnyActive() {
-		snapshotPower *= 1.3
-	}
-
 	if updateCurrent {
 		bleedSpell.CurrentSnapshotPower = snapshotPower
 

sim/druid/_talents.go

@@ -59,14 +59,20 @@ func (druid *Druid) registerFaerieFireSpell() {
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			baseDamage := 0.0
 			outcome := spell.OutcomeMagicHit
+
 			if druid.InForm(Bear) {
 				baseDamage = 10.0 + 0.302*spell.MeleeAttackPower()
 				outcome = spell.OutcomeMagicHitAndCrit
 			}
 
 			result := spell.CalcAndDealDamage(sim, target, baseDamage, outcome)
+
 			if result.Landed() {
 				druid.TryApplyFaerieFireEffect(sim, target)
+
+				if druid.InForm(Bear) && sim.Proc(0.25, "Mangle CD Reset") {
+					druid.MangleBear.CD.Reset()
+				}
 			}
 		},
 

sim/druid/druid.go

@@ -6,19 +6,20 @@ import (
 	"github.com/wowsims/mop/sim/core"
 )
 
+const RendAndTearBonusCritPercent = 35.0
+
 func (druid *Druid) registerFerociousBiteSpell() {
 	// Raw parameters from spell database
-	coefficient := 0.38299998641
-	variance := 0.74000000954
-	resourceCoefficient := 0.58399999142
+	const coefficient = 0.45699998736
+	const variance = 0.74000000954
+	const resourceCoefficient = 0.69599997997
+	const scalingPerComboPoint = 0.196
 
 	// Scaled parameters for spell code
 	avgBaseDamage := coefficient * druid.ClassSpellScaling
 	damageSpread := variance * avgBaseDamage
 	minBaseDamage := avgBaseDamage - damageSpread/2
 	dmgPerComboPoint := resourceCoefficient * druid.ClassSpellScaling
-	scalingPerComboPoint := 0.125
-	ripRefreshChance := 0.5 * float64(druid.Talents.BloodInTheWater)
 
 	druid.FerociousBite = druid.RegisterSpell(Cat, core.SpellConfig{
 		ActionID:    core.ActionID{SpellID: 22568},
@@ -40,8 +41,8 @@ func (druid *Druid) registerFerociousBiteSpell() {
 			return druid.ComboPoints() > 0
 		},
 
-		BonusCritPercent: core.TernaryFloat64(druid.AssumeBleedActive, []float64{0.0, 8.0, 17.0, 25.0}[druid.Talents.RendAndTear], 0),
-		DamageMultiplier: 1 + 0.05*float64(druid.Talents.FeralAggression),
+		BonusCritPercent: core.TernaryFloat64(druid.AssumeBleedActive, RendAndTearBonusCritPercent, 0),
+		DamageMultiplier: 1,
 		CritMultiplier:   druid.DefaultCritMultiplier(),
 		ThreatMultiplier: 1,
 		MaxRange:         core.MaxMeleeRange,
@@ -61,15 +62,14 @@ func (druid *Druid) registerFerociousBiteSpell() {
 
 			if result.Landed() {
 				druid.SpendEnergy(sim, excessEnergy, spell.EnergyMetrics())
-				druid.ApplyFeral4pT12(sim)
 				druid.SpendComboPoints(sim, spell.ComboPointMetrics())
 
 				// Blood in the Water
 				ripDot := druid.Rip.Dot(target)
 
-				if sim.IsExecutePhase25() && ripDot.IsActive() && sim.Proc(ripRefreshChance, "Blood in the Water") {
+				if sim.IsExecutePhase25() && ripDot.IsActive() {
 					ripDot.BaseTickCount = RipBaseNumTicks
-					ripDot.Apply(sim)
+					ripDot.ApplyRollover(sim)
 				}
 			} else {
 				spell.IssueRefund(sim)
@@ -94,3 +94,26 @@ func (druid *Druid) registerFerociousBiteSpell() {
 func (druid *Druid) CurrentFerociousBiteCost() float64 {
 	return druid.FerociousBite.Cost.GetCurrentCost()
 }
+
+// Modifies the Bleed aura to apply the bonus.
+func (druid *Druid) applyRendAndTear(aura core.Aura) core.Aura {
+	if druid.FerociousBite == nil || druid.AssumeBleedActive {
+		return aura
+	}
+
+	aura.ApplyOnGain(func(_ *core.Aura, _ *core.Simulation) {
+		if druid.BleedsActive == 0 {
+			druid.FerociousBite.BonusCritPercent += RendAndTearBonusCritPercent
+		}
+		druid.BleedsActive++
+	})
+	aura.ApplyOnExpire(func(_ *core.Aura, _ *core.Simulation) {
+		druid.BleedsActive--
+		if druid.BleedsActive == 0 {
+			druid.FerociousBite.BonusCritPercent -= RendAndTearBonusCritPercent
+		}
+	})
+
+	return aura
+}
+