Faction Test v1.0.1.0

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/MissionAction.cs

@@ -1,5 +1,4 @@
 using Barotrauma.Extensions;
-using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -8,7 +7,7 @@ using System.Linq;
 
 namespace Barotrauma
 {
-    class MissionAction : EventAction
+    partial class MissionAction : EventAction
     {
         [Serialize("", IsPropertySaveable.Yes)]
         public Identifier MissionIdentifier { get; set; }
@@ -106,7 +105,8 @@ namespace Barotrauma
                             IconColor = unlockedMission.Prefab.IconColor
                         };
 #else
-                        NotifyMissionUnlock(unlockedMission, unlockLocation);
+                        missionsUnlockedThisRound.Add(unlockedMission);
+                        NotifyMissionUnlock(unlockedMission);
 #endif
                     }
                 }
@@ -186,21 +186,5 @@ namespace Barotrauma
         {
             return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(MissionAction)} -> ({(MissionIdentifier.IsEmpty ? MissionTag : MissionIdentifier)})";
         }
-
-#if SERVER
-        private static void NotifyMissionUnlock(Mission mission, Location unlockLocation)
-        {
-            foreach (Client client in GameMain.Server.ConnectedClients)
-            {
-                IWriteMessage outmsg = new WriteOnlyMessage();
-                outmsg.WriteByte((byte)ServerPacketHeader.EVENTACTION);
-                outmsg.WriteByte((byte)EventManager.NetworkEventType.MISSION);
-                outmsg.WriteIdentifier(mission.Prefab.Identifier);
-                outmsg.WriteInt32(GameMain.GameSession?.Map?.Locations.IndexOf(unlockLocation) ?? -1);
-                outmsg.WriteString(mission.Name.Value);
-                GameMain.Server.ServerPeer.Send(outmsg, client.Connection, DeliveryMethod.Reliable);
-            }
-        }
-#endif
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/ModifyLocationAction.cs

@@ -69,8 +69,8 @@ namespace Barotrauma
                         {
                             DebugConsole.ThrowError($"Error in ModifyLocationAction ({ParentEvent.Prefab.Identifier}): could not find a location type with the identifier \"{Type}\".");
                         }
-                        else
-                        {
+                        else if (!location.LocationTypeChangesBlocked)
+                        {                           
                             location.ChangeType(campaign, locationType);
                         }
                     }

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/RemoveItemAction.cs

@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
+using System.Collections.Immutable;
 
 namespace Barotrauma
 {
@@ -11,17 +9,20 @@ namespace Barotrauma
         public Identifier TargetTag { get; set; }
 
         [Serialize("", IsPropertySaveable.Yes)]
-        public Identifier ItemIdentifier { get; set; }
+        public string ItemIdentifiers { get; set; }
 
         [Serialize(1, IsPropertySaveable.Yes)]
         public int Amount { get; set; }
 
-        public RemoveItemAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) 
-        { 
-            if (ItemIdentifier.IsEmpty)
+        private readonly ImmutableHashSet<Identifier> itemIdentifierSplit;
+
+        public RemoveItemAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element)
+        {
+            if (string.IsNullOrEmpty(ItemIdentifiers))
             {
-                ItemIdentifier = element.GetAttributeIdentifier("itemidentifiers", element.GetAttributeIdentifier("identifier", Identifier.Empty));
+                ItemIdentifiers = element.GetAttributeString("itemidentifier", element.GetAttributeString("identifier", string.Empty));
             }
+            itemIdentifierSplit = ItemIdentifiers.Split(',').ToIdentifiers().ToImmutableHashSet();
         }
 
         private bool isFinished = false;
@@ -62,7 +63,7 @@ namespace Barotrauma
                         var item = inventory.FindItem(it => 
                             it != null && 
                             !removedItems.Contains(it) &&
-                            (ItemIdentifier.IsEmpty || it.Prefab.Identifier == ItemIdentifier), recursive: true);
+                            (itemIdentifierSplit.Count == 0 || itemIdentifierSplit.Contains(it.Prefab.Identifier)), recursive: true);
                         if (item == null) { break; }
                         Entity.Spawner.AddItemToRemoveQueue(item);
                         removedItems.Add(item);
