From e2793e6a03228fffed489734793fdd7eefed52a2 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sat, 27 May 2023 16:23:21 +0200
Subject: [PATCH] Fix TotalFlips

---
 P3D/Screens/MainMenu/PauseScreen.vb |  1 +
 P3D/Screens/VoltorbFlipScreen.vb    | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb
index 5a1e6441e..1506a4ff0 100644
--- a/P3D/Screens/MainMenu/PauseScreen.vb
+++ b/P3D/Screens/MainMenu/PauseScreen.vb
@@ -299,6 +299,7 @@
         VoltorbFlip.VoltorbFlipScreen.CurrentLevel = 1
         VoltorbFlip.VoltorbFlipScreen.PreviousLevel = 1
         VoltorbFlip.VoltorbFlipScreen.ConsecutiveWins = 0
+        VoltorbFlip.VoltorbFlipScreen.TotalFlips = 0
 
         If JoinServerScreen.Online = True Then
             Core.ServersManager.ServerConnection.Disconnect()
diff --git a/P3D/Screens/VoltorbFlipScreen.vb b/P3D/Screens/VoltorbFlipScreen.vb
index a34c51a9d..a77b37b4a 100644
--- a/P3D/Screens/VoltorbFlipScreen.vb
+++ b/P3D/Screens/VoltorbFlipScreen.vb
@@ -932,19 +932,20 @@ TryAgain:
                 If Delay = 0 Then
                     PreviousLevel = CurrentLevel
 
-                    TotalFlips += CurrentFlips
+                    If CurrentFlips >= 8 Then
+                        TotalFlips += 1
+                    End If
+
                     CurrentFlips = 0
                     ConsecutiveWins += 1
 
-                    If ConsecutiveWins = 5 AndAlso TotalFlips >= 8 Then
+                    If ConsecutiveWins = 5 AndAlso TotalFlips = 5 Then
                         CurrentLevel = MaxLevel + 1
                     Else
-                        If CurrentLevel < MaxLevel + 1 Then
-                            If CurrentLevel + 1 > MaxLevel Then
-                                CurrentLevel = MaxLevel
-                            Else
-                                CurrentLevel += 1
-                            End If
+                        If CurrentLevel + 1 > MaxLevel Then
+                            CurrentLevel = MaxLevel
+                        Else
+                            CurrentLevel += 1
                         End If
                     End If
 
@@ -1055,6 +1056,10 @@ TryAgain:
                 If TextBox.Showing = False Then
                     SoundManager.PlaySound("VoltorbFlip\StartGame")
                     Board = CreateBoard(CurrentLevel)
+                    If CurrentLevel = 8 Then
+                        TotalFlips = 0
+                        ConsecutiveWins = 0
+                    End If
                     If CurrentLevel < PreviousLevel Then
                         TextBox.Show("Dropped to Game Lv." & " " & CurrentLevel & "!")
                     End If