projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better location shift action text.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index 99e16bf9c9de53a5ac8fb26a63e79ed328aed75b..ff8a431d0369fe0fa6f1ed1a52cbda87126fd538 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-18,7
+18,15
@@
class LocationAction(object):
self.data = data
def get_text(self):
self.data = data
def get_text(self):
- return self.TEXT % self.data
+ substitutions = self.data.copy()
+ if 'direction' in self.data:
+ substitutions['rowcol'] = {
+ 'NORTH': 'column',
+ 'SOUTH': 'column',
+ 'EAST': 'row',
+ 'WEST': 'row',
+ }[self.data['direction']]
+ return self.TEXT % substitutions
def check_available(self, player):
return player.bits.check_bits(self.required_bits)
def check_available(self, player):
return player.bits.check_bits(self.required_bits)
@@
-100,7
+108,7
@@
class GainHealthAndClearBitsOrMSB(LocationAction):
class ShiftLocations(LocationAction):
class ShiftLocations(LocationAction):
- TEXT = "Shift
board location
s %(direction)s."
+ TEXT = "Shift
current %(rowcol)
s %(direction)s."
def perform_action(self, board, location):
board.shift_locations(self.data['direction'])
def perform_action(self, board, location):
board.shift_locations(self.data['direction'])