From 6c25ed2467593c85827e6cec9768d0e4d91fc900 Mon Sep 17 00:00:00 2001 From: Shriansh Chari <30420527+shrianshChari@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:51:06 -0400 Subject: [PATCH 1/3] Add animation for Thunderclap --- .../src/battle-animations-moves.ts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/play.pokemonshowdown.com/src/battle-animations-moves.ts b/play.pokemonshowdown.com/src/battle-animations-moves.ts index cc009246a4..f1e4c56d1e 100644 --- a/play.pokemonshowdown.com/src/battle-animations-moves.ts +++ b/play.pokemonshowdown.com/src/battle-animations-moves.ts @@ -36363,6 +36363,34 @@ export const BattleMoveAnims: AnimTable = { } }, }, + thunderclap: { + anim(scene, [attacker, defender]) { + scene.backgroundEffect('#000000', 200, 0.2); + attacker.anim({ + y: attacker.y + 8, + scale: 1.3, + time: 200, + }, 'linear'); + attacker.delay(100); + attacker.anim({ + time: 200, + }, 'decel'); + scene.showEffect('lightning', { + x: defender.x, + y: defender.y + 150, + z: defender.z, + yscale: 0, + xscale: 2, + time: 200, + }, { + y: defender.y + 50, + yscale: 1, + xscale: 1.5, + opacity: 0.8, + time: 400, + }, 'linear', 'fade', {filter: 'hue-rotate(180deg)'}); + }, + }, }; // placeholder animations From 16fc6ec9235a89a76f34ebf26e9ae3b5f40bcaa1 Mon Sep 17 00:00:00 2001 From: Shriansh Chari <30420527+shrianshChari@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:36:48 -0400 Subject: [PATCH 2/3] Add sparks before Thunderclap bolt --- .../src/battle-animations-moves.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/play.pokemonshowdown.com/src/battle-animations-moves.ts b/play.pokemonshowdown.com/src/battle-animations-moves.ts index f1e4c56d1e..a93ff8ec8a 100644 --- a/play.pokemonshowdown.com/src/battle-animations-moves.ts +++ b/play.pokemonshowdown.com/src/battle-animations-moves.ts @@ -36366,15 +36366,17 @@ export const BattleMoveAnims: AnimTable = { thunderclap: { anim(scene, [attacker, defender]) { scene.backgroundEffect('#000000', 200, 0.2); - attacker.anim({ - y: attacker.y + 8, - scale: 1.3, - time: 200, - }, 'linear'); - attacker.delay(100); - attacker.anim({ + scene.showEffect('electroball', { + x: attacker.x, + y: attacker.y, + z: attacker.z, + scale: 1.5, + opacity: 0.8, + }, { + scale: 3, + opacity: 0.2, time: 200, - }, 'decel'); + }, 'accel', 'fade', {filter: 'hue-rotate(150deg)'}) scene.showEffect('lightning', { x: defender.x, y: defender.y + 150, From 233aa5c7caecd90fca73ac7d352e3293b34ecd0e Mon Sep 17 00:00:00 2001 From: Shriansh Chari <30420527+shrianshChari@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:28:37 -0400 Subject: [PATCH 3/3] Satisfy linter --- play.pokemonshowdown.com/src/battle-animations-moves.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play.pokemonshowdown.com/src/battle-animations-moves.ts b/play.pokemonshowdown.com/src/battle-animations-moves.ts index a93ff8ec8a..f80971cb8b 100644 --- a/play.pokemonshowdown.com/src/battle-animations-moves.ts +++ b/play.pokemonshowdown.com/src/battle-animations-moves.ts @@ -36376,7 +36376,7 @@ export const BattleMoveAnims: AnimTable = { scale: 3, opacity: 0.2, time: 200, - }, 'accel', 'fade', {filter: 'hue-rotate(150deg)'}) + }, 'accel', 'fade', {filter: 'hue-rotate(150deg)'}); scene.showEffect('lightning', { x: defender.x, y: defender.y + 150,