cortex-command-community · garethyr · Apr 29, 2023 · Jan 12, 2023 · Jan 12, 2023 · Jan 12, 2023
diff --git a/Activities/GATutorial.cpp b/Activities/GATutorial.cpp
@@ -87,6 +87,7 @@ void GATutorial::Clear()
     for (int stage = 0; stage < FIGHTSTAGECOUNT; ++stage)
         m_FightTriggers[stage].Reset();
 
+	m_EnemyCount = 0;
     m_CurrentFightStage = NOFIGHT;
     m_pCPUBrain = 0;
 }
@@ -141,6 +142,7 @@ int GATutorial::Create(const GATutorial &reference)
     for (int stage = 0; stage < FIGHTSTAGECOUNT; ++stage)
         m_FightTriggers[stage] = reference.m_FightTriggers[stage];
 
+	m_EnemyCount = reference.m_EnemyCount;
     m_CurrentFightStage = reference.m_CurrentFightStage;
 // DOn't, owned and need to make deep copy in that case
 //    m_pCPUBrain;
@@ -293,6 +295,7 @@ int GATutorial::Start()
                     pOtherBrain = 0;
                 }
             }
+			m_EnemyCount = g_MovableMan.GetTeamRoster(m_CPUTeam)->size();
         }
         // Give the player some scratch
         else
@@ -767,23 +770,19 @@ void GATutorial::Update()
     ////////////////////////
     // FIGHT LOGIC
 
-    if (m_ControlledActor[m_TutorialPlayer])
-    {
-        // Triggered defending stage
-        if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].IsWithinBox(m_ControlledActor[m_TutorialPlayer]->GetPos()))
-        {
-            // Take over control of screen messages
-            m_MessageTimer[m_TutorialPlayer].Reset();
-            // Display the text of the current step
-            g_FrameMan.ClearScreenText(ScreenOfPlayer(m_TutorialPlayer));
-            g_FrameMan.SetScreenText("DEFEND YOUR BRAIN AGAINST THE INCOMING FORCES!", ScreenOfPlayer(m_TutorialPlayer), 500, 8000, true);
-            // This will make all the enemy team AI's go into brain hunt mode
-            GameActivity::InitAIs();
-            DisableAIs(false, Teams::TeamTwo);
-
-            // Advance the stage
-            m_CurrentFightStage = DEFENDING;
-        }
+    // Triggered defending stage
+	if (m_CurrentFightStage == NOFIGHT && ((m_ControlledActor[m_TutorialPlayer] && m_FightTriggers[DEFENDING].IsWithinBox(m_ControlledActor[m_TutorialPlayer]->GetPos())) || g_MovableMan.GetTeamRoster(m_CPUTeam)->size() < m_EnemyCount)) {
+        // Take over control of screen messages
+        m_MessageTimer[m_TutorialPlayer].Reset();
+        // Display the text of the current step
+        g_FrameMan.ClearScreenText(ScreenOfPlayer(m_TutorialPlayer));
+        g_FrameMan.SetScreenText("DEFEND YOUR BRAIN AGAINST THE INCOMING FORCES!", ScreenOfPlayer(m_TutorialPlayer), 500, 8000, true);
+        // This will make all the enemy team AI's go into brain hunt mode
+        GameActivity::InitAIs();
+        DisableAIs(false, Teams::TeamTwo);
+
+        // Advance the stage
+        m_CurrentFightStage = DEFENDING;
     }
 
     ///////////////////////////////////////////
@@ -1043,7 +1042,7 @@ void GATutorial::SetupAreas()
     m_TutAreaSteps[ROOFTOP].push_back(TutStep("If you dig up gold, it is added to your team's funds", 4000, "Missions.rte/Objects/Tutorial/Funds.png", 2, 250));
     m_TutAreaSteps[ROOFTOP].push_back(TutStep("Funds can be spent in the Buy Menu", 4000, "Missions.rte/Objects/Tutorial/Funds.png", 1, 333));
     m_TutAreaSteps[ROOFTOP].push_back(TutStep("Which is opened through the Command Menu", 4000, "Missions.rte/Objects/Tutorial/MenuBuyMenu.png", 1, 500));
-    m_TutAreaSteps[ROOFTOP].push_back(TutStep("Hold [" + PieName + "] and point up-left to 'Buy Menu'", 6000, "Missions.rte/Objects/Tutorial/MenuBuyMenu.png", 2, 500));
+    m_TutAreaSteps[ROOFTOP].push_back(TutStep("Hold [" + PieName + "] and point up and left to 'Buy Menu'", 6000, "Missions.rte/Objects/Tutorial/MenuBuyMenu.png", 2, 500));
     m_TutAreaSteps[ROOFTOP].push_back(TutStep("The Buy Menu works like a shopping cart", 6000, "Missions.rte/Objects/Tutorial/BuyMenuCargo.png", 1, 500));
     m_TutAreaSteps[ROOFTOP].push_back(TutStep("Add to the Cargo list the items you want delivered", 6000, "Missions.rte/Objects/Tutorial/BuyMenuCargo.png", 2, 500));
     m_TutAreaSteps[ROOFTOP].push_back(TutStep("Then use the BUY button, or click outside the menu", 4000, "Missions.rte/Objects/Tutorial/BuyMenuBuy.png", 2, 500));
