Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2025-04-10 10:37:09 -03:00
parent fdfc3a77f3 38cce0c933
commit 103871a4e9
296 changed files with 8420 additions and 2945 deletions
@@ -38,7 +38,7 @@ namespace Barotrauma
                }
            }

-            if (Submarine.MainSubs[1] is not null)
+            if (Submarine.MainSubs[1] is not null && GameMain.GameSession.GameMode is PvPMode)
            {
                foreach (var team2Perk in Team2Perks)
                {
@@ -703,70 +703,6 @@ namespace Barotrauma

            casualties.Clear();

-            GameAnalyticsManager.AddProgressionEvent(
-                GameAnalyticsManager.ProgressionStatus.Start,
-                GameMode?.Preset?.Identifier.Value ?? "none");
-
-            string eventId = "StartRound:" + (GameMode?.Preset?.Identifier.Value ?? "none") + ":";
-            GameAnalyticsManager.AddDesignEvent(eventId + "Submarine:" + (Submarine.MainSub?.Info?.Name ?? "none"));
-            GameAnalyticsManager.AddDesignEvent(eventId + "GameMode:" + (GameMode?.Preset?.Identifier.Value ?? "none"));
-            GameAnalyticsManager.AddDesignEvent(eventId + "CrewSize:" + (CrewManager?.GetCharacterInfos()?.Count() ?? 0));
-            foreach (Mission mission in missions)
-            {
-                GameAnalyticsManager.AddDesignEvent(eventId + "MissionType:" + (mission.Prefab.Type.ToString() ?? "none") + ":" + mission.Prefab.Identifier);
-            }
-            if (Level.Loaded != null)
-            {
-                Identifier levelId = (Level.Loaded.Type == LevelData.LevelType.Outpost ?
-                    Level.Loaded.StartOutpost?.Info?.OutpostGenerationParams?.Identifier :
-                    Level.Loaded.GenerationParams?.Identifier) ?? "null".ToIdentifier();
-                GameAnalyticsManager.AddDesignEvent(eventId + "LevelType:" + Level.Loaded.Type.ToString() + ":" + levelId);
-            }
-            GameAnalyticsManager.AddDesignEvent(eventId + "Biome:" + (Level.Loaded?.LevelData?.Biome?.Identifier.Value ?? "none"));
-#if CLIENT
-            if (GameMode is TutorialMode tutorialMode)
-            {
-                GameAnalyticsManager.AddDesignEvent(eventId + tutorialMode.Tutorial.Identifier);
-                if (GameMain.IsFirstLaunch)
-                {
-                    GameAnalyticsManager.AddDesignEvent("FirstLaunch:" + eventId + tutorialMode.Tutorial.Identifier);
-                }
-            }
-            GameAnalyticsManager.AddDesignEvent($"{eventId}HintManager:{(HintManager.Enabled ? "Enabled" : "Disabled")}");
-#endif
-            var campaignMode = GameMode as CampaignMode;
-            if (campaignMode != null)
-            {
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:RadiationEnabled:" + campaignMode.Settings.RadiationEnabled);
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:WorldHostility:" + campaignMode.Settings.WorldHostility);
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:ShowHuskWarning:" + campaignMode.Settings.ShowHuskWarning);
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:StartItemSet:" + campaignMode.Settings.StartItemSet);
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:MaxMissionCount:" + campaignMode.Settings.MaxMissionCount);
-                //log the multipliers as integers to reduce the number of distinct values
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:RepairFailMultiplier:" + (int)(campaignMode.Settings.RepairFailMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:FuelMultiplier:" + (int)(campaignMode.Settings.FuelMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:MissionRewardMultiplier:" + (int)(campaignMode.Settings.MissionRewardMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:CrewVitalityMultiplier:" + (int)(campaignMode.Settings.CrewVitalityMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:NonCrewVitalityMultiplier:" + (int)(campaignMode.Settings.NonCrewVitalityMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:OxygenMultiplier:" + (int)(campaignMode.Settings.OxygenMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:RepairFailMultiplier:" + (int)(campaignMode.Settings.RepairFailMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:ShipyardPriceMultiplier:" + (int)(campaignMode.Settings.ShipyardPriceMultiplier * 100));
-                GameAnalyticsManager.AddDesignEvent("CampaignSettings:ShopPriceMultiplier:" + (int)(campaignMode.Settings.ShopPriceMultiplier * 100));
-
-                bool firstTimeInBiome = Map != null && !Map.Connections.Any(c => c.Passed && c.Biome == LevelData!.Biome);
-                if (firstTimeInBiome)
-                {
-                    GameAnalyticsManager.AddDesignEvent(eventId + (Level.Loaded?.LevelData?.Biome?.Identifier.Value ?? "none") + "Discovered:Playtime", campaignMode.TotalPlayTime);
-                    GameAnalyticsManager.AddDesignEvent(eventId + (Level.Loaded?.LevelData?.Biome?.Identifier.Value ?? "none") + "Discovered:PassedLevels", campaignMode.TotalPassedLevels);
-                }
-                if (GameMain.NetworkMember?.ServerSettings is { } serverSettings)
-                {
-                    GameAnalyticsManager.AddDesignEvent("ServerSettings:RespawnMode:" + serverSettings.RespawnMode);
-                    GameAnalyticsManager.AddDesignEvent("ServerSettings:IronmanMode:" + serverSettings.IronmanModeActive);
-                    GameAnalyticsManager.AddDesignEvent("ServerSettings:AllowBotTakeoverOnPermadeath:" + serverSettings.AllowBotTakeoverOnPermadeath);
-                }
-            }
-
 #if DEBUG
            double startDuration = (DateTime.Now - startTime).TotalSeconds;
            if (startDuration < MinimumLoadingTime)
@@ -818,7 +754,11 @@ namespace Barotrauma

            GameMain.LuaCs.Hook.Call("roundStart");
            EnableEventLogNotificationIcon(enabled: false);
+
+            LogStartRoundStats();
+
 #endif
+            var campaignMode = GameMode as CampaignMode;
            if (campaignMode is { ItemsRelocatedToMainSub: true })
            {
 #if SERVER
@@ -1102,7 +1042,11 @@ namespace Barotrauma

 #if SERVER
            players = GameMain.Server.ConnectedClients.Select(c => c.Character).Where(c => c?.Info != null && !c.IsDead);
-            bots = crewManager.GetCharacters().Where(c => !c.IsRemotePlayer);
+            bots = crewManager.GetCharacterInfos()
+                //filter out players in case a player has been given control of a bot using console commands
+                .Where(characterInfo => GameMain.Server.ConnectedClients.None(c => c.CharacterInfo == characterInfo))
+                .Select(characterInfo => characterInfo.Character)
+                .NotNull();
 #elif CLIENT
            players = crewManager.GetCharacters().Where(static c => c.IsPlayer);
            bots = crewManager.GetCharacters().Where(static c => c.IsBot);
@@ -1124,7 +1068,7 @@ namespace Barotrauma
        private double LastEndRoundErrorMessageTime;
 #endif

-        public void EndRound(string endMessage, CampaignMode.TransitionType transitionType = CampaignMode.TransitionType.None, TraitorManager.TraitorResults? traitorResults = null)
+        public void EndRound(string endMessage, CampaignMode.TransitionType transitionType = CampaignMode.TransitionType.None, TraitorManager.TraitorResults? traitorResults = null, bool createRoundSummary = true)
        {
            RoundEnding = true;

@@ -1141,35 +1085,14 @@ namespace Barotrauma

                ImmutableHashSet<Character> crewCharacters = GetSessionCrewCharacters(CharacterType.Both);
                int prevMoney = GetAmountOfMoney(crewCharacters);
-                foreach (Mission mission in missions)
-                {
-                    mission.End();
-                }
+
+                EndMissions();

                foreach (Character character in crewCharacters)
                {
                    character.CheckTalents(AbilityEffectType.OnRoundEnd);
                }

-                if (missions.Any())
-                {
-                    if (missions.Any(m => m.Completed))
-                    {
-                        foreach (Character character in crewCharacters)
-                        {
-                            character.CheckTalents(AbilityEffectType.OnAnyMissionCompleted);
-                        }
-                    }
-
-                    if (missions.All(m => m.Completed))
-                    {
-                        foreach (Character character in crewCharacters)
-                        {
-                            character.CheckTalents(AbilityEffectType.OnAllMissionsCompleted);
-                        }
-                    }
-                }
-
                GameMain.LuaCs.Hook.Call("missionsEnded", missions);

 #if CLIENT
@@ -1186,7 +1109,10 @@ namespace Barotrauma

                GUI.PreventPauseMenuToggle = true;

-                if (GameMode is not TestGameMode && Screen.Selected == GameMain.GameScreen && RoundSummary != null && transitionType != CampaignMode.TransitionType.End)
+                if (createRoundSummary &&
+                    GameMode is not TestGameMode && 
+                    Screen.Selected == GameMain.GameScreen && RoundSummary != null && 
+                    transitionType != CampaignMode.TransitionType.End)
                {
                    GUI.ClearMessages();
                    GUIMessageBox.MessageBoxes.RemoveAll(mb => mb.UserData is RoundSummary);
@@ -1265,6 +1191,34 @@ namespace Barotrauma
            }
        }

+        public void EndMissions()
+        {
+            ImmutableHashSet<Character> crewCharacters = GetSessionCrewCharacters(CharacterType.Both);
+            foreach (Mission mission in missions)
+            {
+                mission.End();
+            }
+
+            if (missions.Any())
+            {
+                if (missions.Any(m => m.Completed))
+                {
+                    foreach (Character character in crewCharacters)
+                    {
+                        character.CheckTalents(AbilityEffectType.OnAnyMissionCompleted);
+                    }
+                }
+
+                if (missions.All(m => m.Completed))
+                {
+                    foreach (Character character in crewCharacters)
+                    {
+                        character.CheckTalents(AbilityEffectType.OnAllMissionsCompleted);
+                    }
+                }
+            }
+        }
+
        public static PerkCollection GetPerks()
        {
            if (GameMain.NetworkMember?.ServerSettings is not { } serverSettings)
@@ -1347,8 +1301,89 @@ namespace Barotrauma
            return true;
        }

+        private void LogStartRoundStats()
+        {
+#if !UNSTABLE
+            if (!GameAnalyticsManager.ShouldLogRandomSample())
+            {
+                return;
+            }
+#endif
+            GameAnalyticsManager.AddProgressionEvent(
+                GameAnalyticsManager.ProgressionStatus.Start,
+                GameMode?.Preset?.Identifier.Value ?? "none");
+
+            string eventId = "StartRound:" + (GameMode?.Preset?.Identifier.Value ?? "none") + ":";
+            GameAnalyticsManager.AddDesignEvent(eventId + "Submarine:" + (Submarine.MainSub?.Info?.Name ?? "none"));
+            GameAnalyticsManager.AddDesignEvent(eventId + "GameMode:" + (GameMode?.Preset?.Identifier.Value ?? "none"));
+            GameAnalyticsManager.AddDesignEvent(eventId + "CrewSize:" + (CrewManager?.GetCharacterInfos()?.Count() ?? 0));
+            foreach (Mission mission in missions)
+            {
+                GameAnalyticsManager.AddDesignEvent(eventId + "MissionType:" + (mission.Prefab.Type.ToString() ?? "none") + ":" + mission.Prefab.Identifier);
+            }
+            if (Level.Loaded != null)
+            {
+                Identifier levelId = (Level.Loaded.Type == LevelData.LevelType.Outpost ?
+                    Level.Loaded.StartOutpost?.Info?.OutpostGenerationParams?.Identifier :
+                    Level.Loaded.GenerationParams?.Identifier) ?? "null".ToIdentifier();
+                GameAnalyticsManager.AddDesignEvent(eventId + "LevelType:" + Level.Loaded.Type.ToString() + ":" + levelId);
+            }
+            GameAnalyticsManager.AddDesignEvent(eventId + "Biome:" + (Level.Loaded?.LevelData?.Biome?.Identifier.Value ?? "none"));
+#if CLIENT
+            if (GameMode is TutorialMode tutorialMode)
+            {
+                GameAnalyticsManager.AddDesignEvent(eventId + tutorialMode.Tutorial.Identifier);
+                if (GameMain.IsFirstLaunch)
+                {
+                    GameAnalyticsManager.AddDesignEvent("FirstLaunch:" + eventId + tutorialMode.Tutorial.Identifier);
+                }
+            }
+            GameAnalyticsManager.AddDesignEvent($"{eventId}HintManager:{(HintManager.Enabled ? "Enabled" : "Disabled")}");
+#endif
+            var campaignMode = GameMode as CampaignMode;
+            if (campaignMode != null)
+            {
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:RadiationEnabled:" + campaignMode.Settings.RadiationEnabled);
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:WorldHostility:" + campaignMode.Settings.WorldHostility);
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:ShowHuskWarning:" + campaignMode.Settings.ShowHuskWarning);
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:StartItemSet:" + campaignMode.Settings.StartItemSet);
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:MaxMissionCount:" + campaignMode.Settings.MaxMissionCount);
+                //log the multipliers as integers to reduce the number of distinct values
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:RepairFailMultiplier:" + (int)(campaignMode.Settings.RepairFailMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:FuelMultiplier:" + (int)(campaignMode.Settings.FuelMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:MissionRewardMultiplier:" + (int)(campaignMode.Settings.MissionRewardMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:CrewVitalityMultiplier:" + (int)(campaignMode.Settings.CrewVitalityMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:NonCrewVitalityMultiplier:" + (int)(campaignMode.Settings.NonCrewVitalityMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:OxygenMultiplier:" + (int)(campaignMode.Settings.OxygenMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:RepairFailMultiplier:" + (int)(campaignMode.Settings.RepairFailMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:ShipyardPriceMultiplier:" + (int)(campaignMode.Settings.ShipyardPriceMultiplier * 100));
+                GameAnalyticsManager.AddDesignEvent("CampaignSettings:ShopPriceMultiplier:" + (int)(campaignMode.Settings.ShopPriceMultiplier * 100));
+
+                bool firstTimeInBiome = Map != null && !Map.Connections.Any(c => c.Passed && c.Biome == LevelData!.Biome);
+                if (firstTimeInBiome)
+                {
+                    GameAnalyticsManager.AddDesignEvent(eventId + (Level.Loaded?.LevelData?.Biome?.Identifier.Value ?? "none") + "Discovered:Playtime", campaignMode.TotalPlayTime);
+                    GameAnalyticsManager.AddDesignEvent(eventId + (Level.Loaded?.LevelData?.Biome?.Identifier.Value ?? "none") + "Discovered:PassedLevels", campaignMode.TotalPassedLevels);
+                }
+                if (GameMain.NetworkMember?.ServerSettings is { } serverSettings)
+                {
+                    GameAnalyticsManager.AddDesignEvent("ServerSettings:RespawnMode:" + serverSettings.RespawnMode);
+                    GameAnalyticsManager.AddDesignEvent("ServerSettings:IronmanMode:" + serverSettings.IronmanModeActive);
+                    GameAnalyticsManager.AddDesignEvent("ServerSettings:AllowBotTakeoverOnPermadeath:" + serverSettings.AllowBotTakeoverOnPermadeath);
+                }
+            }
+
+        }
+
        public void LogEndRoundStats(string eventId, TraitorManager.TraitorResults? traitorResults = null)
        {
+#if !UNSTABLE
+            //only collect the stats from a random sample of round ends
+            if (!GameAnalyticsManager.ShouldLogRandomSample())
+            {
+                return;
+            }
+#endif
            if (Submarine.MainSub?.Info?.IsVanillaSubmarine() ?? false)
            {
                //don't log modded subs, that's a ton of extra data to collect
@@ -1405,7 +1440,8 @@ namespace Barotrauma
                GameAnalyticsManager.AddDesignEvent($"TraitorEvent:{traitorResults.Value.TraitorEventIdentifier}:{(traitorResults.Value.VotedCorrectTraitor ? "TraitorIdentifier" : "TraitorUnidentified")}");
            }

-            foreach (Character c in GetSessionCrewCharacters(CharacterType.Both))
+            //disabled to reduce the amount of data we collect through GA
+            /*foreach (Character c in GetSessionCrewCharacters(CharacterType.Both))
            {
                foreach (var itemSelectedDuration in c.ItemSelectedDurations)
                {
@@ -1420,7 +1456,7 @@ namespace Barotrauma
                    }
                    GameAnalyticsManager.AddDesignEvent("TimeSpentOnDevices:" + (GameMode?.Preset?.Identifier.Value ?? "none") + ":" + characterType + ":" + (c.Info?.Job?.Prefab.Identifier.Value ?? "NoJob") + ":" + itemSelectedDuration.Key.Identifier, itemSelectedDuration.Value);
                }
-            }
+            }*/
 #if CLIENT
            if (GameMode is TutorialMode tutorialMode)
            {
@@ -1430,15 +1466,17 @@ namespace Barotrauma
                    GameAnalyticsManager.AddDesignEvent("FirstLaunch:" + eventId + tutorialMode.Tutorial.Identifier);
                }
            }
-            GameAnalyticsManager.AddDesignEvent(eventId + "TimeSpentCleaning", TimeSpentCleaning);
-            GameAnalyticsManager.AddDesignEvent(eventId + "TimeSpentPainting", TimeSpentPainting);
+            //disabled to reduce the amount of data we collect through GA
+            //GameAnalyticsManager.AddDesignEvent(eventId + "TimeSpentCleaning", TimeSpentCleaning);
+            //GameAnalyticsManager.AddDesignEvent(eventId + "TimeSpentPainting", TimeSpentPainting);
            TimeSpentCleaning = TimeSpentPainting = 0.0;
 #endif
        }

        public void KillCharacter(Character character)
        {
-            if (CrewManager != null && CrewManager.GetCharacters().Contains(character))
+            if (CrewManager != null && 
+                CrewManager.GetCharacterInfos().Contains(character.Info))
            {
                casualties.Add(character);
            }
@@ -1542,6 +1580,8 @@ namespace Barotrauma

            rootElement.Add(new XAttribute("nextleveltype", campaign.NextLevel?.Type ?? LevelData?.Type ?? LevelData.LevelType.Outpost));

+            rootElement.Add(new XAttribute("ismultiplayer", campaign is MultiPlayerCampaign));
+
            LastSaveVersion = GameMain.Version;
            rootElement.Add(new XAttribute("version", GameMain.Version));
            if (Submarine?.Info != null && !Submarine.Removed && Campaign != null)