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

Tweak tackle, correct line breaks

Browse Source
This commit is contained in:
JappaWakka 2023-06-30 09:55:09 +02:00
parent 7112b7cdf1
commit ba4a377d23
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
P3D/Battle/BattleAnimations/BAEntityMove.vb
View File

@ -145,6 +145,7 @@
End If End If
Else Else
If EasedOut = False Then If EasedOut = False Then
If MoveDistance.X <= 0.05F AndAlso MoveDistance.Y <= 0.05F AndAlso MoveDistance.Z <= 0.05F Then
If InterpolationSpeed > 0.05F OrElse InterpolationYSpeed > 0.05F Then If InterpolationSpeed > 0.05F OrElse InterpolationYSpeed > 0.05F Then
If InterpolationSpeed > 0.05F Then If InterpolationSpeed > 0.05F Then
InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, 0.0F, 0.9F) InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, 0.0F, 0.9F)
@ -157,6 +158,19 @@
InterpolationSpeed = 0 InterpolationSpeed = 0
EasedOut = True EasedOut = True
End If End If
Else
If InterpolationSpeed > 0.05F + MoveSpeed / 10 * 3 OrElse InterpolationYSpeed > 0.05F + MoveYSpeed / 10 * 3 Then
If InterpolationSpeed > 0.05F + MoveSpeed / 10 * 3 Then
InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, 0.0F, 0.9F)
End If
If InterpolationYSpeed > 0.05F + MoveYSpeed / 10 * 3 Then
InterpolationYSpeed = MathHelper.Lerp(InterpolationYSpeed, 0.0F, 0.9F)
End If
Else
InterpolationYSpeed = MoveSpeed / 10 * 3
InterpolationSpeed = MoveSpeed / 10 * 3
End If
End If
End If End If
End If End If
End Select End Select

4
P3D/Pokemon/Attacks/Normal/Tackle.vb
View File

@ -54,8 +54,8 @@
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC) Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC)
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip) Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
MoveAnimation.AnimationMove(Nothing, False, -0.5F, 0, 0, 0.3F, False, False, 0, 0,,, 2) MoveAnimation.AnimationMove(Nothing, False, -0.5F, 0, 0, 0.035F, False, False, 0, 0)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0, 0.3F, False, False, 1.5, 0,,, 2) MoveAnimation.AnimationMove(Nothing, False, 0.5F, 0, 0, 0.06F, False, False, 1.25, 0)
BattleScreen.BattleQuery.Add(MoveAnimation) BattleScreen.BattleQuery.Add(MoveAnimation)
End Sub End Sub