X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgamestate.py;h=71abcc73a00eff7982eedadd5cb726120f4b3450;hb=ee32cda1beebfdc07234f393bf39bb948b36a39a;hp=9dca03026f773869e126e71647358dbfdba354d1;hpb=78a001f6b445795f347d1ae7399d8f3b4072f779;p=naja.git

diff --git a/naja/gamestate.py b/naja/gamestate.py
index 9dca030..71abcc7 100644
--- a/naja/gamestate.py
+++ b/naja/gamestate.py
@@ -2,9 +2,8 @@
 The current game state.
 """
 
-from .constants import NORTH, SOUTH, EAST, WEST
-from .gameboard import GameBoard
-from .player import Player
+from naja.gameboard import GameBoard
+from naja.constants import BITS
 
 
 class GameState(object):
@@ -12,11 +11,20 @@ class GameState(object):
     Naja game state.
     """
 
-    INITIAL_BITS = NORTH | SOUTH | EAST | WEST
-    MAX_HEALTH = 4
-    WINS_REQUIRED = 4
-
     def __init__(self):
-        self.player = Player(self.INITIAL_BITS, (0, 0))
-        self.gameboard = GameBoard(
-            self.player, self.MAX_HEALTH, self.WINS_REQUIRED)
+        # This is a very simple deck to allow testing more drawing logic
+        # on tiles. These will need to be replaced with better stuff.
+        self.gameboard = GameBoard.new_game(
+            locations_definition=[
+                {'actions': []},
+                {'actions': [{'required_bits': [BITS['CYAN']],
+                              'action_class': 'DoNothing'}]},
+                {'actions': [{'required_bits': [BITS['YELLOW']],
+                              'action_class': 'DoNothing'}]},
+                {'actions': [{'required_bits': [BITS['YELLOW'], BITS['MAGENTA']],
+                              'action_class': 'DoNothing'}]},
+                ])
+
+    @property
+    def player(self):
+        return self.gameboard.player