Merge branch 'dev'

ARKBreedingStats/ARKBreedingStats.csproj

@@ -84,6 +84,10 @@
     <Compile Include="Ark.cs" />
     <Compile Include="BreedingPlanning\Score.cs" />
     <Compile Include="BreedingPlanning\BreedingScore.cs" />
+    <Compile Include="importExportGun\ExportGunCreatureFile.cs" />
+    <Compile Include="importExportGun\ExportGunServerFile.cs" />
+    <Compile Include="importExportGun\ImportExportGun.cs" />
+    <Compile Include="importExportGun\ReadExportFile.cs" />
     <Compile Include="library\AddDummyCreaturesSettings.cs">
       <SubType>Form</SubType>
     </Compile>

ARKBreedingStats/ARKOverlay.cs

@@ -173,7 +173,6 @@ public void SetStatLevels(int[] wildValues, int[] tamedValues, int levelWild, in
         /// <summary>
         /// Used to display longer texts at the top right, e.g. taming-info.
         /// </summary>
-        /// <param name="infoText"></param>
         internal void SetInfoText(string infoText, Color textColor)
         {
             labelInfo.ForeColor = textColor;

ARKBreedingStats/Ark.cs

@@ -106,6 +106,11 @@ public static class Ark
         public const int ColorRegionCount = 6;
 
         #endregion
+
+        /// <summary>
+        /// The name is trimmed to this length in game.
+        /// </summary>
+        public const int MaxCreatureNameLength = 24;
     }
 
     /// <summary>
@@ -131,6 +136,23 @@ public static class Stats
         public const int TemperatureFortitude = 10;
         public const int CraftingSpeedMultiplier = 11;
 
+        /// <summary>
+        /// Index of additive taming multiplier in stat multipliers.
+        /// </summary>
+        public const int IndexTamingAdd = 0;
+        /// <summary>
+        /// Index of multiplicative taming multiplier in stat multipliers.
+        /// </summary>
+        public const int IndexTamingMult = 1;
+        /// <summary>
+        /// Index of domesticated level multiplier in stat multipliers.
+        /// </summary>
+        public const int IndexLevelDom = 2;
+        /// <summary>
+        /// Index of wild level multiplier in stat multipliers.
+        /// </summary>
+        public const int IndexLevelWild = 3;
+
         /// <summary>
         /// Returns the stat-index for the given order index (like it is ordered in game).
         /// </summary>

ARKBreedingStats/CreatureInfoInput.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Text;
 using System.Windows.Forms;
 using System.Windows.Threading;
 using ARKBreedingStats.Library;
@@ -47,6 +48,7 @@ public partial class CreatureInfoInput : UserControl
         private bool _isNewCreature;
 
         private readonly Debouncer _parentsChangedDebouncer = new Debouncer();
+        private readonly Debouncer _nameChangedDebouncer = new Debouncer();
 
         /// <summary>
         /// The pictureBox that displays the colored species dependent on the selected region colors.
@@ -589,9 +591,8 @@ public void GenerateCreatureName(Creature creature, int[] speciesTopLevels, int[
         {
             SetCreatureData(creature);
             CreatureName = NamePattern.GenerateCreatureName(creature, _sameSpecies, speciesTopLevels, speciesLowestLevels, customReplacings, showDuplicateNameWarning, namingPatternIndex, false, colorsExisting: ColorAlreadyExistingInformation);
-            const int maxNameLengthInGame = 24;
-            if (CreatureName.Length > maxNameLengthInGame)
-                SetMessageLabelText?.Invoke($"The generated name is longer than {maxNameLengthInGame} characters, the name will look like this in game:\r\n" + CreatureName.Substring(0, maxNameLengthInGame), MessageBoxIcon.Error);
+            if (CreatureName.Length > Ark.MaxCreatureNameLength)
+                SetMessageLabelText?.Invoke($"The generated name is longer than {Ark.MaxCreatureNameLength} characters, the name will look like this in game:\r\n" + CreatureName.Substring(0, Ark.MaxCreatureNameLength), MessageBoxIcon.Error);
             else SetMessageLabelText?.Invoke();
         }
 
@@ -754,15 +755,22 @@ private void lblTribe_Click(object sender, EventArgs e)
         }
 
         private void textBoxName_TextChanged(object sender, EventArgs e)
+        {
+            _nameChangedDebouncer.Debounce(500, CheckIfNameAlreadyExists, Dispatcher.CurrentDispatcher);
+        }
+
+        private void CheckIfNameAlreadyExists()
         {
             // feedback if name already exists
             if (!string.IsNullOrEmpty(textBoxName.Text) && NamesOfAllCreatures != null && NamesOfAllCreatures.Contains(textBoxName.Text))
             {
                 textBoxName.BackColor = Color.Khaki;
+                _tt.SetToolTip(textBoxName, Loc.S("nameAlreadyExistsInLibrary"));
             }
             else
             {
                 textBoxName.BackColor = SystemColors.Window;
+                _tt.SetToolTip(textBoxName, null);
             }
         }
 

ARKBreedingStats/FileService.cs

@@ -158,7 +158,7 @@ public static bool TryCreateDirectory(string path, out string error)
         /// <returns>True if the file is not existing after this method ends.</returns>
         public static bool TryDeleteFile(string filePath)
         {
-            if (!File.Exists(filePath)) return true;
+            if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath)) return true;
             try
             {
                 File.Delete(filePath);

ARKBreedingStats/Form1.collection.cs

@@ -12,6 +12,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using System.Xml.Serialization;
+using ARKBreedingStats.importExportGun;
 using ARKBreedingStats.uiControls;
 using ARKBreedingStats.utils;
 
@@ -670,6 +671,9 @@ private void SaveDebugFile()
             SetMessageLabelText("A File with the current library and the values in the extractor has been created and copied to the clipboard. You can paste this file to a folder to add it to an issue report.", MessageBoxIcon.Information, tempZipFilePath);
         }
 
+        /// <summary>
+        /// Zipped library files are often error reports.
+        /// </summary>
         private bool OpenZippedLibrary(string filePath)
         {
             if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath))
