Merge branch 'master' of git://ctpug.org.za/naja

diff --git a/data/location_decks/puzzles/chess.yaml b/data/location_decks/puzzles/chess.yaml
index dca1a9f8931c86ea25a18e1292f10d7235fd346f..aabfe7b151c1e2af6485410a6ddefc02de78f889 100644 (file)
--- a/data/location_decks/puzzles/chess.yaml
+++ b/data/location_decks/puzzles/chess.yaml
@@ -18,6 +18,7 @@ _action_defitions:
 _card_definitions:
   - &CHESS-WIN-CARD-BISHOP
     card_name: 'chess-win-bishop'
+    bits: [NORTH, SOUTH, EAST, WEST, RED, GREEN, BLUE, MSB]
     actions:
       - action_class: AllowChessMove
         required_bits: []
@@ -26,6 +27,7 @@ _card_definitions:
       - *PYRRHIC-VICTORY
   - &CHESS-WIN-CARD-CASTLE
     card_name: 'chess-win-rook'
+    bits: [NORTH, SOUTH, EAST, WEST, RED, GREEN, BLUE, MSB]
     actions:
       - action_class: AllowChessMove
         required_bits: []
@@ -34,6 +36,7 @@ _card_definitions:
       - *PYRRHIC-VICTORY
   - &CHESS-WIN-CARD-KNIGHT
     card_name: 'chess-win-knight'
+    bits: [NORTH, SOUTH, EAST, WEST, RED, GREEN, BLUE, MSB]
     actions:
       - action_class: AllowChessMove
         required_bits: []
@@ -42,6 +45,7 @@ _card_definitions:
       - *PYRRHIC-VICTORY
   - &CHESS-WIN-CARD-SEPPUKU
     card_name: 'chess-win-seppuku'
+    bits: [NORTH, SOUTH, EAST, WEST, RED, GREEN, BLUE, MSB]
     actions:
       - action_class: LoseHealthOrMSB
         required_bits: []
@@ -62,7 +66,7 @@ _card_definitions:
         required_bits: [RED, GREEN, BLUE, MSB]
   - &CHESS-NORTH
     card_name: 'chess-north'
-    bits: [NORTH, EAST, WEST, RED]
+    bits: [NORTH, SOUTH, EAST, WEST, RED]
     actions:
       - action_class: GenericBits
         required_bits: []
@@ -72,7 +76,7 @@ _card_definitions:
           set: [SOUTH]
   - &CHESS-SOUTH
     card_name: 'chess-south'
-    bits: [SOUTH, EAST, WEST, RED, GREEN]
+    bits: [NORTH, SOUTH, EAST, WEST, RED, GREEN]
     actions:
       - action_class: GenericBits
         required_bits: []
@@ -82,7 +86,7 @@ _card_definitions:
           set: [NORTH]
   - &CHESS-EAST
     card_name: 'chess-east'
-    bits: [NORTH, SOUTH, EAST, RED, BLUE]
+    bits: [NORTH, SOUTH, EAST, WEST, RED, BLUE]
     actions:
       - action_class: GenericBits
         required_bits: []
@@ -92,7 +96,7 @@ _card_definitions:
           set: [WEST]
   - &CHESS-WEST
     card_name: 'chess-west'
-    bits: [NORTH, SOUTH, WEST, BLUE, MSB]
+    bits: [NORTH, SOUTH, EAST, WEST, BLUE, MSB]
     actions:
       - action_class: GenericBits
         required_bits: []

diff --git a/naja/actions.py b/naja/actions.py
index 9513a0a32ad2bb15843220049e98e49ce69f62be..5701109fec37a31959b73c9fe02b2cd77772a9df 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
 
+    def sanity_check(self, location):
+        pass
+
     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)
 
+    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)

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
+        if options.debug:
+            for action in self.actions:
+                action.sanity_check(self)
 
     @classmethod
     def import_location(cls, state):

diff --git a/tools/gen_json.py b/tools/gen_json.py
index e3468cd530ea1be35970a5e4670c907bb5c7ff33..c274f9ce864309548be0b9a89cfc8846fd618de4 100755 (executable)
--- a/tools/gen_json.py
+++ b/tools/gen_json.py
@@ -29,6 +29,12 @@ def convert_to_json(directory, update=True):
         import yaml
         with open(yaml_path) as yaml_f:
             obj = yaml.safe_load(yaml_f)
+
+        # These old objects, referenced in cards
+        for k in obj.keys():
+            if k.startswith('_'):
+                del obj[k]
+
         with open(json_path, 'w') as json_f:
             json.dump(obj, json_f, indent=2)