X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=17cb43215bbcc8289d0cdcae11d910f185674faa;hb=2e8c585ed020f0d1bfec43077714aa72384dc683;hp=35f4342a3afc40c74196ce516473599d0ab68ec2;hpb=5fe12b55d1908f850145eec16a1ee2c8e61ba6ef;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 35f4342..17cb432 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,4 @@
-from naja.constants import BITS, CHESS_PIECES
+from naja.constants import ACTION_GLYPHS, BITS, CHESS_PIECES
 from naja.utils import bit_glyphs, move_glyph
 
 
@@ -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
@@ -60,6 +60,7 @@ class LocationAction(object):
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
 
     def perform_action(self, board, location):
         pass
@@ -67,7 +68,7 @@ class DoNothing(LocationAction):
 
 class LoseHealthOrMSB(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}."
-    USES_MSB = True
+    GLYPHS = (ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -76,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)
@@ -83,6 +85,7 @@ 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)
@@ -90,7 +93,7 @@ class ToggleBits(LocationAction):
 
 class LoseHealthOrMSBAndSetBits(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
-    USES_MSB = True
+    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):
@@ -100,6 +103,7 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 class AcquireWinToken(LocationAction):
     TEXT = "Gain {WINTOKEN}, then clear {RED,GREEN,BLUE}."
+    GLYPHS = (ACTION_GLYPHS.WINTOKEN,)
 
     def perform_action(self, board, location):
         board.acquire_win_token()
@@ -110,7 +114,7 @@ class AcquireWinToken(LocationAction):
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
     TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
-    USES_MSB = True
+    GLYPHS = (ACTION_GLYPHS.HEAL, ACTION_GLYPHS.MSB, ACTION_GLYPHS.CLEAR_BITS)
 
     def perform_action(self, board, location):
         board.gain_health()
@@ -120,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'])
@@ -127,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: