fixed tab-order in the creature-info-input. fixed check for existing …

…Guid. fixed not saving ARK-ID.
cadon · Aug 23, 2018 · 00bb9e9 · 00bb9e9
1 parent 9dea9a4
commit 00bb9e9
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 47 deletions.
diff --git a/ARKBreedingStats/CreatureCollection.cs b/ARKBreedingStats/CreatureCollection.cs
@@ -186,13 +186,13 @@ public bool mergeCreatureList(List<Creature> creaturesToMerge, bool update = fal
         /// </summary>
         /// <param name="guid">Guid to check</param>
         /// <returns>True if there is a creature with the given Guid</returns>
-        public bool GUIDAlreadyExist(Guid guid, out Creature creature)
+        public bool GUIDAlreadyExist(Guid guid, Creature concerningCreature, out Creature creature)
         {
             creature = null;
             bool exists = false;
             foreach (var c in creatures)
             {
-                if (c.guid == guid)
+                if (c.guid == guid && c != concerningCreature)
                 {
                     creature = c;
                     exists = true;
@@ -201,15 +201,5 @@ public bool GUIDAlreadyExist(Guid guid, out Creature creature)
             }
             return exists;
         }
-
-        /// <summary>
-        /// Checks if a creature with the Guid created from an ARKID exists
-        /// </summary>
-        /// <param name="arkId">ARKID to check</param>
-        /// <returns></returns>
-        public bool GuidOfARKIDExists(long arkId, out Creature creature)
-        {
-            return GUIDAlreadyExist(Utils.ConvertIdToGuid(arkId), out creature);
-        }
     }
 }
diff --git a/ARKBreedingStats/CreatureInfoInput.Designer.cs b/ARKBreedingStats/CreatureInfoInput.Designer.cs
diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -1224,7 +1224,7 @@ private void add2Lib(bool fromExtractor = true)
             };
 
             Guid newGuid = Utils.ConvertIdToGuid(input.ARKID);
-            if (input.ARKID != 0 && creatureCollection.GUIDAlreadyExist(newGuid, out Creature guidCreature))
+            if (input.ARKID != 0 && creatureCollection.GUIDAlreadyExist(newGuid, creature, out Creature guidCreature))
             {
                 MessageBox.Show("The entered ARK-ID results in a Guid that is already existing in this library (" + guidCreature.species + " (lvl " + guidCreature.level.ToString() + ")" + ": " + guidCreature.name + ").\nUsually that means there is already a creature in this library with this ARK-ID.\nYou have to choose a different ARK-ID or delete the other creature first.", "ARK-ID already existing",
                 MessageBoxButtons.OK,
@@ -1240,6 +1240,9 @@ private void add2Lib(bool fromExtractor = true)
                 creature.guid = input.CreatureGuid;
             else
                 creature.guid = Guid.NewGuid();
+
+            creature.ARKID = input.ARKID;
+
             // if parent creatures don't exist in the library but they have a known id, save these for if they are imported later
             if (creature.Mother == null && input.motherId != Guid.Empty) creature.motherGuid = input.motherId;
             if (creature.Father == null && input.fatherId != Guid.Empty) creature.fatherGuid = input.fatherId;
@@ -3973,7 +3976,7 @@ private void creatureInfoInputTester_Save2Library_Clicked(CreatureInfoInput send
 
                 // check if the ARKID was changed to an id that results in a Guid that is already existing
                 Guid newGuid = Utils.ConvertIdToGuid(creatureInfoInputTester.ARKID);
-                if (creatureInfoInputTester.ARKID != 0 && creatureCollection.GUIDAlreadyExist(newGuid, out Creature guidCreature))
+                if (creatureInfoInputTester.ARKID != 0 && creatureCollection.GUIDAlreadyExist(newGuid, creatureTesterEdit, out Creature guidCreature))
                 {
                     MessageBox.Show("The entered ARK-ID results in a Guid that is already existing in this library (" + guidCreature.species + " (lvl " + guidCreature.level.ToString() + ")" + ": " + guidCreature.name + ").\nUsually that means there is already a creature in this library with this ARK-ID.\nYou have to choose a different ARK-ID or delete the other creature first.", "ARK-ID already existing",
                     MessageBoxButtons.OK,

diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -34,6 +34,6 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.28.9")]
+[assembly: AssemblyFileVersion("0.28.9.1")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/ver.txt b/ARKBreedingStats/ver.txt
@@ -1 +1 @@
-282.102.1,0.28.9
+282.102.1,0.28.9.1