Skip to content

Commit

Permalink
fixed deck if statement and commented out loaded in on child_added
Browse files Browse the repository at this point in the history
  • Loading branch information
taffy-chen committed Jul 11, 2016
1 parent e35ee7c commit ef1e86f
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions app/browser/js/game/game.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,15 @@ tsuro.controller('gameCtrl', function ($scope, $firebaseAuth, firebaseUrl, $stat
});
} else {
// deal to me if I dont have three.
if ($scope.me.tiles.length < 3 && $scope.game.deck.tiles.length) {
let newTile = $scope.game.deal(1);
$scope.me.tiles = $scope.me.tiles.concat(newTile);
firebasePlayersArr[$scope.meIdx].tiles = $scope.me.tiles;
firebasePlayersArr.$save($scope.meIdx);
syncDeck();
};
if ($scope.game.deck.tiles) {
if ($scope.me.tiles.length < 3 && $scope.game.deck.tiles.length) {
let newTile = $scope.game.deal(1);
$scope.me.tiles = $scope.me.tiles.concat(newTile);
firebasePlayersArr[$scope.meIdx].tiles = $scope.me.tiles;
firebasePlayersArr.$save($scope.meIdx);
syncDeck();
};
}
}
gameRef.update({
"currentPlayerIndex": $scope.game.nextCanPlay()
Expand All @@ -422,12 +424,12 @@ tsuro.controller('gameCtrl', function ($scope, $firebaseAuth, firebaseUrl, $stat

//if a dead player is added and changes the deck...make sure all the players refresh their deck to the newly created deck
deckRef.on("child_added", function (snap) {
console.log(snap.val());
deckArr.$loaded()
.then(function (deck) {
console.log(deck);
$scope.game.deck.tiles = deckArr[0];
});
console.log("updated deck", snap.val());
// deckArr.$loaded()
// .then(function (deck) {
// console.log(deck);
$scope.game.deck.tiles = snap.val();
// });
});


Expand Down Expand Up @@ -461,7 +463,7 @@ tsuro.controller('gameCtrl', function ($scope, $firebaseAuth, firebaseUrl, $stat
// deckArr.$loaded()
// .then(function (deck) {
// console.log(deck);
$scope.game.deck.tiles = deckArr[0];
// $scope.game.deck.tiles = deckArr[0];
console.log('this is the deck with tiles that were added', $scope.game.deck, $scope.game.deck.tiles);
if (!$scope.game.deck.tiles && $scope.me.tiles.length < 3) {
console.log("deck is empty, and I don't have 3 tiles");
Expand Down

0 comments on commit ef1e86f

Please sign in to comment.