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

diff --git a/naja/actions.py b/naja/actions.py
index d5e2b37..7ae189e 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -77,6 +77,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 +96,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 +115,15 @@ class ClearBits(LocationAction):
         board.player.bits.clear_bits(location.bitwise_operand)
 
 
+class ClearBitsAndHealth(LocationAction):
+    TEXT = "Clear %(location_bits)s and {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 +132,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)
 
@@ -128,22 +149,53 @@ class GenericBits(LocationAction):
         self.set_bits = parse_bits(self.data.get('set', []))
         self.clear_bits = parse_bits(self.data.get('clear', []))
         self.toggle_bits = parse_bits(self.data.get('toggle', []))
+        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)
 
     def perform_action(self, board, location):
         bits = board.player.bits
         bits.set_bits(self.set_bits)
         bits.toggle_bits(self.toggle_bits)
         bits.clear_bits(self.clear_bits)
+        if self.acquire_win:
+            sound.play_sound('yipee.ogg')
+            board.acquire_win_token()
+        if self.lose_health:
+            sound.play_sound('awwww.ogg')
+            board.lose_health()
+        if self.once:
+            location.actions.remove(self)
+
+    def get_glyphs(self):
+        glyphs = []
+        if self.acquire_win:
+            glyphs.append(ACTION_GLYPHS.WINTOKEN)
+        if self.lose_health:
+            glyphs.append(ACTION_GLYPHS.DAMAGE)
+        if self.set_bits:
+            glyphs.append(ACTION_GLYPHS.SET_BITS)
+        if self.clear_bits:
+            glyphs.append(ACTION_GLYPHS.CLEAR_BITS)
+        if self.toggle_bits:
+            glyphs.append(ACTION_GLYPHS.TOGGLE_BITS)
+        return tuple(glyphs)
 
     def get_text(self, location=None):
         if 'message' in self.data:
             return super(GenericBits, self).get_text()
         parts = []
+        if self.acquire_win:
+            parts.append("Gain a {WINTOKEN}.")
+        if self.lose_health:
+            parts.append("Lose {HEALTH}.")
         for template, bits in [
                 ('Set %s.', self.set_bits), ('Clear %s.', self.clear_bits),
                 ('Toggle %s', self.toggle_bits)]:
             if bits:
                 parts.append(template % (bit_glyphs(bits)))
+        if self.once:
+            parts.append('Usable once only.')
         return " ".join(parts)
 
 
@@ -181,8 +233,6 @@ class AcquireWinToken(LocationAction):
         board.player.bits.clear_bits(set([
             BITS.RED, BITS.GREEN, BITS.BLUE,
         ]))
-        if self.data.get('once', False):
-            location.actions.remove(self)
 
 
 class GainHealth(LocationAction):