projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better card action handling.
[naja.git]
/
naja
/
widgets
/
robot.py
diff --git
a/naja/widgets/robot.py
b/naja/widgets/robot.py
index 3518cb0bb8b41253ad89901221ed55cd386602c8..ddad5808547469f023348bd38dcdd8b0050d5d37 100644
(file)
--- a/
naja/widgets/robot.py
+++ b/
naja/widgets/robot.py
@@
-2,8
+2,8
@@
import pygame.locals as pgl
import pygame.locals as pgl
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT
-from naja.events import
InvalidateTheWorld
+from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT
, KEYS
+from naja.events import
finish_event
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.widgets.base import Widget
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.widgets.base import Widget
@@
-28,7
+28,7
@@
class RobotWidget(Widget):
self.pos = (self.state.player.position[0] * TILE_SIZE[0],
self.state.player.position[1] * TILE_SIZE[1] + BIT_SIZE[1])
self.surface = resources.get_image('board/robot.png',
self.pos = (self.state.player.position[0] * TILE_SIZE[0],
self.state.player.position[1] * TILE_SIZE[1] + BIT_SIZE[1])
self.surface = resources.get_image('board/robot.png',
- transforms=(EIGHT_BIT,))
+ transforms=(EIGHT_BIT,))
.copy()
for bit, img_name in IMG_MAP.iteritems():
if self.state.player.bits.check_bit(bit):
bit_img = resources.get_image(img_name,
for bit, img_name in IMG_MAP.iteritems():
if self.state.player.bits.check_bit(bit):
bit_img = resources.get_image(img_name,
@@
-42,28
+42,23
@@
class RobotWidget(Widget):
if self.state.gameboard.player_mode == ACT:
return super(RobotWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if self.state.gameboard.player_mode == ACT:
return super(RobotWidget, self).handle_event(ev)
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):
self.state.gameboard.change_mode()
if self.state.player.move(BITS.NORTH):
self.state.gameboard.change_mode()
- InvalidateTheWorld.post()
- return True
- if ev.key in (pgl.K_DOWN, pgl.K_s):
+ return finish_event()
+ if ev.key in KEYS.DOWN:
if self.state.player.move(BITS.SOUTH):
self.state.gameboard.change_mode()
if self.state.player.move(BITS.SOUTH):
self.state.gameboard.change_mode()
- InvalidateTheWorld.post()
- return True
- if ev.key in (pgl.K_LEFT, pgl.K_a):
+ return finish_event()
+ if ev.key in KEYS.LEFT:
if self.state.player.move(BITS.WEST):
self.state.gameboard.change_mode()
if self.state.player.move(BITS.WEST):
self.state.gameboard.change_mode()
- InvalidateTheWorld.post()
- return True
- if ev.key in (pgl.K_RIGHT, pgl.K_d):
+ return finish_event()
+ if ev.key in KEYS.RIGHT:
if self.state.player.move(BITS.EAST):
self.state.gameboard.change_mode()
if self.state.player.move(BITS.EAST):
self.state.gameboard.change_mode()
- InvalidateTheWorld.post()
- return True
+ return finish_event()
if ev.key in (pgl.K_SPACE,):
self.state.gameboard.change_mode()
if ev.key in (pgl.K_SPACE,):
self.state.gameboard.change_mode()
- InvalidateTheWorld.post()
- return True
+ return finish_event()
return super(RobotWidget, self).handle_event(ev)
return super(RobotWidget, self).handle_event(ev)