More tile juggling.

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 35f4342a3afc40c74196ce516473599d0ab68ec2..cf916b9280126f879baf157444806432645702c2 100644 (file)
--- 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,8 @@ 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
@@ -67,7 +68,7 @@ class DoNothing(LocationAction):
 
 class LoseHealthOrMSB(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}."
-    USES_MSB = True
+    MSB_GLYPH = 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,8 @@ class ToggleBits(LocationAction):
 
 class LoseHealthOrMSBAndSetBits(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
-    USES_MSB = True
+    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):
@@ -100,6 +104,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 +115,8 @@ class AcquireWinToken(LocationAction):
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
     TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
-    USES_MSB = True
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+    MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
     def perform_action(self, board, location):
         board.gain_health()
@@ -120,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'])
@@ -127,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: