X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Frobot.py;h=09fd099f0a258d7d5136d590318512b4f7ca72f9;hb=83850d913f756713d0e82c768147a018e2dcc84d;hp=292c6bb74e55f7de3990894c62ff106fc5f8ce9e;hpb=2e101a5b1f6b271358fc2dbb56fc1fe6d0d53f37;p=naja.git

diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py
index 292c6bb..09fd099 100644
--- a/naja/widgets/robot.py
+++ b/naja/widgets/robot.py
@@ -1,19 +1,16 @@
 """Widget to draw the player on the screen"""
 
-import pygame.locals as pgl
-
-from naja.constants import (PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS, ACT, KEYS,
-                            EXAMINE, MOVE)
-from naja.events import finish_event
+from naja.constants import (PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS)
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
 
 IMG_MAP = {
-        BITS.CYAN: 'board/robot_cyan.png',
-        BITS.YELLOW: 'board/robot_yellow.png',
-        BITS.MAGENTA: 'board/robot_magenta.png',
-        }
+    BITS.MSB: 'board/robot_msb.png',
+    BITS.RED: 'board/robot_red.png',
+    BITS.GREEN: 'board/robot_green.png',
+    BITS.BLUE: 'board/robot_blue.png',
+}
 
 
 class RobotWidget(Widget):
@@ -38,31 +35,3 @@ class RobotWidget(Widget):
 
     def draw(self, surface):
         surface.blit(self.surface, self.rect)
-
-    def handle_event(self, ev):
-        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):
-                    self.state.gameboard.change_mode(ACT)
-                    return finish_event()
-            if ev.key in KEYS.DOWN:
-                if self.state.player.move(BITS.SOUTH):
-                    self.state.gameboard.change_mode(ACT)
-                    return finish_event()
-            if ev.key in KEYS.LEFT:
-                if self.state.player.move(BITS.WEST):
-                    self.state.gameboard.change_mode(ACT)
-                    return finish_event()
-            if ev.key in KEYS.RIGHT:
-                if self.state.player.move(BITS.EAST):
-                    self.state.gameboard.change_mode(ACT)
-                    return finish_event()
-            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)