projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the player.
[naja.git]
/
naja
/
gamestate.py
diff --git
a/naja/gamestate.py
b/naja/gamestate.py
index a82cec8e6f5de9f9229f63a950b4c12d5d9acb65..c8bbbc7acc67c54ec1d5827c3e3ddcb70be3bfd7 100644
(file)
--- a/
naja/gamestate.py
+++ b/
naja/gamestate.py
@@
-2,7
+2,15
@@
The current game state.
"""
The current game state.
"""
+import yaml
+
from naja.gameboard import GameBoard
from naja.gameboard import GameBoard
+from naja.resources import resources
+
+
+def load_location_deck(name):
+ with resources.get_file('location_decks', '%s.yaml' % (name,)) as deck_fp:
+ return yaml.safe_load(deck_fp)
class GameState(object):
class GameState(object):
@@
-11,9
+19,15
@@
class GameState(object):
"""
def __init__(self):
"""
def __init__(self):
- self.gameboard = GameBoard.new_game(
- locations_definition=[{'actions': []}]) # TODO: we will need some of these :)
+ # This is a very simple deck to allow testing more drawing logic
+ # on tiles. These will need to be replaced with better stuff.
+ locations_deck = load_location_deck('test')
+ self.gameboard = GameBoard.new_game(locations_deck['cards'])
@property
def player(self):
return self.gameboard.player
@property
def player(self):
return self.gameboard.player
+
+ @property
+ def board_locations(self):
+ return self.gameboard.board_locations