projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow custom flags for blending.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index cfa1011cd2d4b76d27322b039b6bf36533d96732..b492f809bced439332fb18ca4e09074e7b3bfeac 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.constants import ACTION_GLYPHS, BITS, CHESS_PIECES
+from naja.sound import sound
from naja.utils import bit_glyphs, move_glyph
from naja.utils import bit_glyphs, move_glyph
@@
-31,6
+32,10
@@
class LocationAction(object):
substitutions['chesspiece_name'] = move_glyph(
self.data['chesspiece'])
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:
if location is None:
substitutions['location_bits'] = 'bits specified by this location'
else:
@@
-137,14
+142,16
@@
class ShiftLocations(LocationAction):
GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
def perform_action(self, board, location):
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):
board.shift_locations(self.data['direction'])
class RotateLocations(LocationAction):
- TEXT = "Rotate adjacent locations %(rot_direction)s."
+ TEXT = "Rotate adjacent locations %(rot_direction
_name
)s."
GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
def perform_action(self, board, location):
GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
def perform_action(self, board, location):
+ sound.play_sound('grind.ogg')
board.rotate_locations(self.data['rot_direction'])
board.rotate_locations(self.data['rot_direction'])