Unstable 0.1400.1.0

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

@@ -303,9 +303,15 @@ namespace Barotrauma
 
         private bool IsValidTarget(Entity e)
         {
-            return 
-                e is Character character && !character.Removed && !character.IsDead && !character.IsIncapacitated &&
+            bool isValid = e is Character character && !character.Removed && !character.IsDead && !character.IsIncapacitated &&
                 (e == Character.Controlled || character.IsRemotePlayer);
+#if SERVER
+            UpdateIgnoredClients();
+            isValid &= !ignoredClients.Keys.Any(c => c.Character == e);
+#elif CLIENT
+            isValid &= (e != Character.Controlled || !GUI.InputBlockingMenuOpen);
+#endif
+            return isValid;
         }
 
         private void TryStartConversation(Character speaker, Character targetCharacter = null)
@@ -348,7 +354,7 @@ namespace Barotrauma
             {
                 ParentEvent.AddTarget(InvokerTag, targetCharacter);
             }
-            
+
             ShowDialog(speaker, targetCharacter);
 
             dialogOpened = true;

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

@@ -14,6 +14,18 @@ namespace Barotrauma
         [Serialize("", true)]
         public string MissionTag { get; set; }
 
+        [Serialize("", true, description: "The type of the location the mission will be unlocked in (if empty, any location can be selected).")]
+        public string LocationType { get; set; }
+
+        [Serialize(0, true, description: "Minimum distance to the location the mission is unlocked in (1 = one path between locations).")]
+        public int MinLocationDistance { get; set; }
+
+        [Serialize(true, true, description: "If true, the mission has to be unlocked in a location further on the campaign map.")]
+        public bool UnlockFurtherOnMap { get; set; }
+
+        [Serialize(false, true, description: "If true, a suitable location is forced on the map if one isn't found.")]
+        public bool CreateLocationIfNotFound { get; set; }
+
         private bool isFinished;
 
         public MissionAction(ScriptedEvent parentEvent, XElement element) : base(parentEvent, element)
@@ -44,33 +56,82 @@ namespace Barotrauma
             if (GameMain.GameSession.GameMode is CampaignMode campaign)
             {
                 MissionPrefab prefab = null;
-                if (!string.IsNullOrEmpty(MissionIdentifier))
+                var unlockLocation = FindUnlockLocation();
+                if (unlockLocation == null && CreateLocationIfNotFound)
                 {
-                    prefab = campaign.Map.CurrentLocation.UnlockMissionByIdentifier(MissionIdentifier);                    
-                }
-                else if (!string.IsNullOrEmpty(MissionTag))
-                {
-                    prefab = campaign.Map.CurrentLocation.UnlockMissionByTag(MissionTag);
-                }
-                if (campaign is MultiPlayerCampaign mpCampaign)
-                {
-                    mpCampaign.LastUpdateID++;
+                    //find an empty location at least 3 steps away, further on the map
+                    var emptyLocation = FindUnlockLocationRecursive(campaign.Map.CurrentLocation, Math.Max(MinLocationDistance, 3), "none", true, new HashSet<Location>());
+                    if (emptyLocation != null)
+                    {
+                        emptyLocation.ChangeType(Barotrauma.LocationType.List.Find(lt => lt.Identifier.Equals(LocationType, StringComparison.OrdinalIgnoreCase)));
+                        unlockLocation = emptyLocation;
+                    }
                 }
 
-                if (prefab != null)
+                if (unlockLocation != null)
                 {
-#if CLIENT
-                    new GUIMessageBox(string.Empty, TextManager.GetWithVariable("missionunlocked", "[missionname]", prefab.Name), 
-                        new string[0], type: GUIMessageBox.Type.InGame, icon: prefab.Icon, relativeSize: new Vector2(0.3f, 0.15f), minSize: new Point(512, 128))
+                    if (!string.IsNullOrEmpty(MissionIdentifier))
                     {
-                        IconColor = prefab.IconColor
-                    };
-#else
-                    NotifyMissionUnlock(prefab);
-#endif
+                        prefab = unlockLocation.UnlockMissionByIdentifier(MissionIdentifier);                    
+                    }
+                    else if (!string.IsNullOrEmpty(MissionTag))
+                    {
+                        prefab = unlockLocation.UnlockMissionByTag(MissionTag);
+                    }
+                    if (campaign is MultiPlayerCampaign mpCampaign)
+                    {
+                        mpCampaign.LastUpdateID++;
+                    }
+                    if (prefab != null)
+                    {
+                        DebugConsole.NewMessage($"Unlocked mission \"{prefab.Name}\" in the location \"{unlockLocation.Name}\".");
+    #if CLIENT
+                        new GUIMessageBox(string.Empty, TextManager.GetWithVariable("missionunlocked", "[missionname]", prefab.Name), 
+                            new string[0], type: GUIMessageBox.Type.InGame, icon: prefab.Icon, relativeSize: new Vector2(0.3f, 0.15f), minSize: new Point(512, 128))
+                        {
+                            IconColor = prefab.IconColor
+                        };
+    #else
+                        NotifyMissionUnlock(prefab);
+    #endif
+                    }
+                }
+                else
+                {
+                    DebugConsole.AddWarning($"Failed to find a suitable location to unlock a mission in (LocationType: {LocationType}, MinLocationDistance: {MinLocationDistance}, UnlockFurtherOnMap: {UnlockFurtherOnMap})");
                 }
             }
