X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=b492f809bced439332fb18ca4e09074e7b3bfeac;hb=84c542f883e16a7f40c70e8a7096b92c063a0e7f;hp=0535c8be1b37964d752773636d2538c877adc78b;hpb=d2d864e01ddcf38536812f37b8bffb3ee3227d4f;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 0535c8b..b492f80 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,6 @@
-from naja.constants import BITS
+from naja.constants import ACTION_GLYPHS, BITS, CHESS_PIECES
+from naja.sound import sound
+from naja.utils import bit_glyphs, move_glyph
 
 
 class LocationAction(object):
@@ -7,14 +9,16 @@ 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
         self.data = data
 
-    def get_text(self):
+    def get_text(self, location=None):
         substitutions = self.data.copy()
+
         if 'direction' in self.data:
             substitutions['rowcol'] = {
                 'NORTH': 'column',
@@ -22,13 +26,30 @@ class LocationAction(object):
                 'EAST': 'row',
                 'WEST': 'row',
             }[self.data['direction']]
+            substitutions['direction'] = '{%s}' % (substitutions['direction'],)
+
+        if 'chesspiece' in self.data:
+            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:
+            substitutions['location_bits'] = bit_glyphs(
+                location.bitwise_operand)
+
         return self.TEXT % substitutions
 
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
 
     def perform_action(self, board, location):
-        raise NotImplementedError("TODO")
+        raise NotImplementedError(
+            "%s does not implement perform_action()." % (type(self).__name__,))
 
     def check_and_clear_MSB(self, player):
         if player.bits.check_bit(BITS.MSB):
@@ -51,8 +72,8 @@ class DoNothing(LocationAction):
 
 
 class LoseHealthOrMSB(LocationAction):
-    TEXT = "Lose health or MSB."
-    USES_MSB = True
+    TEXT = "Lose {HEALTH} or {MSB}."
+    MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -60,22 +81,25 @@ class LoseHealthOrMSB(LocationAction):
 
 
 class SetBits(LocationAction):
-    TEXT = "Set bits specified by this location."
+    TEXT = "Set %(location_bits)s."
+    GLYPHS = (ACTION_GLYPHS.SET_BITS,)
 
     def perform_action(self, board, location):
         board.player.bits.set_bits(location.bitwise_operand)
 
 
 class ToggleBits(LocationAction):
-    TEXT = "Toggle bits specified by this location."
+    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 bits specified by this location."
-    USES_MSB = True
+    TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
+    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):
@@ -84,7 +108,8 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 
 class AcquireWinToken(LocationAction):
-    TEXT = "Acquire a win token, then clear all key bits."
+    TEXT = "Gain {WINTOKEN}, then clear {RED,GREEN,BLUE}."
+    GLYPHS = (ACTION_GLYPHS.WINTOKEN,)
 
     def perform_action(self, board, location):
         board.acquire_win_token()
@@ -93,9 +118,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 bits specified by this location or MSB."
-    USES_MSB = True
+    TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+    MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
     def perform_action(self, board, location):
         board.gain_health()
@@ -105,6 +139,27 @@ class GainHealthAndClearBitsOrMSB(LocationAction):
 
 class ShiftLocations(LocationAction):
     TEXT = "Shift current %(rowcol)s %(direction)s."
+    GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
 
     def perform_action(self, board, location):
+        sound.play_sound('grind.ogg')
         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):
+        sound.play_sound('grind.ogg')
+        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:
+            chesspiece = CHESS_PIECES[self.data['chesspiece']]
+            board.allow_chess_move(chesspiece)