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

diff --git a/naja/actions.py b/naja/actions.py
index 6c6f123..cf916b9 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,5 @@
-from naja.constants import BITS, CHESS_PIECES
+from naja.constants import ACTION_GLYPHS, BITS, CHESS_PIECES
+from naja.utils import bit_glyphs, move_glyph
 
 
 class LocationAction(object):
@@ -7,13 +8,14 @@ class LocationAction(object):
     """
 
     TEXT = None
-    USES_MSB = False
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
+    MSB_GLYPH = None
 
     def __init__(self, required_bits, **data):
         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:
@@ -23,9 +25,17 @@ class LocationAction(object):
                 'EAST': 'row',
                 'WEST': 'row',
             }[self.data['direction']]
+            substitutions['direction'] = '{%s}' % (substitutions['direction'],)
 
         if 'chesspiece' in self.data:
-            substitutions['chesspiece_name'] = self.data['chesspiece'].lower()
+            substitutions['chesspiece_name'] = move_glyph(
+                self.data['chesspiece'])
+
+        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
 
@@ -57,8 +67,8 @@ class DoNothing(LocationAction):
 
 
 class LoseHealthOrMSB(LocationAction):
-    TEXT = "Lose HEALTH or MSB."
-    USES_MSB = True
+    TEXT = "Lose {HEALTH} or {MSB}."
+    MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -66,22 +76,25 @@ class LoseHealthOrMSB(LocationAction):
 
 
 class SetBits(LocationAction):
-    TEXT = "Set bits specified by this location."
+    TEXT = "Set %(location_bits)s."
+    GLYPHS = (ACTION_GLYPHS.SET_BITS,)
 
     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."
+    GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS,)
 
     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."
-    USES_MSB = True
+    TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
+    GLYPHS = (ACTION_GLYPHS.SET_BITS,)
+    MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -90,7 +103,8 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 
 class AcquireWinToken(LocationAction):
-    TEXT = "Gain WINTOKEN, then clear all key bits."
+    TEXT = "Gain {WINTOKEN}, then clear {RED,GREEN,BLUE}."
+    GLYPHS = (ACTION_GLYPHS.WINTOKEN,)
 
     def perform_action(self, board, location):
         board.acquire_win_token()
@@ -100,8 +114,9 @@ class AcquireWinToken(LocationAction):
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
-    TEXT = "Gain HEALTH, then clear bits specified by this location or MSB."
-    USES_MSB = True
+    TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+    MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
     def perform_action(self, board, location):
         board.gain_health()
@@ -111,6 +126,7 @@ class GainHealthAndClearBitsOrMSB(LocationAction):
 
 class ShiftLocations(LocationAction):
     TEXT = "Shift current %(rowcol)s %(direction)s."
+    GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
 
     def perform_action(self, board, location):
         board.shift_locations(self.data['direction'])
@@ -118,6 +134,7 @@ class ShiftLocations(LocationAction):
 
 class AllowChessMove(LocationAction):
     TEXT = "Move like a %(chesspiece_name)s for one turn."
+    GLYPHS = (ACTION_GLYPHS.MOVEMENT,)
 
     def perform_action(self, board, location):
         if self.data['chesspiece'] in CHESS_PIECES: