projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up menu slightly.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index 34c84f6660e7ac343e0dc94de2c200c609198fed..596a505c7bc9178347a0b32386ca415beef4885d 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-1,5
+1,5
@@
-from naja.constants import BITS, CHESS_PIECES
-from naja.utils import bit_glyphs
+from naja.constants import
ACTION_GLYPHS,
BITS, CHESS_PIECES
+from naja.utils import bit_glyphs
, move_glyph
class LocationAction(object):
class LocationAction(object):
@@
-8,7
+8,8
@@
class LocationAction(object):
"""
TEXT = None
"""
TEXT = None
- USES_MSB = False
+ GLYPHS = (ACTION_GLYPHS.NOTHING,)
+ MSB_GLYPH = None
def __init__(self, required_bits, **data):
self.required_bits = required_bits
def __init__(self, required_bits, **data):
self.required_bits = required_bits
@@
-24,9
+25,15
@@
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 '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'
if location is None:
substitutions['location_bits'] = 'bits specified by this location'
@@
-64,8
+71,8
@@
class DoNothing(LocationAction):
class LoseHealthOrMSB(LocationAction):
class LoseHealthOrMSB(LocationAction):
- TEXT = "Lose
HEALTH or MSB
."
- USES_MSB = True
+ TEXT = "Lose
{HEALTH} or {MSB}
."
+ MSB_GLYPH = ACTION_GLYPHS.DAMAGE
def perform_action(self, board, location):
if not self.check_and_clear_MSB(board.player):
def perform_action(self, board, location):
if not self.check_and_clear_MSB(board.player):
@@
-74,6
+81,7
@@
class LoseHealthOrMSB(LocationAction):
class SetBits(LocationAction):
TEXT = "Set %(location_bits)s."
class SetBits(LocationAction):
TEXT = "Set %(location_bits)s."
+ GLYPHS = (ACTION_GLYPHS.SET_BITS,)
def perform_action(self, board, location):
board.player.bits.set_bits(location.bitwise_operand)
def perform_action(self, board, location):
board.player.bits.set_bits(location.bitwise_operand)
@@
-81,14
+89,16
@@
class SetBits(LocationAction):
class ToggleBits(LocationAction):
TEXT = "Toggle %(location_bits)s."
class ToggleBits(LocationAction):
TEXT = "Toggle %(location_bits)s."
+ GLYPHS = (ACTION_GLYPHS.TOGGLE_BITS,)
def perform_action(self, board, location):
board.player.bits.toggle_bits(location.bitwise_operand)
class LoseHealthOrMSBAndSetBits(LocationAction):
def perform_action(self, board, location):
board.player.bits.toggle_bits(location.bitwise_operand)
class LoseHealthOrMSBAndSetBits(LocationAction):
- TEXT = "Lose HEALTH or MSB, then set %(location_bits)s."
- USES_MSB = True
+ TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
+ GLYPHS = (ACTION_GLYPHS.SET_BITS,)
+ MSB_GLYPH = ACTION_GLYPHS.DAMAGE
def perform_action(self, board, location):
if not self.check_and_clear_MSB(board.player):
def perform_action(self, board, location):
if not self.check_and_clear_MSB(board.player):
@@
-97,7
+107,8
@@
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}."
+ GLYPHS = (ACTION_GLYPHS.WINTOKEN,)
def perform_action(self, board, location):
board.acquire_win_token()
def perform_action(self, board, location):
board.acquire_win_token()
@@
-106,9
+117,18
@@
class AcquireWinToken(LocationAction):
]))
]))
+class GainHealth(LocationAction):
+ TEXT = "Gain {HEALTH}."
+ GLYPHS = (ACTION_GLYPHS.HEAL,)
+
+ def perform_action(self, board, location):
+ board.gain_health()
+
+
class GainHealthAndClearBitsOrMSB(LocationAction):
class GainHealthAndClearBitsOrMSB(LocationAction):
- TEXT = "Gain HEALTH, then clear %(location_bits)s or MSB."
- USES_MSB = True
+ TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
+ GLYPHS = (ACTION_GLYPHS.HEAL,)
+ MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
def perform_action(self, board, location):
board.gain_health()
def perform_action(self, board, location):
board.gain_health()
@@
-118,13
+138,23
@@
class GainHealthAndClearBitsOrMSB(LocationAction):
class ShiftLocations(LocationAction):
TEXT = "Shift current %(rowcol)s %(direction)s."
class ShiftLocations(LocationAction):
TEXT = "Shift current %(rowcol)s %(direction)s."
+ GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
def perform_action(self, board, location):
board.shift_locations(self.data['direction'])
def perform_action(self, board, location):
board.shift_locations(self.data['direction'])
+class RotateLocations(LocationAction):
+ TEXT = "Rotate adjacent locations %(rot_direction_name)s."
+ GLYPHS = (ACTION_GLYPHS.CHANGE_BOARD,)
+
+ def perform_action(self, board, location):
+ board.rotate_locations(self.data['rot_direction'])
+
+
class AllowChessMove(LocationAction):
TEXT = "Move like a %(chesspiece_name)s for one turn."
class AllowChessMove(LocationAction):
TEXT = "Move like a %(chesspiece_name)s for one turn."
+ GLYPHS = (ACTION_GLYPHS.MOVEMENT,)
def perform_action(self, board, location):
if self.data['chesspiece'] in CHESS_PIECES:
def perform_action(self, board, location):
if self.data['chesspiece'] in CHESS_PIECES: