From 639185159778c5c5f8202d97d175e833b452c7e6 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Fri, 7 Jan 2022 19:27:05 +0100 Subject: [PATCH] Improved Wrap & Bind animations, fixed some errors in the Bind animation --- P3D/Battle/BattleSystemV2/Battle.vb | 70 +++++++++++++++----- P3D/Content/Textures/Battle/Normal/Bind.png | Bin 1022 -> 2325 bytes P3D/Content/Textures/Battle/Normal/Wrap.png | Bin 1192 -> 2202 bytes P3D/Pokemon/Attacks/Normal/Bind.vb | 13 ++-- P3D/Pokemon/Attacks/Normal/Wrap.vb | 10 +-- 5 files changed, 66 insertions(+), 27 deletions(-) diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index ec7dbb70c..05b1e1165 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -5831,10 +5831,12 @@ ChangeCameraAngle(1, True, BattleScreen) Dim WrapAnimation As AnimationQueryObject = New AnimationQueryObject(.OwnPokemonNPC, False) WrapAnimation.AnimationPlaySound("Battle\Attacks\Normal\Wrap", 5.0F, 0) - Dim WrapEntity = WrapAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 0, 64, 32), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 1) - WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 32, 64, 32), ""), 1, 1) - WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 64, 64, 32), ""), 2, 1) - WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 96, 64, 32), ""), 3, 2) + Dim WrapEntity = WrapAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 0, 80, 40), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 40, 80, 40), ""), 0.75, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 80, 80, 40), ""), 1.5, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 120, 80, 40), ""), 2.25, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 160, 80, 40), ""), 3, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 200, 80, 40), ""), 3.75, 0.75) WrapAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 5, 0) WrapAnimation.AnimationScale(WrapEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) WrapAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 7, 0) @@ -5905,19 +5907,21 @@ ChangeCameraAngle(1, True, BattleScreen) Dim BindAnimation As AnimationQueryObject = New AnimationQueryObject(.OwnPokemonNPC, False) BindAnimation.AnimationPlaySound("Battle\Attacks\Normal\Bind", 5.0F, 0) - Dim WrapEntity = BindAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 0, 64, 32), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 1) - BindAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 32, 64, 32), ""), 1, 1) - BindAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 64, 64, 32), ""), 2, 1) - BindAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 96, 64, 32), ""), 3, 2) + Dim BindEntity = BindAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 0, 80, 40), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 40, 80, 40), ""), 0.75, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 80, 80, 40), ""), 1.5, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 120, 80, 40), ""), 2.25, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 160, 80, 40), ""), 3, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 200, 80, 40), ""), 3.75, 0.75) BindAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 5, 0) - BindAnimation.AnimationScale(WrapEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) + BindAnimation.AnimationScale(BindEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) BindAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 7, 0) - BindAnimation.AnimationScale(WrapEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 7, 0) + BindAnimation.AnimationScale(BindEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 7, 0) BindAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 9, 0) - BindAnimation.AnimationScale(WrapEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 9, 0) + BindAnimation.AnimationScale(BindEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 9, 0) BindAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 11, 0) - BindAnimation.AnimationScale(WrapEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 11, 0) - BindAnimation.AnimationFade(WrapEntity, True, 0.03, False, 0.0, 11, 0) + BindAnimation.AnimationScale(BindEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 11, 0) + BindAnimation.AnimationFade(BindEntity, True, 0.03, False, 0.0, 11, 0) BattleScreen.BattleQuery.Add(BindAnimation) End If ReduceHP(multiHP, True, False, BattleScreen, .OwnPokemon.GetDisplayName() & " is hurt by Bind!", "bind") @@ -6693,13 +6697,21 @@ ChangeCameraAngle(1, False, BattleScreen) Dim WrapAnimation As AnimationQueryObject = New AnimationQueryObject(.OppPokemonNPC, True) WrapAnimation.AnimationPlaySound("Battle\Attacks\Normal\Wrap", 5.0F, 0) - Dim WrapEntity = WrapAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 0, 64, 32), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 1) - WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 32, 64, 32), ""), 1, 1) - WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 64, 64, 32), ""), 2, 1) - WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 96, 64, 32), ""), 3, 2) + Dim WrapEntity = WrapAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 0, 80, 40), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 40, 80, 40), ""), 0.75, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 80, 80, 40), ""), 1.5, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 120, 80, 40), ""), 2.25, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 160, 80, 40), ""), 3, 0.75) + WrapAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 200, 80, 40), ""), 3.75, 0.75) + WrapAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 5, 0) WrapAnimation.AnimationScale(WrapEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) + WrapAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 7, 0) WrapAnimation.AnimationScale(WrapEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 7, 0) - WrapAnimation.AnimationScale(WrapEntity, True, False, 0.75F, 0.5F, 0.75F, 0.02F, 9, 1) + WrapAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 9, 0) + WrapAnimation.AnimationScale(WrapEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 9, 0) + WrapAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 11, 0) + WrapAnimation.AnimationScale(WrapEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 11, 0) + WrapAnimation.AnimationFade(WrapEntity, True, 0.03, False, 0.0, 11, 0) BattleScreen.BattleQuery.Add(WrapAnimation) End If ReduceHP(multiHP, False, True, BattleScreen, .OppPokemon.GetDisplayName() & " is hurt by Wrap!", "wrap") @@ -6756,6 +6768,28 @@ multiHP = CInt(.OppPokemon.MaxHP / 6) End If End If + 'Bind Animation + If Core.Player.ShowBattleAnimations <> 0 Then + ChangeCameraAngle(1, False, BattleScreen) + Dim BindAnimation As AnimationQueryObject = New AnimationQueryObject(.OppPokemonNPC, True) + BindAnimation.AnimationPlaySound("Battle\Attacks\Normal\Bind", 5.0F, 0) + Dim BindEntity = BindAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 0, 80, 40), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 40, 80, 40), ""), 0.75, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 80, 80, 40), ""), 1.5, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 120, 80, 40), ""), 2.25, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 160, 80, 40), ""), 3, 0.75) + BindAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 200, 80, 40), ""), 3.75, 0.75) + BindAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 5, 0) + BindAnimation.AnimationScale(BindEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) + BindAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 7, 0) + BindAnimation.AnimationScale(BindEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 7, 0) + BindAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 9, 0) + BindAnimation.AnimationScale(BindEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 9, 0) + BindAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 11, 0) + BindAnimation.AnimationScale(BindEntity, False, True, 1.0F, 0.5F, 1.0F, 0.04F, 11, 0) + BindAnimation.AnimationFade(BindEntity, True, 0.03, False, 0.0, 11, 0) + BattleScreen.BattleQuery.Add(BindAnimation) + End If ReduceHP(multiHP, False, True, BattleScreen, .OppPokemon.GetDisplayName() & " is hurt by Bind!", "bind") End If End If diff --git a/P3D/Content/Textures/Battle/Normal/Bind.png b/P3D/Content/Textures/Battle/Normal/Bind.png index 16eeb2cd04e159762e182d1c395b6d18fdd349dc..a45062aeda2d9fa8fb29968d2bcf62e10ddcb25b 100644 GIT binary patch delta 2289 zcmYk8dpy%^AIE>2$+^rhR8H-oBrQbbFsw{vNja5rNHQvN$Z_o_sY%5=WjVG;DW$SS|>ao&FcWI((uVv+v2n9xGEyIx#oo8-{ zb01GE&VK*J8XBxxul@qI4iQZ%^deWPix4(Rpxh+{45bPY!(rqFLc%}`MR6FYOyaRk z0ktW; zUcSCbAOk#}K(#QSV5u@*B+VS&5hB(# zvm`>!&!#iL@4c2#AaG7^ajoj&>(0I-nCPQnoCVH2Uvzfm*5de(-?hpg8GW@nVdYVO zDVaiB#iK`2NoV1S;AZzOTL_xeRZ0JV_=iIP^X<@ioTnMZ&xG@9)*gD7q;aa|Hzdb( z&`8t=Q2y zsn2Ys;NuP@X(VZraJCxFZ|XW{$*+Z|LV$Gl%q%T(dx{tqFgx~f_FAtI7XTW>(OxRV zt2KfKu_9bg>733AEh?A;q-NViJS9?f#|u5W`??5WW-+yjcK&RC_3Ef4Nz5%eL#iWB z7t=Z(!fVpfen*%|r82jH%p0M^ALYwN6T({Uq}`yLPOztBgt?u$Vo{VdQT1X=ugU?R zh*zzC4)CSN!OUU4#>*XVR87O#&A*28Ty16_WXU{_d+9NK#w$Lm{?6*J+Wk_Kx_>OK zwurQDlaF^KVBDPhw0u9cCma@d>|bN$6$0M|ikoeZS%Blm%ppQY5u&)7P6!D)d*VOt zazMDKH4rF!T>COv0pc_B`ZDtq@5Eg)Wpm1PL%EUw#>zmhbLT?suM=EukDh3jSpRz# z6-k@xm^LAn?tq7lxY!}<-8(C>RZR??LUh@3gLVLM(jIN?+GzH?HXulm_3$jbxOHHQ1Ad~dg4C%xmllVEMpj5@9n*2NW9hv{`G#cvp+f zAj#e=5mvWRr5H8bqruq=G#=8F8K`BZ<6OYeT|sE`#XatIllymdtUwwR>5HI2<=pai z$6on(k-VR3=^~fV?nBluj1>5p_hN6q(cexk-|xV&T&#r5DBom7@eL?lr${(49k-G%o)nWq`a)Pys~Tb3j70IgZ5%4kcW3s{YQt z6oIe9J}Hl!$Sij1@1@Mk_;(EP!n0E71e6g)ANz=KVf{Ylo^sYx7~f)-W8kD8)5EWv zQTd$AR>yr6JM^JiA#bO3nxNuAH=hoVD@PMn^&ck?@u>Mwhi8apc-KlWB}B^u4`arS lZTH=7ZLs8X8}q76iW-z~&epn{VlU=WnB9HDLe% delta 976 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 N002ovPDHLkV1i|<>)ikV diff --git a/P3D/Pokemon/Attacks/Normal/Bind.vb b/P3D/Pokemon/Attacks/Normal/Bind.vb index f4e169155..e50542ea6 100644 --- a/P3D/Pokemon/Attacks/Normal/Bind.vb +++ b/P3D/Pokemon/Attacks/Normal/Bind.vb @@ -89,11 +89,14 @@ Namespace BattleSystem.Moves.Normal Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity) Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip) - MoveAnimation.AnimationPlaySound("Battle\Attacks\Normal\Bind", 0.0F, 0) - Dim BindEntity = MoveAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 0, 64, 32), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 1) - MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 32, 64, 32), ""), 1, 1) - MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 64, 64, 32), ""), 2, 1) - MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 96, 64, 32), ""), 3, 2) + MoveAnimation.AnimationPlaySound("Battle\Attacks\Normal\Bind", 5.0F, 0) + Dim BindEntity = MoveAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 0, 80, 40), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 0.75) + MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 40, 80, 40), ""), 0.75, 0.75) + MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 80, 80, 40), ""), 1.5, 0.75) + MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 120, 80, 40), ""), 2.25, 0.75) + MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 160, 80, 40), ""), 3, 0.75) + MoveAnimation.AnimationChangeTexture(BindEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Bind", New Rectangle(0, 200, 80, 40), ""), 3.75, 0.75) + MoveAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 5, 0) MoveAnimation.AnimationScale(BindEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) MoveAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 7, 0) diff --git a/P3D/Pokemon/Attacks/Normal/Wrap.vb b/P3D/Pokemon/Attacks/Normal/Wrap.vb index 116b891e2..534165c7e 100644 --- a/P3D/Pokemon/Attacks/Normal/Wrap.vb +++ b/P3D/Pokemon/Attacks/Normal/Wrap.vb @@ -90,10 +90,12 @@ Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity) Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip) MoveAnimation.AnimationPlaySound("Battle\Attacks\Normal\Wrap", 5.0F, 0) - Dim WrapEntity = MoveAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 0, 64, 32), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 1) - MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 32, 64, 32), ""), 1, 1) - MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 64, 64, 32), ""), 2, 1) - MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 96, 64, 32), ""), 3, 2) + Dim WrapEntity = MoveAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 0, 80, 40), ""), New Vector3(1.0F, 0.5F, 1.0F), 1, 0, 0.75) + MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 40, 80, 40), ""), 0.75, 0.75) + MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 80, 80, 40), ""), 1.5, 0.75) + MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 120, 80, 40), ""), 2.25, 0.75) + MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 160, 80, 40), ""), 3, 0.75) + MoveAnimation.AnimationChangeTexture(WrapEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Wrap", New Rectangle(0, 200, 80, 40), ""), 3.75, 0.75) MoveAnimation.AnimationScale(Nothing, False, False, 0.75F, 1.0F, 0.75F, 0.02F, 5, 0) MoveAnimation.AnimationScale(WrapEntity, False, False, 0.75F, 0.5F, 0.75F, 0.02F, 5, 0) MoveAnimation.AnimationScale(Nothing, False, True, 1.0F, 1.0F, 1.0F, 0.04F, 7, 0)