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

[WIP] Brewmaster/Windwalker implementation

Author: 1337LutZ

proto/apl.proto

@@ -85,7 +85,7 @@ message APLAction {
     }
 }
 
-// NextIndex: 99
+// NextIndex: 100
 message APLValue {
 	UUID uuid = 87;
 
@@ -125,6 +125,7 @@ message APLValue {
         APLValueCurrentSolarEnergy current_solar_energy = 68;
         APLValueCurrentLunarEnergy current_lunar_energy = 69;
 		APLValueCurrentGenericResource current_generic_resource = 75;
+        APLValueMaxHealth max_health = 99;
 		APLValueMaxComboPoints max_combo_points = 94;
 		APLValueMaxEnergy max_energy = 88;
 		APLValueMaxFocus max_focus = 89;
@@ -472,6 +473,7 @@ message APLValueCurrentRunicPower {}
 message APLValueCurrentSolarEnergy {}
 message APLValueCurrentLunarEnergy {}
 message APLValueCurrentGenericResource {}
+message APLValueMaxHealth {}
 message APLValueMaxComboPoints {}
 message APLValueMaxEnergy {}
 message APLValueMaxFocus {}
@@ -701,4 +703,4 @@ message APLValueShamanFireElementalDuration {
 }
 
 message APLValueMonkCurrentChi {}
-message APLValueMonkMaxChi {}
+message APLValueMonkMaxChi {}

sim/common/cata/other_effects.go

@@ -148,6 +148,9 @@ func init() {
 					Timer:    sharedTimer,
 				},
 			},
+			ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
+				return character.HasManaBar()
+			},
 			ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) {
 				for _, aoeTarget := range sim.Encounter.TargetUnits {
 					spell.CalcAndDealDamage(sim, aoeTarget, storedMana, spell.OutcomeMagicHitAndCrit)
@@ -477,6 +480,9 @@ func init() {
 						Duration: time.Minute * 2,
 					},
 				},
+				ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
+					return character.HasManaBar()
+				},
 				ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 					procAura.Deactivate(sim)
 					// can not regain stacks for 30 seconds

sim/core/apl_value.go

