Merge branch 'master' into No_movement_mode

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 9c4e8f3fcc756973612cb4d60140bd7ed0114ed5..343aeb2735f3169476ce13171964e13895668f59 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -17,6 +17,9 @@ class LocationAction(object):
         self.required_bits = frozenset(bits)
         self.data = data
 
+    def get_text(self):
+        return self.TEXT % self.data
+
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
 
@@ -77,15 +80,13 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 
 class AcquireWinToken(LocationAction):
-    TEXT = "Acquire a win token, then clear all high bits."
-    USES_MSB = True
+    TEXT = "Acquire a win token, then clear all key bits."
 
     def perform_action(self, board, location):
-        if self.check_and_clear_MSB(board.player):
-            board.acquire_win_token()
-            board.player.bits.clear_bits(set([
-                BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
-            ]))
+        board.acquire_win_token()
+        board.player.bits.clear_bits(set([
+            BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
+        ]))
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
@@ -99,8 +100,7 @@ class GainHealthAndClearBitsOrMSB(LocationAction):
 
 
 class ShiftLocations(LocationAction):
-    # TODO: Direction parameter in TEXT.
-    TEXT = "Shift board locations."
+    TEXT = "Shift board locations %(direction)s."
 
     def perform_action(self, board, location):
         board.shift_locations(self.data['direction'])