From 7de3bd345d8d4ae6dd045a02638cbf5f0afa7e2e Mon Sep 17 00:00:00 2001
From: Me_TheCat <spacekitty135@gmail.com>
Date: Sun, 31 Mar 2019 07:46:45 +0300
Subject: [PATCH] Added stats to status bar display

---
 SekiroFpsUnlockAndMore/MainWindow.xaml    | 29 ++++++++++++++-
 SekiroFpsUnlockAndMore/MainWindow.xaml.cs | 22 +++++++-----
 SekiroFpsUnlockAndMore/StatViewModel.cs   | 43 +++++++++++++++++++++++
 3 files changed, 85 insertions(+), 9 deletions(-)
 create mode 100644 SekiroFpsUnlockAndMore/StatViewModel.cs

diff --git a/SekiroFpsUnlockAndMore/MainWindow.xaml b/SekiroFpsUnlockAndMore/MainWindow.xaml
index 4fc5190..dad717c 100644
--- a/SekiroFpsUnlockAndMore/MainWindow.xaml
+++ b/SekiroFpsUnlockAndMore/MainWindow.xaml
@@ -22,7 +22,7 @@
 		<Button x:Name="bPatch" Content="Patch game (CTRL + P)" FontSize="14 px" HorizontalAlignment="Left" Margin="10,153,0,0" VerticalAlignment="Top" Width="277" Height="30"
                 BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" Focusable="False" Click="BPatch_Click" />
 		<TextBox x:Name="tbStatus" Text="waiting for game..." TextAlignment="Center" HorizontalAlignment="Left" TextWrapping="NoWrap" Height="25" Margin="10,189,0,0" VerticalAlignment="Top" Width="277" FontSize="14 px" IsEnabled="False" FontWeight="Bold" />
-		<StackPanel HorizontalAlignment="Left" Height="304" Margin="12,219,0,0" VerticalAlignment="Top" Width="275">
+		<StackPanel HorizontalAlignment="Left" Height="329" Margin="12,219,0,0" VerticalAlignment="Top" Width="275">
 			<TextBlock HorizontalAlignment="Left" TextWrapping="WrapWithOverflow" VerticalAlignment="Top" FontSize="11 px" IsEnabled="False" Height="280">
 				<TextBlock.Inlines>
 					<Run FontWeight="Bold">If your monitor is 60 Hz you will have to use</Run>
@@ -47,5 +47,32 @@
 				</Hyperlink>
 			</Label>
 		</StackPanel>
+		<StatusBar DockPanel.Dock="Bottom" VerticalAlignment="Bottom">
+			<StatusBar.ItemsPanel>
+				<ItemsPanelTemplate>
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+					</Grid>
+				</ItemsPanelTemplate>
+			</StatusBar.ItemsPanel>
+
+			<StatusBarItem Grid.Column="0">
+				<TextBlock Name="sbDeathCount">
+					<Run Text="Deaths:"/>
+					<Run Text="{Binding Deaths}"/>
+				</TextBlock>
+			</StatusBarItem>
+			<Separator Grid.Column="1" />
+			<StatusBarItem Grid.Column="2">
+				<TextBlock Name="sbKillCount">
+					<Run Text="Kills:"/>
+					<Run Text="{Binding Kills}"/>
+				</TextBlock>
+			</StatusBarItem>
+		</StatusBar>
 	</Grid>
 </Window>
diff --git a/SekiroFpsUnlockAndMore/MainWindow.xaml.cs b/SekiroFpsUnlockAndMore/MainWindow.xaml.cs
index 2db3491..b4b12fc 100644
--- a/SekiroFpsUnlockAndMore/MainWindow.xaml.cs
+++ b/SekiroFpsUnlockAndMore/MainWindow.xaml.cs
@@ -52,17 +52,21 @@ namespace SekiroFpsUnlockAndMore
 		internal const string deathCounterFilename = "DeathCouner.txt";
 		internal const string totalKillsFilename = "TotalKillsCounter.txt";
 
