X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=4d4a0f0b3ac9960b39f335ddb0e54253e18037d3;hb=a1c561e26fae79ce8a9570c9404975a8a0367d65;hp=4064947648abb1bd4205a20fb0ed7b455a36af85;hpb=51c21cef44d0a7f3cb59f4a005d4a1dba9159d51;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 4064947..4d4a0f0 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
 
@@ -77,6 +80,10 @@ class LocationAction(object):
                 'data': self.data,
                 'action_class': self.__class__.__name__}
 
+    def take_damage(self, board):
+        sound.play_sound('awwww.ogg')
+        board.lose_health()
+
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
@@ -92,8 +99,7 @@ class LoseHealthOrMSB(LocationAction):
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
-            sound.play_sound('awwww.ogg')
-            board.lose_health()
+            self.take_damage(board)
 
 
 class SetBits(LocationAction):
@@ -112,6 +118,15 @@ class ClearBits(LocationAction):
         board.player.bits.clear_bits(location.bitwise_operand)
 
 
+class ClearBitsAndHealth(LocationAction):
+    TEXT = "Clear %(location_bits)s and lose {HEALTH}."
+    GLYPHS = (ACTION_GLYPHS.CLEAR_BITS, ACTION_GLYPHS.DAMAGE)
+
+    def perform_action(self, board, location):
+        board.player.bits.clear_bits(location.bitwise_operand)
+        self.take_damage(board)
+
+
 class ToggleBits(LocationAction):
     TEXT = "Toggle %(location_bits)s."
     GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS,)
@@ -120,6 +135,15 @@ class ToggleBits(LocationAction):
         board.player.bits.toggle_bits(location.bitwise_operand)
 
 
+class ToggleBitsAndHarm(LocationAction):
+    TEXT = "Toggle %(location_bits)s and lose {HEALTH}."
+    GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS, ACTION_GLYPHS.DAMAGE)
+
+    def perform_action(self, board, location):
+        board.player.bits.toggle_bits(location.bitwise_operand)
+        self.take_damage(board)
+
+
 class GenericBits(LocationAction):
     GLYPHS = (ACTION_GLYPHS.SET_BITS, ACTION_GLYPHS.CLEAR_BITS)
 
@@ -131,6 +155,17 @@ class GenericBits(LocationAction):
         self.once = self.data.get('once', False)
         self.acquire_win = self.data.get('acquire_win', False)
         self.lose_health = self.data.get('lose_health', False)
+        self.gain_health = self.data.get('gain_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
@@ -143,6 +178,9 @@ class GenericBits(LocationAction):
         if self.lose_health:
             sound.play_sound('awwww.ogg')
             board.lose_health()
+        if self.gain_health:
+            sound.play_sound('aha.ogg')
+            board.gain_health()
         if self.once:
             location.actions.remove(self)
 
@@ -152,6 +190,8 @@ class GenericBits(LocationAction):
             glyphs.append(ACTION_GLYPHS.WINTOKEN)
         if self.lose_health:
             glyphs.append(ACTION_GLYPHS.DAMAGE)
+        if self.gain_health:
+            glyphs.append(ACTION_GLYPHS.HEAL)
         if self.set_bits:
             glyphs.append(ACTION_GLYPHS.SET_BITS)
         if self.clear_bits:
@@ -165,12 +205,14 @@ class GenericBits(LocationAction):
             return super(GenericBits, self).get_text()
         parts = []
         if self.acquire_win:
-            parts.append("Gain a {WINTOKEN}.")
+            parts.append("Gain {WINTOKEN}.")
         if self.lose_health:
             parts.append("Lose {HEALTH}.")
+        if self.gain_health:
+            parts.append("Gain {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:
@@ -213,6 +255,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}."