@@ -768,5 +772,104 @@ private void OpenRecentlyUsedFile(object sender, EventArgs e)
                 )
                 LoadCollectionFile(mi.Text);
         }
+
+        /// <summary>
+        /// Imports creature from file created by the export gun mod.
+        /// Returns true if the last imported creature already exists in the library.
+        /// </summary>
+        private bool ImportExportGunFiles(string[] filePaths, out bool creatureAdded, out Creature lastAddedCreature)
+        {
+            creatureAdded = false;
+            var newCreatures = new List<Creature>();
+
+            var importedCounter = 0;
+            var importFailedCounter = 0;
+            string lastError = null;
+            string lastCreatureFilePath = null;
+            string serverMultipliersHash = null;
+            bool? multipliersImportSuccessful = null;
+            string serverImportResult = null;
+            bool creatureAlreadyExists = false;
+
+            foreach (var filePath in filePaths)
+            {
+                var c = ImportExportGun.ImportCreature(filePath, out lastError, out serverMultipliersHash);
+                if (c != null)
+                {
+                    newCreatures.Add(c);
+                    importedCounter++;
+                    lastCreatureFilePath = filePath;
+                }
+                else if (lastError != null)
+                {
+                    // file could be a server multiplier file, try to read it that way
+                    var esm = ImportExportGun.ReadServerMultipliers(filePath, out var serverImportResultTemp);
+                    if (esm != null)
+                    {
+                        multipliersImportSuccessful = ImportExportGun.SetServerMultipliers(_creatureCollection, esm, Path.GetFileNameWithoutExtension(filePath));
+                        serverImportResult = serverImportResultTemp;
+                        continue;
+                    }
+
+                    importFailedCounter++;
+                    MessageBoxes.ShowMessageBox(lastError);
+                }
+            }
+
+            if (!string.IsNullOrEmpty(serverMultipliersHash) && _creatureCollection.ServerMultipliersHash != serverMultipliersHash)
+            {
+                // current server multipliers might be outdated, import them again
+                var serverMultiplierFilePath = Path.Combine(Path.GetDirectoryName(lastCreatureFilePath), "Servers", serverMultipliersHash + ".sav");
+                multipliersImportSuccessful = ImportExportGun.ImportServerMultipliers(_creatureCollection, serverMultiplierFilePath, serverMultipliersHash, out serverImportResult);
+            }
+
+            lastAddedCreature = newCreatures.LastOrDefault();
+            if (lastAddedCreature != null)
+            {
+                creatureAlreadyExists = IsCreatureAlreadyInLibrary(lastAddedCreature.guid, lastAddedCreature.ArkId, out _);
+                creatureAdded = true;
+            }
+
+            _creatureCollection.MergeCreatureList(newCreatures, true);
+            UpdateCreatureParentLinkingSort();
+
+            var resultText = (importedCounter > 0 || importFailedCounter > 0
+                                 ? $"Imported {importedCounter} creatures successfully.{(importFailedCounter > 0 ? $"Failed to import {importFailedCounter} files. Last error:{Environment.NewLine}{lastError}" : $"{Environment.NewLine}Last file: {lastCreatureFilePath}")}"
+                                 : string.Empty)
+                             + (string.IsNullOrEmpty(serverImportResult)
+                                 ? string.Empty
+                                 : (importedCounter > 0 || importFailedCounter > 0 ? Environment.NewLine : string.Empty)
+                                  + serverImportResult);
+
+            SetMessageLabelText(resultText, importFailedCounter > 0 || multipliersImportSuccessful == false ? MessageBoxIcon.Error : MessageBoxIcon.Information, lastCreatureFilePath);
+            return creatureAlreadyExists;
+        }
+
+        /// <summary>
+        /// Call after creatures were added (imported) to the library. Updates parent linkings, creature lists, set collection as changed
+        /// </summary>
+        private void UpdateCreatureParentLinkingSort()
+        {
+            UpdateParents(_creatureCollection.creatures);
+
+            foreach (var creature in _creatureCollection.creatures)
+            {
+                creature.RecalculateAncestorGenerations();
+            }
+
+            UpdateIncubationParents(_creatureCollection);
+
+            // update UI
+            SetCollectionChanged(true);
+            UpdateCreatureListings();
+
+            if (_creatureCollection.creatures.Any())
+                tabControlMain.SelectedTab = tabPageLibrary;
+
+            // reapply last sorting
+            SortLibrary();
+
+            UpdateTempCreatureDropDown();
+        }
     }
 }