fixed disappeared top-stats-highlighting (#859). if name already exis…

…ts, background in name-input is colored (#860).
cadon · Jan 2, 2019 · 4e832a3 · 4e832a3
1 parent 3dc7ff1
commit 4e832a3
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 58 deletions.
diff --git a/ARKBreedingStats/AboutBox1.Designer.cs b/ARKBreedingStats/AboutBox1.Designer.cs
diff --git a/ARKBreedingStats/AboutBox1.cs b/ARKBreedingStats/AboutBox1.cs
@@ -87,10 +87,5 @@ private void linkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         {
             System.Diagnostics.Process.Start("https://github.com/cadon/ARKStatsExtractor");
         }
-
-        private void pictureBox1_Click(object sender, EventArgs e)
-        {
-            System.Diagnostics.Process.Start("http://ko-fi.com/826WMCII3B24");
-        }
     }
 }
diff --git a/ARKBreedingStats/CreatureInfoInput.Designer.cs b/ARKBreedingStats/CreatureInfoInput.Designer.cs
diff --git a/ARKBreedingStats/CreatureInfoInput.cs b/ARKBreedingStats/CreatureInfoInput.cs
@@ -25,6 +25,7 @@ public partial class CreatureInfoInput : UserControl
         private bool updateMaturation;
         private List<Creature> _females;
         private List<Creature> _males;
+        public List<string> NamesOfAllCreatures;
         private string[] _ownersTribes;
         private int[] regionColorIDs;
         private bool _tribeLock, _ownerLock;
@@ -60,7 +61,11 @@ private void buttonSaveChanges_Click(object sender, EventArgs e)
         public string CreatureName
         {
             get => textBoxName.Text;
-            set => textBoxName.Text = value;
+            set
+            {
+                textBoxName.Text = value;
+                textBoxName.BackColor = SystemColors.Window;
+            }
         }
         public string CreatureOwner
         {
@@ -478,6 +483,19 @@ private void lblTribe_Click(object sender, EventArgs e)
             TribeLock = !TribeLock;
         }
 
+        private void textBoxName_TextChanged(object sender, EventArgs e)
+        {
+            // feedback if name already exists
+            if (NamesOfAllCreatures.Contains(textBoxName.Text))
+            {
+                textBoxName.BackColor = Color.Khaki;
+            }
+            else
+            {
+                textBoxName.BackColor = SystemColors.Window;
+            }
+        }
+
         internal void Clear()
         {
             textBoxName.Clear();

diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -2257,6 +2257,7 @@ private void updateParentListInput(CreatureInfoInput input)
             input.ParentsSimilarities = findParentSimilarities(parents, creature);
             input.Parents = parents;
             input.parentListValid = true;
+            input.NamesOfAllCreatures = creatureCollection.creatures.Select(c => c.name).ToList();
         }
 
         private void newToolStripMenuItem_Click(object sender, EventArgs e)
@@ -2923,21 +2924,21 @@ private void calculateTopStats(List<Creature> creatures)
                     c.topBreedingStats = new bool[8];
                     c.topBreedingCreature = false;
 
-                    // only consider creature if it's available for breeding
-                    if (!creatureCollection.useFiltersInTopStatCalculation
-                        && !(
-                            c.status == CreatureStatus.Available
-                            || c.status == CreatureStatus.Cryopod
-                            || c.status == CreatureStatus.Obelisk
-                            )
-                       )
+                    if (creatureCollection.useFiltersInTopStatCalculation)
                     {
-                        continue;
+                        //if not in the filtered collection (using library filter settings), continue
+                        if (!filteredCreatures.Contains(c))
+                            continue;
+                    }
+                    else
+                    {
+                        // only consider creature if it's available for breeding
+                        if (c.status != CreatureStatus.Available
+                            && c.status != CreatureStatus.Cryopod
+                            && c.status != CreatureStatus.Obelisk
+                            )
+                            continue;
                     }
-
-                    //if not in the filtered collection (using library filter settings), continue
-                    if (!filteredCreatures.Contains(c))
-                        continue;
 
                     for (int s = 0; s < Enum.GetNames(typeof(StatName)).Length; s++)
                     {

diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.29.3.1")]
+[assembly: AssemblyFileVersion("0.29.3.2")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/ver.txt b/ARKBreedingStats/ver.txt
@@ -1 +1 @@
-285.106.2,0.29.3.1
+285.106.2,0.29.3.2