projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Highlight illegal actions in a different colour
[naja.git]
/
naja
/
widgets
/
robot.py
diff --git
a/naja/widgets/robot.py
b/naja/widgets/robot.py
index ddad5808547469f023348bd38dcdd8b0050d5d37..292c6bb74e55f7de3990894c62ff106fc5f8ce9e 100644
(file)
--- a/
naja/widgets/robot.py
+++ b/
naja/widgets/robot.py
@@
-2,7
+2,8
@@
import pygame.locals as pgl
import pygame.locals as pgl
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT, KEYS
+from naja.constants import (PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT, KEYS,
+ EXAMINE, MOVE)
from naja.events import finish_event
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.events import finish_event
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
@@
-39,26
+40,29
@@
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
:
+ if self.state.gameboard.player_mode
in (ACT, EXAMINE)
:
return super(RobotWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if ev.key in KEYS.UP:
if self.state.player.move(BITS.NORTH):
return super(RobotWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if ev.key in KEYS.UP:
if self.state.player.move(BITS.NORTH):
- self.state.gameboard.change_mode()
+ self.state.gameboard.change_mode(
ACT
)
return finish_event()
if ev.key in KEYS.DOWN:
if self.state.player.move(BITS.SOUTH):
return finish_event()
if ev.key in KEYS.DOWN:
if self.state.player.move(BITS.SOUTH):
- self.state.gameboard.change_mode()
+ self.state.gameboard.change_mode(
ACT
)
return finish_event()
if ev.key in KEYS.LEFT:
if self.state.player.move(BITS.WEST):
return finish_event()
if ev.key in KEYS.LEFT:
if self.state.player.move(BITS.WEST):
- self.state.gameboard.change_mode()
+ self.state.gameboard.change_mode(
ACT
)
return finish_event()
if ev.key in KEYS.RIGHT:
if self.state.player.move(BITS.EAST):
return finish_event()
if ev.key in KEYS.RIGHT:
if self.state.player.move(BITS.EAST):
- self.state.gameboard.change_mode()
+ self.state.gameboard.change_mode(
ACT
)
return finish_event()
return finish_event()
- if ev.key in (pgl.K_SPACE,):
- self.state.gameboard.change_mode()
+ if ev.key in KEYS.NOMOVE:
+ self.state.gameboard.change_mode(ACT)
+ return finish_event()
+ if ev.key in KEYS.SWITCH:
+ self.state.gameboard.change_mode(EXAMINE)
return finish_event()
return super(RobotWidget, self).handle_event(ev)
return finish_event()
return super(RobotWidget, self).handle_event(ev)