Removed async operations from starting battles (#719)

We shouldn't be `.then`-ing a play Promise. It's meant to be async. Pipes through a `startTransition` name if it exists.
FullScreenShenanigans · Apr 24, 2018 · 5653e61 · 5653e61
1 parent 2fb15b1
commit 5653e61
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/components/Battles.ts b/src/components/Battles.ts
@@ -210,6 +210,11 @@ export interface IPartialBattleOptions {
      */
     onComplete?: IOnBattleComplete;
 
+    /**
+     * Transition name to start with, if not a random one.
+     */
+    startTransition?: string;
+
     /**
      * Opposing teams in the battle.
      */

diff --git a/src/components/battles/animations/Starting.ts b/src/components/battles/animations/Starting.ts
@@ -28,18 +28,19 @@ export class Starting<TGameStartr extends FullScreenPokemon> extends GeneralComp
             this.gameStarter.graphics.moveThingsToText(battleInfo.keptThings);
         }
 
+        // tslint:disable-next-line no-floating-promises
         this.gameStarter.audioPlayer.play(battleInfo.theme, {
             alias: this.gameStarter.audio.aliases.theme,
             loop: true,
-        }).then(() => {
-            this.transitions.play({
-                onComplete: (): void => {
-                    this.setupThings(battleInfo);
-                    this.runTeamEntrances(battleInfo, onComplete);
-                },
-            });
         });
 
+        this.transitions.play({
+            name: battleInfo.startTransition,
+            onComplete: (): void => {
+                this.setupThings(battleInfo);
+                this.runTeamEntrances(battleInfo, onComplete);
+            },
+        });
     }
 
     /**