projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move keys to constants
[naja.git]
/
naja
/
widgets
/
robot.py
diff --git
a/naja/widgets/robot.py
b/naja/widgets/robot.py
index b6e219bd0305a68a090f149b5b6301178aa95da5..cbeba2e73443d4e8e75fe220033c32e00e59ba09 100644
(file)
--- a/
naja/widgets/robot.py
+++ b/
naja/widgets/robot.py
@@
-2,7
+2,7
@@
import pygame.locals as pgl
import pygame.locals as pgl
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
+from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
, ACT, KEYS
from naja.events import InvalidateTheWorld
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.events import InvalidateTheWorld
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
@@
-39,21
+39,31
@@
class RobotWidget(Widget):
surface.blit(self.surface, self.rect)
def handle_event(self, ev):
surface.blit(self.surface, self.rect)
def handle_event(self, ev):
+ if self.state.gameboard.player_mode == ACT:
+ return super(RobotWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if ev.type == pgl.KEYDOWN:
- if ev.key in
(pgl.K_UP, pgl.K_w)
:
+ if ev.key in
KEYS.UP
:
if self.state.player.move(BITS.NORTH):
if self.state.player.move(BITS.NORTH):
+ self.state.gameboard.change_mode()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_DOWN, pgl.K_s)
:
+ if ev.key in
KEYS.DOWN
:
if self.state.player.move(BITS.SOUTH):
if self.state.player.move(BITS.SOUTH):
+ self.state.gameboard.change_mode()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_LEFT, pgl.K_a)
:
+ if ev.key in
KEYS.LEFT
:
if self.state.player.move(BITS.WEST):
if self.state.player.move(BITS.WEST):
+ self.state.gameboard.change_mode()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_RIGHT, pgl.K_d)
:
+ if ev.key in
KEYS.RIGHT
:
if self.state.player.move(BITS.EAST):
if self.state.player.move(BITS.EAST):
+ self.state.gameboard.change_mode()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- super(RobotWidget, self).handle_event(ev)
+ if ev.key in (pgl.K_SPACE,):
+ self.state.gameboard.change_mode()
+ InvalidateTheWorld.post()
+ return True
+ return super(RobotWidget, self).handle_event(ev)