From 7214556ddaf7f904e6bba225c4009efd9742e8e5 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sat, 18 Jan 2025 13:33:38 +0100 Subject: [PATCH] Fix battle model offsets --- P3D/Battle/BattleAnimations/BAEntityMove.vb | 17 ++++++----------- .../QueryObjects/AnimationQueryObject.vb | 7 ++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/P3D/Battle/BattleAnimations/BAEntityMove.vb b/P3D/Battle/BattleAnimations/BAEntityMove.vb index ee0d1b138..873aa8bfb 100644 --- a/P3D/Battle/BattleAnimations/BAEntityMove.vb +++ b/P3D/Battle/BattleAnimations/BAEntityMove.vb @@ -93,11 +93,6 @@ Private Sub Move() - Dim DestinationOffset As Vector3 = New Vector3(0) - If TargetEntity.Model IsNot Nothing Then - DestinationOffset = New Vector3(0, -0.5, 0) - End If - Select Case MovementCurve Case Curves.EaseIn If EasedIn = False Then @@ -195,17 +190,17 @@ End If If MoveDistance.Y > 0.05F Then - If StartPosition.Y < Me.Destination.Y + DestinationOffset.Y Then + If StartPosition.Y < Me.Destination.Y Then TargetEntity.Position.Y += Me.MoveYSpeed - If TargetEntity.Position.Y >= Me.Destination.Y + DestinationOffset.Y - 0.05 Then - TargetEntity.Position.Y = Me.Destination.Y + DestinationOffset.Y + If TargetEntity.Position.Y >= Me.Destination.Y - 0.05 Then + TargetEntity.Position.Y = Me.Destination.Y End If - ElseIf StartPosition.Y > Me.Destination.Y + DestinationOffset.Y Then + ElseIf StartPosition.Y > Me.Destination.Y Then TargetEntity.Position.Y -= Me.MoveYSpeed - If TargetEntity.Position.Y <= Me.Destination.Y + DestinationOffset.Y + 0.05 Then - TargetEntity.Position.Y = Me.Destination.Y + DestinationOffset.Y + If TargetEntity.Position.Y <= Me.Destination.Y + 0.05 Then + TargetEntity.Position.Y = Me.Destination.Y End If End If MoveDistance.Y -= Me.MoveYSpeed diff --git a/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb b/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb index 98488cfd5..08f6e942f 100644 --- a/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb +++ b/P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb @@ -109,12 +109,18 @@ Namespace BattleSystem Position.X *= -1 End If NewPosition = CurrentEntity.Position + Position + If CurrentEntity.Model IsNot Nothing Then + NewPosition.Y += 0.5F + End If Else NewPosition = Position End If Else If CurrentEntity IsNot Nothing Then NewPosition = CurrentEntity.Position + If CurrentEntity.Model IsNot Nothing Then + NewPosition.Y += 0.5F + End If Else NewPosition = New Vector3(0, 0, 0) End If @@ -184,7 +190,6 @@ Namespace BattleSystem Destination = CurrentEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ) End If - Dim baEntityMove As BAEntityMove = New BAEntityMove(MoveEntity, RemoveEntityAfter, Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve, MoveYSpeed) AnimationSequence.Add(baEntityMove)