tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change order of VoltorbFlip messages

This commit is contained in:
JappaWakka 2023-05-30 09:59:03 +02:00
parent a2718ac639
commit 5cd5e00587
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
P3D/Content/Localization/Tokens_en.dat
View File

@ -440,10 +440,10 @@ VoltorbFlip_MaxCoins,Your Coin Case can't fit~any more Coin(s)!
VoltorbFlip_NewLevel_Lower1,Dropped to Game Lv.
VoltorbFlip_NewLevel_Lower2,!
VoltorbFlip_NewLevel_Same1,Ready to play Game Lv.
VoltorbFlip_NewLevel_Same2,!
VoltorbFlip_NewLevel_Higher1,Advanced to Game Lv.
VoltorbFlip_NewLevel_Higher2,!
VoltorbFlip_NewLevel_Ready1,Ready to play Game Lv.
VoltorbFlip_NewLevel_Ready2,!
VoltorbFlip_QuitGame_1,<player.name> received~
VoltorbFlip_QuitGame_2,Coin(s)!

48
P3D/Screens/VoltorbFlipScreen.vb
View File

@ -1055,9 +1055,15 @@ TryAgain:
Next
Next
If Controls.Accept = True AndAlso TextBox.Showing = False Then
If ReadyAmount = CInt(GridSize * GridSize) Then
SoundManager.PlaySound("select")
If Controls.Accept = True AndAlso ReadyAmount = CInt(GridSize * GridSize) AndAlso TextBox.Showing = False Then
SoundManager.PlaySound("select")
If Delay = 0 Then
Delay = 5
End If
If Delay > 3 Then
If CurrentLevel > PreviousLevel Then
TextBox.Show(Localization.GetString("VoltorbFlip_NewLevel_Higher1", "Advanced to Game Lv.") & " " & CurrentLevel & Localization.GetString("VoltorbFlip_NewLevel_Higher2", "!"))
End If
GameState = States.FlipWon
End If
End If
@ -1065,7 +1071,6 @@ TryAgain:
'Revealed a Voltorb
If GameState = States.GameLost Then
CurrentCoins = 0
'Flip all Tiles to reveal contents
@ -1079,15 +1084,21 @@ TryAgain:
Next
Next
If ReadyAmount = CInt(GridSize * GridSize) Then
If Controls.Accept = True AndAlso TextBox.Showing = False Then
PreviousLevel = CurrentLevel
If CurrentFlips < CurrentLevel Then
CurrentLevel = Math.Max(1, CurrentFlips)
Else
CurrentLevel = 1
If Controls.Accept = True AndAlso ReadyAmount = CInt(GridSize * GridSize) AndAlso TextBox.Showing = False Then
PreviousLevel = CurrentLevel
If CurrentFlips < CurrentLevel Then
CurrentLevel = Math.Max(1, CurrentFlips)
Else
CurrentLevel = 1
End If
SoundManager.PlaySound("select")
If Delay = 0 Then
Delay = 5
End If
If Delay > 3 Then
If CurrentLevel < PreviousLevel Then
TextBox.Show(Localization.GetString("VoltorbFlip_NewLevel_Lower1", "Dropped to Game Lv.") & " " & CurrentLevel & Localization.GetString("VoltorbFlip_NewLevel_Lower2", "!"))
End If
SoundManager.PlaySound("select")
GameState = States.FlipLost
End If
End If
@ -1111,7 +1122,7 @@ TryAgain:
End If
'Drop Level, reset Tiles
If GameState = States.FlipLost Then
If GameState = States.FlipLost AndAlso TextBox.Showing = False Then
Dim ReadyAmount As Integer = 0
For _row = 0 To GridSize - 1
For _column = 0 To GridSize - 1
@ -1205,17 +1216,8 @@ TryAgain:
TotalFlips = 0
ConsecutiveWins = 0
End If
If CurrentLevel < PreviousLevel Then
TextBox.Show(Localization.GetString("VoltorbFlip_NewLevel_Lower1", "Dropped to Game Lv.") & " " & CurrentLevel & Localization.GetString("VoltorbFlip_NewLevel_Lower2", "!"))
End If
If CurrentLevel = PreviousLevel Then
TextBox.Show(Localization.GetString("VoltorbFlip_NewLevel_Same1", "Ready to play Game Lv.") & " " & CurrentLevel & Localization.GetString("VoltorbFlip_NewLevel_Same2", "!"))
End If
If CurrentLevel > PreviousLevel Then
TextBox.Show(Localization.GetString("VoltorbFlip_NewLevel_Higher1", "Advanced to Game Lv.") & " " & CurrentLevel & Localization.GetString("VoltorbFlip_NewLevel_Higher2", "!"))
End If
TextBox.Show(Localization.GetString("VoltorbFlip_NewLevel_Ready1", "Ready to play Game Lv.") & " " & CurrentLevel & Localization.GetString("VoltorbFlip_NewLevel_Ready2", "!"))
Else
Delay = 15
GameState = States.Game