projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aac1783
)
Better bits constants.
author
Jeremy Thurgood
<firxen@gmail.com>
Fri, 16 May 2014 08:07:32 +0000
(10:07 +0200)
committer
Jeremy Thurgood
<firxen@gmail.com>
Fri, 16 May 2014 08:07:32 +0000
(10:07 +0200)
naja/constants.py
patch
|
blob
|
history
diff --git
a/naja/constants.py
b/naja/constants.py
index f81cb8f725a935c2fabb40784f80c9880d66eae2..c941401d9c6541c7a1a8e87c7709df87efebe47c 100644
(file)
--- a/
naja/constants.py
+++ b/
naja/constants.py
@@
-24,20
+24,21
@@
DEFAULT_SOUND_VOLUME = 1.0 # sound volume
DEFAULT_MUSIC_VOLUME = 0.3 # music volume
# Player bits
DEFAULT_MUSIC_VOLUME = 0.3 # music volume
# Player bits
-BITS = AttrDict({
- # Direction bits
+DIRECTION_BITS = AttrDict({
'NORTH': 0,
'SOUTH': 1,
'EAST': 2,
'WEST': 3,
'NORTH': 0,
'SOUTH': 1,
'EAST': 2,
'WEST': 3,
- # Condition bits
+})
+CONDITION_BITS = AttrDict({
'BLUE': 4,
'GREEN': 5,
'RED': 6,
'MSB': 7,
})
'BLUE': 4,
'GREEN': 5,
'RED': 6,
'MSB': 7,
})
-DIRECTION_BITS = AttrDict((k, v) for k, v in BITS.items() if v < 4)
-CONDITION_BITS = AttrDict((k, v) for k, v in BITS.items() if v >= 4)
+BITS = AttrDict()
+BITS.update(DIRECTION_BITS)
+BITS.update(CONDITION_BITS)
# PLAYER MOVES
MOVES = AttrDict({
# PLAYER MOVES
MOVES = AttrDict({