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

Fix for softlock animations and tail whip crash

Browse Source
This commit is contained in:
JappaWakka 2022-07-24 15:16:16 +02:00
parent eb69a8ee5b
commit 6f5f992d6e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,39 +118,39 @@
If TargetEntity.Position.X < Me.Destination.X Then If TargetEntity.Position.X < Me.Destination.X Then
TargetEntity.Position.X += Me.MoveSpeed TargetEntity.Position.X += Me.MoveSpeed
If TargetEntity.Position.X >= Me.Destination.X Then If TargetEntity.Position.X >= Me.Destination.X - 0.05 Then
TargetEntity.Position.X = Me.Destination.X TargetEntity.Position.X = Me.Destination.X
End If End If
ElseIf TargetEntity.Position.X > Me.Destination.X Then ElseIf TargetEntity.Position.X > Me.Destination.X Then
TargetEntity.Position.X -= Me.MoveSpeed TargetEntity.Position.X -= Me.MoveSpeed
If TargetEntity.Position.X <= Me.Destination.X Then If TargetEntity.Position.X <= Me.Destination.X + 0.05 Then
TargetEntity.Position.X = Me.Destination.X TargetEntity.Position.X = Me.Destination.X
End If End If
End If End If
If TargetEntity.Position.Y < Me.Destination.Y Then If TargetEntity.Position.Y < Me.Destination.Y Then
TargetEntity.Position.Y += Me.MoveYSpeed TargetEntity.Position.Y += Me.MoveYSpeed
If TargetEntity.Position.Y >= Me.Destination.Y Then If TargetEntity.Position.Y >= Me.Destination.Y - 0.05 Then
TargetEntity.Position.Y = Me.Destination.Y TargetEntity.Position.Y = Me.Destination.Y
End If End If
ElseIf TargetEntity.Position.Y > Me.Destination.Y Then ElseIf TargetEntity.Position.Y > Me.Destination.Y Then
TargetEntity.Position.Y -= Me.MoveYSpeed TargetEntity.Position.Y -= Me.MoveYSpeed
If TargetEntity.Position.Y <= Me.Destination.Y Then If TargetEntity.Position.Y <= Me.Destination.Y + 0.05 Then
TargetEntity.Position.Y = Me.Destination.Y TargetEntity.Position.Y = Me.Destination.Y
End If End If
End If End If
If TargetEntity.Position.Z < Me.Destination.Z Then If TargetEntity.Position.Z < Me.Destination.Z Then
TargetEntity.Position.Z += Me.MoveSpeed TargetEntity.Position.Z += Me.MoveSpeed
If TargetEntity.Position.Z >= Me.Destination.Z Then If TargetEntity.Position.Z >= Me.Destination.Z - 0.05 Then
TargetEntity.Position.Z = Me.Destination.Z TargetEntity.Position.Z = Me.Destination.Z
End If End If
ElseIf TargetEntity.Position.Z > Me.Destination.Z Then ElseIf TargetEntity.Position.Z > Me.Destination.Z Then
TargetEntity.Position.Z -= Me.MoveSpeed TargetEntity.Position.Z -= Me.MoveSpeed
If TargetEntity.Position.Z <= Me.Destination.Z Then If TargetEntity.Position.Z <= Me.Destination.Z + 0.05 Then
TargetEntity.Position.Z = Me.Destination.Z TargetEntity.Position.Z = Me.Destination.Z
End If End If
End If End If

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

@ -240,7 +240,8 @@
End If End If
If Not BattleFlipped = Nothing AndAlso BattleFlipped = True Then If Not BattleFlipped = Nothing AndAlso BattleFlipped = True Then
EndFaceRotation -= 2 EndFaceRotation += 2
TurnSpeed *= -1
End If End If
Dim BAEntityFaceRotate As BAEntityFaceRotate = New BAEntityFaceRotate(TurnNPC, TurnSteps, startDelay, endDelay, EndFaceRotation, TurnSpeed, TurnDelay, TurnModel) Dim BAEntityFaceRotate As BAEntityFaceRotate = New BAEntityFaceRotate(TurnNPC, TurnSteps, startDelay, endDelay, EndFaceRotation, TurnSpeed, TurnDelay, TurnModel)

3
P3D/Entites/Other/NPC.vb
View File

@ -251,6 +251,9 @@
If spriteIndex < 0 Then If spriteIndex < 0 Then
spriteIndex += 4 spriteIndex += 4
End If End If
If spriteIndex > 3 Then
spriteIndex -= 4
End If
Dim x As Integer = 0 Dim x As Integer = 0
If Me.Moved > 0.0F Or AnimateIdle = True Then If Me.Moved > 0.0F Or AnimateIdle = True Then