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

diff --git a/naja/actions.py b/naja/actions.py
index 35f4342..596a505 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,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
@@ -30,6 +31,10 @@ class LocationAction(object):
             substitutions['chesspiece_name'] = move_glyph(
                 self.data['chesspiece'])
 
+        if 'rot_direction' in self.data:
+            substitutions['rot_direction_name'] = '{%s}' % (
+                substitutions['rot_direction'],)
+
         if location is None:
             substitutions['location_bits'] = 'bits specified by this location'
         else:
@@ -67,7 +72,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 +81,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 +89,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 +97,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 +108,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()
@@ -108,9 +117,18 @@ class AcquireWinToken(LocationAction):
         ]))
 
 
+class GainHealth(LocationAction):
+    TEXT = "Gain {HEALTH}."
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+
+    def perform_action(self, board, location):
+        board.gain_health()
+
+
 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,13 +138,23 @@ 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'])
 
 
+class RotateLocations(LocationAction):
+    TEXT = "Rotate adjacent locations %(rot_direction_name)s."
+    GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
+
+    def perform_action(self, board, location):
+        board.rotate_locations(self.data['rot_direction'])
+
+
 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: