X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=blobdiff_plain;f=naja%2Factions.py;fp=naja%2Factions.py;h=08d63693bf1c4915b1886177acba5b286ec934e2;hp=4d4a0f0b3ac9960b39f335ddb0e54253e18037d3;hb=a4cb14512c07e5677c295d56b475a9562936a5e6;hpb=1dd7a53e5f3442d78e1db6d8142445f8185c817b

diff --git a/naja/actions.py b/naja/actions.py
index 4d4a0f0..08d6369 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -94,7 +94,7 @@ class DoNothing(LocationAction):
 
 
 class LoseHealthOrMSB(LocationAction):
-    TEXT = "Lose {HEALTH} or {MSB}."
+    TEXT = "Lose {MSB} or {HEALTH}."
     MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
@@ -233,7 +233,7 @@ class ShiftBits(LocationAction):
 
 
 class LoseHealthOrMSBAndSetBits(LocationAction):
-    TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
+    TEXT = "Lose {MSB} or {HEALTH}, then set %(location_bits)s."
     GLYPHS = (ACTION_GLYPHS.SET_BITS,)
     MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
@@ -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}."
@@ -274,7 +276,7 @@ class GainHealth(LocationAction):
 
 
 class GainHealthAndClearBitsOrMSB(LocationAction):
-    TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
+    TEXT = "Gain {HEALTH}, then clear {MSB} or %(location_bits)s."
     GLYPHS = (ACTION_GLYPHS.HEAL,)
     MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
@@ -291,7 +293,15 @@ 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))
+        if self.data.get('move_player', False):
+            pos = {
+                'NORTH': (0, -1), 'SOUTH': (0, 1),
+                'EAST': (1, 0), 'WEST': (-1, 0),
+            }.get(self.data['direction'], (0, 0))
+            board.player.force_position(pos, delta=True)
 
 
 class RotateLocations(LocationAction):
@@ -315,8 +325,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):