chess moves are working; need more tests

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 343aeb2735f3169476ce13171964e13895668f59..f92961cd4bdfc38e61d8e5eb33b521aa55446d11 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,4 @@
-from naja.constants import BITS
+from naja.constants import BITS, CHESS_PIECES
 
 
 class LocationAction(object):
@@ -10,15 +10,24 @@ 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
+        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()
+
+        return self.TEXT % substitutions
 
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
@@ -85,7 +94,7 @@ class AcquireWinToken(LocationAction):
     def perform_action(self, board, location):
         board.acquire_win_token()
         board.player.bits.clear_bits(set([
-            BITS.CYAN, BITS.MAGENTA, BITS.YELLOW,
+            BITS.RED, BITS.GREEN, BITS.BLUE,
         ]))
 
 
@@ -100,7 +109,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)