projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test.
[naja.git]
/
naja
/
actions.py
diff --git
a/naja/actions.py
b/naja/actions.py
index 17cb43215bbcc8289d0cdcae11d910f185674faa..0626b34d6d1eb40b62af76c7796f19eb59920c21 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-8,7
+8,8
@@
class LocationAction(object):
"""
TEXT = None
"""
TEXT = None
- GLYPHS = None
+ 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
@@
-60,7
+61,6
@@
class LocationAction(object):
class DoNothing(LocationAction):
TEXT = "No effect."
class DoNothing(LocationAction):
TEXT = "No effect."
- GLYPHS = (ACTION_GLYPHS.NOTHING,)
def perform_action(self, board, location):
pass
def perform_action(self, board, location):
pass
@@
-68,7
+68,7
@@
class DoNothing(LocationAction):
class LoseHealthOrMSB(LocationAction):
TEXT = "Lose {HEALTH} or {MSB}."
class LoseHealthOrMSB(LocationAction):
TEXT = "Lose {HEALTH} or {MSB}."
- GLYPHS = (ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
+ 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):
@@
-93,7
+93,8
@@
class ToggleBits(LocationAction):
class LoseHealthOrMSBAndSetBits(LocationAction):
TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
class LoseHealthOrMSBAndSetBits(LocationAction):
TEXT = "Lose {HEALTH} or {MSB}, then set %(location_bits)s."
- GLYPHS = (ACTION_GLYPHS.SET_BITS, ACTION_GLYPHS.MSB, ACTION_GLYPHS.DAMAGE)
+ 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):
@@
-112,9
+113,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):
TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
class GainHealthAndClearBitsOrMSB(LocationAction):
TEXT = "Gain {HEALTH}, then clear %(location_bits)s or {MSB}."
- GLYPHS = (ACTION_GLYPHS.HEAL, ACTION_GLYPHS.MSB, ACTION_GLYPHS.CLEAR_BITS)
+ 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()