New/Modified Features

Common/Dino.cs

@@ -10,6 +10,7 @@ public class Dino : IEquatable<Dino>
         public string Name { get; set; }
         public int BaseLevel { get; set; }
         public bool Female { get; set; }
+        public bool IsTameable { get; set; }
         public Position Location { get; set; }
         public StatPoints WildLevels { get; set; }
 
@@ -26,6 +27,7 @@ public bool Equals(Dino other)
                    Name == other.Name &&
                    BaseLevel == other.BaseLevel &&
                    Female == other.Female &&
+                   IsTameable == other.IsTameable &&
                    EqualityComparer<Position>.Default.Equals(Location, other.Location) &&
                    EqualityComparer<StatPoints>.Default.Equals(WildLevels, other.WildLevels);
         }
@@ -38,6 +40,7 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
             hashCode = hashCode * -1521134295 + BaseLevel.GetHashCode();
             hashCode = hashCode * -1521134295 + Female.GetHashCode();
+            hashCode = hashCode * -1521134295 + IsTameable.GetHashCode();
             hashCode = hashCode * -1521134295 + EqualityComparer<Position>.Default.GetHashCode(Location);
             hashCode = hashCode * -1521134295 + EqualityComparer<StatPoints>.Default.GetHashCode(WildLevels);
             return hashCode;

Common/SearchCriteria.cs

@@ -26,6 +26,7 @@ public SearchCriteria(SearchCriteria copy)
             MinLevel = copy.MinLevel;
             MaxLevel = copy.MaxLevel;
             Female = copy.Female;
+            GroupSearch = copy.GroupSearch;
         }
 
         public string Group { get; set; }
@@ -34,6 +35,7 @@ public SearchCriteria(SearchCriteria copy)
         public int? MinLevel { get; set; }
         public int? MaxLevel { get; set; }
         public bool? Female { get; set; }
+        public bool GroupSearch { get; set; }
 
         /// <summary>
         /// Compares equality based only on an internal random ID assigned on creation.

Common/StatPoints.cs

@@ -9,6 +9,8 @@ public class StatPoints : IEquatable<StatPoints>
         public int Weight { get; set; }
         public int Melee { get; set; }
         public int Speed { get; set; }
+        public int Food { get; set; }
+        public int Oxygen { get; set; }
 
         public override bool Equals(object obj)
         {
@@ -22,7 +24,9 @@ public bool Equals(StatPoints other)
                    Stamina == other.Stamina &&
                    Weight == other.Weight &&
                    Melee == other.Melee &&
-                   Speed == other.Speed;
+                   Speed == other.Speed &&
+                   Food == other.Food &&
+                   Oxygen == other.Oxygen;
         }
 
         public override int GetHashCode()
@@ -33,18 +37,20 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + Weight.GetHashCode();
             hashCode = hashCode * -1521134295 + Melee.GetHashCode();
             hashCode = hashCode * -1521134295 + Speed.GetHashCode();
+            hashCode = hashCode * -1521134295 + Food.GetHashCode();
+            hashCode = hashCode * -1521134295 + Oxygen.GetHashCode();
             return hashCode;
         }
 
         public override string ToString()
         {
-            return $"{Health}/{Stamina}/{Weight}/{Melee}/{Speed}";
+            return $"{Health}/{Stamina}/{Oxygen}/{Food}/{Weight}/{Melee}/{Speed}";
         }
 
         public string ToString(bool fixedWidth = false)
         {
             if (fixedWidth)
-                return $"{Health,2}/{Stamina,2}/{Weight,2}/{Melee,2}/{Speed,2}";
+                return $"{Health,2}/{Stamina,2}/{Oxygen,2}/{Food,2}//{Weight,2}{Melee,2}/{Speed,2}";
             else
                 return ToString();
         }

LarkatorGUI/ArkReader.cs

@@ -120,16 +120,19 @@ private Dino ConvertCreature(GameObject obj)
                 Id = (ulong)obj.GetDinoId(),
                 BaseLevel = obj.GetBaseLevel(),
                 Name = obj.GetPropertyValue("TamedName", defaultValue: ""),
+                IsTameable = !obj.GetPropertyValue("bForceDisablingTaming", defaultValue: false),
                 Location = ConvertCoordsToLatLong(obj.Location),
                 WildLevels = new StatPoints(),
             };
-
+        
             var status = obj.CharacterStatusComponent();
             if (status != null)
             {
                 var defaultValue = new ArkByteValue(0);
                 dino.WildLevels.Health = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 0, defaultValue).ByteValue;
                 dino.WildLevels.Stamina = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 1, defaultValue).ByteValue;
+                dino.WildLevels.Oxygen = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 3, defaultValue).ByteValue;
+                dino.WildLevels.Food = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 4, defaultValue).ByteValue;
                 dino.WildLevels.Weight = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 7, defaultValue).ByteValue;
                 dino.WildLevels.Melee = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 8, defaultValue).ByteValue;
                 dino.WildLevels.Speed = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 9, defaultValue).ByteValue;

LarkatorGUI/Converters.cs

