From 250192ceec9779f0cd83e3b301f72d4d562c437f Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 17:52:03 +0100
Subject: [PATCH 01/22] Update mission6.cpp

Slightly reduce cam orbit time in mission 6. Less annoying and makes more sense with the voice.
---
 src/training/mission6.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/training/mission6.cpp b/src/training/mission6.cpp
index 29c67901..0dba9324 100644
--- a/src/training/mission6.cpp
+++ b/src/training/mission6.cpp
@@ -6,7 +6,7 @@
 **  Author:  
 **
 **  Description:
-**      Implementation of the fifth training mission
+**      Implementation of the sixth training mission
 **
 **  History:
 */
@@ -88,8 +88,12 @@ namespace Training
 		// outpost here in case you need to replenish yourself.
         pGoalList->AddGoal (CreatePlaySoundGoal (tm_6_01Sound));
 
-        // wait two more seconds
-        pGoalList->AddGoal (new Goal (new ElapsedTimeCondition (2.0f)));
+        // wait two more seconds in cockpit
+        {
+	        Goal*   pGoal = new Goal(new ElapsedTimeCondition(2.0f));
+	        pGoal->AddStartAction(new SetDisplayModeAction(TrekWindow::cmCockpit));
+	        pGoalList->AddGoal(pGoal);
+        }
 
 		// tm_6_02
 		// Iron Coalition Intelligence reports inbound enemy craft. 
@@ -97,7 +101,6 @@ namespace Training
 		// them. Watch your message stream to see what they're up to.
         {
             Goal*   pGoal = CreatePlaySoundGoal (tm_6_02Sound);
-            pGoal->AddStartAction (new SetDisplayModeAction (TrekWindow::cmCockpit));
             pGoal->AddStartAction (new MessageAction ("Watch the chat to see what the enemy craft are after."));
             pGoalList->AddGoal (pGoal);
         }

From 5f92aa08b6c90407e62975b42125736b3c081373 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 18:15:22 +0100
Subject: [PATCH 02/22] Create mission10.h

---
 src/training/mission10.h | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/training/mission10.h

diff --git a/src/training/mission10.h b/src/training/mission10.h
new file mode 100644
index 00000000..4bc42dc8
--- /dev/null
+++ b/src/training/mission10.h
@@ -0,0 +1,41 @@
+/*
+**  File:	mission10.h
+**
+**  Description:
+**      Header file for the training library "Mission FreeFlight" interface.
+*/
+
+#ifndef _MISSION_FREEFLIGHT_H_
+#define _MISSION_FREEFLIGHT_H_
+
+#ifndef _TRAINING_MISSION_H_
+#include "TrainingMission.h"
+#endif
+
+#ifndef _GOAL_H_
+#include "Goal.h"
+#endif
+
+
+namespace Training
+{
+    //------------------------------------------------------------------------------
+    // class definitions
+    //------------------------------------------------------------------------------
+    class Mission10 : public TrainingMission
+    {
+    public:
+        virtual /* void */              ~Mission10(void);
+        virtual int                     GetMissionID(void);
+        virtual SectorID                GetStartSectorID(void);
+        virtual bool                    RestoreShip(void);
+
+    protected:
+        virtual void                    CreateUniverse(void);
+        virtual Condition*              CreateMission(void);
+    };
+
+    //------------------------------------------------------------------------------
+}
+
+#endif  //_MISSION_FREEFLIGHT_H_

From d1d654a09b0bac9b420e701171612a5f040dc1cf Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 18:16:48 +0100
Subject: [PATCH 03/22] Create mission10.cpp

---
 src/training/mission10.cpp | 185 +++++++++++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 src/training/mission10.cpp

