Fix MetaFight immediately failing if a defending brain is present.

In 3b301ef `MovableMan::AddActor()` was changed to do nothing if `g_ActivityMan.ActivityRunning()` returned false (and a couple other functions, but `AddActor()` is the one most relevant). `ActivityRunning()` returns false if an activity is either paused or in a state other than `Running` or `Editing`. MetaFight.lua sets up any pre-existing brains (for the defenders) while in the `PreGame` state. Since this isn't `Running` or `Editing`, the `AddActor()` call in `PlaceResidentBrain()` would do nothing, so the brain would never be added to `MovableMan.m_ValidActors`, so when MetaFight checked if the defending brain was still a valid actor, the check would fail, it would declare the defender's brain to be dead, and immediately kill every actor on the defending team. Since the invading brain didn't even have a chance to spawn, it would also see that the attacking team had no brains, and so you'd see the failure message. Since the point of the check was to avoid resolving a null pointer, I've replaced it with `g_ActivityMan.GetActivity()` instead.

While I was at it, `MetagameGUI::SetEnabled(true)` now calls `UpdatePlayerSetup()`, which means you can once again start a Conquest game immediately, without having to change any settings. I also changed MetaFight.lua so it no longer has hardcoded references to all four teams and instead uses `Activity.MAXTEAMCOUNT` and loops to ensure it should work regardless of how many teams there may be. I also fixed a typo in a local variable name and a small early return bug in `MetaFight:OrderHeavyLoadout()` which would prevent it from spawning more than one actor, and also prevent the guaranteed Light Digger from being added to the loadout.

Author: MageKing17

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+<details><summary><b>Fixed</b></summary>
+
+- Fixed regression introduced in 6.1 causing Conquest activities to immediately fail if a defending brain was present (and probably breaking other activities as well).
+
+- Fixed the Conquest start game menu not letting you immediately start a game until you tweak some settings.
+
+</details>
+
 ## [Release v6.2.1] - 2024/02/21
 
 <details><summary><b>Fixed</b></summary>

Data/Base.rte/Activities/MetaFight.lua

@@ -5,7 +5,10 @@ function MetaFight:BrainCheck()
 	-- Clear all objective markers, they get re-added each frame
 	self:ClearObjectivePoints();
 	-- Keep track of which teams we have set objective points for already, since multiple players can be on the same team
-	local setTeam = { [Activity.TEAM_1] = false, [Activity.TEAM_2] = false, [Activity.TEAM_3] = false, [Activity.TEAM_4] = false };
+	local setTeam = {};
+	for team = Activity.TEAM_1, Activity.MAXTEAMCOUNT - 1 do
+		setTeam[team] = false;
+	end
 
 	-----------------------------------------------------------------
 	-- Brain integrity check logic for every player, Human or AI
@@ -166,36 +169,33 @@ function MetaFight:StartActivity()
 --	self.CurrentScanStage = { [Activity.TEAM_1] = self.ScanStage.PRESCAN, [Activity.TEAM_2] = self.ScanStage.PRESCAN, [Activity.TEAM_3] = self.ScanStage.PRESCAN, [Activity.TEAM_4] = self.ScanStage.PRESCAN };
 	-- Start by assming no teams have scanning scheduled
 	self.CurrentScanStage = self.ScanStage.DONESCAN;
-	self.ScanPosX = { [Activity.TEAM_1] = -1, [Activity.TEAM_2] = -1, [Activity.TEAM_3] = -1, [Activity.TEAM_4] = -1 };
-	self.ScanTimer = { [Activity.TEAM_1] = Timer(), [Activity.TEAM_2] = Timer(), [Activity.TEAM_3] = Timer(), [Activity.TEAM_4] = Timer() };
-	self.StartFunds = { [Activity.TEAM_1] = 0, [Activity.TEAM_2] = 0, [Activity.TEAM_3] = 0, [Activity.TEAM_4] = 0 };
+	self.ScanPosX = {};
+	self.ScanTimer = {};
+	self.StartFunds = {};
 	self.ScanEndPos = Vector();
 
-	-- Reset scan timers and check that there's any teams with a scheduled scan at all
-	for team = Activity.TEAM_1, Activity.MAXTEAMCOUNT - 1 do
-		if self:TeamActive(team) then
-			self.ScanTimer[team]:Reset();
-			-- Yes there is at least one active team that has scanning scheduled
-			if SceneMan.Scene:IsScanScheduled(team) then
-				self.CurrentScanStage = self.ScanStage.PRESCAN;
-			end
-		end
-	end
-
 	-- Which are the invading teams
