mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-21 14:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some animation fixes

Browse Source
This commit is contained in:
innerthunder 2024-10-22 03:26:58 -07:00
parent 1678a809f4
commit c8a0ea47d5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/phases/pokemon-anim-phase.ts
View File

@ -251,8 +251,11 @@ export class PokemonAnimPhase extends BattlePhase {
return this.end(); return this.end();
} }
const tatsugiriX = this.pokemon.x + this.pokemon.getSprite().x;
const tatsugiriY = this.pokemon.y + this.pokemon.getSprite().y;
const getSourceSprite = () => { const getSourceSprite = () => {
const sprite = this.scene.addPokemonSprite(this.pokemon, this.pokemon.x + this.pokemon.getSprite().x, this.pokemon.y + this.pokemon.getSprite().y, this.pokemon.getSprite().texture, this.pokemon.getSprite()!.frame.name, true); const sprite = this.scene.addPokemonSprite(this.pokemon, tatsugiriX, tatsugiriY, this.pokemon.getSprite().texture, this.pokemon.getSprite()!.frame.name, true);
[ "spriteColors", "fusionSpriteColors" ].map(k => sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k]); [ "spriteColors", "fusionSpriteColors" ].map(k => sprite.pipelineData[k] = this.pokemon.getSprite().pipelineData[k]);
sprite.setPipelineData("spriteKey", this.pokemon.getBattleSpriteKey()); sprite.setPipelineData("spriteKey", this.pokemon.getBattleSpriteKey());
sprite.setPipelineData("shiny", this.pokemon.shiny); sprite.setPipelineData("shiny", this.pokemon.shiny);
@ -276,19 +279,17 @@ export class PokemonAnimPhase extends BattlePhase {
this.scene.tweens.add({ this.scene.tweens.add({
targets: sourceSprite, targets: sourceSprite,
duration: 375, duration: 375,
ease: "Cubic.easeOut",
scale: 0.5, scale: 0.5,
x: (_target, _key, value: number) => value + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2, x: { value: tatsugiriX + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2, ease: "Linear" },
y: (this.pokemon.isPlayer() ? 100 : 65) + sourceFpOffset[1], y: { value: (this.pokemon.isPlayer() ? 100 : 65) + sourceFpOffset[1], ease: "Sine.easeOut" },
onComplete: () => { onComplete: () => {
this.scene.field.bringToTop(dondozo); this.scene.field.bringToTop(dondozo);
this.scene.tweens.add({ this.scene.tweens.add({
targets: sourceSprite, targets: sourceSprite,
duration: 375, duration: 375,
ease: "Cubic.easeIn",
scale: 0.01, scale: 0.01,
x: (_target, _key, value: number) => value + (dondozoFpOffset[0] - sourceFpOffset[0]) / 2, x: { value: dondozo.x, ease: "Linear" },
y: dondozo.y + dondozo.height / 2, y: { value: dondozo.y + dondozo.height / 2, ease: "Sine.easeIn" },
onComplete: () => { onComplete: () => {
sourceSprite.destroy(); sourceSprite.destroy();
this.scene.playSound("battle_anims/PRSFX- Liquidation1.wav"); this.scene.playSound("battle_anims/PRSFX- Liquidation1.wav");