[Balance] refactor buff.eclipse expression alias

Author: gastank

engine/class_modules/sc_druid.cpp

@@ -13263,23 +13263,17 @@ std::unique_ptr<expr_t> druid_t::create_expression( std::string_view name )
     if ( util::str_compare_ci( name, "astral_power" ) )
       return make_ref_expr( name, resources.current[ RESOURCE_ASTRAL_POWER ] );
 
-    auto _buff = [ this ] { return buff.eclipse_lunar->check() ? buff.eclipse_lunar : buff.eclipse_solar; };
-
-    if ( splits.size() == 3 && util::str_compare_ci( splits[ 0 ], "buff" ) &&
+    if ( splits.size() >= 2 && util::str_compare_ci( splits[ 0 ], "buff" ) &&
          util::str_compare_ci( splits[ 1 ], "eclipse" ) )
     {
-      if ( util::str_compare_ci( splits[ 2 ], "duration" ) )
-        return make_fn_expr( "eclipse_duration", [ _buff ] { return _buff()->buff_duration(); } );
-      else if ( util::str_compare_ci( splits[ 2 ], "elapsed" ) )
-        return make_fn_expr( "eclipse_elapsed", [ _buff, this ] { return _buff()->elapsed( sim->current_time() ); } );
-      else if ( util::str_compare_ci( splits[ 2 ], "remains" ) )
-        return make_fn_expr( "eclipse_remains", [ _buff ] { return _buff()->remains(); } );
-      else if ( util::str_compare_ci( splits[ 2 ], "up" ) )
-        return make_fn_expr( "eclipse_up", [ _buff ] { return _buff()->check() > 0; } );
-      else if ( util::str_compare_ci( splits[ 2 ], "down" ) )
-        return make_fn_expr( "eclipse_down", [ _buff ] { return _buff()->check() <= 0; } );
-      else if ( util::str_compare_ci( splits[ 2 ], "value" ) )
-        return make_fn_expr( "eclipse_value", [ _buff ] { return _buff()->check_value(); } );
+      splits[ 1 ] = "eclipse_solar";
+      auto solar = druid_t::create_expression( util::string_join( splits, "." ) );
+      splits[ 1 ] = "eclipse_lunar";
+      auto lunar = druid_t::create_expression( util::string_join( splits, "." ) );
+
+      return make_fn_expr( name, [ solar = std::move( solar ), lunar = std::move( lunar ), this ] {
+        return buff.eclipse_lunar->check() ? lunar->evaluate() : solar->evaluate();
+      } );
     }
 
     if ( splits.size() >= 2 && util::str_compare_ci( splits[ 0 ], "cooldown" ) &&
@@ -13294,9 +13288,9 @@ std::unique_ptr<expr_t> druid_t::create_expression( std::string_view name )
     if ( splits.size() == 2 && util::str_compare_ci( splits[ 0 ], "eclipse" ) )
     {
       if ( util::str_compare_ci( splits[ 1 ], "solar" ) )
-        return make_fn_expr( "eclipse_solar", [ this ] { return !buff.lunar_eclipse_override->check(); } );
+        return make_fn_expr( name, [ this ] { return !buff.lunar_eclipse_override->check(); } );
       else if ( util::str_compare_ci( splits[ 1 ], "lunar" ) )
-        return make_fn_expr( "eclipse_lunar", [ this ] { return buff.lunar_eclipse_override->check(); } );
+        return make_fn_expr( name, [ this ] { return buff.lunar_eclipse_override->check(); } );
     }
 
     // New Moon stage related expressions