@@ -132,7 +132,62 @@ public class DinoToTooltipConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var v = (Dino)value;
-            return $"{(String.IsNullOrWhiteSpace(v.Name) ? "" : "\"" + v.Name + "\" ")}{v.Type} {(v.Female ? 'F' : 'M')}{v.BaseLevel} @ {v.Location.ToString(PositionFormat.LatLong)} ({v.Location.ToString(PositionFormat.XYZ)})";
+            String displayStats = "";
+            //Build the string to display only shown stats
+            //Health, Stamina, Oxygen, Food, Weight, Melee, Speed
+            if (Properties.Settings.Default.ShowHealth)
+            {
+                displayStats += v.WildLevels.Health;
+            }
+            if (Properties.Settings.Default.ShowStam)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Stamina;
+            }
+            if (Properties.Settings.Default.ShowOxygen)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Oxygen;
+            }
+            if (Properties.Settings.Default.ShowFood)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Food;
+            }
+            if (Properties.Settings.Default.ShowWeight)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Weight;
+            }
+            if (Properties.Settings.Default.ShowMelee)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Melee;
+            }
+            if (Properties.Settings.Default.ShowSpeed)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Speed;
+            }
+            return $"{(String.IsNullOrWhiteSpace(v.Name) ? "" : "\"" + v.Name + "\" ")}{v.Type} {(v.Female ? 'F' : 'M')}{v.BaseLevel} @ {v.Location.ToString(PositionFormat.LatLong)} ({v.Location.ToString(PositionFormat.XYZ)}) ({displayStats})";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

LarkatorGUI/LarkatorGUI.csproj

@@ -240,6 +240,7 @@
     <Resource Include="imgs\map_ScorchedEarth.jpg" />
     <Resource Include="imgs\map_TheCenter.jpg" />
     <Resource Include="imgs\map_TheIsland.jpg" />
+    <Resource Include="imgs\map_Valguero_P.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="imgs\map_Extinction.jpg" />

LarkatorGUI/MainWindow.xaml

@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:LarkatorGUI"
+        xmlns:properties="clr-namespace:LarkatorGUI.Properties"
         xmlns:common="clr-namespace:Larkator.Common;assembly=Larkator.Common"
         xmlns:fa="http://schemas.fontawesome.io/icons/"
         xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
@@ -313,18 +314,24 @@
                     </StackPanel>
                     <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="16" Content="+" Click="CreateSearch_Click"
                             Visibility="{Binding CreateSearchAvailable, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                    <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
+                        <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
                         <StackPanel Margin="8" Orientation="Vertical" HorizontalAlignment="Stretch" DataContext="{Binding NewSearch}">
-                            <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True"/>
-                            <ComboBox x:Name="speciesCombo" Text="{Binding Species}"/>
+                            <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True" />
+                            <ComboBox x:Name="speciesCombo" Text="{Binding Species}" IsEditable="True" StaysOpenOnEdit="True" GotFocus="ComboOpen" AllowDrop="True"/>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
-                                <TextBlock Text="Min"/>
+                                <TextBlock Text="Min "/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>
                             </StackPanel>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
-                                <TextBlock Text="Max"/>
+                                <TextBlock Text="Max "/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>
                             </StackPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
+                                <TextBlock Text="Grouped search "/>
+                                <CheckBox x:Name="groupCheck" ToolTip="Keyword search for a group of dinosaurs"
+                                               IsChecked="{Binding Source={StaticResource Settings}, Path=Settings.GroupSearch, Mode=TwoWay}" HorizontalAlignment="Right"
+                                               Margin="7,4"/>
+                            </StackPanel>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="4,0" Content="+" Click="SaveSearch_Click" />
                                 <TextBlock VerticalAlignment="Center" MouseDown="CloseNewSearch_Click"><Underline><Run Text="X"/></Underline></TextBlock>
@@ -378,11 +385,13 @@
                         </DataGridTemplateColumn>
                         <DataGridTextColumn Header="Lvl" Width="1.2*" Binding="{Binding Dino.BaseLevel}"/>
                         <DataGridTextColumn Header="Pos" Width="2.2*" Binding="{Binding Path=Dino.Location, Converter={StaticResource PositionToStringConverter}}"/>
-                        <DataGridTextColumn Header="Hp" Width="1*" Binding="{Binding Path=Dino.WildLevels.Health}"/>
-                        <DataGridTextColumn Header="St" Width="1*" Binding="{Binding Path=Dino.WildLevels.Stamina}"/>
-                        <DataGridTextColumn Header="We" Width="1*" Binding="{Binding Path=Dino.WildLevels.Weight}"/>
-                        <DataGridTextColumn Header="Me" Width="1*" Binding="{Binding Path=Dino.WildLevels.Melee}"/>
-                        <DataGridTextColumn Header="Sp" Width="1*" Binding="{Binding Path=Dino.WildLevels.Speed}"/>
+                        <DataGridTextColumn x:Name="health" Header="Hp" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowHealth, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Health}"/>
+                        <DataGridTextColumn x:Name="stamina" Header="St" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowStam, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Stamina}"/>
+                        <DataGridTextColumn x:Name="oxygen" Header="Ox" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowOxygen, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Weight}"/>
+                        <DataGridTextColumn x:Name="food" Header="Fd" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowFood, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Melee}"/>
+                        <DataGridTextColumn x:Name="weight" Header="We" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowWeight, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Speed}"/>
+                        <DataGridTextColumn x:Name="melee" Header="Me" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowMelee, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Food}"/>
+                        <DataGridTextColumn x:Name="speed" Header="Sp" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowSpeed, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Oxygen}"/>
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -398,6 +407,7 @@
                         <fa:ImageAwesome Icon="Remove" Height="30" Width="30" Margin="8" Foreground="#88FFFF00" ToolTip="Remove user settings &amp; exit" MouseDown="Dev_RemoveSettings_Click"/>
                     </StackPanel>
                     <fa:ImageAwesome Icon="cogs" Width="30" Height="30" Margin="8" Foreground="#44ffffff" ToolTip="Settings" MouseDown="Settings_Click"/>
+                    <fa:ImageAwesome Icon="refresh" Width="30" Height="30" Margin="8" Foreground="#44ffffff" ToolTip="Refresh" Visibility="Hidden" MouseDown="Refresh_Click"/>
                 </StackPanel>
             </Grid>
         </Grid>