Saner save game loading.

[naja.git] / naja / actions.py

diff --git a/naja/actions.py b/naja/actions.py
index 17cb43215bbcc8289d0cdcae11d910f185674faa..7ed4c6b7fae55a7d49d2ec2d229ff0a05d36c422 100644 (file)
--- 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,8 @@ class LocationAction(object):
     """
 
     TEXT = None
-    GLYPHS = None
+    GLYPHS = tuple()
+    MSB_GLYPH = None
 
     def __init__(self, required_bits, **data):
         self.required_bits = required_bits
@@ -30,6 +32,10 @@ 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'
         else:
@@ -68,7 +74,7 @@ class DoNothing(LocationAction):
 
 class LoseHealthOrMSB(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}."
-    GLYPHS = (ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
+    MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -93,7 +99,8 @@ class ToggleBits(LocationAction):
 
 class LoseHealthOrMSBAndSetBits(LocationAction):
     TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
-    GLYPHS = (ACTION_GLYPHS.SET_BITS, ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
+    GLYPHS = (ACTION_GLYPHS.SET_BITS,)
+    MSB_GLYPH = ACTION_GLYPHS.DAMAGE
 
     def perform_action(self, board, location):
         if not self.check_and_clear_MSB(board.player):
@@ -112,9 +119,18 @@ class AcquireWinToken(LocationAction):
         ]))
 
 
+class GainHealth(LocationAction):
+    TEXT = "Gain {HEALTH}."
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+
+    def perform_action(self, board, location):
+        board.gain_health()
+
+
 class GainHealthAndClearBitsOrMSB(LocationAction):
     TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
-    GLYPHS = (ACTION_GLYPHS.HEAL, ACTION_GLYPHS.MSB, ACTION_GLYPHS.CLEAR_BITS)
+    GLYPHS = (ACTION_GLYPHS.HEAL,)
+    MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
 
     def perform_action(self, board, location):
         board.gain_health()
@@ -127,9 +143,19 @@ 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_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'])
+
+
 class AllowChessMove(LocationAction):
     TEXT = "Move like a %(chesspiece_name)s for one turn."
     GLYPHS = (ACTION_GLYPHS.MOVEMENT,)