Merge pull request #109 from wowsims/guardian

Tank attack table fix

Author: NerdEgghead

sim/core/TestProtoVersioning.results

@@ -618,7 +618,7 @@ func (character *Character) GetPseudoStatsProto() []float64 {
 		// Base values are modified by Enemy attackTables, but we display for LVL 80 enemy as paperdoll default
 		proto.PseudoStat_PseudoStatDodgePercent: (character.PseudoStats.BaseDodgeChance + character.GetDiminishedDodgeChance()) * 100,
 		proto.PseudoStat_PseudoStatParryPercent: (character.PseudoStats.BaseParryChance + character.GetDiminishedParryChance()) * 100,
-		proto.PseudoStat_PseudoStatBlockPercent: 5 + character.GetStat(stats.BlockPercent),
+		proto.PseudoStat_PseudoStatBlockPercent: (character.PseudoStats.BaseBlockChance + character.GetDiminishedBlockChance()) * 100,
 
 		// Used by UI to incorporate multiplicative Haste buffs into final character stats display.
 		proto.PseudoStat_PseudoStatRangedSpeedMultiplier: character.PseudoStats.RangedSpeedMultiplier,

sim/core/character.go

@@ -436,7 +436,7 @@ type PseudoStats struct {
 	// probabilities (between 0 and 1).
 	BaseDodgeChance float64
 	BaseParryChance float64
-	//BaseMiss is not needed, this is always 5%
+	BaseBlockChance float64
 
 	ReducedCritTakenChance float64 // Reduces chance to be crit.
 

sim/core/stats/stats.go

@@ -255,9 +255,9 @@ func NewAttackTable(attacker *Unit, defender *Unit) *AttackTable {
 	} else {
 		table.BaseSpellMissChance = UnitLevelFloat64(attacker.Level, 0.06, 0.03, 0, -0.03)
 		table.BaseMissChance = UnitLevelFloat64(attacker.Level, 0.03, 0.015, 0, -0.015)
-		table.BaseBlockChance = UnitLevelFloat64(attacker.Level, 0.03, 0.015, 0, -0.015)
-		table.BaseDodgeChance = UnitLevelFloat64(attacker.Level, 0.03, 0.015, 0, -0.015)
-		table.BaseParryChance = UnitLevelFloat64(attacker.Level, 0.03, 0.015, 0, -0.015)
+		table.BaseBlockChance = UnitLevelFloat64(attacker.Level, 0, -0.015, -0.03, -0.045)
+		table.BaseDodgeChance = UnitLevelFloat64(attacker.Level, 0, -0.015, -0.03, -0.045)
+		table.BaseParryChance = UnitLevelFloat64(attacker.Level, 0, -0.015, -0.03, -0.045)
 	}
 
 	return table

sim/core/target.go

@@ -721,7 +721,8 @@ func (unit *Unit) GetTotalChanceToBeMissedAsDefender(atkTable *AttackTable) floa
 }
 
 func (unit *Unit) GetTotalBlockChanceAsDefender(atkTable *AttackTable) float64 {
-	chance := atkTable.BaseBlockChance +
+	chance := unit.PseudoStats.BaseBlockChance +
+		atkTable.BaseBlockChance +
 		unit.GetDiminishedBlockChance()
 	return math.Max(chance, 0.0)
 }

sim/core/unit.go

@@ -3086,10 +3086,10 @@ dps_results: {
 dps_results: {
  key: "TestBrewmaster-Average-Default"
  value: {
-  dps: 116510.47879
-  tps: 116510.47879
-  dtps: 46610.76715
-  hps: 12007.64212
+  dps: 116511.51533
+  tps: 116511.51533
+  dtps: 46625.34082
+  hps: 12006.42408
  }
 }
 dps_results: {

sim/monk/brewmaster/TestBrewmaster.results

@@ -232,6 +232,8 @@ func NewMonk(character *core.Character, options *proto.MonkOptions, talents stri
 	core.FillTalentsProto(monk.Talents.ProtoReflect(), talents)
 
 	monk.PseudoStats.CanParry = true
+	monk.PseudoStats.BaseParryChance += 0.03
+	monk.PseudoStats.BaseDodgeChance += 0.03
 	monk.XuenPet = monk.NewXuen()
 
 	monk.registerSEFPets()