diff --git a/src/training/mission10.cpp b/src/training/mission10.cpp
new file mode 100644
index 00000000..cb52fe52
--- /dev/null
+++ b/src/training/mission10.cpp
@@ -0,0 +1,185 @@
+/*
+**  File:	Mission10.cpp
+**
+**  Description:
+**      Implementation of the tenth pseudo training mission "Free Flight", intended for dev use
+*/
+#include    "pch.h"
+#include    "Mission10.h"
+
+#include    "Training.h"
+#include    "GoalList.h"
+#include    "ConditionalAction.h"
+#include    "GetShipIsDestroyedCondition.h"
+#include    "FalseCondition.h"
+#include    "ElapsedTimeCondition.h"
+#include    "SetDisplayModeAction.h"
+#include    "CreateDroneAction.h"
+#include    "MessageAction.h"
+
+namespace Training
+{
+    //------------------------------------------------------------------------------
+    // class methods
+    //------------------------------------------------------------------------------
+    /* void */  Mission10::~Mission10(void)
+    {
+    }
+
+    //------------------------------------------------------------------------------
+    int         Mission10::GetMissionID(void)
+    {
+        return c_TM_10_Free_Flight;
+    }
+
+    //------------------------------------------------------------------------------
+    SectorID    Mission10::GetStartSectorID(void)
+    {
+        return 1030;
+    }
+
+    //------------------------------------------------------------------------------
+    bool        Mission10::RestoreShip(void)
+    {
+        // end the mission
+        Terminate();
+
+        // and return false so the engine stays in the override camera mode
+        return false;
+    }
+
+    //------------------------------------------------------------------------------
+    void        Mission10::CreateUniverse(void)
+    {
+        LoadUniverse("training_3", 488, 1030);    // a fighter 3
+
+                                                  // activate all the starting weapons
+        trekClient.fGroupFire = true;
+
+        // put the commander ship in the station
+        ImissionIGC*    pCore = trekClient.GetCore();
+        ImodelIGC*      pStation = pCore->GetModel(OT_station, 1030);
+        IshipIGC*       pCommander = pCore->GetShip(m_commanderID);
+        pCommander->SetStation(static_cast<IstationIGC*> (pStation));
+        pCommander->SetCommand(c_cmdAccepted, NULL, c_cidDoNothing);
+        pCommander->SetCommand(c_cmdCurrent, NULL, c_cidDoNothing);
+        pCommander->SetAutopilot(false);
+    }
+
+    //------------------------------------------------------------------------------
+    Condition*  Mission10::CreateMission(void)
+    {
+        debugf("Creating mission.");
+        GoalList*   pGoalList = new GoalList;
+
+        // wait .1 seconds, so stuff is initialized
+        pGoalList->AddGoal(new Goal(new ElapsedTimeCondition(0.1f)));
+
+        // play the introductory audio and change camera
+        {
+            Goal*   pGoal = CreatePlaySoundGoal(salCommenceScanSound);
+            pGoal->AddStartAction(new SetDisplayModeAction(TrekWindow::cmCockpit));
+            pGoalList->AddGoal(pGoal);
+        }
+
+        pGoalList->AddGoal(new Goal(new ElapsedTimeCondition(1.0f)));
+
+        // tm_6_02
+        // Iron Coalition Intelligence reports inbound enemy craft. 
+        // They're using an old code for their comms, so we can hear 
+        // them. Watch your message stream to see what they're up to.
+        {
+            Goal*   pGoal = CreatePlaySoundGoal(tm_6_02Sound);
+            pGoal->AddStartAction(new MessageAction("Watch the chat to see what the enemy craft are after."));
+            pGoalList->AddGoal(pGoal);
+        }
+
+        // wait half  second
+        pGoalList->AddGoal(new Goal(new ElapsedTimeCondition(0.5f)));
+
+        // tm_6_03
+        // DEFEND THE MINERS! This simulation is over when you die.
+        pGoalList->AddGoal(CreatePlaySoundGoal(tm_6_03Sound));
+
+        // wait two more seconds
+        pGoalList->AddGoal(new Goal(new ElapsedTimeCondition(2.0f)));
+
+        // need this
+        ImissionIGC*        pMission = trekClient.GetCore();
+        ImodelIGC*          pStation = pMission->GetModel(OT_station, 1030);
+
+        // wait for player to be dead
+        {
+            Goal*               pGoal = new Goal(new FalseCondition);
+
+            // create enemy ships
+            ShipID              enemyShipID = pMission->GenerateNewShipID();
+            CreateDroneAction*  pCreateDroneAction = new CreateDroneAction("Enemy Support", enemyShipID, 310, 1, c_ptWingman);
+            pCreateDroneAction->SetCreatedLocation(GetStartSectorID(), Vector(3800.0f, 4275.0f, 855.0f));
+            Condition*          pShipIsDestroyedcondition = new GetShipIsDestroyedCondition2(OT_ship, static_cast<ObjectID> (enemyShipID));
+            pGoal->AddConstraintCondition(new ConditionalAction(pShipIsDestroyedcondition, pCreateDroneAction));
+
+            enemyShipID = pMission->GenerateNewShipID();
+            pCreateDroneAction = new CreateDroneAction("Enemy Fighter", enemyShipID, 315, 1, c_ptWingman);
+            pCreateDroneAction->SetCreatedLocation(GetStartSectorID(), Vector(3800.0f, 4175.0f, 855.0f));
+            pShipIsDestroyedcondition = new GetShipIsDestroyedCondition2(OT_ship, static_cast<ObjectID> (enemyShipID));
+            pGoal->AddConstraintCondition(new ConditionalAction(pShipIsDestroyedcondition, pCreateDroneAction));
+
+            pGoalList->AddGoal(pGoal);
+        }
+
+        // build the goal that we'll return
+        {
+            Goal*   pGoal = new Goal(pGoalList);
+
+            // create friendly miners
+            Vector              pos = pStation->GetPosition();
+            pos.x += random(-1000.0f, 1000.0f);
+            pos.y += random(-1000.0f, 1000.0f);
+            pos.z += random(-1000.0f, 1000.0f);
+
+            ShipID              minerShipID = pMission->GenerateNewShipID();
+            CreateDroneAction*  pCreateDroneAction = new CreateDroneAction("Miner 01", minerShipID, 436, 0, c_ptMiner);
+            pCreateDroneAction->SetCreatedLocation(GetStartSectorID(), pos);
+            Condition*          pShipIsDestroyedcondition = new GetShipIsDestroyedCondition2(OT_ship, static_cast<ObjectID> (minerShipID));
+            pGoal->AddConstraintCondition(new ConditionalAction(pShipIsDestroyedcondition, pCreateDroneAction));
+
+            pos = pStation->GetPosition();
+            pos.x += random(-1000.0f, 1000.0f);
+            pos.y += random(-1000.0f, 1000.0f);
+            pos.z += random(-1000.0f, 1000.0f);
+
+            minerShipID = pMission->GenerateNewShipID();
+            pCreateDroneAction = new CreateDroneAction("Miner 02", minerShipID, 436, 0, c_ptMiner);
+            pCreateDroneAction->SetCreatedLocation(GetStartSectorID(), pos);
+            pShipIsDestroyedcondition = new GetShipIsDestroyedCondition2(OT_ship, static_cast<ObjectID> (minerShipID));
+            pGoal->AddConstraintCondition(new ConditionalAction(pShipIsDestroyedcondition, pCreateDroneAction));
+
+            pos = pStation->GetPosition();
+            pos.x += random(-1000.0f, 1000.0f);
+            pos.y += random(-1000.0f, 1000.0f);
+            pos.z += random(-1000.0f, 1000.0f);
+
+            minerShipID = pMission->GenerateNewShipID();
+            pCreateDroneAction = new CreateDroneAction("Miner 03", minerShipID, 436, 0, c_ptMiner);
+            pCreateDroneAction->SetCreatedLocation(GetStartSectorID(), pos);
+            pShipIsDestroyedcondition = new GetShipIsDestroyedCondition2(OT_ship, static_cast<ObjectID> (minerShipID));
+            pGoal->AddConstraintCondition(new ConditionalAction(pShipIsDestroyedcondition, pCreateDroneAction));
+
+            pos = pStation->GetPosition();
+            pos.x += random(-1000.0f, 1000.0f);
+            pos.y += random(-1000.0f, 1000.0f);
+            pos.z += random(-1000.0f, 1000.0f);
+
+            minerShipID = pMission->GenerateNewShipID();
+            pCreateDroneAction = new CreateDroneAction("Miner 04", minerShipID, 436, 0, c_ptMiner);
+            pCreateDroneAction->SetCreatedLocation(GetStartSectorID(), pos);
+            pShipIsDestroyedcondition = new GetShipIsDestroyedCondition2(OT_ship, static_cast<ObjectID> (minerShipID));
+            pGoal->AddConstraintCondition(new ConditionalAction(pShipIsDestroyedcondition, pCreateDroneAction));
+
+            return pGoal;
+        }
+    }
+
+    //------------------------------------------------------------------------------
+}

