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

If BattleAnimations = 0, skip catch animations

This commit is contained in:
JappaWakka 2022-06-06 15:00:18 +02:00
parent 9e67b5fc62
commit c22f7d3894
1 changed files with 80 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
P3D/Screens/Battle/BattleCatchScreen.vb
View File

@ -140,6 +140,27 @@ nextIndex:
Select Case AnimationIndex Select Case AnimationIndex
Case 0 Case 0
If AnimationHasStarted = False Then If AnimationHasStarted = False Then
Dim Shakes As List(Of Boolean) = New List(Of Boolean)
For i = 0 To 3
If StayInBall() = True Then
Select Case i
Case 0
Shakes.Add(False)
Case 1
Shakes.Add(True)
Case 2
Shakes.Add(False)
Case 3
InBall = True
End Select
Else
Exit For
InBall = False
End If
Next
If Core.Player.ShowBattleAnimations <> 0 Then
PokemonScale = BattleScreen.OppPokemonNPC.Scale PokemonScale = BattleScreen.OppPokemonNPC.Scale
'Ball is thrown 'Ball is thrown
Dim CatchAnimation = New BattleSystem.AnimationQueryObject(Nothing, False, Nothing) Dim CatchAnimation = New BattleSystem.AnimationQueryObject(Nothing, False, Nothing)
@ -179,24 +200,7 @@ nextIndex:
CatchAnimation.AnimationMove(BallEntity, False, 3, -0.35, 0, 0.1F, False, False, 8, 0) CatchAnimation.AnimationMove(BallEntity, False, 3, -0.35, 0, 0.1F, False, False, 8, 0)
CatchAnimation.AnimationPlaySound("Battle\Pokeball\Land", 9, 0) CatchAnimation.AnimationPlaySound("Battle\Pokeball\Land", 9, 0)
Dim Shakes As List(Of Boolean) = New List(Of Boolean)
For i = 0 To 3
If StayInBall() = True Then
Select Case i
Case 0
Shakes.Add(False)
Case 1
Shakes.Add(True)
Case 2
Shakes.Add(False)
Case 3
InBall = True
End Select
Else
Exit For
InBall = False
End If
Next
For i = 0 To Shakes.Count - 1 For i = 0 To Shakes.Count - 1
CatchAnimation.AnimationPlaySound("Battle\Pokeball\Shake", 12 + i * 10, 0) CatchAnimation.AnimationPlaySound("Battle\Pokeball\Shake", 12 + i * 10, 0)
If Shakes(i) = False Then If Shakes(i) = False Then
@ -244,6 +248,7 @@ nextIndex:
End If End If
AnimationList.Add(CatchAnimation) AnimationList.Add(CatchAnimation)
End If
AnimationHasStarted = True AnimationHasStarted = True
Else Else
If AnimationList.Count = 0 Then If AnimationList.Count = 0 Then