center robot again

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 5599bd73b2d724e6986bc8a58d3ecf7e3ba2da16..32ac03509c88527cf8d5205d0bfa0a490456c674 100644 (file)
--- 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):
@@ -25,6 +29,11 @@ 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."
@@ -33,7 +42,7 @@ class DoNothing(LocationAction):
         pass
 
 
-class LoseHeathOrMSB(LocationAction):
+class LoseHealthOrMSB(LocationAction):
     TEXT = "Lose health. If MSB is set, it will be cleared instead."
 
     def perform_action(self, board, location):