Bastard merge

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 333d174b75302f72e323a01b44c19a19cea38556..5599bd73b2d724e6986bc8a58d3ecf7e3ba2da16 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,16 +1,55 @@
-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, location):
+        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, location):
         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, location):
+        if not self.check_and_clear_MSB(board.player):
             board.lose_health()
+
+
+class SetBits(LocationAction):
+    TEXT = "Set bits specified by this location."
+
+    def perform_action(self, board, location):
+        board.player.bits.set_bits(location.bitwise_operand)
+
+
+class ToggleBits(LocationAction):
+    TEXT = "Toggle bits specified by this location."
+
+    def perform_action(self, board, location):
+        board.player.bits.toggle_bits(location.bitwise_operand)