From 137dc317b7269dd65b3a2d3073b9fa4d2eaa3c5a Mon Sep 17 00:00:00 2001
From: Ridaz <ridaz@live.com.pt>
Date: Thu, 14 Mar 2019 16:23:39 +0000
Subject: [PATCH] Move animations: Fix xattack

...And the moves that use its animation
---
 src/battle-animations.ts | 60 ++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/battle-animations.ts b/src/battle-animations.ts
index 2b7d2e905..bd66cfecd 100644
--- a/src/battle-animations.ts
+++ b/src/battle-animations.ts
@@ -3076,6 +3076,51 @@ const BattleOtherAnims: AnimTable = {
 	},
 	xattack: {
 		anim(scene, [attacker, defender]) {
+			scene.showEffect('wisp', {
+				x: defender.x,
+				y: defender.y,
+				z: defender.z,
+				scale: 0,
+				opacity: 1,
+				time: 400,
+			}, {
+				x: defender.leftof(-20),
+				y: defender.y,
+				z: defender.behind(20),
+				scale: 3,
+				opacity: 0,
+				time: 700,
+			}, 'linear');
+			scene.showEffect('wisp', {
+				x: defender.x,
+				y: defender.y,
+				z: defender.z,
+				scale: 0,
+				opacity: 1,
+				time: 700,
+			}, {
+				x: defender.leftof(-20),
+				y: defender.y,
+				z: defender.behind(20),
+				scale: 3,
+				opacity: 0,
+				time: 1000,
+			}, 'linear');
+			defender.delay(480);
+			defender.anim({
+				z: defender.behind(20),
+				time: 100,
+			}, 'swing');
+			defender.anim({
+				time: 200,
+			}, 'swing');
+			defender.anim({
+				z: defender.behind(20),
+				time: 100,
+			}, 'swing');
+			defender.anim({
+				time: 300,
+			}, 'swing');
 			attacker.anim({
 				x: defender.leftof(-30),
 				y: defender.y + 80,
@@ -3103,21 +3148,6 @@ const BattleOtherAnims: AnimTable = {
 			attacker.anim({
 				time: 500,
 			}, 'ballistic2Back');
-			defender.delay(450);
-			defender.anim({
-				z: defender.behind(20),
-				time: 100,
-			}, 'swing');
-			defender.anim({
-				time: 200,
-			}, 'swing');
-			defender.anim({
-				z: defender.behind(20),
-				time: 100,
-			}, 'swing');
-			defender.anim({
-				time: 300,
-			}, 'swing');
 		},
 	},
 	slashattack: {