-	self.InvadingTeam = { [Activity.TEAM_1] = false, [Activity.TEAM_2] = false, [Activity.TEAM_3] = false, [Activity.TEAM_4] = false };
+	self.InvadingTeam = {};
 	-- Which Teams are managed tactically by the AI? Only teams with NO human players on them
-	self.TeamAIActive = { [Activity.TEAM_1] = false, [Activity.TEAM_2] = false, [Activity.TEAM_3] = false, [Activity.TEAM_4] = false };
+	self.TeamAIActive = {};
 	-- Team has given up and is evacuating their brain
-	self.TeamEvacuating = { [Activity.TEAM_1] = false, [Activity.TEAM_2] = false, [Activity.TEAM_3] = false, [Activity.TEAM_4] = false };
+	self.TeamEvacuating = {};
 
 	-- A list of AI controlled team numbers
 	local CPUTeams = {};
 	-- Timers for controlling the AI modes of team members
 	self.AIModeTimer = {};
 
 	for team = Activity.TEAM_1, Activity.MAXTEAMCOUNT - 1 do
+		self.ScanPosX[team] = -1;
+		self.ScanTimer[team] = Timer();
+		self.StartFunds[team] = 0;
+
 		if self:TeamActive(team) then
+			if SceneMan.Scene:IsScanScheduled(team) then
+				-- Yes there is at least one active team that has scanning scheduled
+				self.CurrentScanStage = self.ScanStage.PRESCAN;
+			end
 			-- Start out assuming all teams are all AI invaders, then disprove it
 			self.InvadingTeam[team] = true;
 			self.TeamAIActive[team] = true;
@@ -220,34 +220,32 @@ function MetaFight:StartActivity()
 				self.AIModeTimer[team] = Timer();
 				table.insert(CPUTeams, team);
 			end
+		else
+			self.InvadingTeam[team] = false;
+			self.TeamAIActive[team] = false;
+			self.TeamEvacuating[team] = false;
 		end
 	end
 
 	-- MetaFight-specific player parameters
-	self.InvadingPlayer = { [Activity.PLAYER_1] = false, [Activity.PLAYER_2] = false, [Activity.PLAYER_3] = false, [Activity.PLAYER_4] = false };
-	self.Ready = { [Activity.PLAYER_1] = false, [Activity.PLAYER_2] = false, [Activity.PLAYER_3] = false, [Activity.PLAYER_4] = false };
+	self.InvadingPlayer = {};
+	self.Ready = {};
 	self.InvadingPlayerCount = 0;
 	-- At what funds level the AI starts thinking about going into brain evacuation mode
-	self.EvacThreshold = { [Activity.PLAYER_1] = 100, [Activity.PLAYER_2] = 100, [Activity.PLAYER_3] = 100, [Activity.PLAYER_4] = 100 };
+	self.EvacThreshold = {};
 	-- The last known position of all players' active brains
-	self.LastBrainPos = { [Activity.PLAYER_1] = Vector(), [Activity.PLAYER_2] = Vector(), [Activity.PLAYER_3] = Vector(), [Activity.PLAYER_4] = Vector() };
+	self.LastBrainPos = {};
 	-- The position of the last brain that died
 	self.LastBrainDeathPos = Vector();
 
-	-- Count how many invading players there are
-	for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
-		if self:PlayerActive(player) then -- and self:PlayerHuman(player) then
-			if not SceneMan.Scene:GetResidentBrain(player) then
-				self.InvadingPlayerCount = self.InvadingPlayerCount + 1;
-			end
-		end
-	end
-
 	local defenderTeam;
 	local defenderTeamNativeCostMultiplier = 1.0;
 
 	-- Now init all players
 	for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
+		self.Ready[player] = false;
+		self.EvacThreshold[player] = 100;
+		self.LastBrainPos[player] = Vector();
 		if self:PlayerActive(player) then
 			-- Reset the timer that will measure the delay between ordering of reinforcements
 			-- Determine whether this player is invading or already has a brain to defend here
@@ -273,10 +271,7 @@ function MetaFight:StartActivity()
 			-- Invading player
 			if not residentBrain then
 				self.InvadingPlayer[player] = true;