@@ -1062,12 +1061,12 @@ void GATutorial::SetupAreas()
     m_TextOffsets[ROOFEAST].SetXY(m_apCommonScreens[0]->w / 2, -16);
     // Set up the steps
     m_TutAreaSteps[ROOFEAST].clear();
-    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Hold [" + PieName + "] and point up-right to 'Form Squad'", 4000, "Missions.rte/Objects/Tutorial/MenuTeam.png", 2, 500));
+    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Hold [" + PieName + "] and point down and right to 'Form Squad'", 4000, "Missions.rte/Objects/Tutorial/MenuTeam.png", 2, 500));
     m_TutAreaSteps[ROOFEAST].push_back(TutStep("Adjust selection circle to select nearby bodies", 4000, "Missions.rte/Objects/Tutorial/TeamSelect.png", 4, 500));
     m_TutAreaSteps[ROOFEAST].push_back(TutStep("All selected units will follow you, and engage on their own", 4000, "Missions.rte/Objects/Tutorial/TeamFollow.png", 2, 500));
-    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Units with weapons similar to the leader's will fire in unison with him.", 4000, "Missions.rte/Objects/Tutorial/TeamFollow.png", 2, 500));
-    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Hold [" + PieName + "] and point up-right again to disband squad", 4000, "Missions.rte/Objects/Tutorial/MenuTeam.png", 2, 500));
-    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Next, you can go to the east for a TRIAL BATTLE!", 8000, "Missions.rte/Objects/Tutorial/ArrowRight.png", 2));
+    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Units with similar weapons will fire in unison with the leader", 4000, "Missions.rte/Objects/Tutorial/TeamFollow.png", 2, 500));
+    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Hold [" + PieName + "] and point down and right again to disband squad", 4000, "Missions.rte/Objects/Tutorial/MenuTeam.png", 2, 500));
+    m_TutAreaSteps[ROOFEAST].push_back(TutStep("Next, you can head east for a TRIAL BATTLE!", 8000, "Missions.rte/Objects/Tutorial/ArrowRight.png", 2));
 
     m_AreaTimer.Reset();
     m_StepTimer.Reset();

diff --git a/Activities/GATutorial.h b/Activities/GATutorial.h
@@ -313,6 +313,7 @@ ClassInfoGetters;
     TutorialRoom m_CurrentRoom;
     // Trigger box for the subsequent fight
     Box m_FightTriggers[FIGHTSTAGECOUNT];
+	int m_EnemyCount; //!< The amount of enemy actors at the start of the activity.
     // The current fight stage
     FightStage m_CurrentFightStage;
     // The CPU opponent brain; not owned!

diff --git a/Activities/GameActivity.cpp b/Activities/GameActivity.cpp
@@ -63,7 +63,6 @@ void GameActivity::Clear()
     {
         m_ObservationTarget[player].Reset();
         m_DeathViewTarget[player].Reset();
-        m_DeathTimer[player].Reset();
         m_ActorSelectTimer[player].Reset();
         m_ActorCursor[player].Reset();
         m_pLastMarkedActor[player] = 0;
@@ -166,7 +165,6 @@ int GameActivity::Create(const GameActivity &reference)
     {
         m_ObservationTarget[player] = reference.m_ObservationTarget[player];
         m_DeathViewTarget[player] = reference.m_DeathViewTarget[player];
-//        m_DeathTimer[player] = reference.m_DeathTimer[player];
         m_ActorCursor[player] = reference.m_ActorCursor[player];
         m_pLastMarkedActor[player] = reference.m_pLastMarkedActor[player];
         m_LandingZone[player] = reference.m_LandingZone[player];
@@ -1365,14 +1363,13 @@ void GameActivity::Update()
                 if (g_MovableMan.IsActor(m_ControlledActor[player]))
                 {
                     m_DeathViewTarget[player] = m_ControlledActor[player]->GetPos();
+					m_DeathTimer[player].Reset();
                 }
                 // Add delay after death before switching so the death comedy can be witnessed
                 // Died, so enter death watch mode
                 else
                 {
-                    m_ControlledActor[player] = 0;
-                    m_ViewState[player] = ViewState::DeathWatch;
-                    m_DeathTimer[player].Reset();
+					LoseControlOfActor(player);
                 }
             }
             // Ok, done watching death comedy, now automatically switch
@@ -1392,9 +1389,7 @@ void GameActivity::Update()
             // Any other viewing mode and the actor died... go to deathwatch
             else if (m_ControlledActor[player] && !g_MovableMan.IsActor(m_ControlledActor[player]))
             {
-                m_ControlledActor[player] = 0;
-                m_ViewState[player] = ViewState::DeathWatch;
-                m_DeathTimer[player].Reset();
+				LoseControlOfActor(player);
             }
         }
         // Player brain is now gone! Remove any control he may have had

diff --git a/Activities/GameActivity.h b/Activities/GameActivity.h
@@ -1018,8 +1018,6 @@ class GameActivity : public Activity {
     Vector m_ObservationTarget[Players::MaxPlayerCount];
     // The player death sceneman scroll targets, for when a player-controlled actor dies and the view should go to his last position
     Vector m_DeathViewTarget[Players::MaxPlayerCount];
-    // Timers for measuring death cam delays.
-    Timer m_DeathTimer[Players::MaxPlayerCount];
     // Times the delay between regular actor swtich, and going into manual siwtch mode
     Timer m_ActorSelectTimer[Players::MaxPlayerCount];
     // The cursor for selecting new Actors