X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=ff8a431d0369fe0fa6f1ed1a52cbda87126fd538;hb=87f51eafe4495e6ca13cf1702e0c9dce4862dc49;hp=7d5be63b7663d727fc81cd66a9105f5eda3a8927;hpb=00bdc8cec84b91a3a76bf946bc4764e8cb96fded;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 7d5be63..ff8a431 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -18,7 +18,15 @@ class LocationAction(object):
         self.data = data
 
     def get_text(self):
-        return self.TEXT % self.data
+        substitutions = self.data.copy()
+        if 'direction' in self.data:
+            substitutions['rowcol'] = {
+                'NORTH': 'column',
+                'SOUTH': 'column',
+                'EAST': 'row',
+                'WEST': 'row',
+            }[self.data['direction']]
+        return self.TEXT % substitutions
 
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
@@ -80,15 +88,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.RED, BITS.GREEN, BITS.BLUE,
+        ]))
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
@@ -102,7 +108,7 @@ class GainHealthAndClearBitsOrMSB(LocationAction):
 
 
 class ShiftLocations(LocationAction):
-    TEXT = "Shift board locations %(direction)s."
+    TEXT = "Shift current %(rowcol)s %(direction)s."
 
     def perform_action(self, board, location):
         board.shift_locations(self.data['direction'])