From 53987fb0c8a7daa6016508e7c2da2ad8ae11e554 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 18:19:45 +0100
Subject: [PATCH 04/22] cloned mission 6

---
 src/training/mission10.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/training/mission10.cpp b/src/training/mission10.cpp
index cb52fe52..0b7c46f7 100644
--- a/src/training/mission10.cpp
+++ b/src/training/mission10.cpp
@@ -2,7 +2,8 @@
 **  File:	Mission10.cpp
 **
 **  Description:
-**      Implementation of the tenth pseudo training mission "Free Flight", intended for dev use
+**      Implementation of the tenth pseudo training mission "Free Flight", intended for dev use.
+**      Cloned mission 6 without intro and with less constraints.
 */
 #include    "pch.h"
 #include    "Mission10.h"

From 45457183ff46071108213f45af38becb7a8739bc Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 18:48:35 +0100
Subject: [PATCH 05/22] post slideshow for FreeFlight training mission

---
 src/WinTrek/WinTrek.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/WinTrek/WinTrek.cpp b/src/WinTrek/WinTrek.cpp
index a7fff058..ce52aaf5 100644
--- a/src/WinTrek/WinTrek.cpp
+++ b/src/WinTrek/WinTrek.cpp
@@ -2470,7 +2470,7 @@ class TrekWindowImpl :
                 {
                     extern  TRef<ModifiableNumber>  g_pnumberMissionNumber;
                     int     iMission = static_cast<int> (g_pnumberMissionNumber->GetValue ());
-                    ZAssert ((iMission >= 1) && (iMission <= 8)); //TheBored 06-JUL-07: second condition must be (iMission <= (number of training missions))
+                    ZAssert ((iMission >= 1) && (iMission <= 10)); //TheBored 06-JUL-07: second condition must be (iMission <= (number of training missions))
                     char*   strNamespace[] =
                     {
                         "",
@@ -2480,8 +2480,10 @@ class TrekWindowImpl :
                         "tm_4_enemy_engagement_post",
                         "tm_5_command_view_post",
                         "tm_6_practice_arena_post",
-						"", //TheBored 06-JUL-07: Mish #7, blank because its never used
-						"tm_8_nanite_post", //TheBored 06-JUL-07: Mish #8 postgame panels
+                        "", //TheBored 06-JUL-07: Mish #7, blank because its never used
+                        "tm_8_nanite_post", //TheBored 06-JUL-07: Mish #8 postgame panels
+                        "",
+                        "tm_6_practice_arena_post" //05-NOV-17: FreeFlight pseudo training mission - use same post slides as tm6 (showing station instead of text in ui-stretch beta)
                     };
 					SetUiScreen(CreatePostTrainingSlideshow (GetModeler (), strNamespace[iMission]));
                     break;

From e2bf1f1d5d7ef52ce99a0fc3c3309089bc4d926f Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 20:52:05 +0100
Subject: [PATCH 06/22] skip slideshow for FreeFlight

---
 src/WinTrek/trainingscreen.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/WinTrek/trainingscreen.cpp b/src/WinTrek/trainingscreen.cpp
index d45a80f1..7d1f051b 100644
--- a/src/WinTrek/trainingscreen.cpp
+++ b/src/WinTrek/trainingscreen.cpp
@@ -93,7 +93,7 @@ class TrainingScreen :
         m_pbuttonTrain->SetChecked (true);
 #ifdef _DEBUG
 		if (bStartTraining) {
-			g_pnumberMissionNumber->SetValue(6);
+			g_pnumberMissionNumber->SetValue(Training::c_TM_10_Free_Flight);
 			OnButtonTrain();
 		}
 #endif
@@ -195,15 +195,27 @@ class TrainingScreen :
             case Training::c_TM_4_Enemy_Engagement:
             case Training::c_TM_5_Command_View:
             case Training::c_TM_6_Practice_Arena:
-			case Training::c_TM_8_Nanite: //TheBored 06-JUL-07: nanite mission
+            case Training::c_TM_8_Nanite:
                 // note that the training slideshow can get the mission number from the global
                 // value when subsequently launching.
-                GetWindow ()->screen (ScreenIDTrainSlideshow);
+                GetWindow()->screen(ScreenIDTrainSlideshow);
+                break;
+            case Training::c_TM_10_Free_Flight:
+                //Skip slideshow -- Let stuff load before changing it
+                TRef<IMessageBox>   pMsgBox = CreateMessageBox("Training simulation initiated...", NULL, false);
+                GetWindow()->GetPopupContainer()->OpenPopup(pMsgBox, false);
+                AddEventTarget(&TrainingScreen::OnFreeFlightSwitchOut, GetWindow(), 0.1f);
                 break;
         }
         return true;
     }
 
