projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use parse_bits from utils.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index c0f19c634cf62443bd2af5bce8bf145bd7098a59..45698ef1c495c1cc6c0092e2faa25a4490940655 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-46,7
+46,11
@@
class LocationAction(object):
substitutions['location_bits'] = bit_glyphs(
location.bitwise_operand)
substitutions['location_bits'] = bit_glyphs(
location.bitwise_operand)
- return self.TEXT % substitutions
+ text = self.TEXT
+ if self.data.get('message', None) is not None:
+ text = self.data['message']
+
+ return 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)
@@
-94,6
+98,14
@@
class SetBits(LocationAction):
board.player.bits.set_bits(location.bitwise_operand)
board.player.bits.set_bits(location.bitwise_operand)
+class ClearBits(LocationAction):
+ TEXT = "Clear %(location_bits)s."
+ GLYPHS = (ACTION_GLYPHS.CLEAR_BITS,)
+
+ def perform_action(self, board, location):
+ board.player.bits.clear_bits(location.bitwise_operand)
+
+
class ToggleBits(LocationAction):
TEXT = "Toggle %(location_bits)s."
GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS,)
class ToggleBits(LocationAction):
TEXT = "Toggle %(location_bits)s."
GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS,)
@@
-188,7
+200,9
@@
class AllowChessMove(LocationAction):
class AllowChessMoveIfMSB(LocationAction):
class AllowChessMoveIfMSB(LocationAction):
- TEXT = "Clear {MSB} and move like a %(chesspiece_name)s for one turn."
+ TEXT = (
+ "Clear {MSB} and move like a %(chesspiece_name)s for one turn if it "
+ "was set.")
MSB_GLYPH = ACTION_GLYPHS.MOVEMENT
def perform_action(self, board, location):
MSB_GLYPH = ACTION_GLYPHS.MOVEMENT
def perform_action(self, board, location):