From 00d495342b783ee9f18d8c3b28cf235868e3798b Mon Sep 17 00:00:00 2001
From: PC_volt <PC_volt@DESKTOP-I20R60L>
Date: Mon, 9 Sep 2024 21:04:58 +0200
Subject: [PATCH] Added stun threshold from memory read

---
 App.config         | 2 +-
 Labtool.cs         | 2 ++
 MainWindow.xaml.cs | 4 ++--
 MemoryAccessor.cs  | 1 +
 Player.cs          | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/App.config b/App.config
index fe1bcf9..cd79703 100644
--- a/App.config
+++ b/App.config
@@ -13,10 +13,10 @@
 	
 	<add key="CharIndexOffset" value="0x44"/>
 	<add key="BlockstunOffset" value="0x4D54"/>
-	<add key="HitstunOffset" value="0x9808"/>
 	<add key="HPOffset" value="0x9CC"/>
 	<add key="AnimStringOffset" value="0x2444" />
 	<add key="StunOffset" value="0x9FC4"/>
+	<add key="StunThresholdOffset" value="0x9FC8"/>
 	<add key="RISCOffset" value="0x24E30"/>
 	<add key="MeterOffset" value="0x2D134"/>
 	<add key="PositionXOffset" value="0x24C"/>
diff --git a/Labtool.cs b/Labtool.cs
index 1dcc177..f1a22c6 100644
--- a/Labtool.cs
+++ b/Labtool.cs
@@ -134,6 +134,8 @@ public void updateFrameInfo()
 		_player2._RISC = MemoryAccessor.ReadInfoInt(ref _player2, MemoryAccessor._RISCOffset);
 		_player1._stun = MemoryAccessor.ReadInfoInt(ref _player1, MemoryAccessor._StunOffset);
 		_player2._stun = MemoryAccessor.ReadInfoInt(ref _player2, MemoryAccessor._StunOffset);
+		_player1._stunThreshold = MemoryAccessor.ReadInfoInt(ref _player1, MemoryAccessor._StunThresholdOffset);
+		_player2._stunThreshold = MemoryAccessor.ReadInfoInt(ref _player2, MemoryAccessor._StunThresholdOffset);
 
 		_player1._pos.x = MemoryAccessor.ReadInfoInt(ref _player1, MemoryAccessor._PositionXOffset);
 		_player1._pos.y = MemoryAccessor.ReadInfoInt(ref _player1, MemoryAccessor._PositionYOffset);
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3eeceea..21f3d90 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -135,8 +135,8 @@ private void refreshInfo()
 				
 				updateLabel(this.p1DefModifLabel, "[x" + _labtool._player1.getDefenseModifier() + "]");
 				updateLabel(this.p2DefModifLabel, "[x" + _labtool._player2.getDefenseModifier() + "]");
-				updateLabel(this.p1StunLabel, "" + _labtool._player1._stun + "/" + Player.stunList[_labtool._player1.characterIndex]);
-				updateLabel(this.p2StunLabel, "" + _labtool._player2._stun + "/" + Player.stunList[_labtool._player2.characterIndex]);
+				updateLabel(this.p1StunLabel, "" + _labtool._player1._stun + "/" + _labtool._player1._stunThreshold * 100);
+				updateLabel(this.p2StunLabel, "" + _labtool._player2._stun + "/" + _labtool._player2._stunThreshold * 100);
 				updateLabel(this.p1GutsLabel, "(x guts)");
 				updateLabel(this.p2GutsLabel, "(x guts)");
 			}
diff --git a/MemoryAccessor.cs b/MemoryAccessor.cs
index 407abed..f976de1 100644
--- a/MemoryAccessor.cs
+++ b/MemoryAccessor.cs
@@ -29,6 +29,7 @@ class MemoryAccessor
 	public static readonly int _PositionYOffset = Convert.ToInt32(ConfigurationManager.AppSettings.Get("PositionYOffset"), 16);
 	public static readonly int _AnimStringOffset = Convert.ToInt32(ConfigurationManager.AppSettings.Get("AnimStringOffset"), 16);
 	public static readonly int _StunOffset = Convert.ToInt32(ConfigurationManager.AppSettings.Get("StunOffset"), 16);
+	public static readonly int _StunThresholdOffset = Convert.ToInt32(ConfigurationManager.AppSettings.Get("StunThresholdOffset"), 16);
 
 	public static readonly int _BlockstunOffset = Convert.ToInt32(ConfigurationManager.AppSettings.Get("BlockstunOffset"), 16);
 	public static readonly int _HitstunOffset = Convert.ToInt32(ConfigurationManager.AppSettings.Get("HitstunOffset"), 16);
diff --git a/Player.cs b/Player.cs
index 9bdd3e7..4c90825 100644
--- a/Player.cs
+++ b/Player.cs
@@ -28,6 +28,7 @@ class Player
 	public int _meter;
 	public int _RISC;
 	public int _stun;
+	public int _stunThreshold;
 	public bool _isBlocking = false;
 	public bool _isHit = false;
 	public int _hitstop;