X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=980a046c4c4f68e690219a2a216f818df018ce9e;hb=a6261f51a91485805fe7ebd3d85ea20a257f798f;hp=de0bc1e3f31c5b4b196d41a9345747a065900595;hpb=5ef59d0391e208e0ef9d4fa998b3a8e653cc57bf;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index de0bc1e..980a046 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -1,7 +1,8 @@
 from random import choice
 
 from naja.constants import(
-    BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS)
+    BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS,
+    MOVE, ACT)
 from naja.player import Player
 from naja import actions
 
@@ -19,6 +20,7 @@ class GameBoard(object):
         self.locations = [item.copy() for item in state['locations']]
         self.player = player
         self.board_locations = board_locations
+        self.player_mode = MOVE
 
     @classmethod
     def new_game(cls, locations_definition,
@@ -88,6 +90,15 @@ class GameBoard(object):
         self.health -= 1
         # TODO: Check win/lose
 
+    def change_mode(self):
+        """Advance to the next mode"""
+        if self.player_mode == MOVE:
+            self.player_mode = ACT
+        elif self.player_mode == ACT:
+            self.player_mode = MOVE
+        else:
+            raise RuntimeError("Illegal player mode %s" % self.player_mode)
+
 
 class LocationCard(object):
     """
@@ -97,6 +108,7 @@ class LocationCard(object):
     def __init__(self, bitwise_operand, location_actions):
         self.bitwise_operand = bitwise_operand
         self.actions = location_actions
+        self.check_actions()
 
     @classmethod
     def import_location(cls, state):
@@ -124,6 +136,19 @@ class LocationCard(object):
             'actions': [action.export() for action in self.actions],
         }
 
+    def check_actions(self):
+        if not self.actions:
+            print "Warning: Location has no actions."
+            self.insert_default_default_action()
+        if self.actions[0].required_bits:
+            self.insert_default_default_action()
+
+    def insert_default_default_action(self):
+        self.actions.insert(0, self.build_action({
+            'action_class': 'DoNothing',
+            'required_bits': [],
+        }))
+
     @staticmethod
     def generate_bitwise_operand():
         """