Allow Display Name to be used in Kills Stats by Ship Class (#6791)

* Allow Display Name to be used in Kills Stats by Ship Class

Currently, the display that is shown for kills by ship type does not use display name of the ship class, which makes the ship classes look different than the other areas where they are displayed throughout the game. This PR fixes that by using display name when rendering the kill stats. Note, this PR does not edit the pilot file structure at all, it simply just tunes how the names are displayed/rendered.

Importantly though, display names do not have to be unique, while the ship class names do. Thus, this PR also consolidates the number of kills of ship classes with the same display name (For example, FotG uses classes like `X-wing#Red` and `X-wing#Blue`, but both have the same display name of `X-wing`, so this consolidation means FSO will simple display `X-wing` with the sum. Overall, mods not using display name will be unaffected, while mods that do use display name will now have it properly work in the barracks and debrief rendering.

Tested and works as expected.

* remove flag for now

* move assert

* use handy get_display_name

Author: wookieejedi

code/menuui/barracks.cpp

@@ -451,25 +451,34 @@ void barracks_init_stats(scoring_struct *stats)
 	// Goober5000 - make sure we have room for all ships
 	Assert((Num_stat_lines + Ship_info.size()) < Max_stat_lines);
 
+	// wookieejedi - Show kills by ship type, but if using display name
+	// then consolidate values for similarly named entries
+	std::map<SCP_string, int, SCP_string_lcase_less_than> kill_map;
 	i = 0;
 	for (auto it = Ship_info.cbegin(); it != Ship_info.cend(); i++, ++it) {
 		if (stats->kills[i]) {
-			Assert(Num_stat_lines < Max_stat_lines);
-
-			// Goober5000 - in case above Assert isn't triggered (such as in non-debug builds)
-			if (Num_stat_lines < Max_stat_lines)
-			{
-				Assert(strlen(it->name) + 1 < STAT_COLUMN1_W);
-				sprintf(Stat_labels[Num_stat_lines], NOX("%s:"), it->name);
-				sprintf(Stats[Num_stat_lines], "%d", stats->kills[i]);
-				Num_stat_lines++;
-			}
-
-			// work out the total score from ship kills
+			// wookieejedi - consolidate by display name or ship class name
+			const char* name_key = it->get_display_name();
+			Assert(strlen(name_key) + 1 < STAT_COLUMN1_W);
+			kill_map[name_key] += stats->kills[i];
 			score_from_kills += stats->kills[i] * it->score;
 		}
 	}
 
+	// wookieejedi - now display the kills per ship type
+	for (const auto& [name, count] : kill_map) {
+		Assert(Num_stat_lines < Max_stat_lines);
+		// Goober5000 - in case above Assert isn't triggered (such as in non-debug builds)
+		if (Num_stat_lines >= Max_stat_lines) {
+			break;
+		}
+
+		Assert(name.length() + 1 < STAT_COLUMN1_W);
+		sprintf(Stat_labels[Num_stat_lines], NOX("%s:"), name.c_str());
+		sprintf(Stats[Num_stat_lines], "%d", count);
+		Num_stat_lines++;
+	}
+
 	// add the score from kills
 	Assert((Num_stat_lines + 1) < Max_stat_lines);
 	STRCPY1(Stat_labels[Num_stat_lines], XSTR("Score from kills only:", 1636));

code/missionui/missiondebrief.cpp

@@ -1721,6 +1721,9 @@ void debrief_setup_ship_kill_stats(int  /*stage_num*/)
 
 	auto stats_type = ( Current_stage == DEBRIEF_MISSION_KILLS ) ? StatsType::MISSION_STATS : StatsType::ALL_TIME_EVER_STATS;
 
+	// wookieejedi - Show kills by ship type, but if using display name
+	// then consolidate values for similarly named entries
+	std::map<SCP_string, int, SCP_string_lcase_less_than> kill_map;
 	Num_text_lines = 0;
 	i = 0;
 	for ( auto it = Ship_info.begin(); it != Ship_info.end(); i++, ++it ) {
@@ -1732,12 +1735,16 @@ void debrief_setup_ship_kill_stats(int  /*stage_num*/)
 			continue;
 		}
 
+		// wookieejedi - consolidate by display name or ship class name
+		const char* name_key = it->get_display_name();
+		kill_map[name_key] += num_kills;
+	}
 
+	// wookieejedi - now copy into Debrief_stats_kills[] for display
+	for (const auto& [name, count] : kill_map) {
 		kill_info = &Debrief_stats_kills[Num_text_lines++];
-
-		kill_info->num = num_kills;
-
-		strcpy_s(kill_info->text, it->name);
+		kill_info->num = count;
+		strcpy_s(kill_info->text, name.c_str());
 		strcat_s(kill_info->text, NOX(":"));
 	}