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

diff --git a/naja/actions.py b/naja/actions.py
index c49f7c6..f62b463 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -7,15 +7,20 @@ class LocationAction(object):
     """
 
     TEXT = None
+    USES_MSB = False
 
     def __init__(self, required_bits, **data):
-        self.required_bits = frozenset(required_bits)
+        bits = set()
+        for bit in required_bits:
+            # Convert names to numbers if applicable.
+            bits.add(BITS.get(bit, bit))
+        self.required_bits = frozenset(bits)
         self.data = data
 
     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 +30,69 @@ class LocationAction(object):
         else:
             return False
 
+    def export(self):
+        return {'required_bits': list(self.required_bits),
+                'data': self.data,
+                'action_class': self.__class__.__name__}
+
 
 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."
+class LoseHealthOrMSB(LocationAction):
+    TEXT = "Lose health or MSB."
+    USES_MSB = True
 
-    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)
+
+
+class LoseHealthOrMSBAndSetBits(LocationAction):
+    TEXT = "Lose health or MSB, then set bits specified by this location."
+    USES_MSB = True
+
+    def perform_action(self, board, location):
+        if not self.check_and_clear_MSB(board.player):
+            board.lose_health()
+        board.player.bits.set_bits(location.bitwise_operand)
+
+
+class AcquireWinToken(LocationAction):
+    TEXT = "Acquire a win token, then clear all high bits."
+    USES_MSB = True
+
+    def perform_action(self, board, location):
+        if self.check_and_clear_MSB(board.player):
+            board.acquire_win_token()
+            board.player.bits.clear_bits(set([
+                BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
+            ]))
+
+
+class GainHealthAndClearBitsOrMSB(LocationAction):
+    TEXT = "Gain health, then clear bits specified by this location or MSB."
+    USES_MSB = True
+
+    def perform_action(self, board, location):
+        board.gain_health()
+        if not self.check_and_clear_MSB(board.player):
+            board.player.bits.clear_bits(location.bitwise_operand)