+    bool OnFreeFlightSwitchOut(void)
+    {
+        GetWindow()->StartTraining(Training::c_TM_10_Free_Flight);
+        return false;
+    }
+
 	bool OnButtonMission(const int iMission)
 	{
 		g_pnumberMissionNumber->SetValue(iMission);

From db4265e4497b536ab132759dcfba947f0f201bc5 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 20:55:38 +0100
Subject: [PATCH 07/22] ID for FreeFlight mission

---
 src/training/Training.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/training/Training.h b/src/training/Training.h
index 934aa8e4..e80fea43 100644
--- a/src/training/Training.h
+++ b/src/training/Training.h
@@ -27,7 +27,8 @@ namespace Training
         c_TM_5_Command_View     = 5,
         c_TM_6_Practice_Arena   = 6,
         c_TM_7_Live             = 7,
-		c_TM_8_Nanite			= 8 //TheBored 06-JUL-07: adding nanite mission
+        c_TM_8_Nanite           = 8, //TheBored 06-JUL-07: adding nanite mission
+        c_TM_10_Free_Flight     = 10
     };
 
     //------------------------------------------------------------------------------

From 1860f63a87537d2db45aa88da4005a6c6de5b82e Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Sun, 5 Nov 2017 20:59:24 +0100
Subject: [PATCH 08/22] enable AI side-visibility for FreeFlight

