(57e816cad) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/ClientCode.projitems

@@ -44,7 +44,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\SinglePlayerCampaign.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\Tutorials\BasicTutorial.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\Tutorials\CaptainTutorial.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\Tutorials\ContextualTutorial.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\Tutorials\DoctorTutorial.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\Tutorials\EditorTutorial.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\GameSession\GameModes\Tutorials\EngineerTutorial.cs" />

Barotrauma/BarotraumaClient/Source/GUI/GUI.cs

@@ -1551,14 +1551,7 @@ namespace Barotrauma
             {
                 if (Tutorial.Initialized)
                 {
-                    if (GameMain.GameSession.GameMode is SinglePlayerCampaign)
+                    ((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop();
-                    {
-                        ((SinglePlayerCampaign)GameMain.GameSession.GameMode).ContextualTutorial.Stop();
-                    }
-                    else
-                    {
-                        ((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop();
-                    }
                 }
 
                 if (GameSettings.SendUserStatistics)

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);
         }
     }

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();
         }
     }
-}
+}*/

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs

@@ -22,9 +22,6 @@ namespace Barotrauma.Tutorials
         private Action infoBoxClosedCallback;
         protected XElement configElement;
 
-        private enum TutorialType { None, Scenario, Contextual };
-        private TutorialType tutorialType = TutorialType.None;
-
         protected VideoPlayer videoPlayer;
         protected enum TutorialContentTypes { None = 0, Video = 1, ManualVideo = 2, TextOnly = 3 };
         protected string playableContentPath;
@@ -164,7 +161,6 @@ namespace Barotrauma.Tutorials
             configElement = element;
             Name = element.GetAttributeString("name", "Unnamed");
             completed = GameMain.Config.CompletedTutorialNames.Contains(Name);
-            Enum.TryParse(element.GetAttributeString("tutorialtype", "Scenario"), true, out tutorialType);
             playableContentPath = element.GetAttributeString("playablecontentpath", "");
 
             segments = new List<TutorialSegment>();

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

Barotrauma/BarotraumaShared/SharedContent.projitems

@@ -364,9 +364,18 @@
     <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\airlock doors.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\AutoDoor.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\AutoHatch.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\Automatic Bilge Pump.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\WindowedAutoDoor.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="$(MSBuildThisFileDirectory)Content\Items\Door\door2.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -481,33 +490,6 @@
     <Content Include="$(MSBuildThisFileDirectory)Content\Map\OutpostWall_C.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\1_CommandReactor\BaroTutorial_CommandReactor.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\2_NavConsole\BaroTutorial_NavConsole.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\3_Flood\BaroTutorial_Flood.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\4_Reactor\BaroTutorial_Reactor.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\5_EnemyOnSonar\BaroTutorial_EnemyOnSonar.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\6_Degrading2\BaroTutorial_Degrading.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\7_Medical\BaroTutorial_Medical.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\8_Approach1\BaroTutorial_Approach.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\ContextualTutorial\9_SwitchCharacter\BaroTutorial_SwitchCharacter.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="$(MSBuildThisFileDirectory)Content\Tutorials\TutorialVideos\tutorial_command.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2191,7 +2173,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="$(MSBuildThisFileDirectory)Submarines\Berilia.sub">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
     <None Include="$(MSBuildThisFileDirectory)Submarines\Dugong_Tutorial.sub">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -3151,9 +3133,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="$(MSBuildThisFileDirectory)Content\Sounds\Water\SplashLoop.ogg" />
-    <None Include="$(MSBuildThisFileDirectory)Content\Tutorials\TutorialSub.sub">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="$(MSBuildThisFileDirectory)Content\Sounds\Ambient\Ambient1.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -3350,7 +3329,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="$(MSBuildThisFileDirectory)Submarines\Remora.sub">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
     <None Include="$(MSBuildThisFileDirectory)Submarines\RemoraDrone.sub">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>