Removed relying on arcade physics for overlap detection, added player respawn

3 files changed, 15 insertions, 7 deletions

diff --git a/game/prefabs/bonusPill.js b/game/prefabs/bonusPill.js
index 1b7ae56..dd8dfce 100644
--- a/game/prefabs/bonusPill.js
+++ b/game/prefabs/bonusPill.js
@@ -4,12 +4,15 @@ var BonusPill = function(game, x, y, frame) {
   Phaser.Sprite.call(this, game, x, y, 'bonus-pill', frame);
   this.scale = {x: 0.01, y: 0.01};
   this.anchor = {x: 0.5, y: 0.5};
-  
-  this.game.physics.arcade.enableBody(this);
+
   this.score = 10;
 };
 
 BonusPill.prototype = Object.create(Phaser.Sprite.prototype);
 BonusPill.prototype.constructor = BonusPill;
 
+BonusPill.prototype.getBounds = function() {
+  return new Phaser.Rectangle(this.x, this.y, 0.2, 0.2);
+};
+
 module.exports = BonusPill;
diff --git a/game/prefabs/pill.js b/game/prefabs/pill.js
index 29bf7a2..13054b0 100644
--- a/game/prefabs/pill.js
+++ b/game/prefabs/pill.js
@@ -4,12 +4,15 @@ var Pill = function(game, x, y, frame) {
   Phaser.Sprite.call(this, game, x, y, 'pill', frame);
   this.scale = {x: 0.01, y: 0.01};
   this.anchor = {x: 0.5, y: 0.5};
-  
-  this.game.physics.arcade.enableBody(this);
+
   this.score = 1;
 };
 
 Pill.prototype = Object.create(Phaser.Sprite.prototype);
 Pill.prototype.constructor = Pill;
 
+Pill.prototype.getBounds = function() {
+  return new Phaser.Rectangle(this.x, this.y, 0.2, 0.2);
+};
+
 module.exports = Pill;
diff --git a/game/prefabs/player.js b/game/prefabs/player.js
index 40fce38..e33b109 100644
--- a/game/prefabs/player.js
+++ b/game/prefabs/player.js
@@ -12,8 +12,6 @@ var Player = function(game, x, y, key, frame, soundKey) {
   this.scale = {x: 0.01, y: 0.01};
   this.anchor = {x: 0.5, y: 0.5};
 
-  this.game.physics.arcade.enableBody(this);
-
   this.score = 0;
   this.maxScore = 1;
   this.isMyTurn = false;
@@ -49,8 +47,8 @@ Player.prototype.update = function() {
 Player.prototype.move = function(newX, newY, callback, callbackContext) {
   this.moving = true;
   var tween = this.game.add.tween(this).to({x: newX, y: newY}, 500);
-  tween.onComplete.add(this.finishMovement, this);
   tween.onComplete.add(callback, callbackContext);
+  tween.onComplete.add(this.finishMovement, this);
   tween.start();
 };
 
@@ -63,4 +61,8 @@ Player.prototype.finishMovement = function() {
   this.moving = false;
 };
 
+Player.prototype.getBounds = function() {
+  return new Phaser.Rectangle(this.x, this.y, 0.2, 0.2);
+};
+
 module.exports = Player;