X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=ff8a431d0369fe0fa6f1ed1a52cbda87126fd538;hb=87f51eafe4495e6ca13cf1702e0c9dce4862dc49;hp=343aeb2735f3169476ce13171964e13895668f59;hpb=74d4017fa5fab71e17062e79399a38d039630a97;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 343aeb2..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)
@@ -85,7 +93,7 @@ class AcquireWinToken(LocationAction):
     def perform_action(self, board, location):
         board.acquire_win_token()
         board.player.bits.clear_bits(set([
-            BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
+            BITS.RED, BITS.GREEN, BITS.BLUE,
         ]))
 
 
@@ -100,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'])