projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d29cf8
)
Oh yeah, we're using a AttrDict thing, aren't we?
author
Neil
<neil@dip.sun.ac.za>
Sun, 11 May 2014 21:34:32 +0000
(23:34 +0200)
committer
Neil
<neil@dip.sun.ac.za>
Sun, 11 May 2014 21:34:38 +0000
(23:34 +0200)
naja/gamestate.py
patch
|
blob
|
history
naja/widgets/tile.py
patch
|
blob
|
history
diff --git
a/naja/gamestate.py
b/naja/gamestate.py
index bbe92d362fa47c9a316afd4d4d52b9fd0957c94a..8d00756f8c85c318f7d30a224683f75c6b274f76 100644
(file)
--- a/
naja/gamestate.py
+++ b/
naja/gamestate.py
@@
-17,11
+17,11
@@
class GameState(object):
self.gameboard = GameBoard.new_game(
locations_definition=[
{'actions': []},
self.gameboard = GameBoard.new_game(
locations_definition=[
{'actions': []},
- {'actions': [{'required_bits': [BITS
['CYAN']
],
+ {'actions': [{'required_bits': [BITS
.CYAN
],
'action_class': 'DoNothing'}]},
'action_class': 'DoNothing'}]},
- {'actions': [{'required_bits': [BITS
['YELLOW']
],
+ {'actions': [{'required_bits': [BITS
.YELLOW
],
'action_class': 'DoNothing'}]},
'action_class': 'DoNothing'}]},
- {'actions': [{'required_bits': [BITS
['YELLOW'], BITS['MAGENTA']
],
+ {'actions': [{'required_bits': [BITS
.YELLOW, BITS.MAGENTA
],
'action_class': 'DoNothing'}]},
])
'action_class': 'DoNothing'}]},
])
diff --git
a/naja/widgets/tile.py
b/naja/widgets/tile.py
index 63fbafef09f054666a42234929a1145ad524bf53..4a88e121fb01dfeb688ec68c119e7e52b6a0595d 100644
(file)
--- a/
naja/widgets/tile.py
+++ b/
naja/widgets/tile.py
@@
-8,9
+8,9
@@
from naja.widgets.base import Widget
BIT_MAP = {
BIT_MAP = {
- BITS
['CYAN']
: 'board/tile_cyan.png',
- BITS
['MAGENTA']
: 'board/tile_magenta.png',
- BITS
['YELLOW']
: 'board/tile_yellow.png',
+ BITS
.CYAN
: 'board/tile_cyan.png',
+ BITS
.MAGENTA
: 'board/tile_magenta.png',
+ BITS
.YELLOW
: 'board/tile_yellow.png',
}
}