@@ -70,7 +71,7 @@ namespace Barotrauma
                 }
                 else if (target is Item item)
                 {
-                    if (ItemIdentifier.IsEmpty || item.Prefab.Identifier == ItemIdentifier)
+                    if (itemIdentifierSplit.Count == 0 || itemIdentifierSplit.Contains(item.Prefab.Identifier))
                     {
                         Entity.Spawner.AddItemToRemoveQueue(item);
                         removedItems.Add(item);

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/SpawnAction.cs

@@ -93,7 +93,13 @@ namespace Barotrauma
         {
             ignoreSpawnPointType = element.GetAttribute("spawnpointtype") == null;
             //backwards compatibility
-            TeamID = element.GetAttributeEnum("teamtag", element.GetAttributeEnum<CharacterTeamType>("team", TeamID));
+            TeamID = element.GetAttributeEnum("teamtag", element.GetAttributeEnum("team", TeamID));
+            if (element.GetAttribute("submarinetype") != null)
+            {
+                DebugConsole.ThrowError(
+                    $"Error in even \"{(parentEvent.Prefab?.Identifier.ToString() ?? "unknown")}\". " +
+                    $"The attribute \"submarinetype\" is not valid in {nameof(SpawnAction)}. Did you mean {nameof(SpawnLocation)}?");
+            }
         }
 
         public override bool IsFinished(ref string goTo)
@@ -320,30 +326,24 @@ namespace Barotrauma
         public static WayPoint GetSpawnPos(SpawnLocationType spawnLocation, SpawnType? spawnPointType, IEnumerable<Identifier> moduleFlags = null, IEnumerable<Identifier> spawnpointTags = null, bool asFarAsPossibleFromAirlock = false, bool requireTaggedSpawnPoint = false)
         {
             bool requireHull = spawnLocation == SpawnLocationType.MainSub || spawnLocation == SpawnLocationType.Outpost;
-            List<WayPoint> potentialSpawnPoints = WayPoint.WayPointList.FindAll(wp => IsValidSubmarineType(spawnLocation, wp.Submarine) && (wp.CurrentHull != null || !requireHull));
-            
-            potentialSpawnPoints = potentialSpawnPoints.FindAll(wp => wp.ConnectedDoor == null && wp.Ladders == null && !wp.isObstructed);
-
+            List<WayPoint> potentialSpawnPoints = WayPoint.WayPointList.FindAll(wp => IsValidSubmarineType(spawnLocation, wp.Submarine) && (wp.CurrentHull != null || !requireHull));           
+            potentialSpawnPoints = potentialSpawnPoints.FindAll(wp => wp.ConnectedDoor == null && wp.Ladders == null && wp.IsTraversable);
             if (moduleFlags != null && moduleFlags.Any())
             {
-                List<WayPoint> spawnPoints = potentialSpawnPoints.Where(wp => wp.CurrentHull?.OutpostModuleTags.Any(moduleFlags.Contains) ?? false).ToList();
+                var spawnPoints = potentialSpawnPoints.Where(wp => wp.CurrentHull is Hull h && h.OutpostModuleTags.Any(moduleFlags.Contains));
                 if (spawnPoints.Any())
                 {
-                    potentialSpawnPoints = spawnPoints;
+                    potentialSpawnPoints = spawnPoints.ToList();
                 }
             }
-
             if (spawnpointTags != null && spawnpointTags.Any())
             {
-                var spawnPoints = potentialSpawnPoints
-                    .Where(wp => spawnpointTags.Any(tag => wp.Tags.Contains(tag) && wp.ConnectedDoor == null && !wp.isObstructed));
-
+                var spawnPoints = potentialSpawnPoints.Where(wp => spawnpointTags.Any(tag => wp.Tags.Contains(tag) && wp.ConnectedDoor == null && wp.IsTraversable));
                 if (requireTaggedSpawnPoint || spawnPoints.Any())
                 {
                     potentialSpawnPoints = spawnPoints.ToList();
                 }
             }
-
             if (potentialSpawnPoints.None())
             {
                 if (requireTaggedSpawnPoint && spawnpointTags != null && spawnpointTags.Any())

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/TagAction.cs

@@ -119,12 +119,12 @@ namespace Barotrauma
 
         private void TagItemsByIdentifier(Identifier identifier)
         {
-            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && SubmarineTypeMatches(it.Submarine) && it.Prefab.Identifier == identifier);
+            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && IsValidItem(it) && it.Prefab.Identifier == identifier);
         }
 
         private void TagItemsByTag(Identifier tag)
         {
-            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && SubmarineTypeMatches(it.Submarine) && it.HasTag(tag));
+            ParentEvent.AddTargetPredicate(Tag, e => e is Item it && IsValidItem(it) && it.HasTag(tag));
         }
 
         private void TagHullsByName(Identifier name)
@@ -137,6 +137,11 @@ namespace Barotrauma
             ParentEvent.AddTargetPredicate(Tag, e => e is Submarine s && SubmarineTypeMatches(s) && (type.IsEmpty || type == s.Info?.Type.ToIdentifier()));
         }
 
+        private bool IsValidItem(Item it)
+        {
+            return !it.HiddenInGame && SubmarineTypeMatches(it.Submarine);
+        }
+
         private bool SubmarineTypeMatches(Submarine sub)
         {
             if (SubmarineType == SubType.Any) { return true; }

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/UIHighlightAction.cs

@@ -19,7 +19,9 @@ partial class UIHighlightAction : EventAction
         TurbineOutputSlider,
         DeconstructButton,
         RechargeSpeedSlider,
-        CPRButton
+        CPRButton,
+        CloseButton,
+        MessageBoxCloseButton
     }
 
     [Serialize(ElementId.None, IsPropertySaveable.Yes)]