Merge pull request #113 from wowsims/fix/monk-and-crit-multi

[MONK] Zen Sphere & AOE Cap

Author: 1337LutZ

proto/apl.proto

@@ -85,7 +85,7 @@ message APLAction {
     }
 }
 
-// NextIndex: 102
+// NextIndex: 101
 message APLValue {
 	UUID uuid = 87;
 
@@ -203,7 +203,6 @@ message APLValue {
         APLValueFrontOfTarget front_of_target = 63;
 
         // Class or Spec-specific values
-		APLValueCurrentVengeancePercent current_vengeance_percent = 101;
         APLValueTotemRemainingTime totem_remaining_time = 49;
         APLValueCatExcessEnergy cat_excess_energy = 52;
         APLValueCatNewSavageRoarDuration cat_new_savage_roar_duration = 61;
@@ -701,5 +700,3 @@ message APLValueShamanFireElementalDuration {}
 message APLValueMonkCurrentChi {}
 message APLValueMonkMaxChi {}
 message APLValueBrewmasterMonkCurrentStaggerPercent {}
-
-message APLValueCurrentVengeancePercent {}

sim/core/apl_value.go

@@ -142,9 +142,6 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue {
 		value = rot.newValueFocusTimeToTarget(config.GetFocusTimeToTarget(), config.Uuid)
 	case *proto.APLValue_CurrentGenericResource:
 		value = rot.newValueCurrentGenericResource(config.GetCurrentGenericResource(), config.Uuid)
-	// Tank "resource"
-	case *proto.APLValue_CurrentVengeancePercent:
-		value = rot.newValueCurrentVengeancePercent(config.GetCurrentVengeancePercent(), config.Uuid)
 
 	// Resources Runes
 	case *proto.APLValue_CurrentRuneCount:

sim/core/apl_values_resources.go

@@ -512,34 +512,3 @@ func (value *APLValueCurrentGenericResource) GetInt(sim *Simulation) int32 {
 func (value *APLValueCurrentGenericResource) String() string {
 	return "Current {GENERIC_RESOURCE}"
 }
-
-type APLValueCurrentVengeancePercent struct {
-	DefaultAPLValueImpl
-	unit *Unit
-	aura *Aura
-}
-
-func (rot *APLRotation) newValueCurrentVengeancePercent(config *proto.APLValueCurrentVengeancePercent, uuid *proto.UUID) APLValue {
-	unit := rot.unit
-	if unit == nil {
-		return nil
-	}
-	vengeanceAura := unit.GetAura("Vengeance")
-	if vengeanceAura == nil {
-		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not know Vengeance", unit.Label)
-		return nil
-	}
-	return &APLValueCurrentVengeancePercent{
-		unit: unit,
-		aura: vengeanceAura,
-	}
-}
-func (value *APLValueCurrentVengeancePercent) Type() proto.APLValueType {
-	return proto.APLValueType_ValueTypeFloat
-}
-func (value *APLValueCurrentVengeancePercent) GetFloat(sim *Simulation) float64 {
-	return float64(value.aura.GetStacks()) / value.unit.MaxHealth()
-}
-func (value *APLValueCurrentVengeancePercent) String() string {
-	return fmt.Sprintf("Current Vengeance %%")
-}

sim/core/avoid_dr.go

@@ -30,29 +30,20 @@ var AvoidanceDRByClass = map[proto.Class]DiminishingReturnsConstants{
 func (unit *Unit) GetDiminishedDodgeChance() float64 {
 	// undiminished Dodge % = D
 	// diminished Dodge % = (D * Cd)/((k*Cd) + D)
-	if unit.avoidanceParams.c_d == 0 {
-		return 0
-	}
 	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)
-	if unit.avoidanceParams.c_p == 0 {
-		return 0
-	}
 	parryPercent := unit.stats[stats.ParryRating] / ParryRatingPerParryPercent
 	return (parryPercent * unit.avoidanceParams.c_p) / (unit.avoidanceParams.k*unit.avoidanceParams.c_p + parryPercent) / 100
 }
 
 func (unit *Unit) GetDiminishedBlockChance() float64 {
 	// undiminished Block % = B
 	// diminished Block % = (B * Cb)/((k*Cb) + B)
-	if unit.avoidanceParams.c_b == 0 {
-		return 0
-	}
 	blockPercent := unit.stats[stats.BlockPercent]
 	return (blockPercent * unit.avoidanceParams.c_b) / (unit.avoidanceParams.k*unit.avoidanceParams.c_b + blockPercent) / 100
 }

sim/core/character.go

@@ -617,8 +617,8 @@ 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: (character.PseudoStats.BaseBlockChance + character.GetDiminishedBlockChance()) * 100,
+		proto.PseudoStat_PseudoStatParryPercent: Ternary(character.PseudoStats.CanParry, (character.PseudoStats.BaseParryChance+character.GetDiminishedParryChance())*100, 0),
+		proto.PseudoStat_PseudoStatBlockPercent: Ternary(character.PseudoStats.CanBlock, (character.PseudoStats.BaseBlockChance+character.GetDiminishedBlockChance())*100, 0),
 
 		// Used by UI to incorporate multiplicative Haste buffs into final character stats display.
 		proto.PseudoStat_PseudoStatRangedSpeedMultiplier: character.PseudoStats.RangedSpeedMultiplier,
@@ -686,10 +686,7 @@ func (character *Character) GetMatchingItemProcAuras(statTypesToMatch []stats.St
 }
 
 // Uses proto reflection to set fields in a talents proto (e.g. MageTalents,
-// WarriorTalents) based on a talentsStr. treeSizes should contain the number
-// of talents in each tree, usually around 30. This is needed because talent
-// strings truncate 0's at the end of each tree, so we can't infer the start index
-// of the tree from the string.
+// WarriorTalents) based on a talentsStr.
 func FillTalentsProto(data protoreflect.Message, talentsStr string) {
 	fieldDescriptors := data.Descriptor().Fields()
 

sim/core/target.go

@@ -85,7 +85,7 @@ func (encounter *Encounter) AOECapMultiplier() float64 {
 	return encounter.aoeCapMultiplier
 }
 func (encounter *Encounter) updateAOECapMultiplier() {
-	encounter.aoeCapMultiplier = min(10/float64(len(encounter.Targets)), 1)
+	encounter.aoeCapMultiplier = min(20/float64(len(encounter.Targets)), 1)
 }
 
 func (encounter *Encounter) doneIteration(sim *Simulation) {