[Druid] fix Sparkles

Author: gastank

engine/class_modules/sc_druid.cpp

@@ -1305,7 +1305,7 @@ struct druid_t final : public parse_player_effects_t
   // hide player_t::is_ptr()
   bool is_ptr() const { return dbc->wowv() > dbc::client_data_version( false ); }
 
-  const char* html_name() const override
+  std::string html_name() const override
   {
     std::string _name = name_str;
     switch ( specialization() )
@@ -1316,7 +1316,7 @@ struct druid_t final : public parse_player_effects_t
       case DRUID_RESTORATION: _name += "🚑🥦"; break;
       default: break;
     }
-    return _name.c_str();
+    return _name;
   }
   // Character Definition
   void activate() override;

engine/player/player.hpp

@@ -1013,8 +1013,8 @@ struct player_t : public actor_t
   const char* name() const override
   { return name_str.c_str(); }
 
-  virtual const char* html_name() const
-  { return name(); }
+  virtual std::string html_name() const
+  { return name_str; }
 
   // Normal methods
   double get_stat_value(stat_e);

engine/report/charts.cpp

@@ -841,7 +841,8 @@ bool chart::generate_gains( highchart::pie_chart_t& pc, const player_t& p, resou
     return false;
   }
 
-  pc.set_title( util::encode_html( p.name_str ) + " " + resource_name + " Gains" );
+  // pc.set_title( util::encode_html( p.name_str ) + " " + resource_name + " Gains" );
+  pc.set_title( util::encode_html( p.html_name() ) + " " + resource_name + " Gains" );
   pc.set( "plotOptions.pie.dataLabels.format", "{point.name}: {point.y:.1f}" );
   if ( p.sim->player_no_pet_list.size() > 1 )
   {
@@ -866,7 +867,8 @@ bool chart::generate_gains( highchart::pie_chart_t& pc, const player_t& p, resou
 
 bool chart::generate_spent_time( highchart::pie_chart_t& pc, const player_t& p )
 {
-  pc.set_title( util::encode_html( p.name_str ) + " Spent Time" );
+  // pc.set_title( util::encode_html( p.name_str ) + " Spent Time" );
+  pc.set_title( util::encode_html( p.html_name() ) + " Spent Time" );
   pc.set( "plotOptions.pie.dataLabels.format", "{point.name}: {point.y:.1f}s" );
   if ( p.sim->player_no_pet_list.size() > 1 )
   {
@@ -1032,7 +1034,8 @@ bool chart::generate_damage_stats_sources( highchart::pie_chart_t& chart, const
   if ( stats_list.size() <= 1 ) // Don't display chart for single source
     return false;
 
-  generate_stats_sources( chart, p, util::encode_html( p.name_str ) + " Damage Sources", stats_list, top_only );
+  // generate_stats_sources( chart, p, util::encode_html( p.name_str ) + " Damage Sources", stats_list, top_only );
+  generate_stats_sources( chart, p, util::encode_html( p.html_name() ) + " Damage Sources", stats_list, top_only );
   chart.set( "series.0.name", "Damage" );
   chart.set( "plotOptions.pie.tooltip.pointFormat",
              "<span style=\"color:{point.color}\">\xE2\x97\x8F</span> {series.name}: <b>{point.y}</b>%<br/>" );
@@ -1073,7 +1076,8 @@ bool chart::generate_heal_stats_sources( highchart::pie_chart_t& chart, const pl
       return l->actual_amount.mean() > r->actual_amount.mean();
   } );
 
-  generate_stats_sources( chart, p, util::encode_html( p.name_str ) + " Healing & Absorb Sources", stats_list );
+  // generate_stats_sources( chart, p, util::encode_html( p.name_str ) + " Healing & Absorb Sources", stats_list );
+  generate_stats_sources( chart, p, util::encode_html( p.html_name() ) + " Healing & Absorb Sources", stats_list );
   chart.set( "plotOptions.pie.events.click", "open_details_from_chart" );
   chart.value( "plotOptions.pie.events.click" ).SetRawOutput( true );
 
@@ -1164,8 +1168,8 @@ bool chart::generate_raid_aps( highchart::bar_chart_t& bc, const sim_t& s, std::
       {
         longest_name = p->name_str.length();
       }*/
-      if ( strlen( p->html_name() ) > longest_name )
-        longest_name = strlen( p->html_name() );
+      if ( p->html_name().length()  > longest_name )
+        longest_name = p->html_name().length();
 
       sc_js_t e;
       e.set( "color", c.str() );
@@ -1504,7 +1508,8 @@ bool chart::generate_action_dpet( highchart::bar_chart_t& bc, const player_t& p
     bc.set_yaxis_title( "Damage per Execute Time" );
   }
 
-  bc.set_title( util::encode_html( p.name_str ) + " Damage per Execute Time" );
+  // bc.set_title( util::encode_html( p.name_str ) + " Damage per Execute Time" );
+  bc.set_title( util::encode_html( p.html_name() ) + " Damage per Execute Time" );
   if ( p.sim->player_no_pet_list.size() > 1 )
   {
     bc.set_toggle_id( "player" + util::to_string( p.index ) + "toggle" );
@@ -1695,7 +1700,8 @@ bool chart::generate_actor_dps_series( highchart::time_series_t& series, const p
 
   series.set( "yAxis.min", 0 );
   series.set_yaxis_title( "Damage per second" );
-  series.set_title( util::encode_html( p.name_str ) + " Damage per second" );
+  // series.set_title( util::encode_html( p.name_str ) + " Damage per second" );
+  series.set_title( util::encode_html( p.html_name() ) + " Damage per second" );
   series.add_simple_series( "area", color::class_color( p.type ), "DPS", timeline_dps.data() );
   series.set_mean( util::round( p.collected_data.dps.mean(), p.sim->report_precision ) );
 
@@ -1713,7 +1719,8 @@ highchart::time_series_t& chart::generate_actor_timeline(
   {
     ts.set_toggle_id( "player" + util::to_string( p.index ) + "toggle" );
   }
-  ts.set_title( util::encode_html( p.name_str ) + " " + attr_str );
+  // ts.set_title( util::encode_html( p.name_str ) + " " + attr_str );
+  ts.set_title( util::encode_html( p.html_name() ) + " " + attr_str );
   ts.set_yaxis_title( "Average " + attr_str );
   ts.add_simple_series( "area", series_color, attr_str, data.data() );
   if ( !p.sim->single_actor_batch )

engine/report/report_html_player.cpp

@@ -2775,7 +2775,8 @@ void print_html_resource_gains_table( report::sc_html_stream& os, const player_t
 
   os << "</tr>\n"
       << "<tr>\n"
-      << "<th colspan=\"8\" class=\"left name\">" << util::encode_html( p.name() ) << "</th>\n"
+      // << "<th colspan=\"8\" class=\"left name\">" << util::encode_html( p.name() ) << "</th>\n"
+      << "<th colspan=\"8\" class=\"left name\">" << util::encode_html( p.html_name() ) << "</th>\n"
       << "</tr>\n"
       << "</thead>\n";
 
@@ -2847,6 +2848,7 @@ void print_html_resource_usage_table( report::sc_html_stream& os, const player_t
 
   os << "</tr>\n"
      << "<tr>\n"
+     // << "<th <th colspan=\"8\" class=\"left name\">" << util::encode_html( p.name() ) << "</th>\n"
      << "<th <th colspan=\"8\" class=\"left name\">" << util::encode_html( p.name() ) << "</th>\n"
      << "</tr>\n"
      << "</thead>\n";
@@ -3145,7 +3147,8 @@ void print_html_player_charts( report::sc_html_stream& os, const player_t& p,
 
   highchart::histogram_chart_t dps_dist( highchart::build_id( p, "dps_dist" ), *p.sim );
   if ( chart::generate_distribution( dps_dist, &p, p.collected_data.dps.distribution,
-                                    util::encode_html( p.name_str ) + " DPS", p.collected_data.dps.mean(),
+                                    // util::encode_html( p.name_str ) + " DPS", p.collected_data.dps.mean(),
+                                    util::encode_html( p.html_name() ) + " DPS", p.collected_data.dps.mean(),
                                     p.collected_data.dps.min(), p.collected_data.dps.max() ) )
   {
     dps_dist.set( "tooltip.headerFormat", "<b>{point.key}</b> DPS<br/>" );
@@ -3159,7 +3162,8 @@ void print_html_player_charts( report::sc_html_stream& os, const player_t& p,
     sc_timeline_t timeline_dps_taken;
     p.collected_data.timeline_dmg_taken.build_derivative_timeline( timeline_dps_taken );
     dps_taken.set_yaxis_title( "Damage taken per second" );
-    dps_taken.set_title( util::encode_html( p.name_str ) + " Damage taken per second" );
+    // dps_taken.set_title( util::encode_html( p.name_str ) + " Damage taken per second" );
+    dps_taken.set_title( util::encode_html( p.html_name() ) + " Damage taken per second" );
     dps_taken.add_simple_series( "area", color::rgb{"FDD017"}, "DPS taken", timeline_dps_taken.data() );
     dps_taken.set_mean( timeline_dps_taken.mean() );
 
@@ -3190,7 +3194,8 @@ void print_html_player_charts( report::sc_html_stream& os, const player_t& p,
   {
     highchart::histogram_chart_t hps_dist( highchart::build_id( p, "hps_dist" ), *p.sim );
     if ( chart::generate_distribution( hps_dist, &p, p.collected_data.hps.distribution,
-                                      util::encode_html( p.name_str ) + " HPS", p.collected_data.hps.mean(),
+                                      // util::encode_html( p.name_str ) + " HPS", p.collected_data.hps.mean(),
+                                      util::encode_html( p.html_name() ) + " HPS", p.collected_data.hps.mean(),
                                       p.collected_data.hps.min(), p.collected_data.hps.max() ) )
     {
       os << hps_dist.to_target_div();
@@ -4193,7 +4198,8 @@ void output_player_damage_summary( report::sc_html_stream& os, const player_t& a
 
   os.format(
     R"(<th class="left name">{}</th><th class="right">{:.0Lf}</th><td colspan="{}" class="filler"></td></tr></thead>)",
-    util::encode_html( actor.name() ),
+    // util::encode_html( actor.name() ),
+    util::encode_html( actor.html_name() ),
     actor.collected_data.dps.mean(),
     static_columns + n_optional_columns );
 
@@ -4374,7 +4380,8 @@ void output_player_simple_ability_summary( report::sc_html_stream& os, const pla
   else
     os << "<tr>\n";
 
-  os << "<th <th colspan=\"3\" class=\"left name\">" << util::encode_html( actor.name() ) << "</th>\n"
+  // os << "<th <th colspan=\"3\" class=\"left name\">" << util::encode_html( actor.name() ) << "</th>\n"
+  os << "<th <th colspan=\"3\" class=\"left name\">" << util::encode_html( actor.html_name() ) << "</th>\n"
      << "</tr>\n"
      << "</thead>\n";