(f417b026f) Fetched: Changes for playing video tutorial from local branch

2019-03-27 20:45:14 +02:00
parent e65c669eaa
commit 3f82c9a2cb
125 changed files with 1317 additions and 3166 deletions
@@ -33,12 +33,12 @@ namespace Barotrauma

        private readonly bool isMultiplayer;

-        public CampaignSetupUI(bool isMultiplayer, GUIComponent newGameContainer, GUIComponent loadGameContainer, IEnumerable<Submarine> submarines, IEnumerable<string> saveFiles = null)
+        public CampaignSetupUI(bool isMultiplayer, GUIComponent newGameContainer, GUIComponent loadGameContainer, IEnumerable<string> saveFiles=null)
        {
            this.isMultiplayer = isMultiplayer;
            this.newGameContainer = newGameContainer;
            this.loadGameContainer = loadGameContainer;
-
+            
            var columnContainer = new GUILayoutGroup(new RectTransform(Vector2.One, newGameContainer.RectTransform), isHorizontal: true)
            {
                Stretch = true,
@@ -60,7 +60,7 @@ namespace Barotrauma
            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), leftColumn.RectTransform), TextManager.Get("SelectedSub") + ":", textAlignment: Alignment.BottomLeft);
            subList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.65f), leftColumn.RectTransform));

-            UpdateSubList(submarines);
+            UpdateSubList();

            // New game right side
            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), TextManager.Get("SaveName") + ":", textAlignment: Alignment.BottomLeft);
@@ -87,8 +87,9 @@ namespace Barotrauma
                        return false;
                    }

-                    if (!(subList.SelectedData is Submarine selectedSub)) { return false; }
-
+                    Submarine selectedSub = subList.SelectedData as Submarine;
+                    if (selectedSub == null) return false;
+                    
                    if (string.IsNullOrEmpty(selectedSub.MD5Hash.Hash))
                    {
                        ((GUITextBlock)subList.SelectedComponent).TextColor = Color.DarkRed * 0.8f;
@@ -195,9 +196,9 @@ namespace Barotrauma
        public void UpdateSubList(IEnumerable<Submarine> submarines)
        {
 #if DEBUG
-            var subsToShow = submarines.Where(s => !s.HasTag(SubmarineTag.HideInMenus));
+            var subsToShow = Submarine.SavedSubmarines.Where(s => !s.HasTag(SubmarineTag.HideInMenus));
 #else
-            var subsToShow = submarines;
+            var subsToShow = Submarine.SavedSubmarines;
 #endif

            subList.ClearChildren();
@@ -262,6 +263,11 @@ namespace Barotrauma
                saveFiles = SaveUtil.GetSaveFiles(isMultiplayer ? SaveUtil.SaveType.Multiplayer : SaveUtil.SaveType.Singleplayer);
            }

+            saveList = new GUIListBox(new RectTransform(new Vector2(0.5f, 1.0f), loadGameContainer.RectTransform, Anchor.CenterLeft))
+            {
+                OnSelected = SelectSaveFile
+            };
+
            saveList = new GUIListBox(new RectTransform(new Vector2(0.5f, 1.0f), loadGameContainer.RectTransform, Anchor.CenterLeft))
            {
                OnSelected = SelectSaveFile
@@ -269,9 +275,7 @@ namespace Barotrauma
            
            foreach (string saveFile in saveFiles)
            {
-                string fileName = saveFile;
-                string subName = "";
-                string saveTime = "";
+                XDocument doc = SaveUtil.LoadGameSessionDoc(saveFile);
                var saveFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.1f), saveList.Content.RectTransform), style: "ListBoxElement")
                {
                    UserData = saveFile
@@ -279,38 +283,25 @@ namespace Barotrauma

                var nameText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), saveFrame.RectTransform),
                    text: Path.GetFileNameWithoutExtension(saveFile));
+                if (doc?.Root == null)
+                {
+                    DebugConsole.ThrowError("Error loading save file \"" + saveFile + "\". The file may be corrupted.");
+                    nameText.Color = Color.Red;
+                    continue;
+                }

-                if (!isMultiplayer)
-                {
-                    XDocument doc = SaveUtil.LoadGameSessionDoc(saveFile);
-                    if (doc?.Root == null)
-                    {
-                        DebugConsole.ThrowError("Error loading save file \"" + saveFile + "\". The file may be corrupted.");
-                        nameText.Color = Color.Red;
-                        continue;
-                    }
-                    subName =  doc.Root.GetAttributeString("submarine", "");
-                    saveTime = doc.Root.GetAttributeString("savetime", "");
-                }
-                else
-                {
-                    string[] splitSaveFile = saveFile.Split(';');
-                    saveFrame.UserData = splitSaveFile[0];
-                    fileName = nameText.Text = Path.GetFileNameWithoutExtension(splitSaveFile[0]);
-                    if (splitSaveFile.Length > 1) { subName = splitSaveFile[1]; }
-                    if (splitSaveFile.Length > 2) { saveTime = splitSaveFile[2]; }
-                }
-                
+                string submarineName = doc.Root.GetAttributeString("submarine", "");
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), saveFrame.RectTransform, Anchor.BottomLeft),
-                    text: subName, font: GUI.SmallFont)
+                    text: submarineName, font: GUI.SmallFont)
                {
-                    UserData = fileName
+                    UserData = saveFile
                };

+                string saveTime = doc.Root.GetAttributeString("savetime", "");
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), saveFrame.RectTransform),
                    text: saveTime, textAlignment: Alignment.Right, font: GUI.SmallFont)
                {
-                    UserData = fileName
+                    UserData = saveFile
                };
            }

@@ -459,12 +459,6 @@ namespace Barotrauma
                    OnClicked = (GUIButton btn, object obj) => { StartRound?.Invoke(); return true; },
                    Enabled = true
                };
-                if (GameMain.Client != null)
-                {
-                    startButton.Visible = !GameMain.Client.GameStarted &&
-                        (GameMain.Client.HasPermission(Networking.ClientPermissions.ManageRound) ||
-                        GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign));
-                }
            }

            OnLocationSelected?.Invoke(location, connection);
@@ -508,13 +502,7 @@ namespace Barotrauma
                CanBeFocused = false
            };

-            if (startButton != null)
-            {
-                startButton.Enabled = true;
-                startButton.Visible = GameMain.Client == null || 
-                    GameMain.Client.HasPermission(Networking.ClientPermissions.ManageRound) || 
-                    GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign);
-            }
+            if (startButton != null) { startButton.Enabled = true; }
        }

        private void CreateItemFrame(PurchasedItem pi, PriceInfo priceInfo, GUIListBox listBox, int width)
@@ -118,19 +118,6 @@ namespace Barotrauma
            instance = this;
        }

-        private void Reset()
-        {
-            AnimParams.ForEach(a => a.Reset(true));
-            RagdollParams.Reset(true);
-            RagdollParams.ClearHistory();
-            CurrentAnimation.ClearHistory();
-            if (!character.Removed)
-            {
-                character.Remove();
-            }
-            character = null;
-        }
-
        public override void Deselect()
        {
            base.Deselect();
@@ -141,7 +128,15 @@ namespace Barotrauma
                isEndlessRunner = false;
                if (character != null)
                {
-                    Reset();
+                    AnimParams.ForEach(a => a.Reset(true));
+                    RagdollParams.Reset(true);
+                    RagdollParams.ClearHistory();
+                    CurrentAnimation.ClearHistory();
+                    if (!character.Removed)
+                    {
+                        character.Remove();
+                    }
+                    character = null;
                }
                GameMain.World.ProcessChanges();
            }
@@ -398,12 +393,6 @@ namespace Barotrauma
            }
            if (!isFreezed)
            {
-                if (character.AnimController.Invalid)
-                {
-                    Reset();
-                    SpawnCharacter(currentCharacterConfig);
-                }
-
                Submarine.MainSub.SetPrevTransform(Submarine.MainSub.Position);
                Submarine.MainSub.Update((float)deltaTime);

@@ -1226,7 +1215,7 @@ namespace Barotrauma
            Cam.Position = character.WorldPosition;
        }

