X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;fp=naja%2Fgameboard.py;h=ad692e716e8ee414371c72152f04ea0672233403;hb=33c14b6ac08f42a34a56ca3309b64b616a4fa650;hp=ed8d74f4657974079b3978ece51edbb0a30b3499;hpb=3ac3ac6a0f96d00a4b8839115badc140c35018e9;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index ed8d74f..ad692e7 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -120,8 +120,9 @@ class GameBoard(object):
         replacement_params = deck.get('replacement_params', None)
         for x in range(5):
             for y in range(5):
+                new_choice = cls.choose_card(deck['cards'], board_locations)
                 board_location = LocationCard.new_location(
-                    choice(deck['cards']).copy(), replacement_params)
+                    new_choice.copy(), replacement_params)
                 board_locations.append([(x, y), board_location.export()])
         return board_locations
 
@@ -144,10 +145,36 @@ 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.replacement_params)
         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 = {}
@@ -240,10 +267,11 @@ class LocationCard(object):
     """
 
     def __init__(self, card_name, bitwise_operand, location_actions,
-                 replacement_time):
+                 replacement_time, 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()
         self.replacement_time = replacement_time
 
@@ -252,7 +280,8 @@ class LocationCard(object):
         location_actions = [
             cls.build_action(definition) for definition in state['actions']]
         return cls(state['card_name'], state['bitwise_operand'],
-                   location_actions, state['replacement_time'])
+                   location_actions, state['replacement_time'],
+                   state['max_number'])
 
     @classmethod
     def build_action(cls, definition):
@@ -274,10 +303,12 @@ class LocationCard(object):
             replacement_time = cls.generate_replacement_time(
                 replacement_params)
 
+        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,
             'replacement_time': replacement_time,
         })
@@ -291,6 +322,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,
             'replacement_time': self.replacement_time,
         }