Optional sanity check for actions.

diff --git a/naja/actions.py b/naja/actions.py
index ff5bdba7dbfd6037afdd5764d4cf30c0ec138c60..395a1f502d63aa4e73f24a7761fe500d72c1ebf8 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -16,6 +16,9 @@ class LocationAction(object):
         self.required_bits = required_bits
         self.data = data
 
         self.required_bits = required_bits
         self.data = data
 

+    def sanity_check(self, location):
+        pass
+

     def get_glyphs(self):
         return self.GLYPHS
 
     def get_glyphs(self):
         return self.GLYPHS
 


@@ -153,6 +156,16 @@ class GenericBits(LocationAction):
         self.acquire_win = self.data.get('acquire_win', False)
         self.lose_health = self.data.get('lose_health', False)
 
         self.acquire_win = self.data.get('acquire_win', False)
         self.lose_health = self.data.get('lose_health', False)
 

+    def sanity_check(self, location):
+        missing_bits = set()
+        missing_bits.update(self.set_bits - set(location.bitwise_operand))
+        missing_bits.update(self.clear_bits - set(location.bitwise_operand))
+        missing_bits.update(self.toggle_bits - set(location.bitwise_operand))
+        if missing_bits:
+            raise ValueError(
+                "Location %s missing bits %r"
+                % (location.card_name, sorted(list(missing_bits))))
+

     def perform_action(self, board, location):
         bits = board.player.bits
         bits.set_bits(self.set_bits)
     def perform_action(self, board, location):
         bits = board.player.bits
         bits.set_bits(self.set_bits)

diff --git a/naja/gameboard.py b/naja/gameboard.py
index 52d1323bd176a5cd3ca7205086b7fe44455f450f..689c3fd15fcf324d9110763331a6a0eeb93023d2 100644 (file)
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -305,6 +305,9 @@ class LocationCard(object):
         self.actions = location_actions
         self.max_number = max_number
         self.replacement_time = replacement_time
         self.actions = location_actions
         self.max_number = max_number
         self.replacement_time = replacement_time

+        if options.debug:
+            for action in self.actions:
+                action.sanity_check(self)

 
     @classmethod
     def import_location(cls, state):
 
     @classmethod
     def import_location(cls, state):