Use parse_bits from utils.

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 464b3ae285482c2b6d3967d8687c39759bd78308..45698ef1c495c1cc6c0092e2faa25a4490940655 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -41,12 +41,16 @@ class LocationAction(object):
                 substitutions['rot_direction'],)
 
         if location is None:
-            substitutions['location_bits'] = 'bits specified by this location'
+            substitutions['location_bits'] = 'bits specified by this tile'
         else:
             substitutions['location_bits'] = bit_glyphs(
                 location.bitwise_operand)
 
-        return self.TEXT % substitutions
+        text = self.TEXT
+        if self.data.get('message', None) is not None:
+            text = self.data['message']
+
+        return text % substitutions
 
     def check_available(self, player):
         return player.bits.check_bits(self.required_bits)
@@ -94,6 +98,14 @@ class SetBits(LocationAction):
         board.player.bits.set_bits(location.bitwise_operand)
 
 
+class ClearBits(LocationAction):
+    TEXT = "Clear %(location_bits)s."
+    GLYPHS = (ACTION_GLYPHS.CLEAR_BITS,)
+
+    def perform_action(self, board, location):
+        board.player.bits.clear_bits(location.bitwise_operand)
+
+
 class ToggleBits(LocationAction):
     TEXT = "Toggle %(location_bits)s."
     GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS,)
@@ -169,7 +181,7 @@ class ShiftLocations(LocationAction):
 
 
 class RotateLocations(LocationAction):
-    TEXT = "Rotate adjacent locations %(rot_direction_name)s."
+    TEXT = "Rotate adjacent tiles %(rot_direction_name)s."
     GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
 
     def perform_action(self, board, location):
@@ -188,7 +200,9 @@ class AllowChessMove(LocationAction):
 
 
 class AllowChessMoveIfMSB(LocationAction):
-    TEXT = "Clear {MSB} and move like a %(chesspiece_name)s for one turn."
+    TEXT = (
+        "Clear {MSB} and move like a %(chesspiece_name)s for one turn if it "
+        "was set.")
     MSB_GLYPH = ACTION_GLYPHS.MOVEMENT
 
     def perform_action(self, board, location):
@@ -196,3 +210,11 @@ class AllowChessMoveIfMSB(LocationAction):
             if self.check_and_clear_MSB(board.player):
                 chesspiece = CHESS_PIECES[self.data['chesspiece']]
                 board.allow_chess_move(chesspiece)
+
+
+class GainMSB(LocationAction):
+    TEXT = "Set {MSB}."
+    GLYPHS = (ACTION_GLYPHS.MSB,)
+
+    def perform_action(self, board, location):
+        board.player.bits.set_bit(BITS.MSB)