tvt and mission versioning

Author: MjnMixael

code/mission/missionparse.cpp

@@ -1248,9 +1248,9 @@ void parse_player_info2(mission *pm)
 			ptr->weaponry_count[num_choices] = wc.count;
 			if (pm->support_ships.rearm_pool_from_loadout) {
 				if (Weapon_info[wc.index].disallow_rearm) {
-					pm->support_ships.rearm_weapon_pool[wc.index] = 0;
-				} else if (wc.count > 0 && pm->support_ships.rearm_weapon_pool[wc.index] >= 0) {
-					pm->support_ships.rearm_weapon_pool[wc.index] += wc.count;
+					pm->support_ships.rearm_weapon_pool[nt][wc.index] = 0;
+				} else if (wc.count > 0 && pm->support_ships.rearm_weapon_pool[nt][wc.index] >= 0) {
+					pm->support_ships.rearm_weapon_pool[nt][wc.index] += wc.count;
 				}
 			}
 
@@ -1292,11 +1292,11 @@ void parse_player_info2(mission *pm)
 					}
 
 					if (Weapon_info[wc.index].disallow_rearm) {
-						pm->support_ships.rearm_weapon_pool[wc.index] = 0;
+						pm->support_ships.rearm_weapon_pool[nt][wc.index] = 0;
 					} else if (wc.count < 0) {
-						pm->support_ships.rearm_weapon_pool[wc.index] = -1;
-					} else if (wc.count > 0 && pm->support_ships.rearm_weapon_pool[wc.index] >= 0) {
-						pm->support_ships.rearm_weapon_pool[wc.index] += wc.count;
+						pm->support_ships.rearm_weapon_pool[nt][wc.index] = -1;
+					} else if (wc.count > 0 && pm->support_ships.rearm_weapon_pool[nt][wc.index] >= 0) {
+						pm->support_ships.rearm_weapon_pool[nt][wc.index] += wc.count;
 					}
 				}
 			}
@@ -7110,7 +7110,7 @@ void mission::Reset()
 	support_ships.max_support_ships = -1;	// infinite
 	support_ships.max_concurrent_ships = 1;
 	support_ships.ship_class = -1;
-	memset(&support_ships.rearm_weapon_pool, -1, sizeof(int) * MAX_WEAPON_TYPES);
+	memset(&support_ships.rearm_weapon_pool, -1, sizeof(support_ships.rearm_weapon_pool));
 	support_ships.disallow_rearm = false;
 	support_ships.allow_rearm_weapon_precedence = false;
 	support_ships.rearm_pool_from_loadout = false;
@@ -9485,5 +9485,24 @@ bool check_for_24_3_data()
 
 bool check_for_25_1_data()
 {
-	return (count_items_with_value(Props) > 0);
+	if ((count_items_with_value(Props) > 0)) {
+		return true;
+	}
+	
+	if (The_mission.flags[Mission::Mission_Flags::Limited_support_rearm_pool]) {
+		return true;
+	}
+
+	if (The_mission.support_ships.disallow_rearm || The_mission.support_ships.allow_rearm_weapon_precedence ||
+		The_mission.support_ships.rearm_pool_from_loadout) {
+		return true;
+	}
+
+	for (int team = 0; team < Num_teams; ++team) {
+		for (int weapon = 0; weapon < MAX_WEAPON_TYPES; ++weapon) {
+			if (The_mission.support_ships.rearm_weapon_pool[team][weapon] != -1) {
+				return true;
+			}
+		}
+	}
 }

code/mission/missionparse.h

@@ -117,7 +117,7 @@ typedef struct support_ship_info {
 	bool	disallow_rearm;                      // if true, support ships can only repair and will not rearm weapons
 	bool	allow_rearm_weapon_precedence;       // if true, support ships may swap to precedence weapons when rearm pool is empty
 	bool	rearm_pool_from_loadout;             // initialize rearm pool from mission loadout after filling starting loadout ships
-	int     rearm_weapon_pool[MAX_WEAPON_TYPES]; // mission stockpile used to limit support ship rearming
+	int     rearm_weapon_pool[MAX_TVT_TEAMS][MAX_WEAPON_TYPES]; // mission stockpile used to limit support ship rearming
 } support_ship_info;
 
 // movie type defines

code/missioneditor/missionsave.cpp

@@ -4402,14 +4402,12 @@ int Fred_mission_save::save_players()
 			}
 
 			fout(" (\n");
