Move the player.

diff --git a/naja/player.py b/naja/player.py
index 97422b867d25fab3ea31675ba2978450a1f00701..fa6e1e9f3b3edd39a7a20a109135c39ee1f9cd36 100644 (file)
--- a/naja/player.py
+++ b/naja/player.py
@@ -1,3 +1,4 @@
+from naja.constants import BITS
 
 
 class PlayerBits(object):
@@ -67,3 +68,27 @@ class Player(object):
             'bits': self.bits.bits,
             'position': list(self.position),
         }
+
+    def move(self, direction):
+        if not self.bits.check_bit(direction):
+            return False
+        # TODO: Something cleaner than this.
+        x, y = self.position
+        if direction == BITS.NORTH:
+            if y > 0:
+                self.position = (x, y - 1)
+                return True
+        elif direction == BITS.SOUTH:
+            if y < 4:
+                self.position = (x, y + 1)
+                return True
+        elif direction == BITS.EAST:
+            if x < 4:
+                self.position = (x + 1, y)
+                return True
+        elif direction == BITS.WEST:
+            if x > 0:
+                self.position = (x - 1, y)
+                return True
+
+        return False

diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py
index 7e218a93a7451291fa662b57508dfc09bb5e537a..4506edf6e1e91d66dc89ee1091b83bcbe92c81db 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
@@ -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)