Unstable v0.1100.0.4 (November 11th 2020)

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs

@@ -181,6 +181,11 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Automatically cleared after triggering -> no need to unregister
+        /// </summary>
+        public event Action BeforeLevelLoading;
+
         public void LoadNewLevel()
         {
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) 
@@ -194,6 +199,9 @@ namespace Barotrauma
                 return;
             }
 
+            BeforeLevelLoading?.Invoke();
+            BeforeLevelLoading = null;
+
             if (Level.Loaded == null || Submarine.MainSub == null)
             {
                 LoadInitialLevel();

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CoOpMode.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Barotrauma
+{
+    class CoOpMode : MissionMode
+    {
+        public CoOpMode(GameModePreset preset, MissionPrefab missionPrefab) : base(preset, ValidateMissionPrefab(missionPrefab, MissionPrefab.CoOpMissionClasses)) { }
+
+        public CoOpMode(GameModePreset preset, MissionType missionType, string seed) : base(preset, ValidateMissionType(missionType, MissionPrefab.CoOpMissionClasses), seed) { }
+    }
+}

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/GameModePreset.cs

@@ -12,6 +12,7 @@ namespace Barotrauma
         public static GameModePreset MultiPlayerCampaign;
         public static GameModePreset Tutorial;
         public static GameModePreset Mission;
+        public static GameModePreset PvP;
         public static GameModePreset TestMode;
         public static GameModePreset Sandbox;
         public static GameModePreset DevSandbox;
@@ -51,7 +52,8 @@ namespace Barotrauma
             TestMode = new GameModePreset("testmode", typeof(TestGameMode), true);
 #endif
             Sandbox = new GameModePreset("sandbox", typeof(GameMode), false);
-            Mission = new GameModePreset("mission", typeof(MissionMode), false);
+            Mission = new GameModePreset("mission", typeof(CoOpMode), false);
+            PvP = new GameModePreset("pvp", typeof(PvPMode), false);
             MultiPlayerCampaign = new GameModePreset("multiplayercampaign", typeof(MultiPlayerCampaign), false, false);
         }
     }

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MissionMode.cs

@@ -1,6 +1,9 @@
-namespace Barotrauma
+using System;
+using System.Collections.Generic;
+
+namespace Barotrauma
 {
-    partial class MissionMode : GameMode
+    abstract partial class MissionMode : GameMode
     {
         private readonly Mission mission;
 
@@ -25,5 +28,29 @@
             Location[] locations = { GameMain.GameSession.StartLocation, GameMain.GameSession.EndLocation };
             mission = Mission.LoadRandom(locations, seed, false, missionType);
         }
+
+        protected static MissionPrefab ValidateMissionPrefab(MissionPrefab missionPrefab, Dictionary<MissionType, Type> missionClasses)
+        {
+            if (ValidateMissionType(missionPrefab.Type, missionClasses) != missionPrefab.Type)
+            {
+                throw new InvalidOperationException("Cannot start gamemode with mission type " + missionPrefab.Type);
+            }
+            return missionPrefab;
+        }
+
+        protected static MissionType ValidateMissionType(MissionType missionType, Dictionary<MissionType, Type> missionClasses)
+        {
+            var missionTypes = (MissionType[])Enum.GetValues(typeof(MissionType));
+            for (int i = 0; i < missionTypes.Length; i++)
+            {
+                var type = missionTypes[i];
+                if (type == MissionType.None || type == MissionType.All) { continue; }
+                if (!missionClasses.ContainsKey(type))
+                {
+                    missionType &= ~(type);
+                }
+            }
+            return missionType;
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -150,6 +150,9 @@ namespace Barotrauma
                     case "cargo":
                         CargoManager?.LoadPurchasedItems(subElement);
                         break;
+                    case "pets":
+                        petsElement = subElement;
+                        break;
 #if SERVER
                     case "availablesubs":
                         foreach (XElement availableSub in subElement.Elements())

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/PvPMode.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Barotrauma
+{
+    class PvPMode : MissionMode
+    {
+        public PvPMode(GameModePreset preset, MissionPrefab missionPrefab) : base(preset, ValidateMissionPrefab(missionPrefab, MissionPrefab.PvPMissionClasses)) { }
+
+        public PvPMode(GameModePreset preset, MissionType missionType, string seed) : base(preset, ValidateMissionType(missionType, MissionPrefab.PvPMissionClasses), seed) { }
+    }
+}