projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak markup, add chesspiece glyphs.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index 34c84f6660e7ac343e0dc94de2c200c609198fed..35f4342a3afc40c74196ce516473599d0ab68ec2 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-1,5
+1,5
@@
from naja.constants import BITS, CHESS_PIECES
from naja.constants import BITS, CHESS_PIECES
-from naja.utils import bit_glyphs
+from naja.utils import bit_glyphs
, move_glyph
class LocationAction(object):
class LocationAction(object):
@@
-24,9
+24,11
@@
class LocationAction(object):
'EAST': 'row',
'WEST': 'row',
}[self.data['direction']]
'EAST': 'row',
'WEST': 'row',
}[self.data['direction']]
+ substitutions['direction'] = '{%s}' % (substitutions['direction'],)
if 'chesspiece' in self.data:
if 'chesspiece' in self.data:
- substitutions['chesspiece_name'] = self.data['chesspiece'].lower()
+ substitutions['chesspiece_name'] = move_glyph(
+ self.data['chesspiece'])
if location is None:
substitutions['location_bits'] = 'bits specified by this location'
if location is None:
substitutions['location_bits'] = 'bits specified by this location'
@@
-64,7
+66,7
@@
class DoNothing(LocationAction):
class LoseHealthOrMSB(LocationAction):
class LoseHealthOrMSB(LocationAction):
- TEXT = "Lose
HEALTH or MSB
."
+ TEXT = "Lose
{HEALTH} or {MSB}
."
USES_MSB = True
def perform_action(self, board, location):
USES_MSB = True
def perform_action(self, board, location):
@@
-87,7
+89,7
@@
class ToggleBits(LocationAction):
class LoseHealthOrMSBAndSetBits(LocationAction):
class LoseHealthOrMSBAndSetBits(LocationAction):
- TEXT = "Lose
HEALTH or MSB
, then set %(location_bits)s."
+ TEXT = "Lose
{HEALTH} or {MSB}
, then set %(location_bits)s."
USES_MSB = True
def perform_action(self, board, location):
USES_MSB = True
def perform_action(self, board, location):
@@
-97,7
+99,7
@@
class LoseHealthOrMSBAndSetBits(LocationAction):
class AcquireWinToken(LocationAction):
class AcquireWinToken(LocationAction):
- TEXT = "Gain
WINTOKEN
, then clear {RED,GREEN,BLUE}."
+ TEXT = "Gain
{WINTOKEN}
, then clear {RED,GREEN,BLUE}."
def perform_action(self, board, location):
board.acquire_win_token()
def perform_action(self, board, location):
board.acquire_win_token()
@@
-107,7
+109,7
@@
class AcquireWinToken(LocationAction):
class GainHealthAndClearBitsOrMSB(LocationAction):
class GainHealthAndClearBitsOrMSB(LocationAction):
- TEXT = "Gain
HEALTH, then clear %(location_bits)s or MSB
."
+ TEXT = "Gain
{HEALTH}, then clear %(location_bits)s or {MSB}
."
USES_MSB = True
def perform_action(self, board, location):
USES_MSB = True
def perform_action(self, board, location):