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

diff --git a/naja/actions.py b/naja/actions.py
index 5a3e6e4..f62b463 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -7,9 +7,14 @@ 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):
@@ -26,7 +31,9 @@ class LocationAction(object):
             return False
 
     def export(self):
-        raise NotImplementedError("TODO")
+        return {'required_bits': list(self.required_bits),
+                'data': self.data,
+                'action_class': self.__class__.__name__}
 
 
 class DoNothing(LocationAction):
@@ -35,13 +42,10 @@ class DoNothing(LocationAction):
     def perform_action(self, board, location):
         pass
 
-    def export(self):
-        return {'required_bits': list(self.required_bits),
-                'action_class': 'DoNothing'}
-
 
 class LoseHealthOrMSB(LocationAction):
-    TEXT = "Lose health. If MSB is set, it will be cleared instead."
+    TEXT = "Lose health or MSB."
+    USES_MSB = True
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -60,3 +64,35 @@ class ToggleBits(LocationAction):
 
     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)