X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Factions.py;h=45698ef1c495c1cc6c0092e2faa25a4490940655;hb=e5731d2cbc0c7a260e7b69aac07e6c26b9b2c56d;hp=cfa1011cd2d4b76d27322b039b6bf36533d96732;hpb=8292a195eeba42e60f9917214350e604554bb6d9;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index cfa1011..45698ef 100644
--- 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):
@@ -18,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',
@@ -31,13 +36,21 @@ 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'
+            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)
@@ -61,6 +74,7 @@ class LocationAction(object):
 
 class DoNothing(LocationAction):
     TEXT = "No effect."
+    GLYPHS = (ACTION_GLYPHS.NOTHING,)
 
     def perform_action(self, board, location):
         pass
@@ -72,6 +86,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()
 
 
@@ -83,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,)
@@ -91,6 +114,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,)
@@ -98,6 +133,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)
 
@@ -107,6 +143,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,
@@ -118,6 +155,7 @@ class GainHealth(LocationAction):
     GLYPHS = (ACTION_GLYPHS.HEAL,)
 
     def perform_action(self, board, location):
+        sound.play_sound('aha.ogg')
         board.gain_health()
 
 
@@ -127,6 +165,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)
@@ -137,14 +176,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 tiles %(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'])
 
 
@@ -156,3 +197,24 @@ 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 if it "
+        "was set.")
+    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)