Fixed spawned animation entities not being positioned/moved correctly + Added Heal animation + Made other animations be affected by battleanimations option
This commit is contained in:
JappaWakkaP3D
parent
7fba875d02
commit
72599bfd16
|
|
@ -1496,7 +1496,7 @@
|
|||
End If
|
||||
|
||||
'Own Pokémon move animation! This displays any effects that should display on the user of the move.
|
||||
moveUsed.UserPokemonMoveAnimation(BattleScreen, Not own)
|
||||
moveUsed.UserPokemonMoveAnimation(BattleScreen, own)
|
||||
|
||||
If moveUsed.Target <> Attack.Targets.Self And moveUsed.FocusOppPokemon = True Then
|
||||
If own = True Then
|
||||
|
|
@ -3412,6 +3412,7 @@
|
|||
End If
|
||||
|
||||
'***STAT INCREASE ANIMATION***
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(pNPC, Not own)
|
||||
Dim maxAmount As Integer = 20 * val
|
||||
Dim currentAmount As Integer = 0
|
||||
|
|
@ -3430,8 +3431,9 @@
|
|||
StatAnimation.AnimationMove(Nothing, True, Destination.X, Destination.Y, Destination.Z, 0.05F, False, True, CSng(startDelay), 0.0F)
|
||||
Threading.Interlocked.Increment(currentAmount)
|
||||
End While
|
||||
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\Stat_Raise", False))
|
||||
BattleScreen.BattleQuery.Add(StatAnimation)
|
||||
End If
|
||||
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\Stat_Raise", False))
|
||||
|
||||
Dim printMessage As String = p.GetDisplayName() & "'s " & statString
|
||||
Select Case val
|
||||
|
|
@ -3693,6 +3695,7 @@
|
|||
End If
|
||||
End If
|
||||
'***STAT DECREASE ANIMATION***
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(pNPC, Not own)
|
||||
Dim maxAmount As Integer = 20 * val
|
||||
Dim currentAmount As Integer = 0
|
||||
|
|
@ -3711,9 +3714,9 @@
|
|||
StatAnimation.AnimationMove(Nothing, True, Destination.X, Destination.Y, Destination.Z, 0.05F, False, True, CSng(startDelay), 0.0F)
|
||||
Threading.Interlocked.Increment(currentAmount)
|
||||
End While
|
||||
StatAnimation.AnimationPlaySound("Battle\Effects\Stat_Lower", 0.0F, 10.0F)
|
||||
BattleScreen.BattleQuery.Add(StatAnimation)
|
||||
|
||||
End If
|
||||
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\Stat_Lower", False))
|
||||
Dim printMessage As String = p.GetDisplayName() & "'s " & statString
|
||||
Select Case val
|
||||
Case 2
|
||||
|
|
@ -3941,8 +3944,10 @@
|
|||
|
||||
Public Sub GainHP(ByVal HPAmount As Integer, ByVal own As Boolean, ByVal from As Boolean, ByVal BattleScreen As BattleScreen, ByVal message As String, ByVal cause As String)
|
||||
Dim p As Pokemon = BattleScreen.OwnPokemon
|
||||
Dim pNPC As NPC = BattleScreen.OwnPokemonNPC
|
||||
If own = False Then
|
||||
p = BattleScreen.OppPokemon
|
||||
pNPC = BattleScreen.OppPokemonNPC
|
||||
End If
|
||||
|
||||
If p.HP < p.MaxHP And p.HP > 0 And p.Status <> Pokemon.StatusProblems.Fainted Then
|
||||
|
|
@ -3962,6 +3967,30 @@
|
|||
BattleScreen.BattleQuery.Add(New MathHPQueryObject(p.HP, p.MaxHP, -HPAmount, New Vector2(300, 256)))
|
||||
End If
|
||||
|
||||
'***HP INCREASE ANIMATION***
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(pNPC, Not own)
|
||||
Dim maxAmount As Integer = 20
|
||||
Dim currentAmount As Integer = 0
|
||||
While currentAmount <= maxAmount
|
||||
Dim Texture As Texture2D = TextureManager.GetTexture("Textures\Battle\StatChange\Heal")
|
||||
Dim xPos = CSng((Random.NextDouble() - 0.5) * 1.2)
|
||||
Dim zPos = CSng((Random.NextDouble() - 0.5) * 1.2)
|
||||
|
||||
Dim Position As New Vector3(xPos, -0.4, zPos)
|
||||
Dim Destination As New Vector3(xPos, 0.8, zPos)
|
||||
Dim Scale As New Vector3(0.2F)
|
||||
|
||||
Dim StatEntity As Entity = StatAnimation.SpawnEntity(Position, Texture, Scale, 1.0F)
|
||||
Dim startDelay As Double = 5.0 * Random.NextDouble()
|
||||
|
||||
StatAnimation.AnimationMove(Nothing, True, Destination.X, Destination.Y, Destination.Z, 0.05F, False, True, CSng(startDelay), 0.0F)
|
||||
Threading.Interlocked.Increment(currentAmount)
|
||||
End While
|
||||
BattleScreen.BattleQuery.Add(StatAnimation)
|
||||
End If
|
||||
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\Heal", False))
|
||||
|
||||
If message <> "" Then
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject(message))
|
||||
End If
|
||||
|
|
@ -3996,14 +4025,14 @@
|
|||
End If
|
||||
BattleScreen.BattleQuery.Add(New PlaySoundQueryObject(sound, False, 0.0F))
|
||||
End If
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim HitAnimation As AnimationQueryObject = New AnimationQueryObject(pNPC, own)
|
||||
HitAnimation.AnimationFade(Nothing, False, 1, False, 0, 0, 0)
|
||||
HitAnimation.AnimationFade(Nothing, False, 1, True, 1, 1, 0)
|
||||
HitAnimation.AnimationFade(Nothing, False, 1, False, 0, 2, 0)
|
||||
HitAnimation.AnimationFade(Nothing, False, 1, True, 1, 3, 0)
|
||||
BattleScreen.BattleQuery.Add(HitAnimation)
|
||||
|
||||
End If
|
||||
If own = True Then
|
||||
BattleScreen.BattleQuery.Add(New MathHPQueryObject(p.HP, p.MaxHP, HPAmount, New Vector2(200, 256)))
|
||||
Else
|
||||
|
|
@ -5356,6 +5385,7 @@
|
|||
If .OwnPokemon.Ability.Name.ToLower() <> "magic guard" Then
|
||||
If .OwnPokemon.Status = Pokemon.StatusProblems.Poison Then 'Own Poison
|
||||
'Poison animation
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim PoisonAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, True)
|
||||
|
||||
PoisonAnimation.AnimationPlaySound("Battle\Effects\Poisoned", 0, 0)
|
||||
|
|
@ -5374,6 +5404,7 @@
|
|||
PoisonAnimation.AnimationChangeTexture(BubbleEntity3, True, TextureManager.GetTexture("Textures\Battle\Poison\Bubble", New Rectangle(0, 64, 32, 32)), 4, 1)
|
||||
|
||||
BattleScreen.BattleQuery.Add(PoisonAnimation)
|
||||
End If
|
||||
'Actual damage
|
||||
ReduceHP(CInt(.OwnPokemon.MaxHP / 8), True, True, BattleScreen, "The poison hurt " & .OwnPokemon.GetDisplayName() & ".", "poison")
|
||||
End If
|
||||
|
|
@ -5382,6 +5413,7 @@
|
|||
.FieldEffects.OwnPoisonCounter += 1
|
||||
Dim multiplier As Double = (.FieldEffects.OwnPoisonCounter / 16)
|
||||
'Poison animation
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim PoisonAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, True)
|
||||
|
||||
PoisonAnimation.AnimationPlaySound("Battle\Effects\Poisoned", 0, 0)
|
||||
|
|
@ -5400,6 +5432,7 @@
|
|||
PoisonAnimation.AnimationChangeTexture(BubbleEntity3, True, TextureManager.GetTexture("Textures\Battle\Poison\Bubble", New Rectangle(0, 64, 32, 32)), 4, 1)
|
||||
|
||||
BattleScreen.BattleQuery.Add(PoisonAnimation)
|
||||
End If
|
||||
'Actual damage
|
||||
ReduceHP(CInt(.OwnPokemon.MaxHP * multiplier), True, True, BattleScreen, "The toxic hurt " & .OwnPokemon.GetDisplayName() & ".", "badpoison")
|
||||
End If
|
||||
|
|
@ -5416,6 +5449,7 @@
|
|||
End If
|
||||
|
||||
'Burn animation
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim BurnAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, False)
|
||||
BurnAnimation.AnimationPlaySound("Battle\Effects\Burned", 0, 0)
|
||||
|
||||
|
|
@ -5425,7 +5459,7 @@
|
|||
BurnAnimation.AnimationChangeTexture(FlameEntity, False, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 96, 32, 32)), 4, 1)
|
||||
BurnAnimation.AnimationChangeTexture(FlameEntity, True, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 128, 32, 32)), 5, 2)
|
||||
BattleScreen.BattleQuery.Add(BurnAnimation)
|
||||
|
||||
End If
|
||||
'Actual damage
|
||||
ReduceHP(reduceAmount, True, True, BattleScreen, .OwnPokemon.GetDisplayName() & " is hurt by the burn.", "burn")
|
||||
End If
|
||||
|
|
@ -6154,6 +6188,7 @@
|
|||
If .OppPokemon.Ability.Name.ToLower() <> "magic guard" Then
|
||||
If .OppPokemon.Status = Pokemon.StatusProblems.Poison Then 'Opp Poison
|
||||
'Poison animation
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim PoisonAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, False)
|
||||
|
||||
PoisonAnimation.AnimationPlaySound("Battle\Effects\Poisoned", 0, 0)
|
||||
|
|
@ -6172,7 +6207,7 @@
|
|||
PoisonAnimation.AnimationChangeTexture(BubbleEntity3, True, TextureManager.GetTexture("Textures\Battle\Poison\Bubble", New Rectangle(0, 64, 32, 32)), 4, 1)
|
||||
|
||||
BattleScreen.BattleQuery.Add(PoisonAnimation)
|
||||
|
||||
End If
|
||||
'Actual damage
|
||||
ReduceHP(CInt(.OppPokemon.MaxHP / 8), False, False, BattleScreen, "The poison hurt " & .OppPokemon.GetDisplayName() & ".", "poison")
|
||||
End If
|
||||
|
|
@ -6180,6 +6215,7 @@
|
|||
If .OppPokemon.Status = Pokemon.StatusProblems.BadPoison Then 'Opp Toxic
|
||||
.FieldEffects.OppPoisonCounter += 1
|
||||
Dim multiplier As Double = (.FieldEffects.OppPoisonCounter / 16)
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
'Poison animation
|
||||
Dim PoisonAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, False)
|
||||
|
||||
|
|
@ -6205,6 +6241,7 @@
|
|||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
If .OppPokemon.HP > 0 Then 'Burn
|
||||
If .OppPokemon.Status = Pokemon.StatusProblems.Burn Then
|
||||
|
|
@ -6214,6 +6251,7 @@
|
|||
reduceAmount = CInt(.OppPokemon.MaxHP / 16)
|
||||
End If
|
||||
'Burn animation
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim BurnAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True)
|
||||
BurnAnimation.AnimationPlaySound("Battle\Effects\Burned", 0, 0)
|
||||
|
||||
|
|
@ -6223,7 +6261,7 @@
|
|||
BurnAnimation.AnimationChangeTexture(FlameEntity, False, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 96, 32, 32)), 4, 1)
|
||||
BurnAnimation.AnimationChangeTexture(FlameEntity, True, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 128, 32, 32)), 5, 2)
|
||||
BattleScreen.BattleQuery.Add(BurnAnimation)
|
||||
|
||||
End If
|
||||
'Actual damage
|
||||
ReduceHP(reduceAmount, False, False, BattleScreen, .OppPokemon.GetDisplayName() & " is hurt by the burn.", "burn")
|
||||
End If
|
||||
|
|
@ -6790,7 +6828,7 @@
|
|||
BattleScreen.AddToQuery(InsertIndex, New TextQueryObject(insertMessage))
|
||||
|
||||
Dim BallReturn As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, False, BattleScreen.OwnPokemonModel)
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
' Ball Closes
|
||||
BallReturn.AnimationPlaySound("Battle\Pokeball\Open", 0, 0)
|
||||
Dim SmokeReturned As Integer = 0
|
||||
|
|
@ -6801,7 +6839,7 @@
|
|||
Dim SmokeTexture As Texture2D = TextureManager.GetTexture("Textures\Battle\Smoke")
|
||||
|
||||
Dim SmokeScale = New Vector3(CSng(Random.Next(2, 6) / 10))
|
||||
Dim SmokeSpeed = CSng(Random.Next(1, 3) / 10.0F)
|
||||
Dim SmokeSpeed = CSng(Random.Next(1, 3) / 20.0F)
|
||||
|
||||
Dim SmokeEntity As Entity = BallReturn.SpawnEntity(SmokePosition, SmokeTexture, SmokeScale, 1.0F)
|
||||
|
||||
|
|
@ -6809,16 +6847,18 @@
|
|||
|
||||
Threading.Interlocked.Increment(SmokeReturned)
|
||||
Loop While SmokeReturned <= 38
|
||||
|
||||
End If
|
||||
' Pokemon disappears
|
||||
|
||||
BallReturn.AnimationFade(Nothing, False, 1, False, 0, 1, 0)
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
BallReturn.AnimationMove(Nothing, False, 0, 0.5, 0, 0.5, False, False, 2, 0,,, 3)
|
||||
|
||||
' Ball returns
|
||||
BallReturn.AnimationPlaySound("Battle\Pokeball\Throw", 1, 0)
|
||||
Dim BallReturnEntity As Entity = BallReturn.SpawnEntity(New Vector3(0.0F), TextureManager.GetTexture(BattleScreen.OwnPokemon.CatchBall.TextureSource), New Vector3(0.3F), 1.0F)
|
||||
Dim BallReturnEntity As Entity = BallReturn.SpawnEntity(Nothing, BattleScreen.OwnPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
|
||||
BallReturn.AnimationMove(BallReturnEntity, True, -2, 0, 0, 0.1, False, True, 1, 0,, 0.3)
|
||||
|
||||
End If
|
||||
BattleScreen.AddToQuery(InsertIndex, BallReturn)
|
||||
|
||||
Dim index As Integer = NewPokemonIndex
|
||||
|
|
@ -6856,9 +6896,10 @@
|
|||
' Ball is thrown
|
||||
Dim BallThrow As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, False, BattleScreen.OwnPokemonModel)
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
BallThrow.AnimationPlaySound("Battle\Pokeball\Throw", 0, 0)
|
||||
|
||||
Dim BallThrowEntity As Entity = BallReturn.SpawnEntity(New Vector3(-2, -0.15, 0), TextureManager.GetTexture(BattleScreen.OwnPokemon.CatchBall.TextureSource), New Vector3(0.3F), 1.0F)
|
||||
Dim BallThrowEntity As Entity = BallThrow.SpawnEntity(New Vector3(-2, -0.15, 0), BattleScreen.OwnPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
|
||||
BallThrow.AnimationMove(BallThrowEntity, True, 0, 0.35, 0, 0.1, False, True, 0F, 0F,, 0.3)
|
||||
|
||||
' Ball Opens
|
||||
|
|
@ -6866,7 +6907,6 @@
|
|||
|
||||
Dim SmokeSpawned As Integer = 0
|
||||
Do
|
||||
Dim SmokePosition = New Vector3(0, 0.35, 0)
|
||||
Dim SmokeDestination = New Vector3(CSng(Random.Next(-10, 10) / 10), CSng(Random.Next(-10, 10) / 10), CSng(Random.Next(-10, 10) / 10))
|
||||
|
||||
Dim SmokeTexture As Texture2D = TextureManager.GetTexture("Textures\Battle\Smoke")
|
||||
|
|
@ -6874,19 +6914,22 @@
|
|||
Dim SmokeScale = New Vector3(CSng(Random.Next(2, 6) / 10))
|
||||
Dim SmokeSpeed = CSng(Random.Next(1, 3) / 10.0F)
|
||||
|
||||
Dim SmokeEntity As Entity = BallThrow.SpawnEntity(SmokePosition, SmokeTexture, SmokeScale, 1.0F)
|
||||
Dim SmokeEntity As Entity = BallThrow.SpawnEntity(Nothing, SmokeTexture, SmokeScale, 1.0F)
|
||||
|
||||
BallThrow.AnimationMove(SmokeEntity, True, SmokeDestination.X, SmokeDestination.Y, SmokeDestination.Z, SmokeSpeed, False, False, 3.0F, 0.0F)
|
||||
|
||||
Threading.Interlocked.Increment(SmokeSpawned)
|
||||
Loop While SmokeSpawned <= 38
|
||||
End If
|
||||
|
||||
' Pokemon appears
|
||||
BallThrow.AnimationFade(Nothing, False, 1, True, 1, 4, 0)
|
||||
BallThrow.AnimationPlaySound(CStr(BattleScreen.OwnPokemon.Number), 4, 0,, True)
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
' Pokémon falls down
|
||||
BallThrow.AnimationMove(Nothing, False, 0, 0, 0, 0.05F, False, False, 4, 0,,, 3)
|
||||
End If
|
||||
|
||||
BattleScreen.AddToQuery(InsertIndex, BallThrow)
|
||||
End If
|
||||
|
|
@ -7133,10 +7176,12 @@
|
|||
|
||||
If BattleScreen.IsTrainerBattle = False Then
|
||||
ChangeCameraAngle(1, False, BattleScreen)
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim Faint As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True, BattleScreen.OppPokemonModel)
|
||||
Faint.AnimationPlaySound(CStr(BattleScreen.OppPokemon.Number), 0, 2, False, True)
|
||||
Faint.AnimationMove(Nothing, False, 0, -1, 0, 0.1, False, False, 2, 0,,, 3)
|
||||
BattleScreen.BattleQuery.Add(Faint)
|
||||
End If
|
||||
|
||||
BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(True, ToggleEntityQueryObject.BattleEntities.OppPokemon, 2, -1, -1, -1, -1))
|
||||
|
||||
|
|
@ -7161,8 +7206,9 @@
|
|||
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject(message))
|
||||
|
||||
Dim BallReturn As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True, BattleScreen.OppPokemonModel)
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim BallReturn As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True, BattleScreen.OppPokemonModel)
|
||||
' Ball Closes
|
||||
BallReturn.AnimationPlaySound("Battle\Pokeball\Open", 0, 0)
|
||||
Dim SmokeReturned As Integer = 0
|
||||
|
|
@ -7181,14 +7227,17 @@
|
|||
|
||||
' Pokemon disappears
|
||||
BallReturn.AnimationFade(Nothing, False, 1, False, 0, 1, 0)
|
||||
|
||||
BallReturn.AnimationMove(Nothing, False, 0, 0.5, 0, 0.5, False, False, 2, 0,,, 4)
|
||||
|
||||
' Ball returns
|
||||
BallReturn.AnimationPlaySound("Battle\Pokeball\Throw", 1, 0)
|
||||
Dim BallReturnEntity = BallReturn.SpawnEntity(New Vector3(0, 0, 0), TextureManager.GetTexture(BattleScreen.OppPokemon.CatchBall.TextureSource), New Vector3(0.3F), 1.0F)
|
||||
Dim BallReturnEntity = BallReturn.SpawnEntity(New Vector3(0, 0, 0), BattleScreen.OppPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
|
||||
BallReturn.AnimationMove(BallReturnEntity, True, -2, 0, 0, 0.1, False, True, 0F, 0F,, 0.3)
|
||||
|
||||
BattleScreen.BattleQuery.Add(BallReturn)
|
||||
Else
|
||||
BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(True, ToggleEntityQueryObject.BattleEntities.OppPokemon, 2, -1, -1, -1, -1))
|
||||
End If
|
||||
|
||||
EndBattle(EndBattleReasons.WinTrainer, BattleScreen, False)
|
||||
If BattleScreen.IsRemoteBattle = True Then
|
||||
|
|
@ -7223,6 +7272,7 @@
|
|||
HasSwitchedInOpp = True
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & ": ""Come back, " & BattleScreen.OppPokemon.GetDisplayName() & "!"""))
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim BallReturn As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True, BattleScreen.OppPokemonModel)
|
||||
|
||||
' Ball Closes
|
||||
|
|
@ -7247,11 +7297,13 @@
|
|||
|
||||
' Ball returns
|
||||
BallReturn.AnimationPlaySound("Battle\Pokeball\Throw", 1, 0)
|
||||
Dim BallReturnEntity = BallReturn.SpawnEntity(New Vector3(0, 0, 0), TextureManager.GetTexture(BattleScreen.OppPokemon.CatchBall.TextureSource), New Vector3(0.3F), 1.0F)
|
||||
Dim BallReturnEntity = BallReturn.SpawnEntity(New Vector3(0, 0, 0), BattleScreen.OppPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
|
||||
BallReturn.AnimationMove(BallReturnEntity, True, -2, 0, 0, 0.1, False, True, 0F, 0F,, 0.3)
|
||||
|
||||
BattleScreen.BattleQuery.Add(BallReturn)
|
||||
|
||||
Else
|
||||
BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(True, ToggleEntityQueryObject.BattleEntities.OppPokemon, 1, -1, -1, -1, -1))
|
||||
End If
|
||||
BattleScreen.SendInNewTrainerPokemon(index)
|
||||
Me.ApplyOppBatonPass(BattleScreen)
|
||||
|
||||
|
|
@ -7275,11 +7327,12 @@
|
|||
BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(True, ToggleEntityQueryObject.BattleEntities.OppPokemon, 1, -1, -1, -1, -1))
|
||||
BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & ": ""Go, " & BattleScreen.OppPokemon.GetDisplayName() & "!"""))
|
||||
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
' Ball is thrown
|
||||
Dim BallThrow As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True, BattleScreen.OppPokemonModel)
|
||||
|
||||
BallThrow.AnimationPlaySound("Battle\Pokeball\Throw", 0, 0)
|
||||
Dim BallThrowEntity = BallThrow.SpawnEntity(New Vector3(-2, -0.15, 0), TextureManager.GetTexture(BattleScreen.OwnPokemon.CatchBall.TextureSource), New Vector3(0.3F), 1.0F)
|
||||
Dim BallThrowEntity = BallThrow.SpawnEntity(New Vector3(-2, -0.15, 0), BattleScreen.OwnPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
|
||||
BallThrow.AnimationMove(BallThrowEntity, True, 0, 0.35, 0, 0.1, False, True, 0F, 0F,, 0.3)
|
||||
|
||||
' Ball opens
|
||||
|
|
@ -7293,7 +7346,7 @@
|
|||
|
||||
Dim SmokeScale = New Vector3(CSng(Random.Next(2, 6) / 10))
|
||||
Dim SmokeSpeed = CSng(Random.Next(1, 3) / 10.0F)
|
||||
Dim SmokeEntity = BallReturn.SpawnEntity(SmokePosition, SmokeTexture, SmokeScale, 1)
|
||||
Dim SmokeEntity = BallThrow.SpawnEntity(SmokePosition, SmokeTexture, SmokeScale, 1)
|
||||
|
||||
BallThrow.AnimationMove(SmokeEntity, True, SmokeDestination.X, SmokeDestination.Y, SmokeDestination.Z, SmokeSpeed, False, False, 3.0F, 0.0F)
|
||||
Threading.Interlocked.Increment(SmokeSpawned)
|
||||
|
|
@ -7308,6 +7361,7 @@
|
|||
|
||||
BattleScreen.BattleQuery.Add(BallThrow)
|
||||
End If
|
||||
End If
|
||||
|
||||
With BattleScreen
|
||||
Dim p As Pokemon = .OppPokemon
|
||||
|
|
|
|||
|
|
@ -91,20 +91,15 @@
|
|||
End Sub
|
||||
|
||||
Public Function SpawnEntity(ByVal Position As Vector3, ByVal Texture As Texture2D, ByVal Scale As Vector3, ByVal Opacity As Single, Optional ByVal startDelay As Single = 0.0F, Optional ByVal endDelay As Single = 0.0F) As Entity
|
||||
Dim SpawnedEntity = New BattleAnimation3D(Position, Texture, Scale, 0, 0, False)
|
||||
Dim NewPosition As Vector3
|
||||
If Not Position = Nothing Then
|
||||
NewPosition = CurrentEntity.Position + Position
|
||||
Else
|
||||
NewPosition = CurrentEntity.Position
|
||||
End If
|
||||
Dim SpawnedEntity = New BattleAnimation3D(NewPosition, Texture, Scale, 0, 0, False)
|
||||
SpawnedEntity.Opacity = Opacity
|
||||
|
||||
If Not BattleFlipped = Nothing Then
|
||||
If BattleFlipped = True Then
|
||||
SpawnedEntity.Position.X = CurrentEntity.Position.X - Position.X
|
||||
SpawnedEntity.Position.Y = CurrentEntity.Position.Y + Position.Y
|
||||
SpawnedEntity.Position.Z = CurrentEntity.Position.Z - Position.Z
|
||||
Else
|
||||
SpawnedEntity.Position.X = CurrentEntity.Position.X + Position.X
|
||||
SpawnedEntity.Position.Y = CurrentEntity.Position.Y + Position.Y
|
||||
SpawnedEntity.Position.Z = CurrentEntity.Position.Z + Position.Z
|
||||
End If
|
||||
End If
|
||||
SpawnedEntities.Add(SpawnedEntity)
|
||||
|
||||
Dim SpawnDelayEntity As BattleAnimation3D = New BattleAnimation3D(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay, True)
|
||||
|
|
@ -135,28 +130,34 @@
|
|||
|
||||
Public Sub AnimationMove(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal DestinationX As Single, ByVal DestinationY As Single, ByVal DestinationZ As Single, ByVal Speed As Single, ByVal SpinX As Boolean, ByVal SpinZ As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal SpinXSpeed As Single = 0.1F, Optional ByVal SpinZSpeed As Single = 0.1F, Optional MovementCurve As Integer = 3)
|
||||
Dim MoveEntity As Entity
|
||||
Dim ModelEntity As Entity = Nothing
|
||||
Dim Destination As Vector3
|
||||
|
||||
If Entity Is Nothing Then
|
||||
MoveEntity = CurrentEntity
|
||||
If Me.CurrentModel IsNot Nothing Then
|
||||
ModelEntity = Me.CurrentModel
|
||||
End If
|
||||
Else
|
||||
MoveEntity = Entity
|
||||
End If
|
||||
|
||||
If Not BattleFlipped = Nothing Then
|
||||
If BattleFlipped = True Then
|
||||
DestinationX -= DestinationX * 2.0F
|
||||
DestinationZ -= DestinationZ * 2.0F
|
||||
End If
|
||||
If Entity Is Nothing Then
|
||||
MoveEntity = CurrentEntity
|
||||
Else
|
||||
MoveEntity = Entity
|
||||
End If
|
||||
Destination = CurrentEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ)
|
||||
If CurrentEntity Is Nothing Then
|
||||
Destination = MoveEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ)
|
||||
Else
|
||||
MoveEntity = Entity
|
||||
Destination = New Vector3(DestinationX, DestinationY, DestinationZ)
|
||||
Destination = CurrentEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ)
|
||||
End If
|
||||
|
||||
Dim baEntityMove As BAEntityMove = New BAEntityMove(MoveEntity, Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve)
|
||||
AnimationSequence.Add(baEntityMove)
|
||||
|
||||
If Me.CurrentModel IsNot Nothing Then
|
||||
If ModelEntity IsNot Nothing Then
|
||||
Dim baModelMove As BAEntityMove = New BAEntityMove(CType(CurrentModel, Entity), Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve)
|
||||
AnimationSequence.Add(baModelMove)
|
||||
End If
|
||||
|
|
@ -232,7 +233,7 @@
|
|||
AnimationSequence.Add(baSound)
|
||||
End Sub
|
||||
|
||||
Public Sub AnimationBackground(Texture As Texture2D, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal FadeOut As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal startState As Single = 0.0F)
|
||||
Public Sub AnimationBackground(Texture As Texture2D, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal FadeOut As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal startState As Single = 0.0F)
|
||||
Dim baBackground As BABackground = New BABackground(Texture, TransitionSpeed, FadeIn, FadeOut, EndState, startDelay, endDelay, startState)
|
||||
AnimationSequence.Add(baBackground)
|
||||
End Sub
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2164,38 +2164,42 @@
|
|||
#Region "Animation"
|
||||
|
||||
Public Sub UserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean)
|
||||
If Core.Player.ShowBattleAnimations = 1 Then
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim BattleFlip As Boolean = False
|
||||
Dim CurrentPokemon As Pokemon = BattleScreen.OwnPokemon
|
||||
Dim CurrentEntity As NPC = BattleScreen.OwnPokemonNPC
|
||||
Dim CurrentModel As ModelEntity = BattleScreen.OwnPokemonModel
|
||||
If own = False Then
|
||||
BattleFlip = True
|
||||
CurrentPokemon = BattleScreen.OppPokemon
|
||||
CurrentEntity = BattleScreen.OppPokemonNPC
|
||||
CurrentModel = BattleScreen.OppPokemonModel
|
||||
End If
|
||||
Me.InternalUserPokemonMoveAnimation(BattleScreen, own, CurrentPokemon, CurrentEntity, CurrentModel)
|
||||
Me.InternalUserPokemonMoveAnimation(BattleScreen, BattleFlip, CurrentPokemon, CurrentEntity, CurrentModel)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Overridable Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Public Overridable Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
'Override this method in the attack class to insert the move animation query objects into the queue.
|
||||
End Sub
|
||||
|
||||
Public Sub OpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean)
|
||||
If Core.Player.ShowBattleAnimations = 1 Then
|
||||
If Core.Player.ShowBattleAnimations <> 0 Then
|
||||
Dim BattleFlip As Boolean = False
|
||||
Dim CurrentPokemon As Pokemon = BattleScreen.OppPokemon
|
||||
Dim CurrentEntity As NPC = BattleScreen.OppPokemonNPC
|
||||
Dim CurrentModel As ModelEntity = BattleScreen.OppPokemonModel
|
||||
If own = False Then
|
||||
BattleFlip = True
|
||||
CurrentPokemon = BattleScreen.OwnPokemon
|
||||
CurrentEntity = BattleScreen.OwnPokemonNPC
|
||||
CurrentModel = BattleScreen.OwnPokemonModel
|
||||
End If
|
||||
Me.InternalOpponentPokemonMoveAnimation(BattleScreen, own, CurrentPokemon, CurrentEntity, CurrentModel)
|
||||
Me.InternalOpponentPokemonMoveAnimation(BattleScreen, BattleFlip, CurrentPokemon, CurrentEntity, CurrentModel)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Overridable Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Public Overridable Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
'Override this method in the attack class to insert the move animation query objects into the queue.
|
||||
End Sub
|
||||
|
||||
|
|
|
|||
|
|
@ -63,14 +63,14 @@
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Dim FireballEntity As Entity = MoveAnimation.SpawnEntity(New Vector3(0.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall"), New Vector3(0.5F), 1.0F)
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
Dim FireballEntity = MoveAnimation.SpawnEntity(Nothing, TextureManager.GetTexture("Textures\Battle\Fire\FireBall"), New Vector3(0.5F), 1.0F)
|
||||
|
||||
MoveAnimation.AnimationMove(FireballEntity, True, 2.0, 0.0, 0.0, 0.05, False, True, 0.0, 0.0,, -0.5, 0)
|
||||
MoveAnimation.AnimationPlaySound("Battle\Attacks\Fire\Ember_Start", 0, 0)
|
||||
For i = 0 To 12
|
||||
Dim SmokeEntity = MoveAnimation.SpawnEntity(New Vector3(CSng(i * 0.2), 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\Smoke"), New Vector3(0.2), 1)
|
||||
Dim SmokeEntity = MoveAnimation.SpawnEntity(New Vector3(CSng(i * 0.2), 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\Smoke"), New Vector3(0.2), 1, CSng(i * 0.2))
|
||||
MoveAnimation.AnimationFade(SmokeEntity, True, 0.02, False, 0.0, CSng(i * 0.2), 0.0)
|
||||
|
||||
i += 1
|
||||
|
|
@ -78,14 +78,14 @@
|
|||
BattleScreen.BattleQuery.Add(MoveAnimation)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Dim FireballEntity As Entity = MoveAnimation.SpawnEntity(New Vector3(2.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall"), New Vector3(0.5F), 1.0F)
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
Dim FireballEntity = MoveAnimation.SpawnEntity(New Vector3(-2.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall"), New Vector3(0.5F), 1.0F)
|
||||
|
||||
MoveAnimation.AnimationMove(FireballEntity, True, 0.0, 0.0, 0.0, 0.05, False, True, 0.0, 0.0,, -0.5, 0)
|
||||
MoveAnimation.AnimationMove(FireballEntity, True, 2.0, 0.0, 0.0, 0.05, False, True, 0.0, 0.0,, -0.5, 0)
|
||||
|
||||
For i = 0 To 12
|
||||
Dim SmokeEntity = MoveAnimation.SpawnEntity(New Vector3(CSng(3.0 - i * 0.2), 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\Smoke"), New Vector3(0.2), 1)
|
||||
Dim SmokeEntity = MoveAnimation.SpawnEntity(New Vector3(CSng(-2.0 + i * 0.2), 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\Smoke"), New Vector3(0.2), 1, CSng(i * 0.2))
|
||||
MoveAnimation.AnimationFade(SmokeEntity, True, 0.02, False, 0.0, CSng(i * 0.2), 0.0)
|
||||
|
||||
i += 1
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
Dim maxAmount As Integer = 8
|
||||
Dim currentAmount As Integer = 0
|
||||
MoveAnimation.AnimationPlaySound("Battle\Attacks\Grass\Absorb", 0, 0)
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
|
||||
MoveAnimation.AnimationPlaySound(CStr(CurrentPokemon.Number), 0, 0,, True)
|
||||
Dim SoundwaveEntity = MoveAnimation.SpawnEntity(New Vector3(0.25, -0.25, -0.25), TextureManager.GetTexture("Textures\Battle\Normal\Growl", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 0, 1)
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@
|
|||
Me.AIField2 = AIField.Nothing
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
MoveAnimation.AnimationPlaySound("Battle\Attacks\Pound", 0.5, 2.5)
|
||||
Dim PoundEntity = MoveAnimation.SpawnEntity(New Vector3(0.25, -0.25, -0.25), TextureManager.GetTexture("Textures\Battle\Normal\Growl", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 0, 3)
|
||||
Dim PoundEntity = MoveAnimation.SpawnEntity(New Vector3(-0.25, -0.25, -0.25), TextureManager.GetTexture("Textures\Battle\Normal\Growl", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 0, 3)
|
||||
MoveAnimation.AnimationFade(PoundEntity, True, 1.0F, False, 0.0F, 3, 0)
|
||||
BattleScreen.BattleQuery.Add(MoveAnimation)
|
||||
End Sub
|
||||
|
|
|
|||
|
|
@ -52,15 +52,15 @@
|
|||
'#End
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own, CurrentModel)
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip, CurrentModel)
|
||||
MoveAnimation.AnimationMove(Nothing, False, -0.5F, 0, 0, 0.3F, False, False, 0, 0,,, 2)
|
||||
MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0, 0.3F, False, False, 1, 0,,, 2)
|
||||
BattleScreen.BattleQuery.Add(MoveAnimation)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
MoveAnimation.AnimationPlaySound("Battle\Attacks\Normal\Tackle", 0, 0)
|
||||
Dim SpawnEntity = MoveAnimation.SpawnEntity(New Vector3(0, 0, 0), TextureManager.GetTexture("Textures\Battle\Normal\Tackle"), New Vector3(0.5F), 1.0F, 0, 2)
|
||||
MoveAnimation.AnimationFade(SpawnEntity, True, 1.0F, False, 0.0F, 2, 0)
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Dim StingerEntity As Entity = MoveAnimation.SpawnEntity(New Vector3(0.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Poison\Stinger"), New Vector3(0.5F), 1.0F)
|
||||
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
Dim StingerEntity As Entity = MoveAnimation.SpawnEntity(Nothing, TextureManager.GetTexture("Textures\Battle\Poison\Stinger"), New Vector3(0.5F), 1.0F)
|
||||
|
||||
MoveAnimation.AnimationPlaySound("Battle\Attacks\Poison\PoisonSting_Start", 0, 0)
|
||||
MoveAnimation.AnimationMove(StingerEntity, True, 2.0, 0.0, 0.0, 0.05, False, False, 0.0, 0.0,,, 0)
|
||||
|
|
@ -75,12 +75,12 @@
|
|||
BattleScreen.BattleQuery.Add(MoveAnimation)
|
||||
End Sub
|
||||
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, own)
|
||||
Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
|
||||
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
|
||||
|
||||
Dim StingerEntity As Entity = MoveAnimation.SpawnEntity(New Vector3(2.0, 0, 0.0), TextureManager.GetTexture("Textures\Battle\Poison\Stinger"), New Vector3(0.5F), 1)
|
||||
Dim StingerEntity As Entity = MoveAnimation.SpawnEntity(New Vector3(-2.0, 0, 0.0), TextureManager.GetTexture("Textures\Battle\Poison\Stinger"), New Vector3(0.5F), 1)
|
||||
|
||||
MoveAnimation.AnimationMove(StingerEntity, True, 0.0, 0.0, 0.0, 0.05, False, False, 0.0, 0.0,,, 0)
|
||||
MoveAnimation.AnimationMove(StingerEntity, True, 2.0, 0.0, 0.0, 0.05, False, False, 0.0, 0.0,,, 0)
|
||||
|
||||
MoveAnimation.AnimationPlaySound("Battle\Attacks\Poison\PoisonSting_Hit", 1, 0)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue