v1.0.20.1 (summer patch)

2023-06-15 16:46:54 +03:00
parent 6acac1d143
commit 83de72e3d2
209 changed files with 4497 additions and 2488 deletions
@@ -15,6 +15,8 @@ namespace Barotrauma
        [Serialize(false, IsPropertySaveable.Yes)]
        public bool AddToCrew { get; set; }

+
+
        [Serialize(false, IsPropertySaveable.Yes)]
        public bool RemoveFromCrew { get; set; }

@@ -38,6 +40,8 @@ namespace Barotrauma
        {
            if (isFinished) { return; }

+            bool isPlayerTeam = TeamID == CharacterTeamType.Team1 || TeamID == CharacterTeamType.Team2;
+
            affectedNpcs = ParentEvent.GetTargets(NPCTag).Where(c => c is Character).Select(c => c as Character).ToList();
            foreach (var npc in affectedNpcs)
            {
@@ -49,9 +53,13 @@ namespace Barotrauma
                    if (idCard != null)
                    {
                        idCard.TeamID = TeamID;
+                        if (isPlayerTeam)
+                        {
+                            idCard.SubmarineSpecificID = 0;
+                        }
                    }
                }
-                if (AddToCrew && (TeamID == CharacterTeamType.Team1 || TeamID == CharacterTeamType.Team2))
+                if (AddToCrew && isPlayerTeam)
                {
                    npc.Info.StartItemsGiven = true;
                    GameMain.GameSession.CrewManager.AddCharacter(npc);