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

[MONK] Fixes

Author: 1337LutZ

proto/apl.proto

@@ -85,7 +85,7 @@ message APLAction {
     }
 }
 
-// NextIndex: 100
+// NextIndex: 102
 message APLValue {
 	UUID uuid = 87;
 
@@ -203,6 +203,7 @@ 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;
@@ -214,6 +215,7 @@ message APLValue {
         APLValueShamanFireElementalDuration shaman_fire_elemental_duration = 83;
         APLValueMonkCurrentChi monk_current_chi = 95;
 		APLValueMonkMaxChi monk_max_chi = 96;
+		APLValueBrewmasterMonkCurrentStaggerPercent brewmaster_monk_current_stagger_percent = 100;
     }
 }
 
@@ -686,21 +688,18 @@ message APLValueSequenceTimeToReady {
 message APLValueTotemRemainingTime {
     ShamanTotems.TotemType totem_type = 1;
 }
-message APLValueCatExcessEnergy {
-}
-message APLValueCatNewSavageRoarDuration {
-}
-message APLValueWarlockShouldRecastDrainSoul {
-}
+message APLValueCatExcessEnergy {}
+message APLValueCatNewSavageRoarDuration {}
+message APLValueWarlockShouldRecastDrainSoul {}
 message APLValueWarlockShouldRefreshCorruption {
     UnitReference target_unit = 1;
 }
-message APLValueMageCurrentCombustionDotEstimate {
-}
-message APLValueShamanCanSnapshotStrongerFireElemental {
-}
-message APLValueShamanFireElementalDuration {
-}
+message APLValueMageCurrentCombustionDotEstimate {}
+message APLValueShamanCanSnapshotStrongerFireElemental {}
+message APLValueShamanFireElementalDuration {}
 
 message APLValueMonkCurrentChi {}
 message APLValueMonkMaxChi {}
+message APLValueBrewmasterMonkCurrentStaggerPercent {}
+
+message APLValueCurrentVengeancePercent {}

sim/core/apl_value.go

@@ -142,6 +142,9 @@ 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,3 +512,34 @@ 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 %%")
+}