center robot again

[naja.git] / naja / widgets / robot.py

diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py
index 7e218a93a7451291fa662b57508dfc09bb5e537a..b6e219bd0305a68a090f149b5b6301178aa95da5 100644 (file)
--- a/naja/widgets/robot.py
+++ b/naja/widgets/robot.py
@@ -1,8 +1,9 @@
 """Widget to draw the player on the screen"""
-import pygame
+
 import pygame.locals as pgl
 
 from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
+from naja.events import InvalidateTheWorld
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
@@ -17,14 +18,14 @@ IMG_MAP = {
 class RobotWidget(Widget):
     """Widget which holds a tile on the game board."""
     def __init__(self, state):
-        pos = (state.player.position[0] * TILE_SIZE[0] + 32,
+        pos = (state.player.position[0] * TILE_SIZE[0],
                state.player.position[1] * TILE_SIZE[1] + BIT_SIZE[1])
         super(RobotWidget, self).__init__(pos, PLAYER_SIZE)
         self.state = state
 
     def prepare(self):
         # Look up the required bits on the board location
-        self.pos = (self.state.player.position[0] * TILE_SIZE[0] + 32,
+        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,))
@@ -36,3 +37,23 @@ class RobotWidget(Widget):
 
     def draw(self, surface):
         surface.blit(self.surface, self.rect)
+
+    def handle_event(self, ev):
+        if ev.type == pgl.KEYDOWN:
+            if ev.key in (pgl.K_UP, pgl.K_w):
+                if self.state.player.move(BITS.NORTH):
+                    InvalidateTheWorld.post()
+                    return True
+            if ev.key in (pgl.K_DOWN, pgl.K_s):
+                if self.state.player.move(BITS.SOUTH):
+                    InvalidateTheWorld.post()
+                    return True
+            if ev.key in (pgl.K_LEFT, pgl.K_a):
+                if self.state.player.move(BITS.WEST):
+                    InvalidateTheWorld.post()
+                    return True
+            if ev.key in (pgl.K_RIGHT, pgl.K_d):
+                if self.state.player.move(BITS.EAST):
+                    InvalidateTheWorld.post()
+                    return True
+        super(RobotWidget, self).handle_event(ev)