-        private bool CreateCharacter(string name, string mainFolder, bool isHumanoid, params object[] ragdollConfig)
+        private bool CreateCharacter(string name, bool isHumanoid, params object[] ragdollConfig)
        {
            var contentPackage = GameMain.Config.SelectedContentPackages.LastOrDefault();
            if (contentPackage == null)
@@ -1245,16 +1234,17 @@ namespace Barotrauma
 #endif

            string speciesName = name;
+            string mainFolder = $"Content/Characters/{speciesName}";
            // Config file
-            string configFilePath = Path.Combine(mainFolder, $"{speciesName}.xml").Replace(@"\", @"/");
+            string configFilePath = $"{mainFolder}/{speciesName}.xml";
            if (ContentPackage.GetFilesOfType(GameMain.SelectedPackages, ContentType.Character).None(path => path.Contains(speciesName)))
            {
                // Create the config file
                XElement mainElement = new XElement("Character",
                    new XAttribute("name", speciesName),
                    new XAttribute("humanoid", isHumanoid),
-                    new XElement("ragdolls", new XAttribute("folder", Path.Combine(mainFolder, $"Ragdolls/").Replace(@"\", @"/"))),
-                    new XElement("animations", new XAttribute("folder", Path.Combine(mainFolder, $"Animations/").Replace(@"\", @"/"))),
+                    new XElement("ragdolls"),
+                    new XElement("animations"),
                    new XElement("health"),
                    new XElement("ai"));
                XDocument doc = new XDocument(mainElement);
@@ -1269,13 +1259,13 @@ namespace Barotrauma
                DebugConsole.NewMessage(GetCharacterEditorTranslation("ContentPackageSaved").Replace("[path]", contentPackage.Path));
            }
            // Ragdoll
-            string ragdollFolder = RagdollParams.GetFolder(speciesName);
+            string ragdollFolder = RagdollParams.GetDefaultFolder(speciesName);
            string ragdollPath = RagdollParams.GetDefaultFile(speciesName);
            RagdollParams ragdollParams = isHumanoid
                ? RagdollParams.CreateDefault<HumanRagdollParams>(ragdollPath, speciesName, ragdollConfig)
                : RagdollParams.CreateDefault<FishRagdollParams>(ragdollPath, speciesName, ragdollConfig) as RagdollParams;
            // Animations
-            string animFolder = AnimationParams.GetFolder(speciesName);
+            string animFolder = AnimationParams.GetDefaultFolder(speciesName);
            foreach (AnimationType animType in Enum.GetValues(typeof(AnimationType)))
            {
                if (animType != AnimationType.NotDefined)
@@ -4662,7 +4652,7 @@ namespace Barotrauma
                                LimbXElements.Values,
                                JointXElements
                        };
-                        if (CharacterEditorScreen.instance.CreateCharacter(Name, Path.GetDirectoryName(XMLPath), IsHumanoid, ragdollParams))
+                        if (CharacterEditorScreen.instance.CreateCharacter(Name, IsHumanoid, ragdollParams))
                        {
                            GUI.AddMessage(GetCharacterEditorTranslation("CharacterCreated").Replace("[name]", Name), Color.Green, font: GUI.Font);
                        }
@@ -282,7 +282,7 @@ namespace Barotrauma
            menuTabs[(int)Tab.LoadGame] = new GUIFrame(new RectTransform(relativeSize, GUI.Canvas, anchor, pivot, minSize, maxSize));
            var paddedLoadGame = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.9f), menuTabs[(int)Tab.LoadGame].RectTransform, Anchor.Center), style: null);
            
-            campaignSetupUI = new CampaignSetupUI(false, paddedNewGame, paddedLoadGame, Submarine.SavedSubmarines)
+            campaignSetupUI = new CampaignSetupUI(false, paddedNewGame, paddedLoadGame)
            {
                LoadGame = LoadGame,
                StartNewGame = StartGame
@@ -336,7 +336,7 @@ namespace Barotrauma

            UpdateTutorialList();

-            campaignSetupUI.UpdateSubList(Submarine.SavedSubmarines);
+            campaignSetupUI.UpdateSubList();

            ResetButtonStates(null);

@@ -632,13 +632,6 @@ namespace Barotrauma
                Visible = false
            };

-            campaignViewButton = new GUIButton(new RectTransform(new Vector2(1.0f, 0.1f), rightInfoColumn.RectTransform),
-                TextManager.Get("CampaignView"), style: "GUIButtonLarge")
-            {
-                OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; },
-                Visible = false
-            };
-
            StartButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.1f), infoFrameContent.RectTransform, Anchor.BottomRight),
                TextManager.Get("StartGameButton"), style: "GUIButtonLarge")
            {
@@ -651,6 +644,13 @@ namespace Barotrauma
            };
            clientHiddenElements.Add(StartButton);

+            campaignViewButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.1f), infoFrameContent.RectTransform, Anchor.BottomRight) { RelativeOffset = new Vector2(0.0f, 0.06f) },
+                TextManager.Get("CampaignView"), style: "GUIButtonLarge")
+            {
+                OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; },
+                Visible = false
+            };
+
            spectateButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.1f), infoFrameContent.RectTransform, Anchor.BottomRight),
                TextManager.Get("SpectateButton"), style: "GUIButtonLarge");
        }
