fixed layout issue on taming-tab with taming-foods (#863). added serv…

…er-filter for breeding-planner (#852, #823, #866).
cadon · Jan 8, 2019 · a1d53cd · a1d53cd
1 parent 36a7fd4
commit a1d53cd
Show file tree

Hide file tree

Showing 11 changed files with 409 additions and 242 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -139,6 +139,9 @@
             <setting name="ImportTribeNameFilter" serializeAs="String">
                 <value />
             </setting>
+            <setting name="UseServerFilterForBreedingPlan" serializeAs="String">
+                <value>False</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/BreedingPlan.Designer.cs b/ARKBreedingStats/BreedingPlan.Designer.cs
diff --git a/ARKBreedingStats/BreedingPlan.cs b/ARKBreedingStats/BreedingPlan.cs
@@ -68,6 +68,8 @@ public BreedingPlan()
             breedingPlanNeedsUpdate = false;
             dontUpdateBreedingPlan = false;
 
+            cbServerFilterLibrary.Checked = Properties.Settings.Default.UseServerFilterForBreedingPlan;
+
             tagSelectorList1.OnTagChanged += TagSelectorList1_OnTagChanged;
         }
 
@@ -209,6 +211,15 @@ private void AsyncCalculateBreedingScoresAndDisplayPairs(BreedingMode breedingMo
                 chosenM = new List<Creature>();
             else chosenM = filterByTags(males);
 
+            // filter by servers
+            if (cbServerFilterLibrary.Checked)
+            {
+                chosenF = chosenF.Where(c => (c.server == "" && !creatureCollection.hiddenServers.Contains("n/a"))
+                                              || (c.server != "" && !creatureCollection.hiddenServers.Contains(c.server))).ToList();
+                chosenM = chosenM.Where(c => (c.server == "" && !creatureCollection.hiddenServers.Contains("n/a"))
+                                              || (c.server != "" && !creatureCollection.hiddenServers.Contains(c.server))).ToList();
+            }
+
             bool creaturesTagFilteredOut = (crCountF != chosenF.Count)
                                         || (crCountM != chosenM.Count);
 
@@ -951,5 +962,11 @@ public void SetLocalizations()
             Loc.setToolTip(nudBPMutationLimit, tt);
             Loc.setToolTip(cbBPTagExcludeDefault, tt);
         }
+
+        private void cbServerFilterLibrary_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.UseServerFilterForBreedingPlan = cbServerFilterLibrary.Checked;
+            calculateBreedingScoresAndDisplayPairs();
+        }
     }
 }
diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs
@@ -2651,9 +2651,15 @@ private void cbServerFilterAll_CheckedChanged(object sender, EventArgs e)
             for (int i = 0; i < checkedListBoxFilterServers.Items.Count; i++)
             {
                 checkedListBoxFilterServers.SetItemChecked(i, chck);
-                if (!chck) creatureCollection.hiddenServers.Add(checkedListBoxFilterServers.Items[i].ToString());
+                if (!chck)
+                {
+                    string server = Regex.Match(checkedListBoxFilterServers.Items[i].ToString(), @"^(.+?)(?: \(\d+\))?$").Groups[1].Value;
+                    creatureCollection.hiddenServers.Add(server);
+                }
             }
 
+            breedingPlan1.breedingPlanNeedsUpdate = true; // needed for serverFilterOption
+
             filterListAllowed = true;
             filterLib();
         }
@@ -2695,6 +2701,8 @@ private void checkedListBoxFilterServers_ItemCheck(object sender, ItemCheckEvent
                         creatureCollection.hiddenServers.Remove(server);
                     }
 
+                    breedingPlan1.breedingPlanNeedsUpdate = true; // needed for serverFilterOption
+
                     recalculateTopStatsIfNeeded();
                     filterLib();
                 }

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.3")]
+[assembly: AssemblyFileVersion("0.29.4.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs
diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings
@@ -149,5 +149,8 @@
     <Setting Name="ImportTribeNameFilter" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="UseServerFilterForBreedingPlan" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>