diff --git a/public/images/arenas/default_bg.png b/public/images/arenas/default_bg.png new file mode 100644 index 000000000..3c1ae88d0 Binary files /dev/null and b/public/images/arenas/default_bg.png differ diff --git a/public/images/arenas/plains_a.png b/public/images/arenas/plains_a.png index eccb820f0..ada3c63cc 100644 Binary files a/public/images/arenas/plains_a.png and b/public/images/arenas/plains_a.png differ diff --git a/public/images/arenas/plains_b.png b/public/images/arenas/plains_b.png index 8da1f3e11..b75b9825b 100644 Binary files a/public/images/arenas/plains_b.png and b/public/images/arenas/plains_b.png differ diff --git a/public/images/arenas/plains_bg.png b/public/images/arenas/plains_bg.png index 3c1ae88d0..0ab30c7ee 100644 Binary files a/public/images/arenas/plains_bg.png and b/public/images/arenas/plains_bg.png differ diff --git a/public/images/arenas/swamp_bg.png b/public/images/arenas/swamp_bg.png index 2cf271414..00679534c 100644 Binary files a/public/images/arenas/swamp_bg.png and b/public/images/arenas/swamp_bg.png differ diff --git a/src/battle-phases.ts b/src/battle-phases.ts index 323b0f81b..ea1e8145b 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -314,14 +314,15 @@ export class SwitchBiomePhase extends BattlePhase { this.scene.time.delayedCall(1000, () => this.scene.arena.playBgm()); this.scene.tweens.add({ - targets: [ this.scene.arenaBgTransition, this.scene.arenaPlayerTransition ], + targets: [ this.scene.arenaPlayer, this.scene.arenaBgTransition, this.scene.arenaPlayerTransition ], duration: 1000, delay: 1000, ease: 'Sine.easeInOut', - alpha: 1, + alpha: (target: any) => target === this.scene.arenaPlayer ? 0 : 1, onComplete: () => { this.scene.arenaBg.setTexture(bgTexture); this.scene.arenaPlayer.setTexture(playerTexture); + this.scene.arenaPlayer.setAlpha(1); this.scene.arenaEnemy.setTexture(enemyTexture); this.scene.arenaNextEnemy.setTexture(enemyTexture); this.scene.arenaBgTransition.setVisible(false); @@ -329,7 +330,7 @@ export class SwitchBiomePhase extends BattlePhase { this.end(); } - }) + }); } }); } diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 0c497a2d2..90799e944 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -480,7 +480,7 @@ export default class BattleScene extends Phaser.Scene { this.arenaBgTransition.setPosition(0, 0); this.arenaPlayer.setPosition(300, 0); - this.arenaPlayerTransition.setPosition(40, 0); + this.arenaPlayerTransition.setPosition(0, 0); this.arenaEnemy.setPosition(-280, 0); this.arenaNextEnemy.setPosition(-280, 0);