projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7894d45
)
Setting defaults shouldn't be restricted to puzzles
author
Stefano Rivera
<stefano@rivera.za.net>
Sat, 17 May 2014 19:04:36 +0000
(21:04 +0200)
committer
Stefano Rivera
<stefano@rivera.za.net>
Sat, 17 May 2014 19:04:36 +0000
(21:04 +0200)
naja/gameboard.py
patch
|
blob
|
history
diff --git
a/naja/gameboard.py
b/naja/gameboard.py
index 934aa3d15b1d308cb12d59d37e6e5d1645a0deae..7d9dfafe1c44b30b160da7d1ba276858ebfa5504 100644
(file)
--- a/
naja/gameboard.py
+++ b/
naja/gameboard.py
@@
-41,14
+41,11
@@
class GameBoard(object):
'wins_required': PLAYER_DEFAULTS.WINS_REQUIRED,
}
'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']
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'],
'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),
}
'clock_count': 0,
'replacement_params': deck.get('replacement_params', None),
}