From 7d37d825d2ea17d7b5f10dd4b71a97b4f8f4dbf8 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 17 May 2014 21:04:36 +0200 Subject: [PATCH] Setting defaults shouldn't be restricted to puzzles --- naja/gameboard.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/naja/gameboard.py b/naja/gameboard.py index 934aa3d..7d9dfaf 100644 --- a/naja/gameboard.py +++ b/naja/gameboard.py @@ -41,14 +41,11 @@ class GameBoard(object): 'wins_required': PLAYER_DEFAULTS.WINS_REQUIRED, } - puzzle = deck.get('puzzle', False) - - if puzzle: - puzzle_defaults = deck.get('defaults', {}) - for k, v in puzzle_defaults.iteritems(): - if isinstance(v, list): - puzzle_defaults[k] = tuple(v) - defaults.update(puzzle_defaults) + deck_defaults = deck.get('defaults', {}) + for k, v in deck_defaults.iteritems(): + if isinstance(v, list): + deck_defaults[k] = tuple(v) + defaults.update(deck_defaults) if initial_bits is None: initial_bits = defaults['initial_bits'] @@ -69,7 +66,7 @@ class GameBoard(object): 'wins_required': wins_required, 'wins': 0, 'locations': deck['cards'], - 'puzzle': puzzle, + 'puzzle': deck.get('puzzle', False), 'clock_count': 0, 'replacement_params': deck.get('replacement_params', None), } -- 2.34.1