Remove vengeance %

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/monk/brewmaster/TestBrewmaster.results

@@ -3086,8 +3086,8 @@ dps_results: {
 dps_results: {
  key: "TestBrewmaster-Average-Default"
  value: {
-  dps: 117295.68757
-  tps: 117295.68757
+  dps: 117295.69434
+  tps: 117295.69434
   dtps: 43935.51737
   hps: 14907.69275
  }

sim/monk/brewmaster/apl_values.go

@@ -10,7 +10,7 @@ import (
 func (monk *BrewmasterMonk) NewAPLValue(_ *core.APLRotation, config *proto.APLValue) core.APLValue {
 	switch config.Value.(type) {
 	case *proto.APLValue_BrewmasterMonkCurrentStaggerPercent:
-		return monk.newValueCurrentVengeancePercent(config.GetBrewmasterMonkCurrentStaggerPercent(), config.Uuid)
+		return monk.newValueCurrentStaggerPercent(config.GetBrewmasterMonkCurrentStaggerPercent(), config.Uuid)
 	default:
 		return nil
 	}
@@ -22,7 +22,7 @@ type APLValueBrewmasterMonkCurrentStaggerPercent struct {
 	aura *core.Aura
 }
 
-func (monk *BrewmasterMonk) newValueCurrentVengeancePercent(config *proto.APLValueBrewmasterMonkCurrentStaggerPercent, uuid *proto.UUID) core.APLValue {
+func (monk *BrewmasterMonk) newValueCurrentStaggerPercent(config *proto.APLValueBrewmasterMonkCurrentStaggerPercent, uuid *proto.UUID) core.APLValue {
 	return &APLValueBrewmasterMonkCurrentStaggerPercent{
 		monk: monk,
 		aura: monk.Stagger.SelfHot().Aura,

ui/core/components/individual_sim_ui/apl_values.ts

@@ -41,7 +41,6 @@ import {
 	APLValueCurrentSolarEnergy,
 	APLValueCurrentTime,
 	APLValueCurrentTimePercent,
-	APLValueCurrentVengeancePercent,
 	APLValueDotIsActive,
 	APLValueDotRemainingTime,
 	APLValueDotTickFrequency,
@@ -1326,14 +1325,6 @@ const valueKindFactories: { [f in NonNullable<APLValueKind>]: ValueKindConfig<AP
 	}),
 
 	// Class/spec specific values
-	currentVengeancePercent: inputBuilder({
-		label: 'Current Vengeance (%)',
-		submenu: ['Tank'],
-		shortDescription: 'Amount of currently available Vengeance, as a percentage.',
-		newValue: APLValueCurrentVengeancePercent.create,
-		includeIf: (player: Player<any>, _isPrepull: boolean) => player.getPlayerSpec().isTankSpec,
-		fields: [],
-	}),
 	totemRemainingTime: inputBuilder({
 		label: 'Totem Remaining Time',
 		submenu: ['Shaman'],