@@ -122,6 +122,8 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue {
 		value = rot.newValueCurrentComboPoints(config.GetCurrentComboPoints(), config.Uuid)
 	case *proto.APLValue_CurrentRunicPower:
 		value = rot.newValueCurrentRunicPower(config.GetCurrentRunicPower(), config.Uuid)
+	case *proto.APLValue_MaxHealth:
+		value = rot.newValueMaxHealth(config.GetMaxHealth(), config.Uuid)
 	case *proto.APLValue_MaxComboPoints:
 		value = rot.newValueMaxComboPoints(config.GetMaxComboPoints(), config.Uuid)
 	case *proto.APLValue_MaxEnergy:

sim/core/apl_values_resources.go

@@ -63,6 +63,31 @@ func (value *APLValueCurrentHealthPercent) String() string {
 	return fmt.Sprintf("Current Health %%")
 }
 
+type APLValueMaxHealth struct {
+	DefaultAPLValueImpl
+	unit *Unit
+}
+
+func (rot *APLRotation) newValueMaxHealth(_ *proto.APLValueMaxHealth, uuid *proto.UUID) APLValue {
+	unit := rot.unit
+	if !unit.HasHealthBar() {
+		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not use Health", unit.Label)
+		return nil
+	}
+	return &APLValueMaxHealth{
+		unit: unit,
+	}
+}
+func (value *APLValueMaxHealth) Type() proto.APLValueType {
+	return proto.APLValueType_ValueTypeFloat
+}
+func (value *APLValueMaxHealth) GetFloat(sim *Simulation) float64 {
+	return value.unit.MaxHealth()
+}
+func (value *APLValueMaxHealth) String() string {
+	return "Max Health"
+}
+
 type APLValueCurrentMana struct {
 	DefaultAPLValueImpl
 	unit UnitReference
@@ -124,7 +149,7 @@ type APLValueCurrentRage struct {
 	unit *Unit
 }
 
-func (rot *APLRotation) newValueCurrentRage(config *proto.APLValueCurrentRage, uuid *proto.UUID) APLValue {
+func (rot *APLRotation) newValueCurrentRage(_ *proto.APLValueCurrentRage, uuid *proto.UUID) APLValue {
 	unit := rot.unit
 	if !unit.HasRageBar() {
 		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not use Rage", unit.Label)
@@ -149,7 +174,7 @@ type APLValueCurrentFocus struct {
 	unit *Unit
 }
 
-func (rot *APLRotation) newValueCurrentFocus(config *proto.APLValueCurrentFocus, uuid *proto.UUID) APLValue {
+func (rot *APLRotation) newValueCurrentFocus(_ *proto.APLValueCurrentFocus, uuid *proto.UUID) APLValue {
 	unit := rot.unit
 	if !unit.HasFocusBar() {
 		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not use Focus", unit.Label)
@@ -260,7 +285,7 @@ type APLValueCurrentEnergy struct {
 	unit *Unit
 }
 
-func (rot *APLRotation) newValueCurrentEnergy(config *proto.APLValueCurrentEnergy, uuid *proto.UUID) APLValue {
+func (rot *APLRotation) newValueCurrentEnergy(_ *proto.APLValueCurrentEnergy, uuid *proto.UUID) APLValue {
 	unit := rot.unit
 	if !unit.HasEnergyBar() {
 		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not use Energy", unit.Label)
@@ -368,7 +393,7 @@ type APLValueCurrentComboPoints struct {
 	unit *Unit
 }
 
-func (rot *APLRotation) newValueCurrentComboPoints(config *proto.APLValueCurrentComboPoints, uuid *proto.UUID) APLValue {
+func (rot *APLRotation) newValueCurrentComboPoints(_ *proto.APLValueCurrentComboPoints, uuid *proto.UUID) APLValue {
 	unit := rot.unit
 	if !unit.HasEnergyBar() {
 		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not use Combo Points", unit.Label)
@@ -418,7 +443,7 @@ type APLValueCurrentRunicPower struct {
 	unit *Unit
 }
 
-func (rot *APLRotation) newValueCurrentRunicPower(config *proto.APLValueCurrentRunicPower, uuid *proto.UUID) APLValue {
+func (rot *APLRotation) newValueCurrentRunicPower(_ *proto.APLValueCurrentRunicPower, uuid *proto.UUID) APLValue {
 	unit := rot.unit
 	if !unit.HasRunicPowerBar() {
 		rot.ValidationMessageByUUID(uuid, proto.LogLevel_Warning, "%s does not use Runic Power", unit.Label)

sim/core/attack.go

@@ -724,6 +724,19 @@ func (aa *AutoAttacks) UpdateSwingTimers(sim *Simulation) {
 	}
 }
 
+// Desyncss the offhand swing
+func (aa *AutoAttacks) DesyncOffHand(sim *Simulation, readyAt time.Duration) {
+	if !aa.AutoSwingMelee { // if not auto swinging, don't auto restart.
+		return
+	}
+
+	if aa.IsDualWielding {
+		aa.oh.swingAt = readyAt + aa.oh.curSwingDuration
+		aa.oh.swingAt += aa.oh.curSwingDuration / 2
+		sim.rescheduleWeaponAttack(aa.oh.swingAt)
+	}
+}
+
 // StopMeleeUntil should be used whenever a non-melee spell is cast. It stops melee, then restarts it
 // at end of cast, but with a reset swing timer (as if swings had just landed).
 func (aa *AutoAttacks) StopMeleeUntil(sim *Simulation, readyAt time.Duration, desyncOH bool) {
@@ -735,14 +748,10 @@ func (aa *AutoAttacks) StopMeleeUntil(sim *Simulation, readyAt time.Duration, de
 	sim.rescheduleWeaponAttack(aa.mh.swingAt)
 
 	if aa.IsDualWielding {
-		aa.oh.swingAt = readyAt + aa.oh.curSwingDuration
-		if desyncOH {
-			// Used by warrior to desync offhand after unglyphed Shattering Throw.
-			aa.oh.swingAt += aa.oh.curSwingDuration / 2
-		}
-		sim.rescheduleWeaponAttack(aa.oh.swingAt)
+		aa.DesyncOffHand(sim, readyAt)
 	}
 }
+
 func (aa *AutoAttacks) StopRangedUntil(sim *Simulation, readyAt time.Duration) {
 	if !aa.AutoSwingRanged { // if not auto swinging, don't auto restart.
 		return

sim/core/aura.go

@@ -254,7 +254,7 @@ func (aura *Aura) ExpiresAt() time.Duration {
 }
 
 // Adds a handler to be called OnGain, in addition to any current handlers.
-func (aura *Aura) ApplyOnGain(newOnGain OnGain) {
+func (aura *Aura) ApplyOnGain(newOnGain OnGain) *Aura {
 	oldOnGain := aura.OnGain
 	if oldOnGain == nil {
 		aura.OnGain = newOnGain
@@ -264,10 +264,12 @@ func (aura *Aura) ApplyOnGain(newOnGain OnGain) {
 			newOnGain(aura, sim)
 		}
 	}
+
+	return aura
 }
 
 // Adds a handler to be called OnExpire, in addition to any current handlers.
-func (aura *Aura) ApplyOnExpire(newOnExpire OnExpire) {
+func (aura *Aura) ApplyOnExpire(newOnExpire OnExpire) *Aura {
 	oldOnExpire := aura.OnExpire
 	if oldOnExpire == nil {
 		aura.OnExpire = newOnExpire
@@ -277,6 +279,8 @@ func (aura *Aura) ApplyOnExpire(newOnExpire OnExpire) {
 			newOnExpire(aura, sim)
 		}
 	}
+
+	return aura
 }
 
 type AuraFactory func(*Simulation) *Aura

sim/core/mana.go

@@ -86,6 +86,7 @@ func (unit *Unit) AddMana(sim *Simulation, amount float64, metrics *ResourceMetr
 
 	oldMana := unit.CurrentMana()
 	newMana := min(oldMana+amount, unit.MaxMana())
+
 	metrics.AddEvent(amount, newMana-oldMana)
 
 	if sim.Log != nil {

sim/core/statweight.go

@@ -158,7 +158,7 @@ func buildStatWeightRequests(swr *proto.StatWeightsRequest) *proto.StatWeightReq
 	}
 
 	// Do half the iterations with a positive, and half with a negative value for better accuracy.
-	const defaultStatMod = 40.0 // match to the impact of a single gem
+	const defaultStatMod = 160.0 // match to the impact of a single gem
 	statModsLow := make([]float64, stats.UnitStatsLen)
 	statModsHigh := make([]float64, stats.UnitStatsLen)
 

sim/monk/apl_values.go

@@ -32,7 +32,7 @@ func (value *APLValueCurrentChi) Type() proto.APLValueType {
 	return proto.APLValueType_ValueTypeInt
 }
 func (value *APLValueCurrentChi) GetInt(_ *core.Simulation) int32 {
-	return value.monk.ComboPoints()
+	return value.monk.GetChi()
 }
 func (value *APLValueCurrentChi) String() string {
 	return "Current Chi"

sim/monk/attack.go

@@ -27,53 +27,46 @@ $offhigh=$?!s124146[${$MWB/2/$mws}][${$OWB/2/$ows}]
 $low=${$<stnc>*($<bm>*$<dwm>*(($mwb)/($MWS)+$<offm>*$<offlow>)+$<apc>-1)}
 $high=${$<stnc>*($<bm>*$<dwm>*(($MWB)/($MWS)+$<offm>*$<offhigh>)+$<apc>+1)}
 */
+var DualWieldModifier = 0.898882275
+
 func (monk *Monk) CalculateMonkStrikeDamage(sim *core.Simulation, spell *core.Spell) float64 {
 	totalDamage := 0.0
 	ap := spell.MeleeAttackPower()
 
 	staffOrPolearm := false
-	hasMainHand := false
 	mh := monk.MainHand()
 	mhw := monk.WeaponFromMainHand(monk.DefaultCritMultiplier())
 	if mh != nil && mh.WeaponType != proto.WeaponType_WeaponTypeUnknown {
 		staffOrPolearm = mh.WeaponType == proto.WeaponType_WeaponTypeStaff || mh.WeaponType == proto.WeaponType_WeaponTypePolearm
 		dmg := mhw.BaseDamage(sim) / mhw.SwingSpeed
 		totalDamage += dmg
-		hasMainHand = true
 
 		if sim.Log != nil {
 			monk.Log(sim, "[DEBUG] main hand weapon damage portion for %s: td=%0.3f, wd=%0.3f, ws=%0.3f",
-				spell.ActionID, totalDamage, dmg, mhw.SwingSpeed, ap)
+				spell.ActionID, totalDamage, dmg, mhw.SwingSpeed)
 		}
 	}
 
-	hasOffHand := false
 	oh := monk.OffHand()
 	if oh != nil && oh.WeaponType != proto.WeaponType_WeaponTypeUnknown {
 		ohw := monk.WeaponFromOffHand(monk.DefaultCritMultiplier())
 		dmg := ohw.BaseDamage(sim) / ohw.SwingSpeed * 0.5
 		totalDamage += dmg
-		hasOffHand = true
 
 		if sim.Log != nil {
 			monk.Log(sim, "[DEBUG] off hand weapon damage portion for %s: td=%0.3f, wd=%0.3f, ws=%0.3f",
-				spell.ActionID, totalDamage, dmg, ohw.SwingSpeed, ap)
+				spell.ActionID, totalDamage, dmg, ohw.SwingSpeed)
 		}
 	}
 
-	// When not wielding a staff or polearm, total damage is multiplied by 0.898882275.
+	// When not wielding a staff or polearm, total damage is multiplied by DualWieldModifier.
 	if !staffOrPolearm {
-		totalDamage *= 0.898882275
+		totalDamage *= DualWieldModifier
 	}
 
-	apMod := monk.GetAttackPowerPerDPS()
+	apMod := 1.0 / core.DefaultAttackPowerPerDPS
 
-	if !hasMainHand && !hasOffHand {
-		// Unarmed
-		totalDamage += mhw.CalculateWeaponDamage(sim, ap)
-	} else {
-		totalDamage += apMod * ap
-	}
+	totalDamage += apMod * ap
 
 	if sim.Log != nil {
 		monk.Log(sim, "[DEBUG] total weapon damage for %s: td=%0.3f, apmod=%0.3f, ap=%0.3f",