Hook up shift glyph

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 2def1cfaf0a8f90bddd27dbc085423ad00074ad4..d73a66aae4ba0dfede3cbd60e1961531f9299146 100644 (file)
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -9,7 +9,7 @@ class LocationAction(object):
     """
 
     TEXT = None
-    GLYPHS = (ACTION_GLYPHS.NOTHING,)
+    GLYPHS = tuple()
     MSB_GLYPH = None
 
     def __init__(self, required_bits, **data):
@@ -19,7 +19,11 @@ class LocationAction(object):
     def get_text(self, location=None):
         substitutions = self.data.copy()
 
-        if 'direction' in self.data:
+        if 'shift' in self.data:
+            substitutions['shift'] = self.data['shift']
+            substitutions['shift_glyph'] = ('{SHIFT_%s}'
+                                            % self.data['direction'].upper())
+        elif 'direction' in self.data:
             substitutions['rowcol'] = {
                 'NORTH': 'column',
                 'SOUTH': 'column',
@@ -66,6 +70,7 @@ class LocationAction(object):
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
 
     def perform_action(self, board, location):
         pass
@@ -96,6 +101,18 @@ class ToggleBits(LocationAction):
         board.player.bits.toggle_bits(location.bitwise_operand)
 
 
+class ShiftBits(LocationAction):
+    TEXT = "Barrel-shift player bits %(shift_glyph)s %(shift)s."
+    GLYPHS = (ACTION_GLYPHS.SHIFT_LEFT,)
+
+    def perform_action(self, board, location):
+        shift = self.data['shift']
+        if self.data['direction'] == 'left':
+            board.player.bits.shift_bits_left(shift)
+        else:
+            board.player.bits.shift_bits_right(shift)
+
+
 class LoseHealthOrMSBAndSetBits(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
     GLYPHS = (ACTION_GLYPHS.SET_BITS,)
@@ -142,7 +159,7 @@ class ShiftLocations(LocationAction):
     GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
 
     def perform_action(self, board, location):
-        sound.play_sound('change.ogg')
+        sound.play_sound('grind.ogg')
         board.shift_locations(self.data['direction'])
 
 
@@ -151,7 +168,7 @@ class RotateLocations(LocationAction):
     GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
 
     def perform_action(self, board, location):
-        sound.play_sound('change.ogg')
+        sound.play_sound('grind.ogg')
         board.rotate_locations(self.data['rot_direction'])