[Player] pass whether resource is increasing to resource callback functor

Author: gastank

engine/player/player.cpp

@@ -14133,47 +14133,64 @@ void player_t::reset_resource_callbacks()
 /**
  * Checks if a resource callback condition has been met and if yes activate it.
  */
-void player_t::check_resource_change_for_callback(resource_e resource, double previous_amount, double previous_pct_points)
- {
-   for (auto& callback : resource_callbacks)
-   {
-     if (callback.is_consumed)
-       continue;
-     if (callback.resource != resource)
-       continue;
-
-     // Evaluate if callback condition is met.
-     bool callback_condition_valid = false;
-     if (callback.is_pct)
-     {
-       double current_pct_points = resources.current[ resource ] / resources.max[ resource ] * 100.0;
-       if ((callback.value < previous_pct_points && callback.value >= current_pct_points) ||
-           (callback.value >= previous_pct_points && callback.value < current_pct_points))
-       {
-         callback_condition_valid = true;
-       }
-     }
-     else
-     {
-       double current_amount = resources.current[ resource ];
-       if ((callback.value < previous_amount && callback.value >= current_amount) ||
-           (callback.value >= previous_amount && callback.value < current_amount))
-       {
-         callback_condition_valid = true;
-       }
-     }
-     if (!callback_condition_valid)
-     {
-       continue;
-     }
-
-     sim->print_debug("{} resource callback triggered.", name());
-     // We have a callback event, trigger stuff.
-     callback.callback();
-     if (callback.fire_once)
-     {
-       callback.is_consumed = true;
-     }
+void player_t::check_resource_change_for_callback( resource_e resource, double previous_amount,
+                                                   double previous_pct_points )
+{
+  for ( auto& callback : resource_callbacks )
+  {
+    if ( callback.is_consumed )
+      continue;
+
+      if ( callback.resource != resource )
+      continue;
+
+    // Evaluate if callback condition is met.
+    bool callback_condition_valid = false;
+    bool increasing;
+
+    if ( callback.is_pct )
+    {
+      double current_pct_points = resources.current[ resource ] / resources.max[ resource ] * 100.0;
+      if ( callback.value < previous_pct_points && callback.value >= current_pct_points )
+      {
+        callback_condition_valid = true;
+        increasing = false;
+      }
+      else if ( callback.value >= previous_pct_points && callback.value < current_pct_points )
+      {
+        callback_condition_valid = true;
+        increasing = true;
+      }
+    }
+    else
+    {
+      double current_amount = resources.current[ resource ];
+      if ( callback.value < previous_amount && callback.value >= current_amount )
+      {
+        callback_condition_valid = true;
+        increasing = false;
+      }
+      else if ( callback.value >= previous_amount && callback.value < current_amount )
+      {
+        callback_condition_valid = true;
+        increasing = true;
+      }
+    }
+
+    if ( !callback_condition_valid )
+    {
+      continue;
+    }
+
+    sim->print_debug( "{} resource callback triggered.", name() );
+
+    // We have a callback event, trigger stuff.
+    callback.callback( increasing );
+
+    if ( callback.fire_once )
+    {
+      callback.is_consumed = true;
+    }
   }
 
   check_resource_callback_deactivation();

engine/player/player.hpp

@@ -716,7 +716,7 @@ struct player_t : public actor_t
   /// Current execution type
   execute_type current_execute_type;
 
-  using resource_callback_function_t = std::function<void()>;
+  using resource_callback_function_t = std::function<void( bool )>;
 
   template <typename T>
   struct player_option_t

engine/sim/raid_event.cpp

@@ -1926,7 +1926,9 @@ void raid_event_t::combat_begin()
       if ( !target )
         sim->error( "Unknown pull target '{}'", pull_target_str );
 
-      target->register_resource_callback( RESOURCE_HEALTH, last_pct, [ this ]() { deactivate( "last_pct reached" ); }, true );
+      target->register_resource_callback( RESOURCE_HEALTH, last_pct, [ this ]( bool ) {
+        deactivate( "last_pct reached" );
+      }, true );
     }
     else if ( sim->current_iteration == 0 || sim->fixed_time )
     {
@@ -1949,7 +1951,9 @@ void raid_event_t::combat_begin()
       if ( !target )
         sim->error( "Unknown pull target '{}'", pull_target_str );
 
-      target->register_resource_callback( RESOURCE_HEALTH, first_pct, [ this ]() { activate( "first_pct reached" ); }, true );
+      target->register_resource_callback( RESOURCE_HEALTH, first_pct, [ this ]( bool ) {
+        activate( "first_pct reached" );
+      }, true );
     }
     else if ( sim->current_iteration == 0 || sim->fixed_time )
     {
@@ -2107,15 +2111,17 @@ void raid_event_t::parse_options( util::string_view options_str )
     if ( last_pct != -1 && !sim->fixed_time )
     {
       assert( sim->target );
-      sim->target->register_resource_callback(
-          RESOURCE_HEALTH, last_pct, [ this ]() { deactivate( "last_pct reached" ); }, true );
+      sim->target->register_resource_callback( RESOURCE_HEALTH, last_pct, [ this ]( bool ) {
+        deactivate( "last_pct reached" );
+      }, true );
     }
 
     if ( first_pct != -1 && !sim->fixed_time )
     {
       assert( sim->target );
-      sim->target->register_resource_callback(
-          RESOURCE_HEALTH, first_pct, [ this ]() { activate( "first_pct reached" ); }, true );
+      sim->target->register_resource_callback( RESOURCE_HEALTH, first_pct, [ this ]( bool ) {
+        activate( "first_pct reached" );
+      }, true );
     }
   }
   else