Add save-game loading.

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index cfa1011cd2d4b76d27322b039b6bf36533d96732..7ed4c6b7fae55a7d49d2ec2d229ff0a05d36c422 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -1,4 +1,5 @@
 from naja.constants import ACTION_GLYPHS, BITS, CHESS_PIECES
+from naja.sound import sound
 from naja.utils import bit_glyphs, move_glyph
 
 
@@ -8,7 +9,7 @@ class LocationAction(object):
     """
 
     TEXT = None
-    GLYPHS = (ACTION_GLYPHS.NOTHING,)
+    GLYPHS = tuple()
     MSB_GLYPH = None
 
     def __init__(self, required_bits, **data):
@@ -31,6 +32,10 @@ class LocationAction(object):
             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:
@@ -61,6 +66,7 @@ class LocationAction(object):
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
 
     def perform_action(self, board, location):
         pass
@@ -137,14 +143,16 @@ class ShiftLocations(LocationAction):
     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)s."
+    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'])