New development branch

Rottenbeer · Aug 4, 2019 · 8b618f8 · 8b618f8
1 parent bf999ef
commit 8b618f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/LarkatorGUI/ArkReader.cs b/LarkatorGUI/ArkReader.cs
@@ -120,11 +120,11 @@ private Dino ConvertCreature(GameObject obj)
                 Id = (ulong)obj.GetDinoId(),
                 BaseLevel = obj.GetBaseLevel(),
                 Name = obj.GetPropertyValue("TamedName", defaultValue: ""),
-                IsTameable = !obj.GetPropertyValue("bForceDisablingTaming",defaultValue: false),
+                IsTameable = !obj.GetPropertyValue("bForceDisablingTaming", defaultValue: false),
                 Location = ConvertCoordsToLatLong(obj.Location),
                 WildLevels = new StatPoints(),
             };
-
+        
             var status = obj.CharacterStatusComponent();
             if (status != null)
             {

diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
@@ -545,11 +545,12 @@ private void SaveSearch_Click(object sender, RoutedEventArgs e)
 
             try
             {
+                ObservableCollection<SearchCriteria> tempListSearch = new ObservableCollection<SearchCriteria>(ListSearches.Where(sc => sc.Group == (String) groupsCombo.SelectedValue));
                 foreach (String newDino in NewSearchList)
                 {
                     tempSearch = new SearchCriteria(NewSearch);
                     tempSearch.Species = newDino;
-                    tempSearch.Order = ListSearches.Where(sc => sc.Group == NewSearch.Group).Max(sc => sc.Order) + 100;
+                    tempSearch.Order = ListSearches.Where(sc => sc.Group == tempSearch.Group).Max(sc => sc.Order) + 100;
                     ListSearches.Add(tempSearch);
                 }
             }
@@ -757,7 +758,7 @@ private void UpdateSearchResults(IList<SearchCriteria> searches)
 
                 ListResults.Clear();
                 foreach (var result in found)
-                    if (!Properties.Settings.Default.hideUntameable || (Properties.Settings.Default.hideUntameable && result.IsTameable))
+                    if (!Properties.Settings.Default.hideUntameable || (result.IsTameable))
                         ListResults.Add(result);
 
                 ShowCounts = true;