From: Neil Date: Sat, 17 May 2014 13:23:06 +0000 (+0200) Subject: Add max_number limitation (with tests, nogal) X-Git-Tag: 0.1~96^2~14 X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=fda6095a8a402c06ca995001800de75e3de36c8c;p=naja.git Add max_number limitation (with tests, nogal) --- diff --git a/naja/gameboard.py b/naja/gameboard.py index 944f21f..79e565e 100644 --- a/naja/gameboard.py +++ b/naja/gameboard.py @@ -110,8 +110,8 @@ class GameBoard(object): board_locations = [] for x in range(5): for y in range(5): - board_location = LocationCard.new_location( - choice(deck['cards']).copy()) + new_choice = cls.choose_card(deck['cards'], board_locations) + board_location = LocationCard.new_location(new_choice.copy()) board_locations.append([(x, y), board_location.export()]) return board_locations @@ -134,9 +134,35 @@ class GameBoard(object): self.replace_card(position) def replace_card(self, position): - location = LocationCard.new_location(choice(self.locations).copy()) + new_choice = self.choose_card(self.locations, + self.board_locations.items(), + position) + location = LocationCard.new_location(new_choice.copy()) self.board_locations[position] = location + @classmethod + def choose_card(cls, cards, board_locations, position=None): + # Find which cards are at their maximum and exclude them from + # the choice list + counts = {} + choices = {card['card_name']: card for card in cards} + for pos, card in board_locations: + if pos == position: + # skip the card we're replacing if appropriate + continue + if isinstance(card, LocationCard): + key = card.card_name + max_num = card.max_number + else: + key = card['card_name'] + max_num = card.get('max_number', 25) + counts.setdefault(key, 0) + counts[key] += 1 + if counts[key] >= max_num: + if key in choices: + del choices[key] + return choice(choices.values()) + def shift_location_row(self, change, is_vertical): px, py = self.player.position shifted_locations = {} @@ -221,10 +247,12 @@ class LocationCard(object): A particular set of options available on a location. """ - def __init__(self, card_name, bitwise_operand, location_actions): + def __init__(self, card_name, bitwise_operand, location_actions, + max_number=25): self.card_name = card_name self.bitwise_operand = bitwise_operand self.actions = location_actions + self.max_number = max_number self.check_actions() @classmethod @@ -232,7 +260,7 @@ class LocationCard(object): location_actions = [ cls.build_action(definition) for definition in state['actions']] return cls(state['card_name'], state['bitwise_operand'], - location_actions) + location_actions, state['max_number']) @classmethod def build_action(cls, definition): @@ -247,10 +275,12 @@ class LocationCard(object): bits = cls.parse_bits(definition['bits']) else: bits = cls.generate_bitwise_operand() + max_number = definition.get('max_number', 25) card_name = definition['card_name'] return cls.import_location({ 'bitwise_operand': bits, 'actions': definition['actions'], + 'max_number': max_number, 'card_name': card_name, }) @@ -263,6 +293,7 @@ class LocationCard(object): return { 'bitwise_operand': sorted(self.bitwise_operand), 'actions': [action.export() for action in self.actions], + 'max_number': self.max_number, 'card_name': self.card_name, } diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py index 5b38399..a72505a 100644 --- a/naja/tests/test_gameboard.py +++ b/naja/tests/test_gameboard.py @@ -31,7 +31,7 @@ class TestGameBoard(TestCase): def test_export_new_board(self): board = GameBoard.new_game({'cards': [ - {'card_name' : 'card1', 'actions': [ + {'card_name': 'card1', 'actions': [ { 'action_class': 'LoseHealthOrMSB', 'required_bits': [], @@ -47,7 +47,7 @@ class TestGameBoard(TestCase): 'health': 4, 'wins_required': 4, 'wins': 0, - 'locations': [{'card_name' : 'card1', 'actions': [ + 'locations': [{'card_name': 'card1', 'actions': [ { 'action_class': 'LoseHealthOrMSB', 'required_bits': [], @@ -65,7 +65,7 @@ class TestGameBoard(TestCase): positions.append(position) self.assertEqual( sorted(location_state.keys()), ['actions', 'bitwise_operand', - 'card_name']) + 'card_name', 'max_number']) self.assertEqual(location_state['actions'], [ { 'action_class': 'LoseHealthOrMSB', @@ -81,6 +81,89 @@ class TestGameBoard(TestCase): self.assertEqual( positions, sorted((x, y) for x in range(5) for y in range(5))) + def test_max_number(self): + def _check_counts(board): + counts = {} + exported_state = board.export() + board_locations = exported_state.pop('board_locations') + for _position, location_state in board_locations: + counts.setdefault( + location_state['actions'][0]['action_class'], 0) + counts[location_state['actions'][0]['action_class']] += 1 + self.assertTrue(counts.get('LoseHealthOrMSB', 0) <= 5) + + board = GameBoard.new_game({'cards': [ + {'card_name': 'card1', 'actions': [{ + 'action_class': 'LoseHealthOrMSB', + 'required_bits': [], }], + 'max_number': 5}, + {'card_name': 'card2', 'actions': [{ + 'action_class': 'DoNothing', + 'required_bits': [], }], + 'max_number': 25}]}) + # check creation constraints + _check_counts(board) + # Check replacement + # Replace center card 12 times and assert invariant still holds + for x in range(12): + board.replace_card((2, 2)) + _check_counts(board) + # replace a diagonal of cards + for x in range(5): + board.replace_card((x, x)) + _check_counts(board) + + def test_max_number_complex(self): + def _check_counts(board): + counts = {} + exported_state = board.export() + board_locations = exported_state.pop('board_locations') + for _position, location_state in board_locations: + counts.setdefault( + location_state['actions'][0]['action_class'], 0) + counts[location_state['actions'][0]['action_class']] += 1 + self.assertTrue(counts.get('LoseHealthOrMSB', 0) <= 5) + self.assertTrue(counts.get('DoNothing', 0) <= 3) + self.assertTrue(counts.get('AcquireWinToken', 0) <= 4) + self.assertTrue(counts.get('GainHealth', 0) <= 3) + + board = GameBoard.new_game({'cards': [ + {'card_name': 'card1', 'actions': [{ + 'action_class': 'LoseHealthOrMSB', + 'required_bits': [], }], + 'max_number': 5}, + {'card_name': 'card2', 'actions': [{ + 'action_class': 'AcquireWinToken', + 'required_bits': [], }], + 'max_number': 4}, + {'card_name': 'card3', 'actions': [{ + 'action_class': 'GainHealth', + 'required_bits': [], }], + 'max_number': 3}, + {'card_name': 'card4', 'actions': [{ + 'action_class': 'RotateLocations', + 'required_bits': [], }], + 'max_number': 25}, + {'card_name': 'card5', 'actions': [{ + 'action_class': 'AllowChessMove', + 'required_bits': [], }], + 'max_number': 25}, + {'card_name': 'card6', 'actions': [{ + 'action_class': 'DoNothing', + 'required_bits': [], }], + 'max_number': 3}]}) + # check creation constraints + _check_counts(board) + # Check replacement + # Replace center card 12 times and assert invariant still holds + for x in range(12): + board.replace_card((2, 2)) + _check_counts(board) + # replace a diagonal of cards + for x in range(5): + board.replace_card((x, x)) + _check_counts(board) + def test_lose_health(self): board = GameBoard.new_game(self.make_deck()) self.assertEqual(board.health, 4)