tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-29 00:34:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Confuse Ray Battle Animation

Browse Source
This commit is contained in:
JappaWakka 2024-03-23 17:47:59 +01:00
parent d239ad0b84
commit 9bb85df200
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb
View File

@ -104,10 +104,10 @@ Namespace BattleSystem
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, Optional ModelPath As String = "") As Entity 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, Optional ModelPath As String = "") As Entity
Dim NewPosition As Vector3 Dim NewPosition As Vector3
If Not Position = Nothing Then If Not Position = Nothing Then
If BattleFlipped = True Then
Position.X *= -1
End If
If CurrentEntity IsNot Nothing Then If CurrentEntity IsNot Nothing Then
If BattleFlipped = True Then
Position.X *= -1
End If
NewPosition = CurrentEntity.Position + Position NewPosition = CurrentEntity.Position + Position
Else Else
NewPosition = Position NewPosition = Position

7
P3D/Pokemon/Attacks/Ghost/ConfuseRay.vb
View File

@ -85,7 +85,12 @@
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 = New AnimationQueryObject(Nothing, BattleFlip) Dim MoveAnimation = New AnimationQueryObject(Nothing, BattleFlip)
Dim SpawnPosition As Vector3 = CurrentEntity.Position Dim SpawnPosition As Vector3 = CurrentEntity.Position
SpawnPosition.X = CurrentEntity.Position.X - 1.5F If BattleFlip = False Then
SpawnPosition.X = CurrentEntity.Position.X - 1.5F
Else
SpawnPosition.X = CurrentEntity.Position.X + 1.5F
End If
If CurrentEntity.Model IsNot Nothing Then If CurrentEntity.Model IsNot Nothing Then
SpawnPosition.Y = CurrentEntity.Position.Y - 0.5F SpawnPosition.Y = CurrentEntity.Position.Y - 0.5F
End If End If