[player] Include base/overridden rules in comment. Revert if undesired, would need to be added to the DK override for that module to gain this feature.

Author: renanthera

engine/player/player.cpp

@@ -3457,24 +3457,33 @@ std::string player_t::aura_expr_from_spell_id( unsigned int spell_id, bool on_se
 
 void player_t::parse_assisted_combat_step( const assisted_combat_step_data_t& step, action_priority_list_t* assisted_combat )
 {
-  std::string options = "";
+  std::string expr = "";
+  std::string base_expr = "";
   std::string comment = "";
   for ( const auto& rule : assisted_combat_rule_data_t::data( step.id, is_ptr() ) )
   {
-    parsed_assisted_combat_rule_t rule_str = parse_assisted_combat_rule( rule, step );
-    if ( !rule_str.expr.empty() )
-      options += options.empty() ? rule_str.expr : "&" + rule_str.expr;
-    if ( !rule_str.comment.empty() )
-      comment += comment.empty() ? rule_str.comment : ", " + rule_str.comment;
+    parsed_assisted_combat_rule_t derived_combat_rule = parse_assisted_combat_rule( rule, step );
+    parsed_assisted_combat_rule_t base_combat_rule = player_t::parse_assisted_combat_rule( rule, step );
+
+    if ( !derived_combat_rule.expr.empty() )
+      expr += expr.empty() ? derived_combat_rule.expr : "&" + derived_combat_rule.expr;
+    if ( !derived_combat_rule.comment.empty() )
+      comment += comment.empty() ? derived_combat_rule.comment : ", " + derived_combat_rule.comment;
+    if ( !base_combat_rule.expr.empty() )
+      base_expr += base_expr.empty() ? base_combat_rule.expr : "&" + base_combat_rule.expr;
   }
+
+  if ( base_expr != expr )
+    comment += comment.empty() ? fmt::format( "({} -> {})", base_expr, expr ) : fmt::format( " ({} -> {})", base_expr, expr );
+
   for ( const auto& name : action_names_from_spell_id( step.spell_id ) )
   {
     if ( !name.empty() )
     {
-      if ( options.empty() )
+      if ( expr.empty() )
         assisted_combat->add_action( name, comment );
       else
-        assisted_combat->add_action( name + ",if=" + options, comment );
+        assisted_combat->add_action( name + ",if=" + expr, comment );
     }
   }
 }