diff options
author | Justin Worthe <justin.worthe@gmail.com> | 2014-08-23 14:11:38 +0200 |
---|---|---|
committer | Justin Worthe <justin.worthe@gmail.com> | 2014-08-23 14:11:38 +0200 |
commit | e74950e005d89fe2fd8453a78d84f26e4e93dada (patch) | |
tree | 008c166bc66b45a1459c740e9f1da59b8e38c8f3 /game/states/play.js | |
parent | 8c0a371916effa25ac77dc8a3420b95bd8b7a173 (diff) |
Removed relying on arcade physics for overlap detection, added player respawn
Diffstat (limited to 'game/states/play.js')
-rw-r--r-- | game/states/play.js | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/game/states/play.js b/game/states/play.js index 7ffcc3d..882882c 100644 --- a/game/states/play.js +++ b/game/states/play.js @@ -41,15 +41,17 @@ Play.prototype = { this.setupPlayerControls(); - this.game.physics.startSystem(Phaser.Physics.ARCADE); - this.playerAScoreText = this.game.add.bitmapText(-0.1, -0.4, 'spaced-scorefont-a','0',2); this.playerBScoreText = this.game.add.bitmapText(this.world.width/this.world.scale.x - 4.5, -0.4, 'spaced-scorefont-b','0',2); this.gameWon = false; }, update: function() { - this.game.physics.arcade.overlap(this.players, this.pills, this.playerPillCollision, null, this); + this.checkForPlayerPillCollisions(); + + if (Phaser.Rectangle.intersects(this.playerA.getBounds(), this.playerB.getBounds())) { + this.playerPlayerCollision(this.playerA, this.playerB); + } if (!this.gameWon && this.pills.total === 0) { this.gameWon = true; @@ -72,6 +74,21 @@ Play.prototype = { this.pollPlayerInput(); }, + checkForPlayerPillCollisions: function() { + var pillCollisions = []; + this.players.forEach(function(player) { + var playerBounds = player.getBounds(); + this.pills.forEach(function(pill) { + var pillBounds = pill.getBounds(); + if (Phaser.Rectangle.intersects(playerBounds, pillBounds)) { + pillCollisions.push({player:player, pill:pill}); + } + }, this); + }, this); + for (var i=0; i<pillCollisions.length; i++) { + this.playerPillCollision(pillCollisions[i].player, pillCollisions[i].pill); + } + }, pollPlayerInput: function() { if (this.game.input.gamepad.pad1.connected) { this.pollAnalogStickForPlayer(this.game.input.gamepad.pad1, this.playerA); @@ -221,6 +238,14 @@ Play.prototype = { this.playerAScoreText.setText(this.playerA.score+''); this.playerBScoreText.setText(this.playerB.score+''); }, + playerPlayerCollision: function(playerA, playerB) { + var eatenPlayer = playerA.isMyTurn ? playerB : playerA; + + var respawnX = Math.ceil(this.map.length/2)-1; + var respawnY = Math.ceil(this.map[0].length/2)-1; + + eatenPlayer.teleport(respawnX, respawnY); + }, togglePlayerTurn: function() { this.updatePlayerTurn((this.playerTurn+1)%this.players.length); }, |