diff --git a/cah.py b/cah.py index 304d797..a61cfb0 100644 --- a/cah.py +++ b/cah.py @@ -82,6 +82,7 @@ class Game(object): self.players = self.build_player_list(players) self.round = None self.question = None + self.score = {} def build_player_list(self, players): player_list = {} @@ -101,7 +102,7 @@ class Game(object): return {'question': self.question, 'hands': self.players} def end_round(self, winner_name, cards_played): - self.score_keeping(winner_name, cards_played[winner_name]) + self.score_keeping(winner_name) for player in cards_played.keys(): if isinstance(cards_played[player], Card): cards_played[player] = [cards_played[player]] @@ -109,8 +110,11 @@ class Game(object): self.players[player].card_list.remove(card) self.players[player].deal_hand(self.deck) - def score_keeping(self, player_name, cards): - pass + def score_keeping(self, player_name): + if self.score.has_key(player_name): + self.score[player_name] = self.score[player_name] + 1 + else: + self.score[player_name] = 1 def cardSubmit(self): for player in self.players: diff --git a/test.py b/test.py index 9b78ef3..5d42ab9 100644 --- a/test.py +++ b/test.py @@ -47,6 +47,7 @@ def test_round_advancement(game=None): assert bot_gets.has_key('question') assert game.has_key('question') assert bot_gets.has_key('hands') + test_end_round(game) def build_end_round_data(game): winner = choice(game.players.keys()) @@ -70,6 +71,7 @@ def test_end_round(game=None): fake_end_round['cards_played'][player] = list(fake_end_round['cards_played'][player]) for card in fake_end_round['cards_played'][player]: assert card not in game.players[player].card_list + assert game.score.has_key(fake_end_round['winner']) def test_player_hand(hand=None):