-				-- Sanity check
-				if self.InvadingPlayerCount < 1 then
-					self.InvadingPlayerCount = 1;
-				end
+				self.InvadingPlayerCount = self.InvadingPlayerCount + 1;
 
 				-- Human player; init as appropriate for invaders
 				if self:PlayerHuman(player) then
@@ -324,7 +319,7 @@ function MetaFight:StartActivity()
 						if residentBrain.Pos.X == -1 and residentBrain.Pos.Y == -1 then
 							-- Find some random spot to put our brain
 							local pos;
-							local sucess = false;
+							local success = false;
 							-- Make few attempts to find a suitable spot
 							for i = 1, 10 do
 								local rangeWidth;
@@ -351,16 +346,16 @@ function MetaFight:StartActivity()
 
 								pos = Vector(math.random(rangeStart, rangeEnd), 0);
 
-								sucess = true;
+								success = true;
 
 								-- Measure heights 5 times and verify that we can put brain there
 								for j = -2, 2 do
 									if SceneMan:FindAltitude(pos + Vector(j * 10, 0), 0, 19) < 25 then
-										sucess = false;
+										success = false;
 									end
 								end
 
-								if sucess then
+								if success then
 									break;
 								end
 							end
@@ -417,7 +412,7 @@ function MetaFight:StartActivity()
 					if residentBrain.Pos.X == -1 and residentBrain.Pos.Y == -1 then
 						-- Find some random spot to put our brain
 						local pos;
-						local sucess = false;
+						local success = false;
 						-- Make few attempts to find a suitable spot
 						for i = 1, 20 do
 							local rangeWidth;
@@ -444,16 +439,16 @@ function MetaFight:StartActivity()
 
 							pos = Vector(math.random(rangeStart, rangeEnd), 0);
 
-							sucess = true;
+							success = true;
 
 							-- Measure heights 5 times and verify that we can put brain there
 							for j = -2, 2 do
 								if SceneMan:FindAltitude(pos + Vector(j * 10, 0), 0, 19) < 25 then
-									sucess = false;
+									success = false;
 								end
 							end
 
-							if sucess then
+							if success then
 								break;
 							end
 						end
@@ -1435,13 +1430,13 @@ function MetaFight:OrderHeavyLoadout(player, team)
 			if actorsInCargo >= passengerLimit or totalMass > craftMaxMass then
 				break;
 			end
-
-			return true;
 		end
 
 		if diggers < 1 then
 			self:AddOverridePurchase(CreateHDFirearm("Light Digger", "Base.rte"), player);
 		end
+
+		return true;
 	end
 end
 

Source/Managers/MovableMan.cpp

@@ -666,7 +666,7 @@ bool MovableMan::AddMO(MovableObject* movableObjectToAdd) {
 }
 
 void MovableMan::AddActor(Actor* actorToAdd) {
-	if (actorToAdd && g_ActivityMan.ActivityRunning()) {
+	if (actorToAdd && g_ActivityMan.GetActivity()) {
 		actorToAdd->SetAsAddedToMovableMan();
 		actorToAdd->CorrectAttachableAndWoundPositionsAndRotations();
 
@@ -696,7 +696,7 @@ void MovableMan::AddActor(Actor* actorToAdd) {
 }
 
 void MovableMan::AddItem(HeldDevice* itemToAdd) {
-	if (itemToAdd && g_ActivityMan.ActivityRunning()) {
+	if (itemToAdd && g_ActivityMan.GetActivity()) {
 		g_ActivityMan.GetActivity()->ForceSetTeamAsActive(itemToAdd->GetTeam());
 
 		itemToAdd->SetAsAddedToMovableMan();
@@ -720,7 +720,7 @@ void MovableMan::AddItem(HeldDevice* itemToAdd) {
 }
 
 void MovableMan::AddParticle(MovableObject* particleToAdd) {
-	if (particleToAdd && g_ActivityMan.ActivityRunning()) {
+	if (particleToAdd && g_ActivityMan.GetActivity()) {
 		g_ActivityMan.GetActivity()->ForceSetTeamAsActive(particleToAdd->GetTeam());
 
 		particleToAdd->SetAsAddedToMovableMan();

Source/Menus/MetagameGUI.cpp

@@ -757,6 +757,9 @@ void MetagameGUI::SetEnabled(bool enable) {
 		}
 	}
 
+	if (enable) {
+		UpdatePlayerSetup(); // Ensure everything's ready to jump right in to the game, if the player wants.
+	}
 	m_ScreenChange = true;
 }