projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary overriding of TextWidget.draw in TextBoxWidget.draw.
[naja.git]
/
naja
/
gameboard.py
diff --git
a/naja/gameboard.py
b/naja/gameboard.py
index 18ecaf5c62d369af2f8a3d32a0493b45b0926923..74abc12e5e82d763faf8f7dfb20df36745356fd4 100644
(file)
--- a/
naja/gameboard.py
+++ b/
naja/gameboard.py
@@
-19,10
+19,11
@@
class GameBoard(object):
self.health = state['health']
self.wins = state['wins']
self.locations = [item.copy() for item in state['locations']]
self.health = state['health']
self.wins = state['wins']
self.locations = [item.copy() for item in state['locations']]
- self.puzzle = state
['puzzle']
+ self.puzzle = state
.get('puzzle', False)
self.player = player
self.board_locations = board_locations
self.player = player
self.board_locations = board_locations
- self.player_mode = EXAMINE
+ self.player_mode = state.get('player_mode', EXAMINE)
+ self.has_cheated = state.get('cheater', options.cheat_enabled)
@classmethod
def new_game(cls, deck,
@classmethod
def new_game(cls, deck,
@@
-54,7
+55,7
@@
class GameBoard(object):
return cls(state, player, board_locations)
def export(self):
return cls(state, player, board_locations)
def export(self):
-
return
{
+
data =
{
'max_health': self.max_health,
'health': self.health,
'wins_required': self.wins_required,
'max_health': self.max_health,
'health': self.health,
'wins_required': self.wins_required,
@@
-63,7
+64,11
@@
class GameBoard(object):
'puzzle': self.puzzle,
'player': self.player.export(),
'board_locations': self.export_board_locations(),
'puzzle': self.puzzle,
'player': self.player.export(),
'board_locations': self.export_board_locations(),
+ 'player_mode': self.player_mode,
}
}
+ if self.has_cheated:
+ data['cheater'] = True
+ return data
@classmethod
def import_locations(cls, locations_definition):
@classmethod
def import_locations(cls, locations_definition):