X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=34c84f6660e7ac343e0dc94de2c200c609198fed;hb=0c5003d45e57223eca4a995952517648a9baa465;hp=6c6f12357e1cbe0ca31301a7f186c667397ab9fd;hpb=96002fdd0010a60c6efcde63701d67051b187667;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 6c6f123..34c84f6 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,5 @@
 from naja.constants import BITS, CHESS_PIECES
+from naja.utils import bit_glyphs
 
 
 class LocationAction(object):
@@ -13,7 +14,7 @@ class LocationAction(object):
         self.required_bits = required_bits
         self.data = data
 
-    def get_text(self):
+    def get_text(self, location=None):
         substitutions = self.data.copy()
 
         if 'direction' in self.data:
@@ -27,6 +28,12 @@ class LocationAction(object):
         if 'chesspiece' in self.data:
             substitutions['chesspiece_name'] = self.data['chesspiece'].lower()
 
+        if location is None:
+            substitutions['location_bits'] = 'bits specified by this location'
+        else:
+            substitutions['location_bits'] = bit_glyphs(
+                location.bitwise_operand)
+
         return self.TEXT % substitutions
 
     def check_available(self, player):
@@ -66,21 +73,21 @@ class LoseHealthOrMSB(LocationAction):
 
 
 class SetBits(LocationAction):
-    TEXT = "Set bits specified by this location."
+    TEXT = "Set %(location_bits)s."
 
     def perform_action(self, board, location):
         board.player.bits.set_bits(location.bitwise_operand)
 
 
 class ToggleBits(LocationAction):
-    TEXT = "Toggle bits specified by this location."
+    TEXT = "Toggle %(location_bits)s."
 
     def perform_action(self, board, location):
         board.player.bits.toggle_bits(location.bitwise_operand)
 
 
 class LoseHealthOrMSBAndSetBits(LocationAction):
-    TEXT = "Lose HEALTH or MSB, then set bits specified by this location."
+    TEXT = "Lose HEALTH or MSB, then set %(location_bits)s."
     USES_MSB = True
 
     def perform_action(self, board, location):
@@ -90,7 +97,7 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 
 class AcquireWinToken(LocationAction):
-    TEXT = "Gain WINTOKEN, then clear all key bits."
+    TEXT = "Gain WINTOKEN, then clear {RED,GREEN,BLUE}."
 
     def perform_action(self, board, location):
         board.acquire_win_token()
@@ -100,7 +107,7 @@ class AcquireWinToken(LocationAction):
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
-    TEXT = "Gain HEALTH, then clear bits specified by this location or MSB."
+    TEXT = "Gain HEALTH, then clear %(location_bits)s or MSB."
     USES_MSB = True
 
     def perform_action(self, board, location):