Implemented flash move animation

P3D/Battle/BattleAnimations/BAEntityColor.vb

@@ -4,19 +4,33 @@
 
     Public TargetEntity As Entity
     Public TransitionSpeed As Single = 0.01F
+    Public TransitionSpeedOut As Single = 0.01F
     Public FadeIn As Boolean = False
+    Public ReturnToFromWhenDone As Boolean = False
+    Public RemoveEntityAfter As Boolean = False
+    Public InitialColorSet As Boolean = False
+    Public IsReturning As Boolean = False
     Public ColorTo As Vector3 = New Vector3(1.0F, 1.0F, 1.0F)
+    Public ColorFrom As Vector3 = New Vector3(1.0F, 1.0F, 1.0F)
 
-    Public Sub New(ByVal Entity As Entity, ByVal TransitionSpeed As Single, ByVal startDelay As Single, ByVal endDelay As Single, ByVal ColorTo As Color, Optional ByVal ColorFrom As Color = Nothing)
+    Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeedIn As Single, ByVal ReturnToFromWhenDone As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, ByVal ColorTo As Vector3, Optional ByVal ColorFrom As Vector3 = Nothing, Optional TransitionSpeedOut As Single = -1)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
-
+        Me.RemoveEntityAfter = RemoveEntityAfter
-        Me.TransitionSpeed = TransitionSpeed
+        If TransitionSpeedOut = -1 Then
+            Me.TransitionSpeedOut = TransitionSpeedIn
+        Else
+            Me.TransitionSpeedOut = TransitionSpeedOut
+        End If
+        Me.TransitionSpeed = TransitionSpeedIn
         Me.TargetEntity = Entity
+        Me.ReturnToFromWhenDone = ReturnToFromWhenDone
 
         If Not ColorFrom = Nothing Then
-            TargetEntity.Color = ColorFrom.ToVector3
+            Me.ColorFrom = ColorFrom
+        Else
+            Me.ColorFrom = TargetEntity.Color
         End If
-        Me.ColorTo = ColorTo.ToVector3
+        Me.ColorTo = ColorTo
 
         Me.Visible = False
 
@@ -24,44 +38,62 @@
     End Sub
 
     Public Overrides Sub DoActionActive()
+        If InitialColorSet = False Then
+            TargetEntity.Color = ColorFrom
+            InitialColorSet = True
+        End If
 
         If TargetEntity.Color.X > ColorTo.X Then
-            TargetEntity.Color.X -= CByte(Me.TransitionSpeed)
+            TargetEntity.Color.X -= Me.TransitionSpeed
             If TargetEntity.Color.X <= ColorTo.X Then
                 TargetEntity.Color.X = ColorTo.X
             End If
         ElseIf TargetEntity.Color.X < ColorTo.X Then
-            TargetEntity.Color.X += CByte(Me.TransitionSpeed)
+            TargetEntity.Color.X += Me.TransitionSpeed
             If TargetEntity.Color.X >= ColorTo.X Then
                 TargetEntity.Color.X = ColorTo.X
             End If
         End If
         If TargetEntity.Color.Y > ColorTo.Y Then
-            TargetEntity.Color.Y -= CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Y -= Me.TransitionSpeed
             If TargetEntity.Color.Y <= ColorTo.Y Then
                 TargetEntity.Color.Y = ColorTo.Y
             End If
         ElseIf TargetEntity.Color.Y < ColorTo.Y Then
-            TargetEntity.Color.Y += CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Y += Me.TransitionSpeed
             If TargetEntity.Color.Y >= ColorTo.Y Then
                 TargetEntity.Color.Y = ColorTo.Y
             End If
         End If
         If TargetEntity.Color.Z > ColorTo.Z Then
-            TargetEntity.Color.Z -= CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Z -= Me.TransitionSpeed
             If TargetEntity.Color.Z <= ColorTo.Z Then
                 TargetEntity.Color.Z = ColorTo.Z
             End If
         ElseIf TargetEntity.Color.Z < ColorTo.Z Then
-            TargetEntity.Color.Z += CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Z += Me.TransitionSpeed
             If TargetEntity.Color.Z >= ColorTo.Z Then
                 TargetEntity.Color.Z = ColorTo.Z
             End If
         End If
 
         If TargetEntity.Color = ColorTo Then
+            If ReturnToFromWhenDone = False Then
+                Me.Ready = True
+            Else
+                If IsReturning = False Then
+                    ColorTo = ColorFrom
+                    TransitionSpeed = TransitionSpeedOut
+                    IsReturning = True
+                Else
                     Me.Ready = True
                 End If
+            End If
+        End If
+    End Sub
+    Public Overrides Sub DoRemoveEntity()
+        If Me.RemoveEntityAfter = True Then
+            TargetEntity.CanBeRemoved = True
+        End If
     End Sub
-
 End Class

P3D/Battle/BattleAnimations/BAEntityFaceRotate.vb

@@ -20,6 +20,8 @@
         Me.TargetEntity = TargetEntity
         Me.TurnSpeed = TurnSpeed
         Me.TurnDelay = TurnDelay
+
+        Me.AnimationType = AnimationTypes.Rotation
     End Sub
 
     Public Overrides Sub DoActionActive()

P3D/Battle/BattleAnimations/BAEntityRotate.vb

@@ -20,6 +20,8 @@
         Me.EndRotation = EndRotation
         Me.TargetEntity = Entity
         Me.ReturnVector = TargetEntity.Rotation
