Words

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 7ae189e0b1c1db50f4ea1c576fbb1b9222fd4f18..9513a0a32ad2bb15843220049e98e49ce69f62be 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -116,7 +116,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):
@@ -191,7 +191,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 +234,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}."