Merge branch 'master' into fix/monk-and-crit-multi

Author: 1337LutZ

sim/core/aura_helpers.go

@@ -400,7 +400,6 @@ func (parentAura *Aura) AttachSpellMod(spellModConfig SpellModConfig) *Aura {
 // Attaches a StatDependency to a parent Aura
 // Returns parent aura for chaining
 func (parentAura *Aura) AttachStatDependency(statDep *stats.StatDependency) *Aura {
-
 	parentAura.ApplyOnGain(func(_ *Aura, sim *Simulation) {
 		parentAura.Unit.EnableBuildPhaseStatDep(sim, statDep)
 	})
@@ -409,6 +408,10 @@ func (parentAura *Aura) AttachStatDependency(statDep *stats.StatDependency) *Aur
 		parentAura.Unit.DisableBuildPhaseStatDep(sim, statDep)
 	})
 
+	if parentAura.IsActive() {
+		parentAura.Unit.StatDependencyManager.EnableDynamicStatDep(statDep)
+	}
+
 	return parentAura
 }
 

sim/core/avoid_dr.go

@@ -1,45 +1,49 @@
 package core
 
 import (
+	"github.com/wowsims/mop/sim/core/proto"
 	"github.com/wowsims/mop/sim/core/stats"
 )
 
-// Could be in constants.go, but they won't be used anywhere else
-// C values are divided by 100 so that we are working with 1% = 0.01
-// TODO: UPDATE FOR MOP
-// Reference for Cata values: https://web.archive.org/web/20130127084642/http://elitistjerks.com/f15/t29453-combat_ratings_level_85_cataclysm/
-const Diminish_k_Druid = 0.972
-const Diminish_k_Nondruid = 0.956
-const Diminish_Cd_Druid = 116.890707 / 100
-const Diminish_Cd_Nondruid = 65.631440 / 100
-const Diminish_Cp = 65.631440 / 100
-const Diminish_kCd_Druid = (Diminish_k_Druid * Diminish_Cd_Druid)
-const Diminish_kCd_Nondruid = (Diminish_k_Nondruid * Diminish_Cd_Nondruid)
-const Diminish_kCp = (Diminish_k_Nondruid * Diminish_Cp)
+type DiminishingReturnsConstants struct {
+	k, c_p, c_d, c_b float64
+}
+
+// https://github.com/raethkcj/MistsDiminishingReturns
+var AvoidanceDRByClass = map[proto.Class]DiminishingReturnsConstants{
+	proto.Class_ClassWarrior:     {0.956, 237.186, 90.6425, 150.376},
+	proto.Class_ClassPaladin:     {0.886, 237.186, 66.5675, 150.376},
+	proto.Class_ClassHunter:      {0.988, 0, 145.560, 0},
+	proto.Class_ClassRogue:       {0.988, 145.560, 145.560, 0},
+	proto.Class_ClassPriest:      {0.983, 0, 150.376, 0},
+	proto.Class_ClassDeathKnight: {0.956, 237.186, 90.6425, 0},
+	proto.Class_ClassShaman:      {0.988, 145.560, 145.560, 0},
+	proto.Class_ClassMonk:        {1.422, 90.6425, 501.253, 0},
+	proto.Class_ClassMage:        {0.983, 0, 150.376, 0},
+	proto.Class_ClassWarlock:     {0.983, 0, 150.376, 0},
+	proto.Class_ClassDruid:       {1.222, 0, 150.376, 0},
+}
 
 // Diminishing Returns for tank avoidance
 // Non-diminishing sources are added separately in spell outcome funcs
 
 func (unit *Unit) GetDiminishedDodgeChance() float64 {
 	// undiminished Dodge % = D
 	// diminished Dodge % = (D * Cd)/((k*Cd) + D)
-	dodgeChance := unit.stats[stats.DodgeRating] / DodgeRatingPerDodgePercent / 100
-
-	if unit.PseudoStats.CanParry {
-		return (dodgeChance * Diminish_Cd_Nondruid) / (Diminish_kCd_Nondruid + dodgeChance)
-	} else {
-		return (dodgeChance * Diminish_Cd_Druid) / (Diminish_kCd_Druid + dodgeChance)
-	}
+	dodgePercent := unit.stats[stats.DodgeRating] / DodgeRatingPerDodgePercent
+	return (dodgePercent * unit.avoidanceParams.c_d) / (unit.avoidanceParams.k * unit.avoidanceParams.c_d + dodgePercent) / 100
 }
 
 func (unit *Unit) GetDiminishedParryChance() float64 {
 	// undiminished Parry % = P
 	// diminished Parry % = (P * Cp)/((k*Cp) + P)
-	parryChance := unit.stats[stats.ParryRating] / ParryRatingPerParryPercent / 100
-	return (parryChance * Diminish_Cp) / (Diminish_kCp + parryChance)
+	parryPercent := unit.stats[stats.ParryRating] / ParryRatingPerParryPercent
+	return (parryPercent * unit.avoidanceParams.c_p) / (unit.avoidanceParams.k * unit.avoidanceParams.c_p + parryPercent) / 100
 }
 
