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

Fixed stats animation, added Tail Whip animation

Browse Source
This commit is contained in:
JappaWakka 2022-07-19 12:03:13 +02:00
parent e6a2f6eab8
commit bf544a5e25
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,11 @@
If Me.TurnSteps > 0 Then If Me.TurnSteps > 0 Then
If Me.TurnTime <= 0.0F Then If Me.TurnTime <= 0.0F Then
Me.TargetEntity.faceRotation += Me.TurnSpeed Me.TargetEntity.faceRotation += Me.TurnSpeed
If Me.TargetEntity.faceRotation = 4 Then If Me.TargetEntity.faceRotation > 3 Then
Me.TargetEntity.faceRotation = 0 Me.TargetEntity.faceRotation -= 4
End If
If Me.TargetEntity.faceRotation < 0 Then
Me.TargetEntity.faceRotation += 4
End If End If
If Me.TargetModel IsNot Nothing Then If Me.TargetModel IsNot Nothing Then
Me.TargetModel.Rotation = Entity.GetRotationFromInteger(Me.TargetEntity.faceRotation) Me.TargetModel.Rotation = Entity.GetRotationFromInteger(Me.TargetEntity.faceRotation)
@ -37,7 +40,7 @@
Me.TurnSteps -= TurnSpeed.ToPositive() Me.TurnSteps -= TurnSpeed.ToPositive()
Me.TurnTime = TurnDelay Me.TurnTime = TurnDelay
Else Else
TurnDelay -= 0.1F TurnTime -= 0.1F
End If End If
Else Else
If Me.TargetEntity.faceRotation <> Me.EndFaceRotation Then If Me.TargetEntity.faceRotation <> Me.EndFaceRotation Then
@ -45,9 +48,8 @@
If Me.TargetModel IsNot Nothing Then If Me.TargetModel IsNot Nothing Then
Me.TargetModel.Rotation = Entity.GetRotationFromInteger(Me.EndFaceRotation) Me.TargetModel.Rotation = Entity.GetRotationFromInteger(Me.EndFaceRotation)
End If End If
Else
Me.Ready = True
End If End If
Me.Ready = True
End If End If
End Sub End Sub

4
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -3756,7 +3756,7 @@
'***STAT INCREASE ANIMATION*** '***STAT INCREASE ANIMATION***
If Core.Player.ShowBattleAnimations <> 0 Then If Core.Player.ShowBattleAnimations <> 0 Then
Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(Nothing, Not own) Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(Nothing, False)
Dim maxAmount As Integer = 20 * val Dim maxAmount As Integer = 20 * val
Dim currentAmount As Integer = 0 Dim currentAmount As Integer = 0
While currentAmount <= maxAmount While currentAmount <= maxAmount
@ -4051,7 +4051,7 @@
End If End If
'***STAT DECREASE ANIMATION*** '***STAT DECREASE ANIMATION***
If Core.Player.ShowBattleAnimations <> 0 Then If Core.Player.ShowBattleAnimations <> 0 Then
Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(Nothing, Not own) Dim StatAnimation As AnimationQueryObject = New AnimationQueryObject(Nothing, False)
Dim maxAmount As Integer = 20 * val Dim maxAmount As Integer = 20 * val
Dim currentAmount As Integer = 0 Dim currentAmount As Integer = 0
While currentAmount <= maxAmount While currentAmount <= maxAmount

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

@ -239,6 +239,10 @@
End If End If
End If End If
If Not BattleFlipped = Nothing AndAlso BattleFlipped = True Then
EndFaceRotation -= 2
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)
AnimationSequence.Add(BAEntityFaceRotate) AnimationSequence.Add(BAEntityFaceRotate)

BIN
P3D/Content/Sounds/Battle/Attacks/Normal/TailWhip.wav Normal file
View File

Binary file not shown.

3
P3D/P3D.vbproj
View File

@ -14753,6 +14753,9 @@
<Content Include="Content\Sounds\Battle\Attacks\Normal\Tackle.wav"> <Content Include="Content\Sounds\Battle\Attacks\Normal\Tackle.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Sounds\Battle\Attacks\Normal\TailWhip.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Sounds\Battle\Attacks\Normal\Wrap.wav"> <Content Include="Content\Sounds\Battle\Attacks\Normal\Wrap.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

12
P3D/Pokemon/Attacks/Normal/TailWhip.vb
View File

@ -62,6 +62,18 @@
End If End If
End Sub End Sub
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As Entity)
Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip, CurrentModel)
MoveAnimation.AnimationTurnNPC(2, 0, 0, 1, -1)
MoveAnimation.AnimationPlaySound("Battle\Attacks\Normal\TailWhip", 1, 0)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, -0.1, 0.025, False, False, 1, 0.5)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0.1, 0.025, False, False, 1.75, 0.5)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, -0.1, 0.025, False, False, 2.75, 0.5)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0.1, 0.025, False, False, 3.75, 0.5)
MoveAnimation.AnimationMove(Nothing, False, 0, 0, 0, 0.025, False, False, 4.5, 0.5)
MoveAnimation.AnimationTurnNPC(2, 5, 0, 3, 1)
BattleScreen.BattleQuery.Add(MoveAnimation)
End Sub
End Class End Class
End Namespace End Namespace