+		internal StatViewModel _statViewModel = new StatViewModel();
+		private bool _statLoggingEnabled = false;
 		internal readonly Timer _statRecordTimer = new Timer();
 		internal readonly DispatcherTimer _dispatcherTimerCheck = new DispatcherTimer();
         internal bool _running = false;
         internal string _logPath;
         internal bool _retryAccess = true;
         internal RECT _windowRect;
+		
 
 		public MainWindow()
-        {
-            InitializeComponent();
-        }
+        {
+			InitializeComponent();
+			DataContext = _statViewModel;
+		}
 
         /// <summary>
         /// On window loaded.
@@ -87,6 +91,7 @@ namespace SekiroFpsUnlockAndMore
 
 			_statRecordTimer.Elapsed += new ElapsedEventHandler(StatReadTimer);
 			_statRecordTimer.Interval = 1500;
+			_statRecordTimer.Start();
 		}
 
         /// <summary>
@@ -447,18 +452,19 @@ namespace SekiroFpsUnlockAndMore
 		/// </summary
 		private void StatReadTimer(object sender, EventArgs e)
 		{
+			if (_gameProc==IntPtr.Zero) return;
 			if (IsValid(_pointer_player_deaths))
 			{
 				int playerDeaths = Read<Int32>(_gameProc, _pointer_player_deaths);
-				//Debug.WriteLine("[STAT]Player deaths: " + playerDeaths);
-				LogStatFile(deathCounterFilename, playerDeaths.ToString());
+				_statViewModel.Deaths = playerDeaths;
+				if (_statLoggingEnabled) LogStatFile(deathCounterFilename, playerDeaths.ToString());
 
 				if (IsValid(_pointer_total_kills))
 				{
 					int totalKills = Read<Int32>(_gameProc, _pointer_total_kills);
 					totalKills -= playerDeaths; //Since this value seems to track every death, including the player
-					//Debug.WriteLine("[STAT]Enemies killed: " + totalKills);
-					LogStatFile(totalKillsFilename, totalKills.ToString());
+					_statViewModel.Kills = totalKills;
+					if (_statLoggingEnabled)  LogStatFile(totalKillsFilename, totalKills.ToString());
 				}
 			}
 		}
@@ -698,7 +704,7 @@ namespace SekiroFpsUnlockAndMore
 
 		private void CbStatChanged(object sender, RoutedEventArgs e)
 		{
-			_statRecordTimer.Enabled = (bool)cbLogStats.IsChecked;
+			_statLoggingEnabled = (bool)cbLogStats.IsChecked;
 		}
 
 		private void BPatch_Click(object sender, RoutedEventArgs e)
diff --git a/SekiroFpsUnlockAndMore/StatViewModel.cs b/SekiroFpsUnlockAndMore/StatViewModel.cs
new file mode 100644
index 0000000..6c1a35c
--- /dev/null
+++ b/SekiroFpsUnlockAndMore/StatViewModel.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+
+namespace SekiroFpsUnlockAndMore
+{
+	/// <summary>
+	/// For Status bar display
+	/// </summary>
+	class StatViewModel : INotifyPropertyChanged
+	{
+		private int _deaths = 0;
+		public int Deaths
+		{
+			get { return _deaths; }
+			set
+			{
+				_deaths = value;
+				OnPropertyChanged(new PropertyChangedEventArgs("Deaths"));
+			}
+		}
+
+		private int _kills = 0;
+		public int Kills
+		{
+			get { return _kills; }
+			set
+			{
+				_kills = value;
+				OnPropertyChanged(new PropertyChangedEventArgs("Kills"));
+			}
+		}
+
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		public void OnPropertyChanged(PropertyChangedEventArgs e)
+		{
+			PropertyChanged?.Invoke(this, e);
+		}
+	}
+}