diff --git a/Common/StatPoints.cs b/Common/StatPoints.cs index 30e3581..61971d5 100644 --- a/Common/StatPoints.cs +++ b/Common/StatPoints.cs @@ -9,6 +9,8 @@ public class StatPoints : IEquatable 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}/{Weight}/{Melee}/{Speed}/{Food}/{Oxygen}"; } public string ToString(bool fixedWidth = false) { if (fixedWidth) - return $"{Health,2}/{Stamina,2}/{Weight,2}/{Melee,2}/{Speed,2}"; + return $"{Health,2}/{Stamina,2}/{Weight,2}/{Melee,2}/{Speed,2}/{Food,2}/{Oxygen,2}"; else return ToString(); } diff --git a/LarkatorGUI/MainWindow.xaml b/LarkatorGUI/MainWindow.xaml index 782bc5f..540fb27 100644 --- a/LarkatorGUI/MainWindow.xaml +++ b/LarkatorGUI/MainWindow.xaml @@ -398,6 +398,7 @@ + diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs index 54ed2a8..99b3983 100644 --- a/LarkatorGUI/MainWindow.xaml.cs +++ b/LarkatorGUI/MainWindow.xaml.cs @@ -176,7 +176,7 @@ public bool ShowCounts private string lastArk; private DebounceDispatcher refreshSearchesTimer = new DebounceDispatcher(); private DebounceDispatcher settingsSaveTimer = new DebounceDispatcher(); - + public MainWindow() { ValidateWindowPositionAndSize(); @@ -576,6 +576,11 @@ private void Settings_Click(object sender, MouseButtonEventArgs e) OnSettingsChanged(); } + private async void Refresh_Click(object sender, MouseButtonEventArgs e) + { + await ReReadArk(); + } + private void AdjustableInteger_MouseWheel(object sender, MouseWheelEventArgs e) { var tb = (TextBlock)sender; diff --git a/LarkatorGUI/Properties/Settings.Designer.cs b/LarkatorGUI/Properties/Settings.Designer.cs index 9c1ee83..c4ea07e 100644 --- a/LarkatorGUI/Properties/Settings.Designer.cs +++ b/LarkatorGUI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace LarkatorGUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -236,5 +236,89 @@ public bool TeleportGhost { this["TeleportGhost"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool showHealth { + get { + return ((bool)(this["showHealth"])); + } + set { + this["showHealth"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool showStam { + get { + return ((bool)(this["showStam"])); + } + set { + this["showStam"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool showWeight { + get { + return ((bool)(this["showWeight"])); + } + set { + this["showWeight"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool showMelee { + get { + return ((bool)(this["showMelee"])); + } + set { + this["showMelee"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool showSpeed { + get { + return ((bool)(this["showSpeed"])); + } + set { + this["showSpeed"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool showFood { + get { + return ((bool)(this["showFood"])); + } + set { + this["showFood"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool showOxygen { + get { + return ((bool)(this["showOxygen"])); + } + set { + this["showOxygen"] = value; + } + } } } diff --git a/LarkatorGUI/Properties/Settings.settings b/LarkatorGUI/Properties/Settings.settings index 175a717..a03ca65 100644 --- a/LarkatorGUI/Properties/Settings.settings +++ b/LarkatorGUI/Properties/Settings.settings @@ -50,5 +50,26 @@ False + + True + + + True + + + True + + + True + + + True + + + False + + + False + \ No newline at end of file diff --git a/LarkatorGUI/SettingsWindow.xaml b/LarkatorGUI/SettingsWindow.xaml index 5111133..2d26e6d 100644 --- a/LarkatorGUI/SettingsWindow.xaml +++ b/LarkatorGUI/SettingsWindow.xaml @@ -110,6 +110,70 @@ Margin="7,4"/> + + + + + + + + + + + + + + + + + Hp + + + St + + + We + + + Me + + + Sp + + + Fd + + + Ox + + + + Display Stats: + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LarkatorGUI/app.config b/LarkatorGUI/app.config index 93cbee7..6dd8a3f 100644 --- a/LarkatorGUI/app.config +++ b/LarkatorGUI/app.config @@ -55,6 +55,27 @@ False + + True + + + True + + + True + + + True + + + True + + + False + + + False + \ No newline at end of file