From e0e2ea0964ee059419e306866f01800b158f1ce6 Mon Sep 17 00:00:00 2001
From: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
Date: Mon, 13 Nov 2023 14:52:40 -0700
Subject: [PATCH] Add some new move animations (#2185)

* strt new nims

* Add moon image to other moon-y moves

* oopz

* build fix
---
 fx/moon.png                    | Bin 0 -> 4824 bytes
 src/battle-animations-moves.ts | 433 +++++++++++++++++++++++++--------
 src/battle-animations.ts       |  10 +-
 3 files changed, 338 insertions(+), 105 deletions(-)
 create mode 100644 fx/moon.png

diff --git a/fx/moon.png b/fx/moon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f859a20a41babbc4cf512a60de19af7738e0961
GIT binary patch
literal 4824
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

literal 0
HcmV?d00001

diff --git a/src/battle-animations-moves.ts b/src/battle-animations-moves.ts
index e42a5f577..34610dff6 100644
--- a/src/battle-animations-moves.ts
+++ b/src/battle-animations-moves.ts
@@ -1532,10 +1532,6 @@ export const BattleMoveAnims: AnimTable = {
 	},
 	orderup: {
 		anim(scene, [attacker, defender]) {
-			let xstep = (defender.x - attacker.x) / 5;
-			let ystep = (defender.y - attacker.y) / 5;
-			let zstep = (defender.z - attacker.z) / 5;
-
 			const tatsugiriSprite = {
 				url: `https://${Config.routes.client}/sprites/gen5/tatsugiri${['-droopy', '-stretchy', ''][Math.floor(Math.random() * 3)]}.png`,
 				w: 96,
@@ -1546,118 +1542,24 @@ export const BattleMoveAnims: AnimTable = {
 				x: defender.x,
 				y: defender.y + 250,
 				z: defender.z,
-				scale: 1,
+				scale: 2,
 				opacity: 1,
 				time: 0,
 			}, {
 				y: defender.y,
-				scale: 0.5,
+				scale: 1,
 				time: 300,
 			}, 'linear');
 			scene.showEffect(tatsugiriSprite, {
 				x: defender.x,
 				y: defender.y,
 				z: defender.z,
-				scale: 0.5,
+				scale: 1,
 				opacity: 1,
 				time: 300,
 			}, {
-				time: 900,
+				time: 600,
 			}, 'linear');
-			for (let i = 0; i < 5; i++) {
-				scene.showEffect('wisp', {
-					x: attacker.x + xstep * (i + 1),
-					y: attacker.y + ystep * (i + 1),
-					z: attacker.z + zstep * (i + 1),
-					scale: 1,
-					opacity: 1,
-					time: 20 * i,
-				}, {
-					scale: 2,
-					opacity: 0,
-					time: 40 * i + 800,
-				}, 'linear');
-				scene.showEffect('poisonwisp', {
-					x: attacker.x + xstep * (i + 1),
-					y: attacker.y + ystep * (i + 1),
-					z: attacker.z + zstep * (i + 1),
-					scale: 0.5,
-					opacity: 0.3,
-					time: 20 * i,
-				}, {
-					scale: 2,
-					opacity: 0,
-					time: 40 * i + 800,
-				}, 'linear');
-			}
-			scene.showEffect('shadowball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.behind(-15),
-				scale: 0.5,
-				opacity: 0.6,
-			}, {
-				scale: 0.6,
-				opacity: 0.2,
-				time: 700,
-			}, 'linear', 'fade');
-
-			scene.showEffect('shadowball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.3,
-				opacity: 0.1,
-				time: 300,
-			}, {
-				x: defender.x,
-				y: defender.y,
-				z: defender.z,
-				scale: 1,
-				time: 500,
-			}, 'linear', 'explode');
-			scene.showEffect('shadowball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.3,
-				opacity: 0.1,
-				time: 400,
-			}, {
-				x: defender.x,
-				y: defender.y,
-				z: defender.z,
-				scale: 1,
-				time: 600,
-			}, 'linear', 'explode');
-			scene.showEffect('shadowball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.3,
-				opacity: 0.1,
-				time: 500,
-			}, {
-				x: defender.x,
-				y: defender.y,
-				z: defender.z,
-				scale: 1,
-				time: 700,
-			}, 'linear', 'explode');
-			scene.showEffect('shadowball', {
-				x: attacker.x,
-				y: attacker.y,
-				z: attacker.z,
-				scale: 0.3,
-				opacity: 0.1,
-				time: 600,
-			}, {
-				x: defender.x,
-				y: defender.y,
-				z: defender.z,
-				scale: 1,
-				time: 800,
-			}, 'linear', 'explode');
 		},
 	},
 	dragonpulse: {
@@ -3721,6 +3623,17 @@ export const BattleMoveAnims: AnimTable = {
 	moonlight: {
 		anim(scene, [attacker]) {
 			scene.backgroundEffect(`url('https://${Config.routes.client}/fx/bg-space.jpg')`, 800, 0.6);
+			scene.showEffect('moon', {
+				x: attacker.x,
+				y: attacker.y + 150,
+				z: attacker.z,
+				scale: 1,
+				opacity: 0,
+				time: 200,
+			}, {
+				opacity: 0.8,
+				time: 900,
+			}, 'accel', 'fade');
 			scene.showEffect('shine', {
 				x: attacker.x + 40,
 				y: attacker.y - 40,
@@ -6140,6 +6053,237 @@ export const BattleMoveAnims: AnimTable = {
 			}, 'swing');
 		},
 	},
+	bloodmoon: {
+		anim(scene, [attacker, defender]) {
+			let xstep = (defender.x - attacker.x) / 5;
+			let ystep = (defender.x - 100 - attacker.x) / 5;
+			let zstep = (defender.z - attacker.z) / 5;
+
+			scene.backgroundEffect('#000000', 1700, 0.8);
+
+			scene.showEffect('moon', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 1,
+				opacity: 0,
+				time: 0,
+			}, {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 1,
+				opacity: 0.9,
+				time: 0,
+			}, 'decel');
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 1.5,
+				opacity: 0,
+				time: 0,
+			}, {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 1.5,
+				opacity: 0.7,
+				time: 0,
+			}, 'decel', '', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 2.5,
+				opacity: 1,
+				time: 500,
+			}, {
+				scale: 3,
+				opacity: 0,
+				time: 1300,
+			}, 'decel', '', {filter: 'hue-rotate(-45deg)'});
+			for (let i = 0; i < 5; i++) {
+				scene.showEffect('flareball', {
+					x: attacker.x + xstep * (i + 1),
+					y: (attacker.y + 100) + ystep * (i + 1),
+					z: attacker.z + zstep * (i + 1),
+					scale: 1.5,
+					opacity: 1,
+					time: 40 * i + 700,
+				}, {
+					scale: 1,
+					opacity: 0,
+					time: 60 * i + 1500,
+				}, 'linear', '', {filter: 'hue-rotate(-45deg)'});
+			}
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 0.4,
+				opacity: 0.6,
+				time: 800,
+			}, {
+				x: defender.x + 30,
+				y: defender.y + 30,
+				z: defender.z,
+				scale: 0.6,
+				opacity: 0.3,
+				time: 1000,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 0.4,
+				opacity: 0.6,
+				time: 875,
+			}, {
+				x: defender.x + 20,
+				y: defender.y - 30,
+				z: defender.z,
+				scale: 0.6,
+				opacity: 0.3,
+				time: 1075,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 0.4,
+				opacity: 0.6,
+				time: 950,
+			}, {
+				x: defender.x - 30,
+				y: defender.y,
+				z: defender.z,
+				scale: 0.6,
+				opacity: 0.3,
+				time: 1150,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 0.4,
+				opacity: 0.6,
+				time: 1025,
+			}, {
+				x: defender.x - 10,
+				y: defender.y + 10,
+				z: defender.z,
+				scale: 0.6,
+				opacity: 0.3,
+				time: 1225,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 0.4,
+				opacity: 0.6,
+				time: 1100,
+			}, {
+				x: defender.x + 10,
+				y: defender.y - 10,
+				z: defender.z,
+				scale: 0.6,
+				opacity: 0.3,
+				time: 1300,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y + 100,
+				z: attacker.z,
+				scale: 0.4,
+				opacity: 0.6,
+				time: 1175,
+			}, {
+				x: defender.x - 20,
+				y: defender.y,
+				z: defender.z,
+				scale: 0.6,
+				opacity: 0.3,
+				time: 1375,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: defender.x,
+				y: defender.y - 50,
+				z: defender.z,
+				scale: 1,
+				xscale: 3,
+				opacity: 0.5,
+				time: 1375,
+			}, {
+				scale: 3,
+				xscale: 8,
+				opacity: 0.1,
+				time: 1675,
+			}, 'linear', 'explode', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: defender.x,
+				y: defender.y,
+				z: defender.behind(5),
+				scale: 0,
+				opacity: 1,
+				time: 1175,
+			}, {
+				scale: 8,
+				opacity: 0,
+				time: 1375,
+			}, 'linear', '', {filter: 'hue-rotate(-45deg)'});
+			scene.showEffect('flareball', {
+				x: defender.x,
+				y: defender.y,
+				z: defender.behind(10),
+				scale: 0,
+				opacity: 1,
+				time: 1275,
+			}, {
+				scale: 8,
+				opacity: 0,
+				time: 1675,
+			}, 'linear', '', {filter: 'hue-rotate(-45deg)'});
+
+			defender.delay(775);
+			defender.anim({
+				z: defender.behind(5),
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				z: defender.behind(5),
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				z: defender.behind(5),
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				z: defender.behind(5),
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				time: 75,
+			}, 'swing');
+			defender.anim({
+				z: defender.behind(10),
+				time: 300,
+			}, 'decel');
+			defender.anim({
+				time: 300,
+			}, 'swing');
+		},
+	},
 	gigatonhammer: {
 		anim(scene, [attacker, defender]) {
 			scene.showEffect('shadowball', {
@@ -16172,6 +16316,55 @@ export const BattleMoveAnims: AnimTable = {
 			}, 'ballistic', 'explode');
 		},
 	},
+	syrupbomb: {
+		anim(scene, [attacker, defender]) {
+			const imageType = {filter: attacker.sp.shiny ? 'hue-rotate(-45deg)' : 'hue-rotate(30deg)'};
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0,
+			}, {
+				x: defender.x,
+				y: defender.y,
+				z: defender.z,
+				scale: 0.7,
+				opacity: 1,
+				time: 400,
+			}, 'ballistic', 'explode', imageType);
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0,
+				time: 100,
+			}, {
+				x: defender.x + 40,
+				y: defender.y - 20,
+				z: defender.z,
+				scale: 0.7,
+				opacity: 1,
+				time: 500,
+			}, 'ballistic', 'explode', imageType);
+			scene.showEffect('flareball', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.1,
+				opacity: 0,
+				time: 200,
+			}, {
+				x: defender.x - 30,
+				y: defender.y - 10,
+				z: defender.z,
+				scale: 0.7,
+				opacity: 1,
+				time: 600,
+			}, 'ballistic', 'explode', imageType);
+		},
+	},
 	mudbomb: {
 		anim(scene, [attacker, defender]) {
 			scene.showEffect('mudwisp', {
@@ -18953,6 +19146,20 @@ export const BattleMoveAnims: AnimTable = {
 	moonblast: {
 		anim(scene, [attacker, defender]) {
 			scene.backgroundEffect(`url('https://${Config.routes.client}/fx/bg-space.jpg')`, 800, 0.6);
+			scene.showEffect('moon', {
+				x: attacker.x,
+				y: attacker.y,
+				z: attacker.z,
+				scale: 0.9,
+				opacity: 0.3,
+			}, {
+				x: defender.x,
+				y: defender.y,
+				z: defender.z,
+				scale: 0.9,
+				opacity: 0.6,
+				time: 500,
+			}, 'linear', 'explode');
 			scene.showEffect('mistball', {
 				x: attacker.x,
 				y: attacker.y,
@@ -34875,7 +35082,7 @@ BattleMoveAnims['entrainment'] = {anim: BattleMoveAnims['painsplit'].anim};
 BattleMoveAnims['roleplay'] = {anim: BattleMoveAnims['painsplit'].anim};
 BattleMoveAnims['psychup'] = {anim: BattleMoveAnims['painsplit'].anim};
 BattleMoveAnims['holdhands'] = {anim: BattleMoveAnims['painsplit'].anim};
-BattleMoveAnims['lunardance'] = {anim: BattleMoveAnims['wish'].anim};
+BattleMoveAnims['lunardance'] = {anim: BattleMoveAnims['moonlight'].anim};
 
 BattleMoveAnims['brickbreak'] = {anim: BattleMoveAnims['karatechop'].anim};
 BattleMoveAnims['throatchop'] = {anim: BattleMoveAnims['karatechop'].anim};
@@ -35153,7 +35360,25 @@ BattleMoveAnims['stoneaxe'] = {
 		BattleOtherAnims.slashattack.anim(scene, [attacker, defender]);
 	},
 };
-BattleMoveAnims['terablast'] = {anim: BattleMoveAnims['swift'].anim}; // placeholder
+BattleMoveAnims['terablast'] = {anim: BattleMoveAnims['scald'].anim};
+BattleMoveAnims['terablastbug'] = {anim: BattleMoveAnims['bugbuzz'].anim};
+BattleMoveAnims['terablastdark'] = {anim: BattleMoveAnims['darkpulse'].anim};
+BattleMoveAnims['terablastdragon'] = {anim: BattleMoveAnims['dragonpulse'].anim};
+BattleMoveAnims['terablastelectric'] = {anim: BattleMoveAnims['thunderbolt'].anim};
+BattleMoveAnims['terablastfairy'] = {anim: BattleMoveAnims['moonblast'].anim};
+BattleMoveAnims['terablastfighting'] = {anim: BattleMoveAnims['focusblast'].anim};
+BattleMoveAnims['terablastfire'] = {anim: BattleMoveAnims['flamethrower'].anim};
+BattleMoveAnims['terablastflying'] = {anim: BattleMoveAnims['aeroblast'].anim};
+BattleMoveAnims['terablastghost'] = {anim: BattleMoveAnims['infernalparade'].anim};
+BattleMoveAnims['terablastgrass'] = {anim: BattleMoveAnims['seedflare'].anim};
+BattleMoveAnims['terablastground'] = {anim: BattleMoveAnims['earthpower'].anim};
+BattleMoveAnims['terablastice'] = {anim: BattleMoveAnims['icebeam'].anim};
+BattleMoveAnims['terablastnormal'] = {anim: BattleMoveAnims['technoblast'].anim};
+BattleMoveAnims['terablastpoison'] = {anim: BattleMoveAnims['sludgebomb'].anim};
+BattleMoveAnims['terablastpsychic'] = {anim: BattleMoveAnims['psychic'].anim};
+BattleMoveAnims['terablastrock'] = {anim: BattleMoveAnims['powergem'].anim};
+BattleMoveAnims['terablaststeel'] = {anim: BattleMoveAnims['flashcannon'].anim};
+BattleMoveAnims['terablastwater'] = {anim: BattleMoveAnims['hydropump'].anim};
 BattleMoveAnims['tidyup'] = {anim: BattleMoveAnims['bulkup'].anim};
 BattleMoveAnims['trailblaze'] = {anim: BattleMoveAnims['powerwhip'].anim};
 BattleMoveAnims['tripledive'] = {anim: BattleMoveAnims['dive'].anim};
diff --git a/src/battle-animations.ts b/src/battle-animations.ts
index 6a160a8e6..ef1c2cba2 100644
--- a/src/battle-animations.ts
+++ b/src/battle-animations.ts
@@ -263,7 +263,10 @@ export class BattleScene implements BattleSceneStub {
 	addSprite(sprite: PokemonSprite) {
 		if (sprite.$el) this.$sprites[+sprite.isFrontSprite].append(sprite.$el);
 	}
-	showEffect(effect: string | SpriteData, start: ScenePos, end: ScenePos, transition: string, after?: string) {
+	showEffect(
+		effect: string | SpriteData, start: ScenePos, end: ScenePos,
+		transition: string, after?: string, additionalCss?: JQuery.PlainObject
+	) {
 		if (typeof effect === 'string') effect = BattleEffects[effect] as SpriteData;
 		if (!start.time) start.time = 0;
 		if (!end.time) end.time = start.time + 500;
@@ -279,6 +282,7 @@ export class BattleScene implements BattleSceneStub {
 
 		let $effect = $('<img src="' + effect.url + '" style="display:block;position:absolute" />');
 		this.$fx.append($effect);
+		if (additionalCss) $effect.css(additionalCss);
 		$effect = this.$fx.children().last();
 
 		if (start.time) {
@@ -2983,6 +2987,10 @@ const BattleEffects: {[k: string]: SpriteData} = {
 		url: 'flareball.png',
 		w: 100, h: 100,
 	},
+	moon: {
+		url: 'moon.png', // by Kalalokki
+		w: 100, h: 100,
+	},
 	pokeball: {
 		url: 'pokeball.png',
 		w: 24, h: 24,