From 25b5fb04067dcc65d1bbb76a99a919d92ceaab25 Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin.worthe@gmail.com>
Date: Sun, 31 Aug 2014 14:17:06 +0200
Subject: Added sound effect for player respawning

---
 assets/audio/ow.ogg    | Bin 0 -> 9891 bytes
 game/prefabs/player.js |   1 +
 game/states/play.js    |   9 ++++++++-
 game/states/preload.js |   2 +-
 todo.md                |   2 --
 5 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 assets/audio/ow.ogg

diff --git a/assets/audio/ow.ogg b/assets/audio/ow.ogg
new file mode 100644
index 0000000..0767ffd
Binary files /dev/null and b/assets/audio/ow.ogg differ
diff --git a/game/prefabs/player.js b/game/prefabs/player.js
index 44c4aa2..fac3967 100644
--- a/game/prefabs/player.js
+++ b/game/prefabs/player.js
@@ -29,6 +29,7 @@ var Player = function(game, x, y, key, frame, soundKey) {
   this.lastTween = null;
 
   this.scoreSound = game.sound.add(soundKey);
+  this.respawnSound = game.sound.add('owSound');
 
 
   //BEWARE! HORRIBLE HACK AHEAD!
diff --git a/game/states/play.js b/game/states/play.js
index 4d6080b..99d29a1 100644
--- a/game/states/play.js
+++ b/game/states/play.js
@@ -341,6 +341,7 @@ Play.prototype = {
     }
 
     poisonPill.destroy();
+    player.respawnSound.play();
   },
   playerPlayerCollision: function(playerA, playerB) {
     var eatenPlayer = playerA.isMyTurn ? playerB : playerA;
@@ -348,7 +349,13 @@ Play.prototype = {
     var respawnX = Math.ceil(this.gameWidth/2)-1;
     var respawnY = Math.ceil(this.gameHeight/2)-1;
 
-    eatenPlayer.teleport(respawnX, respawnY);
+    if (eatenPlayer.lastTween) {
+      eatenPlayer.lastTween.onComplete.add(eatenPlayer.teleport.bind(eatenPlayer, respawnX, respawnY), eatenPlayer);
+    }
+    else {
+      eatenPlayer.teleport(respawnX, respawnY);
+    }
+    eatenPlayer.respawnSound.play();
   },
   togglePlayerTurn: function() {
     this.updatePlayerTurn((this.playerTurn+1)%this.players.length);
diff --git a/game/states/preload.js b/game/states/preload.js
index 6ec5b31..951c83c 100644
--- a/game/states/preload.js
+++ b/game/states/preload.js
@@ -27,7 +27,7 @@ Preload.prototype = {
     this.load.bitmapFont('scorefont-b', 'assets/fonts/scorefont-b.png', 'assets/fonts/scorefont.fnt');
     this.load.audio('nomSound', 'assets/audio/nom.ogg', true);
 
-
+    this.load.audio('owSound', 'assets/audio/ow.ogg', true);
 
     this.load.text('level', 'assets/levels/maze.lvl');
   },
diff --git a/todo.md b/todo.md
index e5e45b0..08057aa 100644
--- a/todo.md
+++ b/todo.md
@@ -5,7 +5,5 @@ TODO
 * Add tutorial / instructions page
 * Add reset / end game early mechanism
 * Regenerate fonts with new colours
-* Sound effect for playing being eaten
-* Sound effect for player eating poison pill
 * Add reading controls from file
 * Refine orientation controls
-- 
cgit v1.2.3