X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=34c84f6660e7ac343e0dc94de2c200c609198fed;hb=0c5003d45e57223eca4a995952517648a9baa465;hp=7d5be63b7663d727fc81cd66a9105f5eda3a8927;hpb=00bdc8cec84b91a3a76bf946bc4764e8cb96fded;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 7d5be63..34c84f6 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,5 @@
-from naja.constants import BITS
+from naja.constants import BITS, CHESS_PIECES
+from naja.utils import bit_glyphs
 
 
 class LocationAction(object):
@@ -10,21 +11,37 @@ class LocationAction(object):
     USES_MSB = False
 
     def __init__(self, required_bits, **data):
-        bits = set()
-        for bit in required_bits:
-            # Convert names to numbers if applicable.
-            bits.add(BITS.get(bit, bit))
-        self.required_bits = frozenset(bits)
+        self.required_bits = required_bits
         self.data = data
 
-    def get_text(self):
-        return self.TEXT % self.data
+    def get_text(self, location=None):
+        substitutions = self.data.copy()
+
+        if 'direction' in self.data:
+            substitutions['rowcol'] = {
+                'NORTH': 'column',
+                'SOUTH': 'column',
+                'EAST': 'row',
+                'WEST': 'row',
+            }[self.data['direction']]
+
+        if 'chesspiece' in self.data:
+            substitutions['chesspiece_name'] = self.data['chesspiece'].lower()
+
+        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):
@@ -47,7 +64,7 @@ class DoNothing(LocationAction):
 
 
 class LoseHealthOrMSB(LocationAction):
-    TEXT = "Lose health or MSB."
+    TEXT = "Lose HEALTH or MSB."
     USES_MSB = True
 
     def perform_action(self, board, location):
@@ -56,21 +73,21 @@ class LoseHealthOrMSB(LocationAction):
 
 
 class SetBits(LocationAction):
-    TEXT = "Set bits specified by this location."
+    TEXT = "Set %(location_bits)s."
 
     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."
 
     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."
+    TEXT = "Lose HEALTH or MSB, then set %(location_bits)s."
     USES_MSB = True
 
     def perform_action(self, board, location):
@@ -80,19 +97,17 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
 
 class AcquireWinToken(LocationAction):
-    TEXT = "Acquire a win token, then clear all high bits."
-    USES_MSB = True
+    TEXT = "Gain WINTOKEN, then clear {RED,GREEN,BLUE}."
 
     def perform_action(self, board, location):
-        if self.check_and_clear_MSB(board.player):
-            board.acquire_win_token()
-            board.player.bits.clear_bits(set([
-                BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
-            ]))
+        board.acquire_win_token()
+        board.player.bits.clear_bits(set([
+            BITS.RED, BITS.GREEN, BITS.BLUE,
+        ]))
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
-    TEXT = "Gain health, then clear bits specified by this location or MSB."
+    TEXT = "Gain HEALTH, then clear %(location_bits)s or MSB."
     USES_MSB = True
 
     def perform_action(self, board, location):
@@ -102,7 +117,16 @@ class GainHealthAndClearBitsOrMSB(LocationAction):
 
 
 class ShiftLocations(LocationAction):
-    TEXT = "Shift board locations %(direction)s."
+    TEXT = "Shift current %(rowcol)s %(direction)s."
 
     def perform_action(self, board, location):
         board.shift_locations(self.data['direction'])
+
+
+class AllowChessMove(LocationAction):
+    TEXT = "Move like a %(chesspiece_name)s for one turn."
+
+    def perform_action(self, board, location):
+        if self.data['chesspiece'] in CHESS_PIECES:
+            chesspiece = CHESS_PIECES[self.data['chesspiece']]
+            board.allow_chess_move(chesspiece)