Merge pull request #15 from mattjennings/dev

a

src/actors/base-player.ts

@@ -105,7 +105,6 @@ export class BasePlayer extends ex.Actor {
     this.isPain = true
     this.isSprinting = false
     this.setAnimation('Pain')
-    assets.snd_dashB.play()
 
     this.vel = direction.scale(500)
   }

src/actors/referee.ts

@@ -162,13 +162,12 @@ export class Referee extends BasePlayer {
           entity.pos.distance(this.pos) < 30
       ) as BasePlayer[]
 
+      assets.snd_taunt.play(0.9)
       if (nearbyPlayers.length) {
         this.suspicion += nearbyPlayers.length * 0.5
         nearbyPlayers.forEach((player) => {
           player.scare(player.pos.sub(this.pos).normalize())
         })
-      } else {
-        assets.snd_dashB.play()
       }
     }
   }
@@ -177,7 +176,7 @@ export class Referee extends BasePlayer {
     if (this.scene.gameHasStarted === true) {
       this.suspicion += 1
     }
-    assets.snd_crowdBLow.play()
+    assets.snd_crowdBLow.play(0.75)
     this.scene.reset()
     this.scene.gameHasStarted = true
   }

src/assets.ts

@@ -59,6 +59,10 @@ export const assets = {
   snd_crowdBLow: new ex.Sound('sfx/CrowdBLow.mp3'),
   snd_bell: new ex.Sound('sfx/Bell1.mp3'),
   snd_watchOut: new ex.Sound('sfx/WatchOut.mp3'),
+  snd_taunt: new ex.Sound('sfx/Taunt.mp3'),
+
+  sng_overtime1: new ex.Sound('music/Overtime1.mp3'),
+  sng_overtime2: new ex.Sound('music/Overtime2.mp3'),
 }
 
 class DevLoader extends ex.Loader {

src/classes/MatchScene.ts

@@ -32,13 +32,16 @@ export default class MatchScene extends ex.Scene {
   lastPosession?: Team
   referee: Referee
 
+  song: ex.Sound
+
   gameHasStarted = false
   gameOver = false
 
   field: ex.BoundingBox
   zones: Record<'left' | 'mid' | 'right', ex.BoundingBox>
 
   onInitialize(engine: ex.Engine): void {
+    this.playSong('intro')
     // add field
     const fieldSprite = assets.img_field.toSprite()
 
@@ -206,17 +209,32 @@ export default class MatchScene extends ex.Scene {
 
     this.add(new IcecreamTruck())
     this.on('goal', this.onGoal.bind(this))
-    assets.snd_crowdA.play()
+    assets.snd_crowdA.play(0.75)
   }
 
+  playSong(song: 'intro' | 'game') {
+    const intro = assets.sng_overtime2
+    const game = assets.sng_overtime1
+
+    if (song === 'intro' && !intro.isPlaying()) {
+      this.song?.stop()
+      this.song = intro
+      intro.play()
+    } else if (song === 'game' && !game.isPlaying()) {
+      this.song?.stop()
+      this.song = game
+      game.play()
+    }
+  }
   onGoal({ team }: { team: Team }) {
     this[team].score++
 
-    assets.snd_crowdA.play()
-    assets.snd_crowdBHigh.play()
-    assets.snd_crowdBLow.play()
+    assets.snd_crowdA.play(0.75)
+    assets.snd_crowdBHigh.play(0.75)
+    assets.snd_crowdBLow.play(0.75)
 
     if (this.home.score >= SCORE_TO_WIN) {
+      this.playSong('intro')
       let suspicionMessage = `Team Red didn't suspect a thing.`
 
       if (this.referee.suspicion > 30) {
@@ -233,6 +251,7 @@ export default class MatchScene extends ex.Scene {
         )
       )
     } else if (this.away.score >= SCORE_TO_WIN) {
+      this.playSong('intro')
       this.gameHasStarted = false
       this.gameOver = true
       this.engine.add(
@@ -252,6 +271,7 @@ export default class MatchScene extends ex.Scene {
       this.home.score = 0
       this.away.score = 0
     }
+    this.playSong('game')
     this.emit('start', {})
   }
 
@@ -281,6 +301,10 @@ export default class MatchScene extends ex.Scene {
   }
 
   onPreUpdate(_engine: Engine, _delta: number): void {
+    if (this.song && !this.song.isPlaying()) {
+      this.song.play()
+    }
+
     // ysort all actors
     const sorted = [...this.entities].sort((a, b) => {
       if (a instanceof Actor && b instanceof Actor) {

src/hud/message-box.ts

@@ -34,7 +34,7 @@ export class MessageBox extends ScreenElement {
 
     const bg = new ex.Rectangle({
       width: this.scene.camera.viewport.width,
-      height: this.scene.camera.viewport.height - this.pos.y,
+      height: this.scene.camera.viewport.height,
       color: ex.Color.Black,
     })