Basketball game: clarify events

demos/basketball/src/entities/ball.js

@@ -438,7 +438,7 @@ export class Ball extends Entity
                 this._locked = true;
                 break;
 
-            case 'restarted':
+            case 'gameoverdismissed':
                 this._locked = false;
                 break;
         }

demos/basketball/src/entities/game-controller.js

@@ -26,6 +26,7 @@ export class GameController extends Entity
 
         this._ballsLeft = NUMBER_OF_BALLS;
         this._score = 0;
+        this._gameStarted = false;
     }
 
     /**
@@ -61,6 +62,7 @@ export class GameController extends Entity
                     this._broadcast(new GameEvent('newball', { ballsLeft: this._ballsLeft }));
                 break;
 
+            case 'started':
             case 'restarted':
                 this._score = 0;
                 this._ballsLeft = NUMBER_OF_BALLS;
@@ -68,9 +70,28 @@ export class GameController extends Entity
                 this._broadcast(new GameEvent('newball', { ballsLeft: this._ballsLeft }));
                 break;
 
-            case 'targetlost':
+            case 'tutorialdismissed':
+                this._gameStarted = true;
+                this._broadcast(new GameEvent('started'));
+                break;
+
+            case 'gameoverdismissed':
                 this._broadcast(new GameEvent('restarted'));
                 break;
+
+            case 'targetfound':
+                if(this._gameStarted)
+                    this._broadcast(new GameEvent('restarted'));
+                else
+                    this._broadcast(new GameEvent('awakened'));
+                break;
+
+            case 'targetlost':
+                if(this._gameStarted)
+                    this._broadcast(new GameEvent('paused'));
+                else
+                    this._broadcast(new GameEvent('slept'));
+                break;
         }
     }
 

demos/basketball/src/entities/gui/ball-counter.js

@@ -78,14 +78,19 @@ class BallIcon extends GUIControl
      */
     handleEvent(event)
     {
-        if(event.type == 'newball') {
-            const ballsLeft = event.detail.ballsLeft;
-            this.control.notRenderable = !(this._id < ballsLeft);
+        switch(event.type) {
+            case 'targetfound':
+                this.control.isVisible = true;
+                break;
+
+            case 'targetlost':
+                this.control.isVisible = false;
+                break;
+
+            case 'newball':
+                this.control.notRenderable = !(this._id < event.detail.ballsLeft);
+                break;
         }
-        else if(event.type == 'targetfound')
-            this.control.isVisible = true;
-        else if(event.type == 'targetlost')
-            this.control.isVisible = false;
     }
 }
 

demos/basketball/src/entities/gui/gameover-overlay.js

@@ -104,7 +104,7 @@ export class GameOverOverlay extends GUIControl
 
         // hide the overlay when touching the screen
         container.isVisible = false;
-        this._broadcast(new GameEvent('restarted'));
+        this._broadcast(new GameEvent('gameoverdismissed'));
     }
 
     /**

demos/basketball/src/entities/gui/mute-button.js

@@ -67,9 +67,14 @@ export class MuteButton extends GUIControl
      */
     handleEvent(event)
     {
-        if(event.type == 'targetfound')
-            this.control.isVisible = true;
-        else if(event.type == 'targetlost')
-            this.control.isVisible = false;
+        switch(event.type) {
+            case 'targetfound':
+                this.control.isVisible = true;
+                break;
+
+            case 'targetlost':
+                this.control.isVisible = false;
+                break;
+        }
     }
 }

demos/basketball/src/entities/gui/tutorial-overlay.js

@@ -26,7 +26,6 @@ export class TutorialOverlay extends GUIControl
     {
         super(game);
         this._timer = 0;
-        this._enabled = true;
     }
 
     /**
@@ -76,20 +75,18 @@ export class TutorialOverlay extends GUIControl
      */
     update()
     {
+        const ar = this.ar;
         const container = this.control;
 
-        // check if the tutorial is enabled / being displayed
-        if(!this._enabled || !container.isVisible)
+        // check if the tutorial is being displayed
+        if(!container.isVisible)
             return;
 
         // hide the overlay when touching the screen
-        const ar = this.ar;
         if(ar.pointers.length > 0) {
             const pointer = ar.pointers[0];
             if(pointer.phase == 'began') {
-                container.isVisible = false;
-                this._enabled = false;
-                this._broadcast(new GameEvent('started'));
+                this._dismiss();
                 return;
             }
         }
@@ -118,15 +115,35 @@ export class TutorialOverlay extends GUIControl
     }
 
     /**
+     * Dismiss the tutorial
+     * @returns {void}
+     */
+    _dismiss()
+    {
+        this.control.isVisible = false;
+        this._broadcast(new GameEvent('tutorialdismissed'));
+    }
+
+    /**
      * Handle an event
      * @param {GameEvent} event
      * @returns {void}
      */
     handleEvent(event)
     {
-        if(event.type == 'targetfound')
-            this.control.isVisible = this._enabled;
-        else if(event.type == 'targetlost' || event.type == 'guiresized')
-            this.control.isVisible = false;
+        switch(event.type) {
+            case 'awakened':
+                this.control.isVisible = true;
+                break;
+
+            case 'targetlost':
+                this.control.isVisible = false;
+                break;
+
+            case 'guiresized':
+                if(this.control.isVisible)
+                    this._dismiss();
+                break;
+        }
     }
 }

demos/basketball/src/entities/jukebox.js

@@ -25,7 +25,6 @@ export class Jukebox extends Entity
         super(game);
         this._sound = new Map();
         this._music = null;
-        this._gameStarted = false;
     }
 
     /**
@@ -70,22 +69,14 @@ export class Jukebox extends Entity
                     this._play('lose');
                 break;
 
-            case 'restarted':
-                this._music.setVolume(0.5);
-                break;
-
             case 'started':
-                this._gameStarted = true;
+            case 'restarted':
                 this._music.setVolume(0.5);
-                this._music.play();
-                break;
-
-            case 'targetfound':
-                if(this._gameStarted)
+                if(!this._music.isPlaying)
                     this._music.play();
                 break;
 
-            case 'targetlost':
+            case 'paused':
                 this._music.stop();
                 break;