(2c8393f34) Fixed "The suitable treatments list may be inaccurate" overflowing in German & Russian, show item name tooltips when hovering over the treatment suggestions

2019-05-18 21:52:36 +03:00
parent 1dc05f04be
commit 51e3e8d667
2 changed files with 111 additions and 23 deletions
@@ -337,6 +337,79 @@ namespace Barotrauma
                keyMapping[(int)InputType.SelectNextCharacter] = new KeyOrMouse(Keys.Z);
                keyMapping[(int)InputType.SelectPreviousCharacter] = new KeyOrMouse(Keys.X);
            }
+        }
+
+        public void CheckBindings(bool useDefaults)
+        {
+            foreach (InputType inputType in Enum.GetValues(typeof(InputType)))
+            {
+                var binding = keyMapping[(int)inputType];
+                if (binding == null)
+                {
+                    switch (inputType)
+                    {
+                        case InputType.Deselect:
+                            if (useDefaults)
+                            {
+                                binding = new KeyOrMouse(1);
+                            }
+                            else
+                            {
+                                // Legacy support
+                                var selectKey = keyMapping[(int)InputType.Select];
+                                if (selectKey != null && selectKey.Key != Keys.None)
+                                {
+                                    binding = new KeyOrMouse(selectKey.Key);
+                                }
+                            }
+                            break;
+                        case InputType.Shoot:
+                            if (useDefaults)
+                            {
+                                binding = new KeyOrMouse(0);
+                            }
+                            else
+                            {
+                                // Legacy support
+                                var useKey = keyMapping[(int)InputType.Use];
+                                if (useKey != null && useKey.MouseButton.HasValue)
+                                {
+                                    binding = new KeyOrMouse(useKey.MouseButton.Value);
+                                }
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                    if (binding == null)
+                    {
+                        DebugConsole.ThrowError("Key binding for the input type \"" + inputType + " not set!");
+                        binding = new KeyOrMouse(Keys.D1);
+                    }
+                    keyMapping[(int)inputType] = binding;
+                }
+            }
+        }
+
+        #region Load DefaultConfig
+        private void LoadDefaultConfig(bool setLanguage = true)
+        {
+            XDocument doc = XMLExtensions.TryLoadXml(savePath);
+
+            if (setLanguage || string.IsNullOrEmpty(Language))
+            {
+                Language = doc.Root.GetAttributeString("language", "English");
+            }
+
+            MasterServerUrl = doc.Root.GetAttributeString("masterserverurl", "");
+
+            AutoCheckUpdates = doc.Root.GetAttributeBool("autocheckupdates", true);
+            WasGameUpdated = doc.Root.GetAttributeBool("wasgameupdated", false);
+
+            VerboseLogging = doc.Root.GetAttributeBool("verboselogging", false);
+            SaveDebugConsoleLogs = doc.Root.GetAttributeBool("savedebugconsolelogs", false);
+
+            QuickStartSubmarineName = doc.Root.GetAttributeString("quickstartsub", "");

            if (legacy)
            {
@@ -1042,12 +1115,17 @@ namespace Barotrauma
                gMode = new XElement("graphicsmode");
                doc.Root.Add(gMode);
            }
-
-            //display error messages after all content packages have been loaded
-            //to make sure the package that contains text files has been loaded before we attempt to use TextManager
-            foreach (string missingPackagePath in missingPackagePaths)
+            if (GraphicsWidth == 0 || GraphicsHeight == 0)
            {
-                DebugConsole.ThrowError(TextManager.Get("ContentPackageNotFound").Replace("[packagepath]", missingPackagePath));
+                gMode.ReplaceAttributes(new XAttribute("displaymode", windowMode));
+            }
+            else
+            {
+                gMode.ReplaceAttributes(
+                    new XAttribute("width", GraphicsWidth),
+                    new XAttribute("height", GraphicsHeight),
+                    new XAttribute("vsync", VSyncEnabled),
+                    new XAttribute("displaymode", windowMode));
            }
            
            XElement audio = doc.Root.Element("audio");
@@ -1086,17 +1164,18 @@ namespace Barotrauma
                doc.Root.Add(new XElement("contentpackage",
                    new XAttribute("path", contentPackage.Path)));
            }
-            foreach (ContentPackage contentPackage in SelectedContentPackages)
+
+            var keyMappingElement = new XElement("keymapping");
+            doc.Root.Add(keyMappingElement);
+            for (int i = 0; i < keyMapping.Length; i++)
            {
-                bool packageOk = contentPackage.VerifyFiles(out List<string> errorMessages);
-                if (!packageOk)
+                if (keyMapping[i].MouseButton == null)
                {
-                    DebugConsole.ThrowError("Error in content package \"" + contentPackage.Name + "\":\n" + string.Join("\n", errorMessages));
-                    continue;
+                    keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].Key));
                }
-                foreach (ContentFile file in contentPackage.Files)
+                else
                {
-                    ToolBox.IsProperFilenameCase(file.Path);
+                    keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].MouseButton));
                }
            }

@@ -1106,6 +1185,8 @@ namespace Barotrauma
            {
                jobPreferences.Add(new XElement("job", new XAttribute("identifier", jobName)));
            }
+            gameplay.Add(jobPreferences);
+            doc.Root.Add(gameplay);

            var playerElement = new XElement("player",
                new XAttribute("name", defaultPlayerName ?? ""),