X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=b0371a7ca987235e0b5ffce32168f020eea64ceb;hb=56157eeadd045772b6bfab1ce80e87c1f9bb8719;hp=333d174b75302f72e323a01b44c19a19cea38556;hpb=da7b5b8cfedca73f510a85275a5c9155b07c2cf9;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 333d174..b0371a7 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,16 +1,41 @@
-from naja.gameboard import LocationAction
+from naja.constants import BITS
+
+
+class LocationAction(object):
+    """
+    An action that may be performed on a location.
+    """
+
+    TEXT = None
+
+    def __init__(self, required_bits, **data):
+        self.required_bits = frozenset(required_bits)
+        self.data = data
+
+    def check_available(self, player):
+        return player.bits.check_bits(self.required_bits)
+
+    def perform_action(self, board):
+        raise NotImplementedError("TODO")
+
+    def check_and_clear_MSB(self, player):
+        if player.bits.check_bit(BITS.MSB):
+            player.bits.clear_bit(BITS.MSB)
+            return True
+        else:
+            return False
 
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
 
-    def perform_action(self, player, board):
+    def perform_action(self, board):
         pass
 
 
 class LoseHeathOrMSB(LocationAction):
     TEXT = "Lose health. If MSB is set, it will be cleared instead."
 
-    def perform_action(self, player, board):
-        if not self.check_and_clear_MSB(player):
+    def perform_action(self, board):
+        if not self.check_and_clear_MSB(board.player):
             board.lose_health()