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

2022-02-24 14:30:39 -03:00
parent db7a6a0bea 102e089aa6
commit 6340304ae4
364 changed files with 10838 additions and 3966 deletions
@@ -78,10 +78,19 @@ namespace Barotrauma
        //there can be no events before this time has passed during the 1st campaign round
        const float FirstRoundEventDelay = 0.0f;

-        public enum InteractionType { None, Talk, Examine, Map, Crew, Store, Repair, Upgrade, PurchaseSub }
+        public double TotalPlayTime;
+        public int TotalPassedLevels;
+
+        public enum InteractionType { None, Talk, Examine, Map, Crew, Store, Repair, Upgrade, PurchaseSub, MedicalClinic, Cargo }
+
+        public static bool BlocksInteraction(InteractionType interactionType)
+        {
+            return interactionType != InteractionType.None && interactionType != InteractionType.Cargo;
+        }

        public readonly CargoManager CargoManager;
        public UpgradeManager UpgradeManager;
+        public MedicalClinic MedicalClinic;

        public List<Faction> Factions;

@@ -91,7 +100,7 @@ namespace Barotrauma

        public CampaignSettings Settings;

-        private List<Mission> extraMissions = new List<Mission>();
+        private readonly List<Mission> extraMissions = new List<Mission>();

        public enum TransitionType
        {
@@ -176,6 +185,7 @@ namespace Barotrauma
        {
            Money = InitialMoney;
            CargoManager = new CargoManager(this);
+            MedicalClinic = new MedicalClinic(this);
        }

        /// <summary>
@@ -688,11 +698,13 @@ namespace Barotrauma

            GameAnalyticsManager.AddProgressionEvent(
                GameAnalyticsManager.ProgressionStatus.Complete,
-                Name ?? "none");
+                Preset?.Identifier ?? "none");
            string eventId = "FinishCampaign:";
            GameAnalyticsManager.AddDesignEvent(eventId + "Submarine:" + (Submarine.MainSub?.Info?.Name ?? "none"));
            GameAnalyticsManager.AddDesignEvent(eventId + "CrewSize:" + (CrewManager?.CharacterInfos?.Count() ?? 0));
-            GameAnalyticsManager.AddDesignEvent(eventId + "Money", Money);            
+            GameAnalyticsManager.AddDesignEvent(eventId + "Money", Money);
+            GameAnalyticsManager.AddDesignEvent(eventId + "Playtime", TotalPlayTime);
+            GameAnalyticsManager.AddDesignEvent(eventId + "PassedLevels", TotalPassedLevels);
        }

        protected virtual void EndCampaignProjSpecific() { }
@@ -705,12 +717,14 @@ namespace Barotrauma
            location.RemoveHireableCharacter(characterInfo);
            CrewManager.AddCharacterInfo(characterInfo);
            Money -= characterInfo.Salary;
+            GameAnalyticsManager.AddMoneySpentEvent(characterInfo.Salary, GameAnalyticsManager.MoneySink.Crew, characterInfo.Job?.Prefab.Identifier ?? "unknown");
            return true;
        }

        private void NPCInteract(Character npc, Character interactor)
        {
            if (!npc.AllowCustomInteract) { return; }
+            GameAnalyticsManager.AddDesignEvent("CampaignInteraction:" + Preset.Identifier + ":" + npc.CampaignInteractionType);
            NPCInteractProjSpecific(npc, interactor);
            string coroutineName = "DoCharacterWait." + (npc?.ID ?? Entity.NullEntityID);
            if (!CoroutineManager.IsCoroutineRunning(coroutineName))
@@ -874,6 +888,19 @@ namespace Barotrauma
        }

        public abstract void Save(XElement element);
+
+        protected void LoadStats(XElement element)
+        {
+            TotalPlayTime = element.GetAttributeDouble(nameof(TotalPlayTime).ToLowerInvariant(), 0);
+            TotalPassedLevels = element.GetAttributeInt(nameof(TotalPassedLevels).ToLowerInvariant(), 0);
+        }
+
+        protected XElement SaveStats()
+        {
+            return new XElement("stats", 
+                new XAttribute(nameof(TotalPlayTime).ToLowerInvariant(), TotalPlayTime), 
+                new XAttribute(nameof(TotalPassedLevels).ToLowerInvariant(), TotalPassedLevels));
+        }
        
        public void LogState()
        {
@@ -126,6 +126,10 @@ namespace Barotrauma
                {
                    case "campaignsettings":
                        Settings = new CampaignSettings(subElement);
+#if CLIENT
+                        GameMain.NetworkMember.ServerSettings.MaxMissionCount = Settings.MaxMissionCount;
+                        GameMain.NetworkMember.ServerSettings.RadiationEnabled = Settings.RadiationEnabled;
+#endif
                        break;
                    case "map":
                        if (map == null)
@@ -159,6 +163,9 @@ namespace Barotrauma
                    case "pets":
                        petsElement = subElement;
                        break;
+                    case "stats":
+                        LoadStats(subElement);
+                        break;
 #if SERVER
                    case "savedexperiencepoints":
                        foreach (XElement savedExp in subElement.Elements())
@@ -192,6 +199,37 @@ namespace Barotrauma
            }
 #endif
        }
+        
+        
+        public static List<SubmarineInfo> GetCampaignSubs()
+        {
+            bool isSubmarineVisible(SubmarineInfo s)
+                => !GameMain.NetworkMember.ServerSettings.HiddenSubs.Any(h
+                    => s.Name.Equals(h, StringComparison.OrdinalIgnoreCase));
+            
+            List<SubmarineInfo> availableSubs =
+                SubmarineInfo.SavedSubmarines
+                    .Where(s =>
+                        s.IsCampaignCompatible
+                        && isSubmarineVisible(s))
+                    .ToList();
+
+            if (!availableSubs.Any())
+            {
+                //None of the available subs were marked as campaign-compatible, just include all visible subs
+                availableSubs.AddRange(
+                    SubmarineInfo.SavedSubmarines
+                        .Where(isSubmarineVisible));
+            }
+
+            if (!availableSubs.Any())
+            {
+                //No subs are visible at all! Just make the selected one available
+                availableSubs.Add(GameMain.NetLobbyScreen.SelectedSub);
+            }
+
+            return availableSubs;
+        }

    }
 }