(7ee8dbc11) v0.9.8.0

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/CombatMission.cs

@@ -44,6 +44,11 @@ namespace Barotrauma
             }
         }
 
+        public override int TeamCount
+        {
+            get { return 2; }
+        }
+
         public CombatMission(MissionPrefab prefab, Location[] locations)
             : base(prefab, locations)
         {
@@ -113,7 +118,7 @@ namespace Barotrauma
             {
                 for (int i = 0; i < 2; i++)
                 {
-                    if (wifiComponent.Item.Submarine == subs[i] || subs[i].DockedTo.Contains(wifiComponent.Item.Submarine))
+                    if (wifiComponent.Item.Submarine == subs[i] || subs[i].ConnectedDockingPorts.ContainsKey(wifiComponent.Item.Submarine))
                     {
                         wifiComponent.TeamID = subs[i].TeamID;
                     }

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs

@@ -74,6 +74,11 @@ namespace Barotrauma
             get { return true; }
         }
 
+        public virtual int TeamCount
+        {
+            get { return 1; }
+        }
+
         public virtual IEnumerable<Vector2> SonarPositions
         {
             get { return Enumerable.Empty<Vector2>(); }
@@ -136,7 +141,7 @@ namespace Barotrauma
             }
             else
             {
-                allowedMissions.AddRange(MissionPrefab.List.Where(m => ((int)(missionType & m.type)) != 0));
+                allowedMissions.AddRange(MissionPrefab.List.Where(m => ((int)(missionType & m.Type)) != 0));
             }
 
             allowedMissions.RemoveAll(m => isSinglePlayer ? m.MultiplayerOnly : m.SingleplayerOnly);            
@@ -168,10 +173,9 @@ namespace Barotrauma
 
         public virtual void Update(float deltaTime) { }
 
-        public virtual bool AssignTeamIDs(List<Networking.Client> clients)
+        public virtual void AssignTeamIDs(List<Networking.Client> clients)
         {
             clients.ForEach(c => c.TeamID = Character.TeamType.Team1);
-            return false; 
         }
 
         protected void ShowMessage(int missionState)

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/MissionPrefab.cs

@@ -31,7 +31,7 @@ namespace Barotrauma
         
         private readonly ConstructorInfo constructor;
 
-        public readonly MissionType type;
+        public readonly MissionType Type;
 
         public readonly bool MultiplayerOnly, SingleplayerOnly;
 
@@ -154,18 +154,18 @@ namespace Barotrauma
             }
 
             string missionTypeName = element.GetAttributeString("type", "");
-            if (!Enum.TryParse(missionTypeName, out type))
+            if (!Enum.TryParse(missionTypeName, out Type))
             {
                 DebugConsole.ThrowError("Error in mission prefab \"" + Name + "\" - \"" + missionTypeName + "\" is not a valid mission type.");
                 return;
             }
-            if (type == MissionType.None)
+            if (Type == MissionType.None)
             {
                 DebugConsole.ThrowError("Error in mission prefab \"" + Name + "\" - mission type cannot be none.");
                 return;
             }
 
-            constructor = missionClasses[type].GetConstructor(new[] { typeof(MissionPrefab), typeof(Location[]) });
+            constructor = missionClasses[Type].GetConstructor(new[] { typeof(MissionPrefab), typeof(Location[]) });
 
             InitProjSpecific(element);
         }
@@ -189,7 +189,7 @@ namespace Barotrauma
 
             return false;
         }
-        
+
         public Mission Instantiate(Location[] locations)
         {
             return constructor?.Invoke(new object[] { this, locations }) as Mission;

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/MonsterMission.cs

@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System;
-using System.Xml.Linq;
-using Barotrauma.Extensions;
-using Barotrauma.Networking;
 
 namespace Barotrauma
 {
@@ -113,7 +110,25 @@ namespace Barotrauma
 
         private void InitializeMonsters(IEnumerable<Character> monsters)
         {
-            monsters.ForEach(m => m.Enabled = false);
+            foreach (var monster in monsters)
+            {
+                monster.Enabled = false;
+                if (monster.Params.AI.EnforceAggressiveBehaviorForMissions)
+                {
+                    foreach (var targetParam in monster.Params.AI.Targets)
+                    {
+                        switch (targetParam.State)
+                        {
+                            case AIState.Avoid:
+                            case AIState.Escape:
+                            case AIState.Flee:
+                            case AIState.PassiveAggressive:
+                                targetParam.State = AIState.Attack;
+                                break;
+                        }
+                    }
+                }
+            }
             SwarmBehavior.CreateSwarm(monsters.Cast<AICharacter>());
             foreach (Character monster in monsters)
             {
@@ -191,7 +206,10 @@ namespace Barotrauma
             completed = true;
         }
 
-        public bool IsEliminated(Character enemy) => enemy.Removed || enemy.IsDead || enemy.AIController is EnemyAIController ai && ai.State == AIState.Flee;
-
+        public bool IsEliminated(Character enemy) =>
+            enemy == null ||
+            enemy.Removed || 
+            enemy.IsDead || 
+            enemy.AIController is EnemyAIController ai && ai.State == AIState.Flee;
     }
 }