From 7bd94614e90482d2ed92db4404048a4d63a425c6 Mon Sep 17 00:00:00 2001 From: Ridaz Date: Thu, 14 Jan 2016 01:15:45 +0000 Subject: [PATCH] Update Animations And revert Fairy Wind and Moonblast animations --- data/graphics.js | 109 +++++++++++++++++++++++++++++++++++++++----- fx/bluefireball.png | Bin 0 -> 4240 bytes 2 files changed, 98 insertions(+), 11 deletions(-) create mode 100644 fx/bluefireball.png diff --git a/data/graphics.js b/data/graphics.js index dc4a85b26..b1dad8390 100644 --- a/data/graphics.js +++ b/data/graphics.js @@ -4889,8 +4889,32 @@ var BattleMoveAnims = { var attacker = args[0]; var defender = args[1]; - battle.backgroundEffect('#000000', 900, 0.3) - battle.showEffect('electroball', { + battle.backgroundEffect('#00CCCC', 900, 0.3); + + battle.showEffect('waterwisp', { + x: attacker.x, + y: attacker.y, + z: attacker.z, + opacity: 1 + }, { + x: defender.x, + y: defender.y, + z: defender.z, + time: 300 + }, 'accel', 'fade'); + battle.showEffect('iceball', { + x: attacker.x, + y: attacker.y, + z: attacker.z, + opacity: 1 + }, { + x: defender.x, + y: defender.y, + z: defender.z, + time: 300 + }, 'accel', 'fade'); + + battle.showEffect('iceball', { x: defender.x, y: defender.y, z: defender.z, @@ -4902,7 +4926,7 @@ var BattleMoveAnims = { opacity: 0, time: 600 }, 'linear'); - battle.showEffect('electroball', { + battle.showEffect('iceball', { x: defender.x, y: defender.y, z: defender.z, @@ -4924,6 +4948,7 @@ var BattleMoveAnims = { x: defender.x, y: defender.y, z: defender.behind(-5), + opacity: 0, time: 350 }, 'accel', 'fade'); battle.showEffect(attacker.sp, { @@ -4936,15 +4961,18 @@ var BattleMoveAnims = { x: defender.x, y: defender.y, z: defender.behind(-5), + opacity: 0, time: 400 }, 'accel', 'fade'); attacker.anim({ x: defender.x, y: defender.y, z: defender.behind(-5), + opacity: 0, time: 300 }, 'accel'); attacker.anim({ + opacity: 1, time: 500 }, 'ballistic2Back'); defender.delay(280); @@ -5010,22 +5038,61 @@ var BattleMoveAnims = { var attacker = args[0]; var defender = args[1]; - battle.showEffect('electroball', { + attacker.anim({ + x: attacker.leftof(-20), + y: attacker.y, + z: attacker.behind(-20), + opacity: 0, + time: 200 + }, 'accel'); + attacker.anim({ + x: defender.x, + y: defender.y, + z: defender.behind(-120), + opacity: 0, + time: 1 + }, 'accel'); + attacker.anim({ + opacity: 0, + time: 1 + }, 'linear'); + attacker.anim({ + time: 500, + opacity: 0 + }, 'linear'); + attacker.anim({ + time: 200, + opacity: 1 + }, 'linear'); + + battle.showEffect('waterwisp', { x: attacker.x, y: attacker.y, z: attacker.z, - opacity: 0.8 + opacity: 1 }, { x: defender.x, y: defender.y, z: defender.z, time: 300 }, 'accel', 'fade'); - battle.showEffect('electroball', { + battle.showEffect('iceball', { + x: attacker.x, + y: attacker.y, + z: attacker.z, + opacity: 1 + }, { x: defender.x, y: defender.y, z: defender.z, - opacity: 0.7, + time: 300 + }, 'accel', 'fade'); + + battle.showEffect('iceball', { + x: defender.x, + y: defender.y, + z: defender.z, + opacity: 1, scale: 0, time: 300 }, { @@ -5036,11 +5103,11 @@ var BattleMoveAnims = { opacity: 0, time: 600 }, 'linear'); - battle.showEffect('electroball', { + battle.showEffect('iceball', { x: defender.x, y: defender.y, z: defender.z, - opacity: 0.7, + opacity: 1, scale: 0, time: 500 }, { @@ -8369,6 +8436,27 @@ var BattleMoveAnims = { }, 'linear', 'explode'); } }, + moonblast: { + anim: function(battle, args) { + var attacker = args[0]; + var defender = args[1]; + + battle.showEffect('mistball', { + x: attacker.x, + y: attacker.y, + z: attacker.z, + scale: 1, + opacity: 0.3 + }, { + x: defender.x, + y: defender.y, + z: defender.z, + scale: 1, + opacity: 0.6, + time: 500 + }, 'linear', 'explode'); + } + }, mistball: { anim: function(battle, args) { var attacker = args[0]; @@ -12695,8 +12783,7 @@ BattleMoveAnims['phantomforce'] = {anim:BattleMoveAnims['shadowforce'].anim,prep BattleMoveAnims['smackdown'] = {anim:BattleMoveAnims['rockblast'].anim}; -BattleMoveAnims['moonblast'] = {anim:BattleMoveAnims['mistball'].anim}; -BattleMoveAnims['fairywind'] = {anim:BattleMoveAnims['mistball'].anim}; +BattleMoveAnims['fairywind'] = {anim:BattleMoveAnims['dazzlinggleam'].anim}; BattleMoveAnims['lightofruin'] = {anim:BattleMoveAnims['psychoboost'].anim}; BattleMoveAnims['dreameater'] = {anim:BattleMoveAnims['drainingkiss'].anim}; BattleMoveAnims['sweetkiss'] = {anim:BattleMoveAnims['lovelykiss'].anim}; diff --git a/fx/bluefireball.png b/fx/bluefireball.png new file mode 100644 index 0000000000000000000000000000000000000000..49b38923160266833cbdf027e01755eb89052ca5 GIT binary patch literal 4240 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 m0r+2qz`Gp(2YA;3{xty0b-Dx=vVzh80000