diff --git a/LarkatorGUI/ArkReader.cs b/LarkatorGUI/ArkReader.cs index f1486f2..665f365 100644 --- a/LarkatorGUI/ArkReader.cs +++ b/LarkatorGUI/ArkReader.cs @@ -120,17 +120,11 @@ private Dino ConvertCreature(GameObject obj) Id = (ulong)obj.GetDinoId(), BaseLevel = obj.GetBaseLevel(), Name = obj.GetPropertyValue("TamedName", defaultValue: ""), - IsTameable = obj.GetPropertyValue("bForceDisabledTaming",defaultValue: true), + IsTameable = !obj.GetPropertyValue("bForceDisablingTaming",defaultValue: false), Location = ConvertCoordsToLatLong(obj.Location), WildLevels = new StatPoints(), }; - if (dino.Type.Contains("Polar")) - { - //stuff - int x = 1; - } - var status = obj.CharacterStatusComponent(); if (status != null) { diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs index 6f735ae..3e52972 100644 --- a/LarkatorGUI/MainWindow.xaml.cs +++ b/LarkatorGUI/MainWindow.xaml.cs @@ -545,17 +545,17 @@ private void SaveSearch_Click(object sender, RoutedEventArgs e) try { - NewSearch.Order = ListSearches.Where(sc => sc.Group == NewSearch.Group).Max(sc => sc.Order) + 100; + 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; + ListSearches.Add(tempSearch); + } } catch (InvalidOperationException) // no entries for .Max - ignore { } - foreach (String newDino in NewSearchList) - { - tempSearch = new SearchCriteria(NewSearch); - tempSearch.Species = newDino; - ListSearches.Add(tempSearch); - } NewSearch = null; tempSearch = null; @@ -757,7 +757,7 @@ private void UpdateSearchResults(IList searches) ListResults.Clear(); foreach (var result in found) - if (!Properties.Settings.Default.hideUntameable || (Properties.Settings.Default.hideUntameable && result.IsTameable == true)) + if (!Properties.Settings.Default.hideUntameable || (Properties.Settings.Default.hideUntameable && result.IsTameable)) ListResults.Add(result); ShowCounts = true;