X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Frobot.py;h=09fd099f0a258d7d5136d590318512b4f7ca72f9;hb=2a3de29aeb0e924ee03ce864222d7228e02a506e;hp=75082d061395512a96bf4e5bc0a6013363027c6c;hpb=c8c4a15980bf4b49dd307e83d5e2b10a1fe7b28c;p=naja.git diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py index 75082d0..09fd099 100644 --- a/naja/widgets/robot.py +++ b/naja/widgets/robot.py @@ -1,18 +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 -from naja.events import PlayerMoved, 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): @@ -37,28 +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 == ACT: - 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() - return finish_event(events=[PlayerMoved]) - if ev.key in KEYS.DOWN: - if self.state.player.move(BITS.SOUTH): - self.state.gameboard.change_mode() - return finish_event(events=[PlayerMoved]) - if ev.key in KEYS.LEFT: - if self.state.player.move(BITS.WEST): - self.state.gameboard.change_mode() - return finish_event(events=[PlayerMoved]) - if ev.key in KEYS.RIGHT: - if self.state.player.move(BITS.EAST): - self.state.gameboard.change_mode() - return finish_event(events=[PlayerMoved]) - if ev.key in (pgl.K_SPACE,): - self.state.gameboard.change_mode() - return finish_event() - return super(RobotWidget, self).handle_event(ev)