[Cooldown] Implement "full_recharge_time" expression that returns the…

… number of seconds until the action is fully recharged.

engine/action/sc_action.cpp

@@ -2658,19 +2658,11 @@ expr_t* action_t::create_expression( const std::string& name_str )
 
     return new persistent_multiplier_expr_t( this );
   }
-  else if ( name_str == "charges" )
-  {
-    return cooldown -> create_expression( this, name_str );
-  }
-  else if ( name_str == "charges_fractional" )
-  {
-    return cooldown -> create_expression( this, name_str );
-  }
-  else if ( name_str == "max_charges" )
-  {
-    return cooldown -> create_expression( this, name_str );
-  }
-  else if ( name_str == "recharge_time" )
+  else if ( name_str == "charges"
+    || name_str == "charges_fractional"
+    || name_str == "max_charges"
+    || name_str == "recharge_time"
+    || name_str == "full_recharge_time" )
   {
     return cooldown -> create_expression( this, name_str );
   }

engine/sim/sc_cooldown.cpp

@@ -431,6 +431,28 @@ expr_t* cooldown_t::create_expression( action_t*, const std::string& name_str )
     };
     return new recharge_time_expr_t( this );
   }
+  else if ( name_str == "full_recharge_time" )
+  {
+    struct full_recharge_time_expr_t : public expr_t
+    {
+      const cooldown_t* cd;
+      full_recharge_time_expr_t( const cooldown_t* c ) :
+        expr_t( "full_recharge_time" ), cd( c )
+      { }
+
+      virtual double evaluate() override
+      {
+        if ( cd -> recharge_event )
+        {
+          return cd -> current_charge_remains().total_seconds() +
+            ( cd -> charges - cd -> current_charge - 1 ) * cd -> duration.total_seconds();
+        }
+        else
+          return 0;
+      }
+    };
+    return new full_recharge_time_expr_t( this );
+  }
   else if ( name_str == "max_charges" )
     return make_ref_expr( name_str, charges );