diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUI.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUI.cs index 90d96a1dd..bb18cab55 100644 --- a/Barotrauma/BarotraumaClient/Source/GUI/GUI.cs +++ b/Barotrauma/BarotraumaClient/Source/GUI/GUI.cs @@ -1551,14 +1551,7 @@ namespace Barotrauma { if (Tutorial.Initialized) { - if (GameMain.GameSession.GameMode is SinglePlayerCampaign) - { - ((SinglePlayerCampaign)GameMain.GameSession.GameMode).ContextualTutorial.Stop(); - } - else - { - ((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop(); - } + ((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop(); } if (GameSettings.SendUserStatistics) diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs index b4a7414e3..ed7b01f1b 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs @@ -65,11 +65,6 @@ namespace Barotrauma endTimer = 5.0f; isRunning = true; CrewManager.InitSinglePlayerRound(); - - if (ContextualTutorial.Initialized) - { - ContextualTutorial.Start(); - } } public bool TryHireCharacter(Location location, CharacterInfo characterInfo) @@ -175,11 +170,6 @@ namespace Barotrauma base.Update(deltaTime); - if (ContextualTutorial.Initialized) - { - ContextualTutorial.Update(deltaTime); - } - if (!GUI.DisableHUD && !GUI.DisableUpperHUD) { endRoundButton.UpdateManually(deltaTime); @@ -440,12 +430,6 @@ namespace Barotrauma new XAttribute("cheatsenabled", CheatsEnabled)); CrewManager.Save(modeElement); Map.Save(modeElement); - - if (ContextualTutorial.Initialized) - { - ContextualTutorial.SavePartiallyComplete(modeElement); - } - element.Add(modeElement); } } diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs index b883c43ed..a05c6a835 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +/*using System.Collections.Generic; using System.Xml.Linq; using System; using Microsoft.Xna.Framework; @@ -9,6 +9,11 @@ namespace Barotrauma.Tutorials { class ContextualTutorial : Tutorial { + public ContextualTutorial(XElement element) : base(element) + { + //Name = "ContextualTutorial"; + } + public static bool Selected = false; private Steering navConsole; @@ -32,11 +37,6 @@ namespace Barotrauma.Tutorials private float medicalTutorialTimer = 0.0f; private const float medicalTutorialDelay = 2.0f; - public ContextualTutorial(XElement element) : base(element) - { - Name = "ContextualTutorial"; - } - public override void Initialize() { base.Initialize(); @@ -517,4 +517,4 @@ namespace Barotrauma.Tutorials Stop(); } } -} +}*/ diff --git a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs index 797209547..72130eaf9 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs @@ -324,7 +324,6 @@ namespace Barotrauma false, null, ""); foreach (Tutorial tutorial in Tutorial.Tutorials) { - if (tutorial is ContextualTutorial) continue; var tutorialText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), tutorialList.Content.RectTransform), tutorial.Name, textAlignment: Alignment.Center, font: GUI.LargeFont) { UserData = tutorial