(8f9250974) Fix spritesheet orientation offestting the joint widgets in the wrong direction, which made it a bit difficult to use.

2019-03-27 20:54:00 +02:00
parent ad1a726e91
commit 4cb3469c4f
40 changed files with 634 additions and 960 deletions
@@ -64,14 +64,11 @@ namespace Barotrauma

            // New game left side
            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))
-            {
-                OnSelected = CheckForPax
-            };
+            subList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.65f), leftColumn.RectTransform));

            UpdateSubList(submarines);

-            // New game right sideon
+            // New game right side
            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), TextManager.Get("SaveName") + ":", textAlignment: Alignment.BottomLeft);
            saveNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), string.Empty);

@@ -271,11 +268,6 @@ 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
@@ -283,7 +275,9 @@ namespace Barotrauma
            
            foreach (string saveFile in saveFiles)
            {
-                XDocument doc = SaveUtil.LoadGameSessionDoc(saveFile);
+                string fileName = saveFile;
+                string subName = "";
+                string saveTime = "";
                var saveFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.1f), saveList.Content.RectTransform), style: "ListBoxElement")
                {
                    UserData = saveFile
@@ -291,25 +285,38 @@ 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;
-                }

-                string submarineName = doc.Root.GetAttributeString("submarine", "");
-                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), saveFrame.RectTransform, Anchor.BottomLeft),
-                    text: submarineName, font: GUI.SmallFont)
+                if (!isMultiplayer)
                {
-                    UserData = saveFile
+                    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]; }
+                }
+                
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.5f), saveFrame.RectTransform, Anchor.BottomLeft),
+                    text: subName, font: GUI.SmallFont)
+                {
+                    UserData = fileName
                };

-                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 = saveFile
+                    UserData = fileName
                };
            }

@@ -358,25 +365,7 @@ namespace Barotrauma
        {
            if (isMultiplayer) return;
            Tutorial contextualTutorial = Tutorial.Tutorials.Find(t => t is ContextualTutorial);
-
-            Submarine selectedSub = subList.SelectedData as Submarine;
-
-            if (selectedSub == null || selectedSub.Name != "PAX")
-            {
-                contextualTutorialBox.Selected = (contextualTutorial != null) ? !GameMain.Config.CompletedTutorialNames.Contains(contextualTutorial.Name) : true;
-            }
-            else
-            {
-                contextualTutorialBox.Selected = true;
-            }
-        }
-
-        private bool CheckForPax(GUIComponent component, object obj)
-        {
-            if (!(obj is Submarine) || contextualTutorialBox == null) return false;
-            Submarine sub = obj as Submarine;
-            contextualTutorialBox.Selected = sub.Name == "PAX";
-            return true;
+            contextualTutorialBox.Selected = (contextualTutorial != null) ? !GameMain.Config.CompletedTutorialNames.Contains(contextualTutorial.Name) : true;
        }

        private bool SelectSaveFile(GUIComponent component, object obj)
@@ -118,6 +118,19 @@ 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();
@@ -128,15 +141,7 @@ namespace Barotrauma
                isEndlessRunner = false;
                if (character != null)
                {
-                    AnimParams.ForEach(a => a.Reset(true));
-                    RagdollParams.Reset(true);
-                    RagdollParams.ClearHistory();
-                    CurrentAnimation.ClearHistory();
-                    if (!character.Removed)
-                    {
-                        character.Remove();
-                    }
-                    character = null;
+                    Reset();
                }
                GameMain.World.ProcessChanges();
            }
@@ -393,6 +398,12 @@ namespace Barotrauma
            }
            if (!isFreezed)
            {
+                if (character.AnimController.Invalid)
+                {
+                    Reset();
+                    SpawnCharacter(currentCharacterConfig);
+                }
+
                Submarine.MainSub.SetPrevTransform(Submarine.MainSub.Position);
                Submarine.MainSub.Update((float)deltaTime);

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

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

            string speciesName = name;
-            string mainFolder = $"Content/Characters/{speciesName}";
            // Config file
-            string configFilePath = $"{mainFolder}/{speciesName}.xml";
+            string configFilePath = Path.Combine(mainFolder, $"{speciesName}.xml").Replace(@"\", @"/");
            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 XElement("animations"),
+                    new XElement("ragdolls", new XAttribute("folder", Path.Combine(mainFolder, $"Ragdolls/").Replace(@"\", @"/"))),
+                    new XElement("animations", new XAttribute("folder", Path.Combine(mainFolder, $"Animations/").Replace(@"\", @"/"))),
                    new XElement("health"),
                    new XElement("ai"));
                XDocument doc = new XDocument(mainElement);
@@ -1259,13 +1269,13 @@ namespace Barotrauma
                DebugConsole.NewMessage(GetCharacterEditorTranslation("ContentPackageSaved").Replace("[path]", contentPackage.Path));
            }
            // Ragdoll
-            string ragdollFolder = RagdollParams.GetDefaultFolder(speciesName);
+            string ragdollFolder = RagdollParams.GetFolder(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.GetDefaultFolder(speciesName);
+            string animFolder = AnimationParams.GetFolder(speciesName);
            foreach (AnimationType animType in Enum.GetValues(typeof(AnimationType)))
            {
                if (animType != AnimationType.NotDefined)
@@ -3918,7 +3928,7 @@ namespace Barotrauma

        private void DrawJointLimitWidgets(SpriteBatch spriteBatch, Limb limb, LimbJoint joint, Vector2 drawPos, bool autoFreeze, bool allowPairEditing, float rotationOffset = 0)
        {
-            rotationOffset -= MathHelper.ToRadians(RagdollParams.SpritesheetOrientation);
+            rotationOffset += MathHelper.ToRadians(RagdollParams.SpritesheetOrientation);
            Color angleColor = joint.UpperLimit - joint.LowerLimit > 0 ? Color.LightGreen * 0.5f : Color.Red;
            DrawRadialWidget(spriteBatch, drawPos, MathHelper.ToDegrees(joint.UpperLimit), $"joint.jointParams.Name {GetCharacterEditorTranslation("UpperLimit")}", Color.Cyan, angle =>
            {
@@ -4652,7 +4662,7 @@ namespace Barotrauma
                                LimbXElements.Values,
                                JointXElements
                        };
-                        if (CharacterEditorScreen.instance.CreateCharacter(Name, IsHumanoid, ragdollParams))
+                        if (CharacterEditorScreen.instance.CreateCharacter(Name, Path.GetDirectoryName(XMLPath), IsHumanoid, ragdollParams))
                        {
                            GUI.AddMessage(GetCharacterEditorTranslation("CharacterCreated").Replace("[name]", Name), Color.Green, font: GUI.Font);
                        }
@@ -866,18 +866,21 @@ namespace Barotrauma
            spectateButton.Enabled = true;
        }

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

@@ -564,6 +564,9 @@ namespace Barotrauma

            MapEntityPrefab.Selected = null;

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

@@ -2040,6 +2043,10 @@ 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);
            }