X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;ds=sidebyside;f=naja%2Factions.py;h=869c6925eead025248ac397f4e65efdaeeb640de;hb=90ccea72b6d86f27d1b4e20a980f8a87a27ceeed;hp=4d4a0f0b3ac9960b39f335ddb0e54253e18037d3;hpb=db2d56a0ea2ac661367084276a74ff45ca247520;p=naja.git

diff --git a/naja/actions.py b/naja/actions.py
index 4d4a0f0..869c692 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -255,14 +255,16 @@ class AcquireWinToken(LocationAction):
             BITS.RED, BITS.GREEN, BITS.BLUE,
         ]))
 
+
 class AcquireWinTokenAndLoseHealth(AcquireWinToken):
     TEXT = "Gain {WINTOKEN}, lose {HEALTH}, then clear {RED,GREEN,BLUE}."
     GLYPHS = (ACTION_GLYPHS.WINTOKEN, ACTION_GLYPHS.DAMAGE)
 
     def perform_action(self, board, location):
         self.take_damage(board)
-        super(AcquireWinTokenAndLoseHealth, self).perform_action(board,
-                                                                location)
+        super(AcquireWinTokenAndLoseHealth, self).perform_action(
+            board, location)
+
 
 class GainHealth(LocationAction):
     TEXT = "Gain {HEALTH}."
@@ -291,7 +293,9 @@ class ShiftLocations(LocationAction):
 
     def perform_action(self, board, location):
         sound.play_sound('grind.ogg')
-        board.shift_locations(self.data['direction'])
+        board.shift_locations(
+            self.data['direction'],
+            self.data.get('skip_current', True))
 
 
 class RotateLocations(LocationAction):
@@ -315,8 +319,8 @@ class AllowChessMove(LocationAction):
 
 class AllowChessMoveIfMSB(LocationAction):
     TEXT = (
-        "Clear {MSB} and move like a %(chesspiece_name)s for one turn if it "
-        "was set.")
+        "If {MSB} is set, unset {MSB} and move like a "
+        "%(chesspiece_name)s for one turn. Otherwise do nothing.")
     MSB_GLYPH = ACTION_GLYPHS.MOVEMENT
 
     def perform_action(self, board, location):