-func (unit *Unit) GetDiminishedMissChance() float64 {
-	// Defense Rating is gone in Cata, so there are no diminished sources of Miss
-	return 0
+func (unit *Unit) GetDiminishedBlockChance() float64 {
+	// undiminished Block % = B
+	// diminished Block % = (B * Cb)/((k*Cb) + B)
+	blockPercent := unit.stats[stats.BlockPercent]
+	return (blockPercent * unit.avoidanceParams.c_b) / (unit.avoidanceParams.k * unit.avoidanceParams.c_b + blockPercent) / 100
 }

sim/core/base_stats.go

@@ -210,7 +210,7 @@ var ClassBaseStats = map[proto.Class]stats.Stats{
 		stats.Strength:    104,
 		stats.Intellect:   169,
 		stats.Spirit:      188,
-		stats.Stamina:     119,
+		stats.Stamina:     114,
 		stats.AttackPower: float64(CharacterLevel)*3.0 - 10,
 	},
 	proto.Class_ClassMonk: {

sim/core/character.go

@@ -101,6 +101,7 @@ func NewCharacter(party *Party, partyIndex int, player *proto.Player) Character
 			Metrics:     NewUnitMetrics(),
 
 			StatDependencyManager: stats.NewStatDependencyManager(),
+			avoidanceParams:       AvoidanceDRByClass[player.Class],
 
 			ReactionTime:            time.Duration(max(player.ReactionTimeMs, 10)) * time.Millisecond,
 			ChannelClipDelay:        max(0, time.Duration(player.ChannelClipDelayMs)*time.Millisecond),

sim/core/stats/deps.go

@@ -84,6 +84,13 @@ func (sd StatDependency) String() string {
 	}
 }
 
+// Updates the "amount" field for a previously defined dep. Note that if this is
+// called after the stats measurement phase, then ApplyStatDependencies() must
+// be immediately called afterwards!
+func (dep *StatDependency) UpdateValue(newAmount float64) {
+	dep.amount = newAmount
+}
+
 // Manages dependencies between stats.
 //
 // Some examples:

sim/core/unit.go

@@ -146,6 +146,7 @@ type Unit struct {
 	AttackTables                []*AttackTable
 	DynamicDamageTakenModifiers []DynamicDamageTakenModifier
 	Blockhandler                func(sim *Simulation, spell *Spell, result *SpellResult)
+	avoidanceParams             DiminishingReturnsConstants
 
 	GCD *Timer
 
@@ -364,6 +365,21 @@ func (unit *Unit) DisableDynamicStatDep(sim *Simulation, dep *stats.StatDependen
 	}
 }
 
+func (unit *Unit) UpdateDynamicStatDep(sim *Simulation, dep *stats.StatDependency, newAmount float64) {
+	dep.UpdateValue(newAmount)
+
+	if unit.Env.IsFinalized() {
+		oldStats := unit.stats
+		unit.stats = unit.ApplyStatDependencies(unit.statsWithoutDeps)
+		statsChange := unit.stats.Subtract(oldStats)
+		unit.processDynamicBonus(sim, statsChange)
+
+		if sim.Log != nil {
+			unit.Log(sim, "Dynamic dep updated (%s): %s", dep.String(), statsChange.FlatString())
+		}
+	}
+}
+
 func (unit *Unit) EnableBuildPhaseStatDep(sim *Simulation, dep *stats.StatDependency) {
 	if unit.Env.MeasuringStats && unit.Env.State != Finalized {
 		unit.StatDependencyManager.EnableDynamicStatDep(dep)
@@ -700,14 +716,13 @@ func (unit *Unit) GetTotalParryChanceAsDefender(atkTable *AttackTable) float64 {
 
 func (unit *Unit) GetTotalChanceToBeMissedAsDefender(atkTable *AttackTable) float64 {
 	chance := atkTable.BaseMissChance +
-		unit.GetDiminishedMissChance() +
 		unit.PseudoStats.ReducedPhysicalHitTakenChance
 	return math.Max(chance, 0.0)
 }
 
 func (unit *Unit) GetTotalBlockChanceAsDefender(atkTable *AttackTable) float64 {
 	chance := atkTable.BaseBlockChance +
-		unit.GetStat(stats.BlockPercent)/100
+		unit.GetDiminishedBlockChance()
 	return math.Max(chance, 0.0)
 }
 

sim/druid/_enrage.go

@@ -40,7 +40,6 @@ type Druid struct {
 	Berserk               *DruidSpell
 	CatCharge             *DruidSpell
 	DemoralizingRoar      *DruidSpell
-	Enrage                *DruidSpell
 	FaerieFire            *DruidSpell
 	FerociousBite         *DruidSpell
 	ForceOfNature         *DruidSpell
@@ -88,7 +87,6 @@ type Druid struct {
 	CatFormAura              *core.Aura
 	ClearcastingAura         *core.Aura
 	DemoralizingRoarAuras    core.AuraArray
-	EnrageAura               *core.Aura
 	FaerieFireAuras          core.AuraArray
 	FrenziedRegenerationAura *core.Aura
 	LunarEclipseProcAura     *core.Aura
@@ -383,11 +381,12 @@ func New(char *core.Character, form DruidForm, selfBuffs SelfBuffs, talents stri
 	druid.AddStatDependency(stats.Strength, stats.AttackPower, 1)
 	druid.AddStatDependency(stats.BonusArmor, stats.Armor, 1)
 	druid.AddStatDependency(stats.Agility, stats.PhysicalCritPercent, core.CritPerAgiMaxLevel[char.Class])
-	// Druids get 0.0041 dodge per agi (before dr), roughly 1% per 244
-	druid.AddStatDependency(stats.Agility, stats.DodgeRating, 0.00410000*core.DodgeRatingPerDodgePercent)
+
+	// Druids get roughly 1% Dodge per 951.16 Agi at level 90
+	druid.AddStatDependency(stats.Agility, stats.DodgeRating, 0.00105135 * core.DodgeRatingPerDodgePercent)
 
 	// Base dodge is unaffected by Diminishing Returns
-	druid.PseudoStats.BaseDodgeChance += 0.04951
+	druid.PseudoStats.BaseDodgeChance += 0.03
 
 	druid.RegisterLeatherSpecialization()
 

sim/druid/druid.go

@@ -22,6 +22,10 @@ const (
 // Converts from 0.009327 to 0.0085
 const AnimalSpiritRegenSuppression = 0.911337
 
+// Thick Hide contribution handled separately in talents code for cleanliness
+// and UI stats display.
+const BaseBearArmorMulti = 2.2
+
 func (form DruidForm) Matches(other DruidForm) bool {
 	return (form & other) != 0
 }
@@ -230,7 +234,9 @@ func (druid *Druid) RegisterBearFormAura() {
 	}
 
 	agiApDep := druid.NewDynamicStatDependency(stats.Agility, stats.AttackPower, 2)
-	stamDep := druid.NewDynamicMultiplyStat(stats.Stamina, 1.2)
+	stamDep := druid.NewDynamicMultiplyStat(stats.Stamina, 1.4)
+	critDep := druid.NewDynamicMultiplyStat(stats.CritRating, 1.5) // TODO: Should this be implemented as EquipScaling instead? Need to check elixirs and procs.
+	hasteDep := druid.NewDynamicMultiplyStat(stats.HasteRating, 1.5) // TODO: Should this be implemented as EquipScaling instead? Need to check elixirs and procs.
 	leatherSpecDep := druid.NewDynamicMultiplyStat(stats.Stamina, 1.05)
 
 	// Need redundant enabling/disabling of the dep both here and below
@@ -249,7 +255,6 @@ func (druid *Druid) RegisterBearFormAura() {
 	})
 
 	clawWeapon := druid.GetBearWeapon()
-	baseBearArmorMulti := 2.2 // Thick Hide contribution handled separately in talents code for cleanliness and UI stats display.
 
 	druid.BearFormAura = druid.RegisterAura(core.Aura{
 		Label:      "Bear Form",
@@ -267,8 +272,10 @@ func (druid *Druid) RegisterBearFormAura() {
 			druid.PseudoStats.SpiritRegenMultiplier *= AnimalSpiritRegenSuppression
 
 			druid.AddStatsDynamic(sim, statBonus)
-			druid.ApplyDynamicEquipScaling(sim, stats.Armor, baseBearArmorMulti)
+			druid.ApplyDynamicEquipScaling(sim, stats.Armor, BaseBearArmorMulti)
 			druid.EnableBuildPhaseStatDep(sim, agiApDep)
+			druid.EnableBuildPhaseStatDep(sim, critDep)
+			druid.EnableBuildPhaseStatDep(sim, hasteDep)
 
 			// Preserve fraction of max health when shifting
 			healthFrac := druid.CurrentHealth() / druid.MaxHealth()
@@ -294,8 +301,10 @@ func (druid *Druid) RegisterBearFormAura() {
 			druid.PseudoStats.SpiritRegenMultiplier /= AnimalSpiritRegenSuppression
 
 			druid.AddStatsDynamic(sim, statBonus.Invert())
-			druid.RemoveDynamicEquipScaling(sim, stats.Armor, baseBearArmorMulti)
+			druid.RemoveDynamicEquipScaling(sim, stats.Armor, BaseBearArmorMulti)
 			druid.DisableBuildPhaseStatDep(sim, agiApDep)
+			druid.DisableBuildPhaseStatDep(sim, critDep)
+			druid.DisableBuildPhaseStatDep(sim, hasteDep)
 
 			healthFrac := druid.CurrentHealth() / druid.MaxHealth()
 			druid.DisableBuildPhaseStatDep(sim, stamDep)
@@ -311,7 +320,6 @@ func (druid *Druid) RegisterBearFormAura() {
 				druid.AutoAttacks.SetMH(druid.WeaponFromMainHand(druid.DefaultCritMultiplier()))
 				druid.AutoAttacks.EnableAutoSwing(sim)
 				druid.UpdateManaRegenRates()
-				druid.EnrageAura.Deactivate(sim)
 
 				if druid.PulverizeAura.IsActive() {
 					druid.PulverizeAura.Deactivate(sim)