---
 src/WinTrek/trekigc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WinTrek/trekigc.cpp b/src/WinTrek/trekigc.cpp
index dc9f21f2..6aeb0752 100644
--- a/src/WinTrek/trekigc.cpp
+++ b/src/WinTrek/trekigc.cpp
@@ -2106,7 +2106,7 @@ class ThingSiteImpl : public ThingSitePrivate
 
             if (Training::IsTraining ())
             {
-                if ((trekClient.GetShip ()->GetSide () != side) && (Training::GetTrainingMissionID () != Training::c_TM_6_Practice_Arena))
+                if ((trekClient.GetShip()->GetSide() != side) && (Training::GetTrainingMissionID() != Training::c_TM_6_Practice_Arena) && (Training::GetTrainingMissionID() != Training::c_TM_10_Free_Flight))
                     return false;
             }
             return m_sideVisibility.fVisible();

From 9d89ec396da63ba4ce8a029a358b824fc13eb225 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Mon, 6 Nov 2017 11:09:28 +0100
Subject: [PATCH 09/22] support free flight creation

---
 src/training/Training.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/training/Training.cpp b/src/training/Training.cpp
index f9a3ea31..a2212477 100644
--- a/src/training/Training.cpp
+++ b/src/training/Training.cpp
@@ -17,7 +17,8 @@
 #include    "Mission4.h"
 #include    "Mission5.h"
 #include    "Mission6.h"
