X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=9e3e5c3a4cb0b68c974f9c42321984deab3bc488;hb=67e79ba3fbe96590efa50a73fe983c2810efdd0f;hp=c49f7c61b909ba01f27778b5265b742cfab63821;hpb=9299925383d4746e7f9c4e948e083a1bff1e339a;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index c49f7c6..9e3e5c3 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -15,7 +15,7 @@ class LocationAction(object):
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
 
-    def perform_action(self, player, board):
+    def perform_action(self, board, location):
         raise NotImplementedError("TODO")
 
     def check_and_clear_MSB(self, player):
@@ -25,17 +25,38 @@ class LocationAction(object):
         else:
             return False
 
+    def export(self):
+        raise NotImplementedError("TODO")
+
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
 
-    def perform_action(self, player, board):
+    def perform_action(self, board, location):
         pass
 
+    def export(self):
+        return {'required_bits': list(self.required_bits),
+                'action_class': 'DoNothing'}
+
 
 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)