Fix Background anim fadeout + tweak psychic anim

This commit is contained in:
JappaWakka 2023-06-22 10:40:29 +02:00
parent 1d535bc14d
commit 4b2138d3b2
2 changed files with 11 additions and 6 deletions

View File

@ -87,21 +87,26 @@
FadeProgress = FadeSteps.Duration FadeProgress = FadeSteps.Duration
Me.BackgroundOpacity = Me.AfterFadeInOpacity Me.BackgroundOpacity = Me.AfterFadeInOpacity
End If End If
Else
FadeProgress = FadeSteps.Duration
Me.BackgroundOpacity = Me.AfterFadeInOpacity
End If End If
Case FadeSteps.Duration Case FadeSteps.Duration
If Date.Now >= DurationDate Then If Date.Now >= DurationDate Then
FadeProgress = FadeSteps.FadeOut FadeProgress = FadeSteps.FadeOut
End If End If
Case FadeSteps.FadeOut Case FadeSteps.FadeOut
If 0 < Me.BackgroundOpacity Then If Me.BackgroundOpacity > 0.0F Then
Me.BackgroundOpacity -= Me.FadeOutSpeed Me.BackgroundOpacity -= Me.FadeOutSpeed
If Me.BackgroundOpacity <= 0 Then If Me.BackgroundOpacity <= 0.0F Then
Me.BackgroundOpacity = 0 Me.BackgroundOpacity = 0.0F
Me.Ready = True
End If End If
End If Else
If Me.BackgroundOpacity = 0 Then Me.BackgroundOpacity = 0.0F
Me.Ready = True Me.Ready = True
End If End If
End Select End Select
End Sub End Sub

View File

@ -74,7 +74,7 @@
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC) Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC)
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip, True) Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip, True)
MoveAnimation.AnimationPlaySound("Battle\Attacks\Psychic\Psychic", 0.0F, 0) MoveAnimation.AnimationPlaySound("Battle\Attacks\Psychic\Psychic", 0.0F, 0)
MoveAnimation.AnimationBackground(TextureManager.GetTexture("Textures\Battle\Psychic\PsychicBackground"), 0, 0, 1.5F,,,, True, 32, 11, 3, 6) MoveAnimation.AnimationBackground(TextureManager.GetTexture("Textures\Battle\Psychic\PsychicBackground"), 0, 0, 1.5F, 0.6F, 0.075F, 0.075F, True, 32, 11, 2, 6)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, -0.1, 0.025, False, False, 1, 0.5) MoveAnimation.AnimationMove(Nothing, False, 0, 0, -0.1, 0.025, False, False, 1, 0.5)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0.1, 0.025, False, False, 1.75, 0.5) MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0.1, 0.025, False, False, 1.75, 0.5)