projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ability to move player with location.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index 431b126829a1d48b401fdb5e3e288c5406a9a0dc..e1ec1e0a40b2cf58bbc741e0fcdd71cbc966602f 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-295,7
+295,13
@@
class ShiftLocations(LocationAction):
sound.play_sound('grind.ogg')
board.shift_locations(
self.data['direction'],
sound.play_sound('grind.ogg')
board.shift_locations(
self.data['direction'],
- self.data.get('skip_player', False))
+ 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):
class RotateLocations(LocationAction):
@@
-319,8
+325,8
@@
class AllowChessMove(LocationAction):
class AllowChessMoveIfMSB(LocationAction):
TEXT = (
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):
MSB_GLYPH = ACTION_GLYPHS.MOVEMENT
def perform_action(self, board, location):