diff --git a/rabi_splitter_WPF/MemorySnapshot.cs b/rabi_splitter_WPF/MemorySnapshot.cs index f56164b..6eea932 100644 --- a/rabi_splitter_WPF/MemorySnapshot.cs +++ b/rabi_splitter_WPF/MemorySnapshot.cs @@ -28,7 +28,6 @@ namespace rabi_splitter_WPF public readonly int currentSprite; public readonly int actionFrame; - public readonly int animationFrame; public readonly float amulet; public readonly int boost; @@ -83,7 +82,6 @@ namespace rabi_splitter_WPF currentSprite = MemoryHelper.GetMemoryValue(process, entityArrayPtr + 0x654, false); actionFrame = MemoryHelper.GetMemoryValue(process, entityArrayPtr + 0x660, false); - animationFrame = MemoryHelper.GetMemoryValue(process, entityArrayPtr + 0x67c, false); amulet = MemoryHelper.GetMemoryValue(process, entityArrayPtr + 0x52C, false); boost = MemoryHelper.GetMemoryValue(process, entityArrayPtr + 0x5DC, false); diff --git a/rabi_splitter_WPF/RabiGameState.cs b/rabi_splitter_WPF/RabiGameState.cs index 7f7f233..3563753 100644 --- a/rabi_splitter_WPF/RabiGameState.cs +++ b/rabi_splitter_WPF/RabiGameState.cs @@ -16,12 +16,10 @@ namespace rabi_splitter_WPF { public int nRestarts; public int nDeaths; - - public int nRestartsAlt; + public int nDeathsAlt; public GameActivity currentActivity; - public int currentBoss; public int lastNonZeroPlayTime = -1; diff --git a/rabi_splitter_WPF/RabiRibiDisplay.cs b/rabi_splitter_WPF/RabiRibiDisplay.cs index edb79f7..d6e745d 100644 --- a/rabi_splitter_WPF/RabiRibiDisplay.cs +++ b/rabi_splitter_WPF/RabiRibiDisplay.cs @@ -80,19 +80,6 @@ namespace rabi_splitter_WPF } gameState.lastNonZeroPlayTime = snapshot.playtime; } - - if (gameState.IsGameStarted() && prevSnapshot != null) - { - // Issue: This sometimes detects warps as resets too. - if (snapshot.animationFrame < prevSnapshot.animationFrame) - { - if (InGame()) - { - gameState.nRestartsAlt++; - } - DebugLog("Reload Game (Alt)!"); - } - } #endregion @@ -164,7 +151,6 @@ namespace rabi_splitter_WPF mainContext.Text12 = "Entities: " + snapshot.entityArraySize + "\n" + "Active: " + snapshot.nActiveEntities; mainContext.Text13 = "Sprite: " + snapshot.GetCurrentSprite() + "\n" + "Action: " + snapshot.GetCurrentAction(); - mainContext.Text14 = "AnimFrame: " + snapshot.animationFrame; { string bosstext = "Boss Fight: " + (gameState.currentActivity == GameActivity.BOSS_BATTLE) + "\n"; bosstext += "Bosses: " + snapshot.bossList.Count + "\n";