@@ -726,12 +726,6 @@ namespace Barotrauma
                spectateButton.Visible = GameMain.Client.GameStarted;
                ReadyToStartBox.Visible = !GameMain.Client.GameStarted;
                ReadyToStartBox.Selected = false;
-                if (campaignUI?.StartButton != null)
-                {
-                    campaignUI.StartButton.Visible = !GameMain.Client.GameStarted &&
-                        (GameMain.Client.HasPermission(ClientPermissions.ManageRound) ||
-                        GameMain.Client.HasPermission(ClientPermissions.ManageCampaign));
-                }
                GameMain.Client.SetReadyToStart(ReadyToStartBox);
            }
            else
@@ -850,13 +844,6 @@ namespace Barotrauma
            GameMain.Client.ShowLogButton.Visible = GameMain.Client.HasPermission(ClientPermissions.ServerLog);

            GameMain.Client.EndRoundButton.Visible = GameMain.Client.HasPermission(ClientPermissions.ManageRound);
-
-            if (campaignUI?.StartButton != null)
-            {
-                campaignUI.StartButton.Visible = !GameMain.Client.GameStarted &&
-                    (GameMain.Client.HasPermission(ClientPermissions.ManageRound) || 
-                    GameMain.Client.HasPermission(ClientPermissions.ManageCampaign));
-            }
        }

        public void ShowSpectateButton()
@@ -866,21 +853,18 @@ namespace Barotrauma
            spectateButton.Enabled = true;
        }

-        public void SetCampaignCharacterInfo(CharacterInfo newCampaignCharacterInfo)
-        {            
-            if (newCampaignCharacterInfo != null)
+        public void SetCampaignCharacterInfo(CharacterInfo characterInfo)
+        {
+            if (CampaignCharacterDiscarded) return;
+
+            campaignCharacterInfo = characterInfo;
+            if (campaignCharacterInfo != null)
            {
-                if (CampaignCharacterDiscarded) { return; }
-                if (campaignCharacterInfo != newCampaignCharacterInfo)
-                {
-                    campaignCharacterInfo = newCampaignCharacterInfo;
-                    UpdatePlayerFrame(campaignCharacterInfo, false);
-                }
+                UpdatePlayerFrame(campaignCharacterInfo, false);
            }
-            else if (campaignCharacterInfo != null)
+            else
            {
-                campaignCharacterInfo = null;
-                UpdatePlayerFrame(campaignCharacterInfo, false);                
+                UpdatePlayerFrame(null, true);
            }
        }

@@ -1207,7 +1191,7 @@ namespace Barotrauma

            if (sub.HasTag(SubmarineTag.Shuttle))
            {
-                new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), frame.RectTransform, Anchor.CenterRight) { RelativeOffset = new Vector2(0.1f, 0.0f) },
+                new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), frame.RectTransform, Anchor.CenterRight),
                    TextManager.Get("Shuttle"), textAlignment: Alignment.CenterRight, font: GUI.SmallFont)
                {
                    TextColor = subTextBlock.TextColor * 0.8f,
@@ -716,7 +716,7 @@ namespace Barotrauma
                    catch (PingException ex)
                    {
                        string errorMsg = "Failed to ping a server (" + serverInfo.ServerName + ", " + serverInfo.IP + ") - " + (ex?.InnerException?.Message ?? ex.Message);
-                        GameAnalyticsManager.AddErrorEventOnce("ServerListScreen.PingServer:PingException" + serverInfo.IP, GameAnalyticsSDK.Net.EGAErrorSeverity.Warning, errorMsg);
+                        GameAnalyticsManager.AddErrorEventOnce("ServerListScreen.PingServer:PingException" + serverInfo.IP, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
 #if DEBUG
                        DebugConsole.NewMessage(errorMsg, Color.Red);
 #endif
@@ -564,9 +564,6 @@ namespace Barotrauma

            MapEntityPrefab.Selected = null;

-            saveFrame = null;
-            loadFrame = null;
-
            MapEntity.DeselectAll();
            MapEntity.SelectionGroups.Clear();

@@ -2043,10 +2040,6 @@ namespace Barotrauma
                        dummyCharacter.SelectedConstruction = null;
                    }
                }
-                else if (MapEntity.SelectedList.Count == 1)
-                {
-                    (MapEntity.SelectedList[0] as Item)?.UpdateHUD(cam, dummyCharacter, (float)deltaTime);
-                }

                CharacterHUD.Update((float)deltaTime, dummyCharacter, cam);
            }