X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=32ac03509c88527cf8d5205d0bfa0a490456c674;hb=7ba98383908eb9546ee78a14dad90057dc65757b;hp=9e3e5c3a4cb0b68c974f9c42321984deab3bc488;hpb=e53f34ee5031f3046fbee2d8f80b3e97bd9c3bbb;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 9e3e5c3..32ac035 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -9,7 +9,11 @@ class LocationAction(object):
     TEXT = None
 
     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 +30,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,12 +41,8 @@ class DoNothing(LocationAction):
     def perform_action(self, board, location):
         pass
 
-    def export(self):
-        return {'required_bits': list(self.required_bits),
-                'action_class': 'DoNothing'}
-
 
-class LoseHeathOrMSB(LocationAction):
+class LoseHealthOrMSB(LocationAction):
     TEXT = "Lose health. If MSB is set, it will be cleared instead."
 
     def perform_action(self, board, location):