-            isFinished = true;            
+            isFinished = true;
+        }
+
+        private Location FindUnlockLocation()
+        {
+            var campaign = GameMain.GameSession.GameMode as CampaignMode;
+            if (string.IsNullOrEmpty(LocationType) && MinLocationDistance <= 1)
+            {
+                return campaign.Map.CurrentLocation;
+            }
+
+            return FindUnlockLocationRecursive(campaign.Map.CurrentLocation, 0, LocationType, UnlockFurtherOnMap, new HashSet<Location>());
+        }
+
+        private Location FindUnlockLocationRecursive(Location currLocation, int currDistance, string locationType, bool unlockFurtherOnMap, HashSet<Location> checkedLocations)
+        {
+            var campaign = GameMain.GameSession.GameMode as CampaignMode;
+            if (currLocation.Type.Identifier.Equals(locationType, StringComparison.OrdinalIgnoreCase) && currDistance >= MinLocationDistance &&
+                (!unlockFurtherOnMap || currLocation.MapPosition.X > campaign.Map.CurrentLocation.MapPosition.X))
+            {
+                return currLocation;
+            }
+            checkedLocations.Add(currLocation);
+            foreach (LocationConnection connection in currLocation.Connections)
+            {
+                var otherLocation = connection.OtherLocation(currLocation);
+                if (checkedLocations.Contains(otherLocation)) { continue; }
+                var unlockLocation = FindUnlockLocationRecursive(otherLocation, ++currDistance, locationType, unlockFurtherOnMap, checkedLocations);
+                if (unlockLocation != null) { return unlockLocation; }
+            }
+            return null;
         }
 
         public override string ToDebugString()
@@ -84,8 +145,8 @@ namespace Barotrauma
             foreach (Client client in GameMain.Server.ConnectedClients)
             {
                 IWriteMessage outmsg = new WriteOnlyMessage();
-                outmsg.Write((byte) ServerPacketHeader.EVENTACTION);
-                outmsg.Write((byte) EventManager.NetworkEventType.MISSION);
+                outmsg.Write((byte)ServerPacketHeader.EVENTACTION);
+                outmsg.Write((byte)EventManager.NetworkEventType.MISSION);
                 outmsg.Write(prefab.Identifier);
                 GameMain.Server.ServerPeer.Send(outmsg, client.Connection, DeliveryMethod.Reliable);
             }

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

@@ -41,9 +41,14 @@ namespace Barotrauma
                     foreach (Item item in npc.Inventory.AllItems)
                     {
                         item.AllowStealing = true;
+                        var wifiComponent = item.GetComponent<Items.Components.WifiComponent>();
+                        if (wifiComponent != null)
+                        {
+                            wifiComponent.TeamID = newTeam;
+                        }
                     }
 #if SERVER
-                    GameMain.NetworkMember.CreateEntityEvent(npc, new object[] { NetEntityEvent.Type.AddToCrew });
+                    GameMain.NetworkMember.CreateEntityEvent(npc, new object[] { NetEntityEvent.Type.AddToCrew, newTeam, npc.Inventory.AllItems.Select(it => it.ID).ToArray() });
 #endif
                 }
             }

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

@@ -15,7 +15,8 @@ namespace Barotrauma
             Outpost,
             MainPath,
             Ruin,
-            Wreck
+            Wreck,
+            BeaconStation
         }
 
         [Serialize("", true, description: "Species name of the character to spawn.")]
@@ -225,6 +226,7 @@ namespace Barotrauma
                     SpawnLocationType.Outpost => Item.ItemList.FindAll(it => it.Submarine != null && it.Submarine.Info.IsOutpost),
                     SpawnLocationType.Wreck => Item.ItemList.FindAll(it => it.Submarine != null && it.Submarine.Info.IsWreck),
                     SpawnLocationType.Ruin => Item.ItemList.FindAll(it => it.ParentRuin != null),
+                    SpawnLocationType.BeaconStation => Item.ItemList.FindAll(it => it.Submarine != null && it.Submarine.Info.IsBeacon),
                     _ => throw new NotImplementedException()
                 };
 
@@ -250,6 +252,7 @@ namespace Barotrauma
                 SpawnLocationType.Outpost => WayPoint.WayPointList.FindAll(wp => wp.Submarine != null && wp.CurrentHull != null && wp.Submarine.Info.IsOutpost),
                 SpawnLocationType.Wreck => WayPoint.WayPointList.FindAll(wp => wp.Submarine != null && wp.Submarine.Info.IsWreck),
                 SpawnLocationType.Ruin => WayPoint.WayPointList.FindAll(wp => wp.ParentRuin != null),
+                SpawnLocationType.BeaconStation => WayPoint.WayPointList.FindAll(wp => wp.Submarine != null && wp.Submarine.Info.IsBeacon),
                 _ => throw new NotImplementedException()
             };
 

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

@@ -51,7 +51,14 @@ namespace Barotrauma
             {
                 foreach (var target in targets)
                 {
-                    effect.Apply(effect.type, deltaTime, target, target as ISerializableEntity);
+                    if (target is Item targetItem)
+                    {
+                        effect.Apply(effect.type, deltaTime, target, targetItem.AllPropertyObjects);
+                    }
+                    else
+                    {
+                        effect.Apply(effect.type, deltaTime, target, target as ISerializableEntity);
+                    }
                 }
             }
 #if SERVER

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

@@ -124,7 +124,7 @@ namespace Barotrauma
                                     npc.CampaignInteractionType = CampaignMode.InteractionType.Examine;
 #if CLIENT
                                     npc.SetCustomInteract(
-                                        Trigger,
+                                        (speaker, player) => { if (e1 == speaker) { Trigger(speaker, player); } else { Trigger(player, speaker); } },
                                         TextManager.GetWithVariable("CampaignInteraction.Examine", "[key]", GameMain.Config.KeyBindText(InputType.Use)));
 #else
                                     npc.SetCustomInteract(