Add a puzzle selection screen

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index d73a66aae4ba0dfede3cbd60e1961531f9299146..c0f19c634cf62443bd2af5bce8bf145bd7098a59 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -41,7 +41,7 @@ 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)
@@ -82,6 +82,7 @@ class LoseHealthOrMSB(LocationAction):
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
+            sound.play_sound('awwww.ogg')
             board.lose_health()
 
 
@@ -120,6 +121,7 @@ class LoseHealthOrMSBAndSetBits(LocationAction):
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
+            sound.play_sound('awwww.ogg')
             board.lose_health()
         board.player.bits.set_bits(location.bitwise_operand)
 
@@ -129,6 +131,7 @@ class AcquireWinToken(LocationAction):
     GLYPHS = (ACTION_GLYPHS.WINTOKEN,)
 
     def perform_action(self, board, location):
+        sound.play_sound('yipee.ogg')
         board.acquire_win_token()
         board.player.bits.clear_bits(set([
             BITS.RED, BITS.GREEN, BITS.BLUE,
@@ -140,6 +143,7 @@ class GainHealth(LocationAction):
     GLYPHS = (ACTION_GLYPHS.HEAL,)
 
     def perform_action(self, board, location):
+        sound.play_sound('aha.ogg')
         board.gain_health()
 
 
@@ -149,6 +153,7 @@ class GainHealthAndClearBitsOrMSB(LocationAction):
     MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
     def perform_action(self, board, location):
+        sound.play_sound('aha.ogg')
         board.gain_health()
         if not self.check_and_clear_MSB(board.player):
             board.player.bits.clear_bits(location.bitwise_operand)
@@ -164,7 +169,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):
@@ -180,3 +185,22 @@ class AllowChessMove(LocationAction):
         if self.data['chesspiece'] in CHESS_PIECES:
             chesspiece = CHESS_PIECES[self.data['chesspiece']]
             board.allow_chess_move(chesspiece)
+
+
+class AllowChessMoveIfMSB(LocationAction):
+    TEXT = "Clear {MSB} and move like a %(chesspiece_name)s for one turn."
+    MSB_GLYPH = ACTION_GLYPHS.MOVEMENT
+
+    def perform_action(self, board, location):
+        if self.data['chesspiece'] in CHESS_PIECES:
+            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)