Merge pull request #4210 from JohnAFernandez/Team-Loadout-Editor-Possible-Rebase

QTFred Loadout Editor

Author: JohnAFernandez

code/ship/ship.cpp

@@ -7222,9 +7222,9 @@ static void ship_set(int ship_index, int objnum, int ship_type)
 	int max_points_per_bank = 0;
 	for (int i = 0; i < sip->num_secondary_banks; ++i)
 	{
-		int slots = pm->missile_banks[i].num_slots;
-		if (slots > max_points_per_bank)
-			max_points_per_bank = slots;
+		int num_slots = pm->missile_banks[i].num_slots; // old variable name was conflicting with qt slots macro
+		if (num_slots > max_points_per_bank)
+			max_points_per_bank = num_slots;
 	}
 	shipp->secondary_point_reload_pct.init(sip->num_secondary_banks, max_points_per_bank, 1.0f);
 

qtfred/source_groups.cmake

@@ -52,6 +52,8 @@ add_file_folder("Source/Mission/Dialogs"
     src/mission/dialogs/FictionViewerDialogModel.h
 	src/mission/dialogs/FormWingDialogModel.cpp
 	src/mission/dialogs/FormWingDialogModel.h
+	src/mission/dialogs/LoadoutEditorDialogModel.cpp
+	src/mission/dialogs/LoadoutEditorDialogModel.h
 	src/mission/dialogs/MissionGoalsDialogModel.cpp
 	src/mission/dialogs/MissionGoalsDialogModel.h
 	src/mission/dialogs/MissionSpecDialogModel.cpp
@@ -114,6 +116,8 @@ add_file_folder("Source/UI/Dialogs"
 	src/ui/dialogs/FictionViewerDialog.h
 	src/ui/dialogs/FormWingDialog.cpp
 	src/ui/dialogs/FormWingDialog.h
+	src/ui/dialogs/LoadoutDialog.cpp	
+	src/ui/dialogs/LoadoutDialog.h
 	src/ui/dialogs/MissionGoalsDialog.cpp
 	src/ui/dialogs/MissionGoalsDialog.h
 	src/ui/dialogs/MissionSpecDialog.cpp
@@ -126,8 +130,6 @@ add_file_folder("Source/UI/Dialogs"
 	src/ui/dialogs/SelectionDialog.h
 	src/ui/dialogs/ShieldSystemDialog.h
 	src/ui/dialogs/ShieldSystemDialog.cpp
-	src/ui/dialogs/TeamLoadoutDialog.cpp
-	src/ui/dialogs/TeamLoadoutDialog.h
 	src/ui/dialogs/VoiceActingManager.h
 	src/ui/dialogs/VoiceActingManager.cpp
 	src/ui/dialogs/WaypointEditorDialog.cpp
@@ -182,13 +184,13 @@ add_file_folder("UI"
 	ui/FictionViewerDialog.ui
 	ui/FormWingDialog.ui
     ui/FredView.ui
+	ui/LoadoutDialog.ui
 	ui/MissionGoalsDialog.ui
 	ui/MissionSpecDialog.ui
 	ui/ObjectOrientationDialog.ui
 	ui/ReinforcementsDialog.ui
 	ui/SelectionDialog.ui
 	ui/ShieldSystemDialog.ui
-	ui/TeamLoadoutDialog.ui
 	ui/VoiceActingManager.ui
     ui/WaypointEditorDialog.ui
 	ui/ShipEditorDialog.ui

qtfred/src/mission/Editor.cpp

@@ -264,7 +264,7 @@ bool Editor::loadMission(const std::string& mission_name, int flags) {
 	}
 
 	for (i = 0; i < Num_teams; i++) {
-		generate_team_weaponry_usage_list(i, used_pool);
+		generate_team_weaponry_usage_list(i, _weapon_usage[i]);
 		for (j = 0; j < Team_data[i].num_weapon_choices; j++) {
 			// The amount used in wings is always set by a static loadout entry so skip any that were set by Sexp variables
 			if ((!strlen(Team_data[i].weaponry_pool_variable[j]))
@@ -276,12 +276,12 @@ bool Editor::loadMission(const std::string& mission_name, int flags) {
 				}
 
 				// zero the used pool entry
-				used_pool[Team_data[i].weaponry_pool[j]] = 0;
+				_weapon_usage[i][Team_data[i].weaponry_pool[j]] = 0;
 			}
 		}
 		// double check the used pool is empty
 		for (j = 0; j < static_cast<int>(Weapon_info.size()); j++) {
-			if (!Team_data[i].do_not_validate && used_pool[j] != 0) {
+			if (_weapon_usage[i][j] != 0) {
 				Warning(LOCATION,
 						"%s is used in wings of team %d but was not in the loadout. Fixing now",
 						Weapon_info[j].name,
@@ -1636,6 +1636,36 @@ void Editor::generate_team_weaponry_usage_list(int team, int* arr) {
 		}
 	}
 }
+void Editor::generate_ship_usage_list(int* arr, int wing) {
+	int i; 
+
+	if (wing < 0) {
+		return;
+	}
+
+	i = Wings[wing].wave_count;
+	while (i--) {
+		arr[Ships[Wings[wing].ship_index[i]].ship_info_index]++; 
+	}
+}
+void Editor::updateStartingWingLoadoutUseCounts() {
+	memset(_ship_usage, 0, sizeof(int) * MAX_TVT_TEAMS * MAX_SHIP_CLASSES);
+
+	if (The_mission.game_type & MISSION_TYPE_MULTI_TEAMS) { 
+		for (int i = 0; i<MAX_TVT_TEAMS; i++) {
+			for (int j = 0; j<MAX_TVT_WINGS_PER_TEAM; j++) {
+				generate_ship_usage_list(_ship_usage[i], TVT_wings[(i*MAX_TVT_WINGS_PER_TEAM) + j]);
+			}			
+			generate_team_weaponry_usage_list(i, _weapon_usage[i]);
+		}
+	}
+	else {
+		for (int i = 0; i < MAX_STARTING_WINGS; i++) {
+			generate_ship_usage_list(_ship_usage[0], Starting_wings[i]);
+		}
+		generate_team_weaponry_usage_list(0, _weapon_usage[0]);
+	}	
+}
 void Editor::delete_marked() {
 	object* ptr, * next;
 
@@ -3169,6 +3199,27 @@ void Editor::lcl_fred_replace_stuff(QString& text)
 	text.replace("\\", "$backslash");
 }
 
+SCP_vector<int> Editor::getStartingWingLoadoutUseCounts() {
+	// update before sending so that we have the most up to date info.
+	updateStartingWingLoadoutUseCounts();
+
+	SCP_vector<int> out;
+
+	for (int i = 0; i < MAX_TVT_TEAMS; i++) {
+		for (auto& entry : _ship_usage[i]) {
+			out.push_back(entry);
+		}
+	}
+	for (int i = 0; i < MAX_TVT_TEAMS; i++) {
+		for (auto& entry : _weapon_usage[i]) {
+			out.push_back(entry);
+		}
+	}
+
+	return out;
+}
+
+
 
 } // namespace fred
 } // namespace fso

qtfred/src/mission/Editor.h

@@ -181,9 +181,12 @@ class Editor : public QObject {
 	static void pad_with_newline(SCP_string& str, size_t max_size);
 	static void lcl_fred_replace_stuff(QString& text);
 
+	SCP_vector<int> getStartingWingLoadoutUseCounts();
+
 	static const ai_goal_list* getAi_goal_list();
 	static int getAigoal_list_size();
 	const char* error_check_initial_orders(ai_goal* goals, int ship, int wing);
+
   private:
 	void clearMission(bool fast_reload = false);
 
@@ -209,6 +212,10 @@ class Editor : public QObject {
 	int obj_count = 0;
 	int g_err = 0;
 
+	// ship and weapon usage pools
+	int _ship_usage[MAX_TVT_TEAMS][MAX_SHIP_CLASSES];
+	int _weapon_usage[MAX_TVT_TEAMS][MAX_WEAPON_TYPES];
+
 	int common_object_delete(int obj);
 
 	int reference_handler(const char* name, sexp_ref_type type, int obj);
@@ -260,6 +267,8 @@ class Editor : public QObject {
 
 	void generate_team_weaponry_usage_list(int team, int* arr);
 
+	void generate_ship_usage_list(int* arr, int wing);
+
 	int get_visible_sub_system_count(ship* shipp);
 
 	int get_next_visible_subsys(ship* shipp, ship_subsys** next_subsys);
@@ -279,6 +288,8 @@ class Editor : public QObject {
 	int global_error_check_player_wings(int multi);
 
 	const char* get_order_name(int order);
+
+	void updateStartingWingLoadoutUseCounts();
 };
 
 } // namespace fred