X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=5701109fec37a31959b73c9fe02b2cd77772a9df;hb=2225b90b4f08fe011a22d29027fc28f13c94f401;hp=7ae189e0b1c1db50f4ea1c576fbb1b9222fd4f18;hpb=8c08ffd9e2d674558bca43d4f709be5f49e46119;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 7ae189e..5701109 100644
--- 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
 
@@ -116,7 +119,7 @@ class ClearBits(LocationAction):
 
 
 class ClearBitsAndHealth(LocationAction):
-    TEXT = "Clear %(location_bits)s and {HEALTH}."
+    TEXT = "Clear %(location_bits)s and lose {HEALTH}."
     GLYPHS = (ACTION_GLYPHS.CLEAR_BITS, ACTION_GLYPHS.DAMAGE)
 
     def perform_action(self, board, location):
@@ -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)
@@ -191,7 +204,7 @@ class GenericBits(LocationAction):
             parts.append("Lose {HEALTH}.")
         for template, bits in [
                 ('Set %s.', self.set_bits), ('Clear %s.', self.clear_bits),
-                ('Toggle %s', self.toggle_bits)]:
+                ('Toggle %s.', self.toggle_bits)]:
             if bits:
                 parts.append(template % (bit_glyphs(bits)))
         if self.once:
@@ -234,6 +247,14 @@ class AcquireWinToken(LocationAction):
             BITS.RED, BITS.GREEN, BITS.BLUE,
         ]))
 
+class AcquireWinTokenAndLoseHealth(AcquireWinToken):
+    TEXT = "Gain {WINTOKEN}, lose {HEALTH}, then clear {RED,GREEN,BLUE}."
+    GLYPHS = (ACTION_GLYPHS.WINTOKEN, ACTION_GLYPHS.DAMAGE)
+
+    def perform_action(self, board, location):
+        self.take_damage(board)
+        super(AcquireWinTokenAndLoseHealth, self).perform_action(board,
+                                                                location)
 
 class GainHealth(LocationAction):
     TEXT = "Gain {HEALTH}."