-			if (i == 0) {
-				for (j = 0; j < weapon_info_size(); j++) {
-					if (!Weapon_info[j].wi_flags[Weapon::Info_Flags::Player_allowed]) {
-						continue;
-					}
-					if (The_mission.support_ships.rearm_weapon_pool[j] != 0) {
-						fout("\t\"%s\"\t%d\n", Weapon_info[j].name, The_mission.support_ships.rearm_weapon_pool[j]);
-					}
+			for (j = 0; j < weapon_info_size(); j++) {
+				if (!Weapon_info[j].wi_flags[Weapon::Info_Flags::Player_allowed]) {
+					continue;
+				}
+				if (The_mission.support_ships.rearm_weapon_pool[i][j] != 0) {
+					fout("\t\"%s\"\t%d\n", Weapon_info[j].name, The_mission.support_ships.rearm_weapon_pool[i][j]);
 				}
 			}
 			fout(")");

code/scripting/api/libs/mission.cpp

@@ -65,6 +65,7 @@
 #include "scripting/api/objs/ship.h"
 #include "scripting/api/objs/shipclass.h"
 #include "scripting/api/objs/sound.h"
+#include "scripting/api/objs/support_rearm_pool.h"
 #include "scripting/api/objs/team.h"
 #include "scripting/api/objs/vecmath.h"
 #include "scripting/api/objs/volumetric.h"
@@ -262,67 +263,40 @@ ADE_FUNC(runSEXP, l_Mission, "string", "Runs the defined SEXP script within a `w
 		return ADE_RETURN_FALSE;
 }
 
-//****SUBLIBRARY: Mission/SupportRearmPool
-ADE_LIB_DERIV(l_Mission_SupportRearmPool, "SupportRearmPool", nullptr,
-	"Array of mission support rearm pool values. Index is weapon class index.", l_Mission);
+//****SUBLIBRARY: Mission/SupportRearmPools
+ADE_LIB_DERIV(l_Mission_SupportRearmPools,
+	"SupportRearmPools",
+	nullptr,
+	"Per-team mission support rearm pools (team indexed).",
+	l_Mission);
 
-ADE_INDEXER(l_Mission_SupportRearmPool,
-	"number/weaponclass IndexOrClass, number amount",
-	"Gets/sets support rearm pool value for a weapon class.\n"
-	"Values: -1 = unlimited, 0 = unavailable, >0 = limited amount.\n"
-	"If a weapon has $Disallow Support Rearm, this always returns 0 and ignores writes.",
-	"number",
-	"Current pool value for the weapon class.")
+ADE_INDEXER(l_Mission_SupportRearmPools,
+	"number TeamIndex",
+	"Gets support rearm pool handle for a specific team.",
+	"support_rearm_pool_team",
+	"Support rearm pool team handle, or invalid handle if index is out of range.")
 {
 	int idx = -1;
-	int amount;
-	if (lua_isnumber(L, 2)) {
-		if (!ade_get_args(L, "*i|i", &idx, &amount)) {
-			return ADE_RETURN_NIL;
-		}
-
-		if (idx < 1 || idx > weapon_info_size()) {
-			return ADE_RETURN_NIL;
-		}
-
-		idx--; // Lua to C++ index
-	} else {
-		if (!ade_get_args(L, "*o|i", l_Weaponclass.Get(&idx), &amount)) {
-			return ADE_RETURN_NIL;
-		}
-
-		if (idx < 0 || idx >= weapon_info_size()) {
-			return ADE_RETURN_NIL;
-		}
+	if (!ade_get_args(L, "*i", &idx)) {
+		return ade_set_error(L, "o", l_SupportRearmPoolTeam.Set(-1));
 	}
 
-	if (ADE_SETTING_VAR) {
-		if (!Weapon_info[idx].disallow_rearm) {
-			if (amount < 0) {
-				The_mission.support_ships.rearm_weapon_pool[idx] = -1;
-			} else {
-				The_mission.support_ships.rearm_weapon_pool[idx] = amount;
-			}
-		} else {
-			The_mission.support_ships.rearm_weapon_pool[idx] = 0;
-		}
-	}
-
-	if (Weapon_info[idx].disallow_rearm) {
-		return ade_set_args(L, "i", 0);
+	idx--; // Lua to C++ index
+	if (idx < 0 || idx >= Num_teams || idx >= MAX_TVT_TEAMS) {
+		return ade_set_error(L, "o", l_SupportRearmPoolTeam.Set(-1));
 	}
 
-	return ade_set_args(L, "i", The_mission.support_ships.rearm_weapon_pool[idx]);
+	return ade_set_args(L, "o", l_SupportRearmPoolTeam.Set(idx));
 }
 
 ADE_FUNC(__len,
-	l_Mission_SupportRearmPool,
+	l_Mission_SupportRearmPools,
 	nullptr,
-	"The number of weapon classes in the support rearm pool array",
+	"The number of support rearm pool teams.",
 	"number",
-	"The number of weapon classes.")
+	"The number of TVT/loadout teams with support rearm pools.")
 {
-	return ade_set_args(L, "i", weapon_info_size());
+	return ade_set_args(L, "i", MIN(Num_teams, MAX_TVT_TEAMS));
 }
 
 //****SUBLIBRARY: Mission/Asteroids

code/scripting/api/objs/support_rearm_pool.cpp

@@ -0,0 +1,79 @@
+//
+//
+
+#include "support_rearm_pool.h"
+
+#include "mission/missionparse.h"
+#include "scripting/api/objs/weaponclass.h"
+#include "weapon/weapon.h"
+
+namespace scripting::api {
+
+//****HANDLE: support_rearm_pool_team
+ADE_OBJ(l_SupportRearmPoolTeam, int, "support_rearm_pool_team", "Support rearm pool team handle");
+
+ADE_INDEXER(l_SupportRearmPoolTeam,
+	"number/weaponclass IndexOrClass, number amount",
+	"Gets/sets support rearm pool value for a weapon class on this team.\n"
+	"Values: -1 = unlimited, 0 = unavailable, >0 = limited amount.\n"
+	"If a weapon has $Disallow Support Rearm, this always returns 0 and ignores writes.",
+	"number",
+	"Current pool value for the weapon class.")
+{
+	int team_idx = -1;
+	int idx = -1;
+	int amount;
+	if (lua_isnumber(L, 2)) {
+		if (!ade_get_args(L, "oi|i", l_SupportRearmPoolTeam.Get(&team_idx), &idx, &amount)) {
+			return ADE_RETURN_NIL;
+		}
+
+		if (idx < 1 || idx > weapon_info_size()) {
+			return ADE_RETURN_NIL;
+		}
+
+		idx--; // Lua to C++ index
+	} else {
+		if (!ade_get_args(L, "oo|i", l_SupportRearmPoolTeam.Get(&team_idx), l_Weaponclass.Get(&idx), &amount)) {
+			return ADE_RETURN_NIL;
+		}
+
+		if (idx < 0 || idx >= weapon_info_size()) {
+			return ADE_RETURN_NIL;
+		}
+	}
+
+	if (team_idx < 0 || team_idx >= Num_teams || team_idx >= MAX_TVT_TEAMS) {
+		return ADE_RETURN_NIL;
+	}
+
+	if (ADE_SETTING_VAR) {
+		if (!Weapon_info[idx].disallow_rearm) {
+			if (amount < 0) {
+				The_mission.support_ships.rearm_weapon_pool[team_idx][idx] = -1;
+			} else {
+				The_mission.support_ships.rearm_weapon_pool[team_idx][idx] = amount;
+			}
+		} else {
+			The_mission.support_ships.rearm_weapon_pool[team_idx][idx] = 0;
+		}
+	}
+
+	if (Weapon_info[idx].disallow_rearm) {
+		return ade_set_args(L, "i", 0);
+	}
+
+	return ade_set_args(L, "i", The_mission.support_ships.rearm_weapon_pool[team_idx][idx]);
+}
+
+ADE_FUNC(__len,
+	l_SupportRearmPoolTeam,
+	nullptr,
+	"The number of weapon classes in this support rearm pool.",
+	"number",
+	"The number of weapon classes.")
+{
+	return ade_set_args(L, "i", weapon_info_size());
+}
+
+} // namespace scripting::api

code/scripting/api/objs/support_rearm_pool.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "globalincs/pstypes.h"
+
+#include "scripting/ade.h"
+#include "scripting/ade_api.h"
+
+namespace scripting::api {
+
+DECLARE_ADE_OBJ(l_SupportRearmPoolTeam, int);
+
+} // namespace scripting::api