X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=9f3b221b3af18cf033093465d0306a9ec1ddab93;hb=28e4f8bd08af2ad4385aef7d1bd6521612eeb92a;hp=b492f809bced439332fb18ca4e09074e7b3bfeac;hpb=9088aafc9f5f35da438c95bd8d0b17e0461d9c49;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index b492f80..9f3b221 100644
--- 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
@@ -77,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()
 
 
@@ -96,6 +102,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,)
@@ -103,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)
 
@@ -112,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,
@@ -123,6 +143,7 @@ class GainHealth(LocationAction):
     GLYPHS = (ACTION_GLYPHS.HEAL,)
 
     def perform_action(self, board, location):
+        sound.play_sound('aha.ogg')
         board.gain_health()
 
 
@@ -132,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)