-#include	"Mission8.h" //TheBored 06-JUL-07: Adding nanite mission.
+#include    "Mission8.h" //TheBored 06-JUL-07: Adding nanite mission.
+#include    "Mission10.h"
 
 namespace Training
 {
@@ -75,11 +76,12 @@ namespace Training
             case c_TM_6_Practice_Arena:
                 g_pMission = new Mission6;
                 break;
-			//TheBored 06-JUL-07: adding nanite mission
-			case c_TM_8_Nanite:
-				g_pMission = new Mission8;
-				break;
-			//End TB
+            case c_TM_8_Nanite:  //TheBored 06-JUL-07: adding nanite mission
+                g_pMission = new Mission8;
+                break;
+            case c_TM_10_Free_Flight:
+                g_pMission = new Mission10;
+                break;
             case c_TM_7_Live:
                 g_bIsMission7 = true;
                 // fall through

From bd3a041fdb87c1116fb38c08c543340f73ac92c4 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Mon, 6 Nov 2017 11:26:04 +0100
Subject: [PATCH 10/22] mission10 files

---
 VS2017/training.vcxproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/VS2017/training.vcxproj b/VS2017/training.vcxproj
index d3d2d80f..36243d60 100644
--- a/VS2017/training.vcxproj
+++ b/VS2017/training.vcxproj
@@ -145,6 +145,7 @@
     <ClCompile Include="..\src\training\Goal.cpp" />
     <ClCompile Include="..\src\training\goallist.cpp" />
     <ClCompile Include="..\src\training\messageaction.cpp" />
+    <ClCompile Include="..\src\training\mission10.cpp" />
     <ClCompile Include="..\src\training\mission2.cpp" />
     <ClCompile Include="..\src\training\mission3.cpp" />
     <ClCompile Include="..\src\training\mission4.cpp" />
@@ -238,6 +239,7 @@
     <ClInclude Include="..\src\training\Goal.h" />
     <ClInclude Include="..\src\training\goallist.h" />
     <ClInclude Include="..\src\training\messageaction.h" />
+    <ClInclude Include="..\src\training\mission10.h" />
     <ClInclude Include="..\src\training\Mission2.h" />
     <ClInclude Include="..\src\training\Mission3.h" />
     <ClInclude Include="..\src\training\Mission4.h" />
@@ -292,4 +294,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

From a3da23a1c72e5cc0dddf311b54b2d266190820ad Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Mon, 6 Nov 2017 11:33:05 +0100
Subject: [PATCH 11/22] Don't disable keys for free flight

---
 src/training/trainingmission.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/training/trainingmission.cpp b/src/training/trainingmission.cpp
index d398992d..d757848b 100644
--- a/src/training/trainingmission.cpp
+++ b/src/training/trainingmission.cpp
@@ -257,18 +257,6 @@ namespace Training
         // check the key for tm conditions
         switch (key)
         {
-            // XXX hack to disable some keys in training
-            case TK_ViewCommand:
-            case TK_ConModeCommand:
-            case TK_ConModeInvest:
-            case TK_TargetSelf:
-            case TK_Suicide:
-            case TK_ConModeGameState:
-            case TK_ConModeTeleport:
-            case TK_ToggleAutoPilot:
-            case TK_RejectCommand: // pkk - Some training missions can't be finished
-            return false;
-
             case TK_PauseTM:
             {
                 // if the game is paused
@@ -310,6 +298,20 @@ namespace Training
             break;
           #endif
 
+            // XXX hack to disable some keys in training
+            case TK_ViewCommand:
+            case TK_ConModeCommand:
+            case TK_ConModeInvest:
+            case TK_TargetSelf:
+            case TK_Suicide:
+            case TK_ConModeGameState:
+            case TK_ConModeTeleport:
+            case TK_ToggleAutoPilot:
+            case TK_RejectCommand: // pkk - Some training missions can't be finished
+                if (GetMissionID() != 10) //Training::c_TM_10_Free_Flight
+                    return false;
+                //fallthrough otherwise
+
             default:
             {
                 // iterate over the key conditions with the unknown key

From 2c30f9c0d41f967765afcb94fc2d6594b0431d96 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Mon, 6 Nov 2017 11:52:48 +0100
Subject: [PATCH 12/22] Update training.vcxproj


From 0c9098b1f3b74d345c856a157a255d61da9d1761 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Tue, 7 Nov 2017 00:18:31 +0100
Subject: [PATCH 13/22] Enable giving commands to self in FreeFlight

---
 src/WinTrek/trekigc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WinTrek/trekigc.cpp b/src/WinTrek/trekigc.cpp
index 6aeb0752..07ba7017 100644
--- a/src/WinTrek/trekigc.cpp
+++ b/src/WinTrek/trekigc.cpp
@@ -4235,7 +4235,7 @@ void      WinTrekClient::ReceiveChat(IshipIGC*   pshipSender,
     if (Training::IsTraining ())
     {
         // prevent players from giving commands to themselves
-        if (pshipSender && (oidRecipient == pshipSender->GetObjectID ()))
+        if (pshipSender && (oidRecipient == pshipSender->GetObjectID ()) && (Training::GetTrainingMissionID() != Training::c_TM_10_Free_Flight))
             pmodelTarget = NULL;
 
         // send out the chat we are getting to see if we are waiting for it...

From cb988d23052958017800972c61edde3eb77cb9ca Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:28:53 +0100
Subject: [PATCH 14/22] bool CommandViewEnabled

---
 src/training/Training.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/training/Training.h b/src/training/Training.h
index e80fea43..21a56c30 100644
--- a/src/training/Training.h
+++ b/src/training/Training.h
@@ -40,6 +40,7 @@ namespace Training
     void            SetSkipPostSlideshow (void);
     bool            IsTraining (void);
     bool            IsInstalled (void);
+    bool            CommandViewEnabled(void);
     int             GetTrainingMissionID (void);
     SectorID        GetStartSectorID (void);
     void            SetupShipAndCamera (void);

From 93529b5ab5114f75defef85a93d4af0772146212 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:33:54 +0100
Subject: [PATCH 15/22] undo last

Where is the button for this?
---
 src/training/Training.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/training/Training.h b/src/training/Training.h
index 21a56c30..e80fea43 100644
--- a/src/training/Training.h
+++ b/src/training/Training.h
@@ -40,7 +40,6 @@ namespace Training
     void            SetSkipPostSlideshow (void);
     bool            IsTraining (void);
     bool            IsInstalled (void);
-    bool            CommandViewEnabled(void);
     int             GetTrainingMissionID (void);
     SectorID        GetStartSectorID (void);
     void            SetupShipAndCamera (void);

From 1f3c087449be36e27d1c4d3790e2b08468c7810d Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:35:27 +0100
Subject: [PATCH 16/22] make CommandView usable in training missions

---
 src/training/Training.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/training/Training.h b/src/training/Training.h
index e80fea43..21a56c30 100644
--- a/src/training/Training.h
+++ b/src/training/Training.h
@@ -40,6 +40,7 @@ namespace Training
     void            SetSkipPostSlideshow (void);
     bool            IsTraining (void);
     bool            IsInstalled (void);
+    bool            CommandViewEnabled(void);
     int             GetTrainingMissionID (void);
     SectorID        GetStartSectorID (void);
     void            SetupShipAndCamera (void);

From d39fa7a4df8f7c71de82d66a98d7d5040d33202d Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:37:51 +0100
Subject: [PATCH 17/22] make CommandView usable in training missions

---
 src/training/Training.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/training/Training.cpp b/src/training/Training.cpp
index a2212477..c67f1101 100644
--- a/src/training/Training.cpp
+++ b/src/training/Training.cpp
@@ -149,6 +149,11 @@ namespace Training
     */
     }
 
+    //------------------------------------------------------------------------------
+    bool            CommandViewEnabled(void) {
+        return g_pMission ? g_pMission->GetCommandViewEnabled() : false;
+    }
+
     //------------------------------------------------------------------------------
     int             GetTrainingMissionID (void)
     {

From 5b831cd8ddf09680aa2feae0e3373a04f23268b8 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:42:27 +0100
Subject: [PATCH 18/22] make CommandView usable in training missions

---
 src/training/trainingmission.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/training/trainingmission.h b/src/training/trainingmission.h
index 69d7ac26..ccaae8b3 100644
--- a/src/training/trainingmission.h
+++ b/src/training/trainingmission.h
@@ -46,6 +46,7 @@ namespace Training
                     void                    AddPartToShip (PartID part, Mount mount, short ammo = 0);
                     IshipIGC*               CreateDrone (const ZString& name, ShipID shipID, HullID hullID, SideID sideID, PilotType pilotType);
                     void                    SetSkipPostSlideshow (void);
+                    bool                    GetCommandViewEnabled(void);
 
         protected:
             virtual void                    CreateUniverse (void) = 0;
@@ -71,6 +72,7 @@ namespace Training
                     TrekWindow::ViewMode    m_deadViewMode;
                     TrekWindow::CameraMode  m_deadCameraMode;
                     bool                    m_bSkipPostSlideShow;
+                    bool                    m_commandViewEnabled;
     };
 
     //------------------------------------------------------------------------------

From 290bc57813b53ab8fe9b5cd12a5e711468eaf444 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:45:40 +0100
Subject: [PATCH 19/22] make CommandView usable in training missions

---
 src/training/trainingmission.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/training/trainingmission.cpp b/src/training/trainingmission.cpp
index d757848b..cd8548f7 100644
--- a/src/training/trainingmission.cpp
+++ b/src/training/trainingmission.cpp
@@ -64,7 +64,8 @@ namespace Training
     m_pDeadCondition (0),
     m_commanderID (NA),
     m_pChatCondition (0),
-    m_bSkipPostSlideShow (false)
+    m_bSkipPostSlideShow (false),
+    m_commandViewEnabled(false)
     {
         // get the window pointer
         TrekWindow* pWindow = GetWindow ();
@@ -490,6 +491,12 @@ namespace Training
         m_bSkipPostSlideShow = true;
     }
 
+    //------------------------------------------------------------------------------
+    bool        TrainingMission::GetCommandViewEnabled(void)
+    {
+        return m_commandViewEnabled;
+    }
+
     //------------------------------------------------------------------------------
     void        TrainingMission::LoadUniverse (const ZString& name, HullID hullID, StationID homeStationID)
     {

From 0e756556a1883d886d23546e7e27afeab250550d Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 08:55:35 +0100
Subject: [PATCH 20/22] Fix TakeMeTo in training missions

---
 src/WinTrek/teampane.cpp | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/WinTrek/teampane.cpp b/src/WinTrek/teampane.cpp
index d152e04f..fda7512f 100644
--- a/src/WinTrek/teampane.cpp
+++ b/src/WinTrek/teampane.cpp
@@ -1241,19 +1241,35 @@ public TrekClientEventSink
             //
             // assert (pplayer->SideID() != SIDE_TEAMLOBBY);
             {
-                if (Training::IsTraining ())
+                if (Training::IsTraining())
                 {
-                    ImissionIGC*    pCore = trekClient.GetCore ();
-                    IshipIGC*       pShip = pCore->GetShip (shipID);
-                    IclusterIGC*    pCluster = pShip->GetCluster ();
-                    if (!pCluster)
+                    if (Training::CommandViewEnabled())
                     {
-                        IstationIGC*    pStation = pShip->GetStation ();
-                        assert (pStation);
-                        pCluster = pStation->GetCluster ();
-                        assert (pCluster);
+                        ImissionIGC*    pCore = trekClient.GetCore();
+                        IshipIGC*       pShip = pCore->GetShip(shipID); //pplayer->GetShip() should be the same
+                        IclusterIGC*    pCluster = pShip->GetCluster();
+                        const Vector*   ppos;
+                        if (!pCluster)
+                        {
+                            IstationIGC*    pStation = pShip->GetStation();
+                            assert(pStation);
+                            pCluster = pStation->GetCluster();
+                            assert(pCluster);
+                            debugf("Ship is in station in %s.\n", pCluster->GetName());
+                            ppos = pStation && pStation->SeenBySide(trekClient.GetSide()) ? &(pStation->GetPosition()) : NULL;
+                        }
+                        else
+                            ppos = pShip && pShip->SeenBySide(trekClient.GetSide()) ? &(pShip->GetPosition()) : NULL;
+
+                        IclusterIGC*    pClusterShip = trekClient.GetShip()->GetCluster();
+                        if ((pClusterShip == NULL) || (pClusterShip == pCluster)) { //check if in station or in the same sector
+                            if (GetWindow()->GetViewMode() != TrekWindow::vmCommand)
+                                GetWindow()->SetViewMode(TrekWindow::vmCommand);
+				
+                    	    //trekClient.RequestViewCluster (pCluster, pplayer->GetShip()); //fails for ships in stations
+                            trekClient.SetViewCluster(pCluster, ppos); 
+                        }
                     }
-                    trekClient.RequestViewCluster (pCluster, pplayer->GetShip());
                 }
                 else if (pplayer->GetShipStatus().GetSectorID() != NA)
                 {
@@ -1279,7 +1295,7 @@ public TrekClientEventSink
                     }
                 }
 
-                GetWindow()->GetConsoleImage()->GetConsoleData()->PickShip(pplayer->GetShip());
+                GetWindow()->GetConsoleImage()->GetConsoleData()->PickShip(pplayer->GetShip()); //Select the ship
             }
         }
         

From e54a45a78de8eeb7fa597fc96b7daf2659afc902 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 09:00:00 +0100
Subject: [PATCH 21/22] Make use of the new CommandViewEnabled setting.

---
 src/training/mission10.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/training/mission10.cpp b/src/training/mission10.cpp
index 0b7c46f7..824b6060 100644
--- a/src/training/mission10.cpp
+++ b/src/training/mission10.cpp
@@ -53,9 +53,7 @@ namespace Training
     void        Mission10::CreateUniverse(void)
     {
         LoadUniverse("training_3", 488, 1030);    // a fighter 3
-
-                                                  // activate all the starting weapons
-        trekClient.fGroupFire = true;
+        trekClient.fGroupFire = true;             // activate all the starting weapons
 
         // put the commander ship in the station
         ImissionIGC*    pCore = trekClient.GetCore();
@@ -70,7 +68,9 @@ namespace Training
     //------------------------------------------------------------------------------
     Condition*  Mission10::CreateMission(void)
     {
-        debugf("Creating mission.");
+        debugf("Creating mission 10.\n");
+        m_commandViewEnabled = true;
+
         GoalList*   pGoalList = new GoalList;
 
         // wait .1 seconds, so stuff is initialized

From c69f6e2083758974c2415e914d5220f302731e68 Mon Sep 17 00:00:00 2001
From: Radulfr4 <33282887+Radulfr4@users.noreply.github.com>
Date: Wed, 8 Nov 2017 10:34:44 +0100
Subject: [PATCH 22/22] Make use of the new CommandViewEnabled setting.

---
 src/WinTrek/trekigc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WinTrek/trekigc.cpp b/src/WinTrek/trekigc.cpp
index 07ba7017..d2722c79 100644
--- a/src/WinTrek/trekigc.cpp
+++ b/src/WinTrek/trekigc.cpp
@@ -4235,7 +4235,7 @@ void      WinTrekClient::ReceiveChat(IshipIGC*   pshipSender,
     if (Training::IsTraining ())
     {
         // prevent players from giving commands to themselves
-        if (pshipSender && (oidRecipient == pshipSender->GetObjectID ()) && (Training::GetTrainingMissionID() != Training::c_TM_10_Free_Flight))
+        if (pshipSender && (oidRecipient == pshipSender->GetObjectID ()) && !Training::CommandViewEnabled())
             pmodelTarget = NULL;
 
         // send out the chat we are getting to see if we are waiting for it...