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

diff --git a/naja/actions.py b/naja/actions.py
index 17cb432..cf916b9 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -8,7 +8,8 @@ class LocationAction(object):
     """
 
     TEXT = None
-    GLYPHS = None
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
+    MSB_GLYPH = None
 
     def __init__(self, required_bits, **data):
         self.required_bits = required_bits
@@ -60,7 +61,6 @@ class LocationAction(object):
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
-    GLYPHS = (ACTION_GLYPHS.NOTHING,)
 
     def perform_action(self, board, location):
         pass
@@ -68,7 +68,7 @@ class DoNothing(LocationAction):
 
 class LoseHealthOrMSB(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}."
-    GLYPHS = (ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
+    MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -93,7 +93,8 @@ class ToggleBits(LocationAction):
 
 class LoseHealthOrMSBAndSetBits(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
-    GLYPHS = (ACTION_GLYPHS.SET_BITS, ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
+    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):
@@ -114,7 +115,8 @@ class AcquireWinToken(LocationAction):
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
     TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
-    GLYPHS = (ACTION_GLYPHS.HEAL, ACTION_GLYPHS.MSB, ACTION_GLYPHS.CLEAR_BITS)
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+    MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
     def perform_action(self, board, location):
         board.gain_health()