X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Frobot.py;h=09fd099f0a258d7d5136d590318512b4f7ca72f9;hb=ea9ef7135b38cb5256c0700f5a0ab023d6378831;hp=ddad5808547469f023348bd38dcdd8b0050d5d37;hpb=4703c51496baf975ee4bff9465b4ed26950688d5;p=naja.git diff --git a/naja/widgets/robot.py b/naja/widgets/robot.py index ddad580..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 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() - if ev.key in KEYS.DOWN: - if self.state.player.move(BITS.SOUTH): - self.state.gameboard.change_mode() - return finish_event() - if ev.key in KEYS.LEFT: - if self.state.player.move(BITS.WEST): - self.state.gameboard.change_mode() - return finish_event() - if ev.key in KEYS.RIGHT: - if self.state.player.move(BITS.EAST): - self.state.gameboard.change_mode() - return finish_event() - if ev.key in (pgl.K_SPACE,): - self.state.gameboard.change_mode() - return finish_event() - return super(RobotWidget, self).handle_event(ev)