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

diff --git a/naja/actions.py b/naja/actions.py
index 34c84f6..17cb432 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,5 +1,5 @@
-from naja.constants import BITS, CHESS_PIECES
-from naja.utils import bit_glyphs
+from naja.constants import ACTION_GLYPHS, BITS, CHESS_PIECES
+from naja.utils import bit_glyphs, move_glyph
 
 
 class LocationAction(object):
@@ -8,7 +8,7 @@ class LocationAction(object):
     """
 
     TEXT = None
-    USES_MSB = False
+    GLYPHS = None
 
     def __init__(self, required_bits, **data):
         self.required_bits = required_bits
@@ -24,9 +24,11 @@ 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'
@@ -58,14 +60,15 @@ class LocationAction(object):
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
 
     def perform_action(self, board, location):
         pass
 
 
 class LoseHealthOrMSB(LocationAction):
-    TEXT = "Lose HEALTH or MSB."
-    USES_MSB = True
+    TEXT = "Lose {HEALTH} or {MSB}."
+    GLYPHS = (ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -74,6 +77,7 @@ class LoseHealthOrMSB(LocationAction):
 
 class SetBits(LocationAction):
     TEXT = "Set %(location_bits)s."
+    GLYPHS = (ACTION_GLYPHS.SET_BITS,)
 
     def perform_action(self, board, location):
         board.player.bits.set_bits(location.bitwise_operand)
@@ -81,14 +85,15 @@ class SetBits(LocationAction):
 
 class ToggleBits(LocationAction):
     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 %(location_bits)s."
-    USES_MSB = True
+    TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
+    GLYPHS = (ACTION_GLYPHS.SET_BITS, ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -97,7 +102,8 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 
 class AcquireWinToken(LocationAction):
-    TEXT = "Gain WINTOKEN, then clear {RED,GREEN,BLUE}."
+    TEXT = "Gain {WINTOKEN}, then clear {RED,GREEN,BLUE}."
+    GLYPHS = (ACTION_GLYPHS.WINTOKEN,)
 
     def perform_action(self, board, location):
         board.acquire_win_token()
@@ -107,8 +113,8 @@ class AcquireWinToken(LocationAction):
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
-    TEXT = "Gain HEALTH, then clear %(location_bits)s or MSB."
-    USES_MSB = True
+    TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
+    GLYPHS = (ACTION_GLYPHS.HEAL, ACTION_GLYPHS.MSB, ACTION_GLYPHS.CLEAR_BITS)
 
     def perform_action(self, board, location):
         board.gain_health()
@@ -118,6 +124,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'])
@@ -125,6 +132,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: