- (position, LocationCard.import_location(definition))
- for position, definition in board_locations_definition.iteritems())
+ (tuple(position), LocationCard.import_location(definition))
+ for position, definition in board_locations_definition)
+
+ @classmethod
+ def generate_board(cls, deck):
+ if deck.get('puzzle', False):
+ return cls.generate_puzzle_board(deck)
+ else:
+ return cls.generate_random_board(deck)
+
+ @classmethod
+ def generate_puzzle_board(cls, deck):
+ assert len(deck['cards']) == 5 * 5
+ board_locations = [
+ [(i % 5, i // 5),
+ LocationCard.new_location(card.copy()).export()]
+ for i, card in enumerate(deck['cards'])
+ ]
+ return board_locations