projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
461ff88
)
swapped msb and health/bits in wording to make clear that msb takes precedence
author
adrianna
<adrianna.pinska@gmail.com>
Sat, 17 May 2014 22:57:36 +0000
(
00:57
+0200)
committer
adrianna
<adrianna.pinska@gmail.com>
Sat, 17 May 2014 22:57:45 +0000
(
00:57
+0200)
naja/actions.py
patch
|
blob
|
history
diff --git
a/naja/actions.py
b/naja/actions.py
index e1ec1e0a40b2cf58bbc741e0fcdd71cbc966602f..08d63693bf1c4915b1886177acba5b286ec934e2 100644
(file)
--- a/
naja/actions.py
+++ b/
naja/actions.py
@@
-94,7
+94,7
@@
class DoNothing(LocationAction):
class LoseHealthOrMSB(LocationAction):
class LoseHealthOrMSB(LocationAction):
- TEXT = "Lose {
HEALTH} or {MSB
}."
+ TEXT = "Lose {
MSB} or {HEALTH
}."
MSB_GLYPH = ACTION_GLYPHS.DAMAGE
def perform_action(self, board, location):
MSB_GLYPH = ACTION_GLYPHS.DAMAGE
def perform_action(self, board, location):
@@
-233,7
+233,7
@@
class ShiftBits(LocationAction):
class LoseHealthOrMSBAndSetBits(LocationAction):
class LoseHealthOrMSBAndSetBits(LocationAction):
- TEXT = "Lose {
HEALTH} or {MSB
}, then set %(location_bits)s."
+ TEXT = "Lose {
MSB} or {HEALTH
}, then set %(location_bits)s."
GLYPHS = (ACTION_GLYPHS.SET_BITS,)
MSB_GLYPH = ACTION_GLYPHS.DAMAGE
GLYPHS = (ACTION_GLYPHS.SET_BITS,)
MSB_GLYPH = ACTION_GLYPHS.DAMAGE
@@
-276,7
+276,7
@@
class GainHealth(LocationAction):
class GainHealthAndClearBitsOrMSB(LocationAction):
class GainHealthAndClearBitsOrMSB(LocationAction):
- TEXT = "Gain {HEALTH}, then clear
%(location_bits)s or {MSB}
."
+ TEXT = "Gain {HEALTH}, then clear
{MSB} or %(location_bits)s
."
GLYPHS = (ACTION_GLYPHS.HEAL,)
MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS
GLYPHS = (ACTION_GLYPHS.HEAL,)
MSB_GLYPH = ACTION_GLYPHS.CLEAR_BITS