X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=blobdiff_plain;f=naja%2Factions.py;h=e1ec1e0a40b2cf58bbc741e0fcdd71cbc966602f;hp=5701109fec37a31959b73c9fe02b2cd77772a9df;hb=0dcb7a00f2ad80c4b544e3e04dce4b008dac1ad7;hpb=2225b90b4f08fe011a22d29027fc28f13c94f401

diff --git a/naja/actions.py b/naja/actions.py
index 5701109..e1ec1e0 100644
--- a/naja/actions.py
+++ b/naja/actions.py
@@ -155,6 +155,7 @@ class GenericBits(LocationAction):
         self.once = self.data.get('once', False)
         self.acquire_win = self.data.get('acquire_win', False)
         self.lose_health = self.data.get('lose_health', False)
+        self.gain_health = self.data.get('gain_health', False)
 
     def sanity_check(self, location):
         missing_bits = set()
@@ -177,6 +178,9 @@ class GenericBits(LocationAction):
         if self.lose_health:
             sound.play_sound('awwww.ogg')
             board.lose_health()
+        if self.gain_health:
+            sound.play_sound('aha.ogg')
+            board.gain_health()
         if self.once:
             location.actions.remove(self)
 
@@ -186,6 +190,8 @@ class GenericBits(LocationAction):
             glyphs.append(ACTION_GLYPHS.WINTOKEN)
         if self.lose_health:
             glyphs.append(ACTION_GLYPHS.DAMAGE)
+        if self.gain_health:
+            glyphs.append(ACTION_GLYPHS.HEAL)
         if self.set_bits:
             glyphs.append(ACTION_GLYPHS.SET_BITS)
         if self.clear_bits:
@@ -199,9 +205,11 @@ class GenericBits(LocationAction):
             return super(GenericBits, self).get_text()
         parts = []
         if self.acquire_win:
-            parts.append("Gain a {WINTOKEN}.")
+            parts.append("Gain {WINTOKEN}.")
         if self.lose_health:
             parts.append("Lose {HEALTH}.")
+        if self.gain_health:
+            parts.append("Gain {HEALTH}.")
         for template, bits in [
                 ('Set %s.', self.set_bits), ('Clear %s.', self.clear_bits),
                 ('Toggle %s.', self.toggle_bits)]:
@@ -247,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}."
@@ -283,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):
@@ -307,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):