+
+        Me.AnimationType = AnimationTypes.Rotation
     End Sub
 
     Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean)

P3D/Battle/BattleAnimations/BAEntityTextureChange.vb

@@ -11,6 +11,7 @@
         Me.RemoveEntityAfter = RemoveEntityAfter
         Me.TargetEntity = Entity
         Me.Texture = Texture
+
         Me.AnimationType = AnimationTypes.Texture
     End Sub
 

P3D/Battle/BattleAnimations/BAPlaySound.vb

@@ -14,6 +14,7 @@
         Me.Visible = False
         Me.stopMusic = stopMusic
         Me.IsPokemon = IsPokemon
+
         AnimationType = AnimationTypes.Sound
     End Sub
 

P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb

@@ -1,4 +1,6 @@
-Namespace BattleSystem
+Imports System.Xml
+
+Namespace BattleSystem
 
 	Public Class AnimationQueryObject
 		Inherits QueryObject
@@ -228,6 +230,34 @@
 
 		End Sub
 
+		Public Sub AnimationColor(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeedIn As Single, ByVal ReturnToFromWhenDone As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, ByVal VectorColorTo As Vector3, Optional ByVal VectorColorFrom As Vector3 = Nothing, Optional TransitionSpeedOut As Single = -1)
+			Dim ColorEntity As Entity
+			If Entity Is Nothing Then
+				ColorEntity = CurrentEntity
+			Else
+				ColorEntity = Entity
+			End If
+			Dim baEntityColor As BAEntityColor = New BAEntityColor(ColorEntity, RemoveEntityAfter, TransitionSpeedIn, ReturnToFromWhenDone, startDelay, endDelay, VectorColorTo, VectorColorFrom, TransitionSpeedOut)
+			AnimationSequence.Add(baEntityColor)
+		End Sub
+
+		Public Sub AnimationColor(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeedIn As Single, ByVal ReturnToFromWhenDone As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, ByVal ColorTo As Color, Optional ByVal ColorFrom As Color = Nothing, Optional TransitionSpeedOut As Single = -1)
+			Dim ColorEntity As Entity
+			If Entity Is Nothing Then
+				ColorEntity = CurrentEntity
+			Else
+				ColorEntity = Entity
+			End If
+			Dim VectorColorTo As Vector3 = ColorTo.ToVector3
+			Dim VectorColorFrom As Vector3 = Nothing
+			If ColorFrom <> Nothing Then
+				VectorColorFrom = ColorFrom.ToVector3
+			End If
+
+			Dim baEntityColor As BAEntityColor = New BAEntityColor(ColorEntity, RemoveEntityAfter, TransitionSpeedIn, ReturnToFromWhenDone, startDelay, endDelay, VectorColorTo, VectorColorFrom, TransitionSpeedOut)
+			AnimationSequence.Add(baEntityColor)
+		End Sub
+
 		Public Sub AnimationFade(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal startState As Single = -1.0F)
 			Dim FadeEntity As Entity
 			If Entity Is Nothing Then
@@ -240,6 +270,7 @@
 			AnimationSequence.Add(baEntityOpacity)
 
 		End Sub
+
 		Public Sub AnimationRotate(Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedX As Single, ByVal RotationSpeedY As Single, ByVal RotationSpeedZ As Single, ByVal EndRotationX As Single, ByVal EndRotationY As Single, ByVal EndRotationZ As Single, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean, ByVal DoReturn As Boolean)
 			Dim RotateEntity As Entity
 			If Entity Is Nothing Then
@@ -253,7 +284,6 @@
 			Dim baEntityRotate As BAEntityRotate = New BAEntityRotate(RotateEntity, RemoveEntityAfter, RotationSpeedVector, EndRotation, startDelay, endDelay, DoXRotation, DoYRotation, DoZRotation, DoReturn)
 			AnimationSequence.Add(baEntityRotate)
 
-
 		End Sub
 
 		Public Sub AnimationTurnNPC(ByVal TurnSteps As Integer, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal EndFaceRotation As Integer = -1, Optional ByVal TurnSpeed As Integer = 1, Optional ByVal TurnDelay As Single = 0.25F)

P3D/P3D.vbproj

@@ -18275,6 +18275,9 @@
     <Content Include="Content\Songs\wind.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Sounds\Battle\Attacks\Electric\Flash.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Sounds\Battle\Attacks\Electric\Thunderbolt.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -18419,6 +18422,9 @@
     <Content Include="Content\Sounds\VoltorbFlip\WinGame.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\Battle\Electric\FlashBackground.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Battle\Flying\Gust.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

P3D/Pokemon/Attacks/Electric/Flash.vb

@@ -57,6 +57,15 @@
             BattleScreen.Battle.LowerStat(own, own, BattleScreen, "Accuracy", 1, "", "move:flash")
         End Sub
 
+        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)
+            MoveAnimation.AnimationPlaySound("Battle\Attacks\Electric\Flash", 0.0F, 0)
+            MoveAnimation.AnimationBackground(TextureManager.GetTexture("Textures\Battle\Electric\FlashBackground"), 0, 0, 0.25F, 0.9F, 0.2F, 0.025F, True, 1, 0, 6)
+            MoveAnimation.AnimationColor(CurrentEntity, False, 0.2F, True, 0, 0, New Vector3(0.1), Nothing, 0.025F)
+
+            BattleScreen.BattleQuery.Add(MoveAnimation)
+        End Sub
+
     End Class
 
 End Namespace