projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly implement player movement.
[naja.git]
/
naja
/
widgets
/
robot.py
diff --git
a/naja/widgets/robot.py
b/naja/widgets/robot.py
index 4506edf6e1e91d66dc89ee1091b83bcbe92c81db..60c3f406ed9b8f08460b8c968e5b56d42e8eb907 100644
(file)
--- a/
naja/widgets/robot.py
+++ b/
naja/widgets/robot.py
@@
-2,8
+2,8
@@
import pygame.locals as pgl
import pygame.locals as pgl
-from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
-from naja.events import InvalidateTheWorld
+from naja.constants import PLAYER_SIZE, BIT_SIZE, TILE_SIZE, BITS
, ACT, KEYS
+from naja.events import InvalidateTheWorld
, PlayerMoved
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.widgets.base import Widget
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.widgets.base import Widget
@@
-18,17
+18,17
@@
IMG_MAP = {
class RobotWidget(Widget):
"""Widget which holds a tile on the game board."""
def __init__(self, state):
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
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',
self.state.player.position[1] * TILE_SIZE[1] + BIT_SIZE[1])
self.surface = resources.get_image('board/robot.png',
- transforms=(EIGHT_BIT,))
+ transforms=(EIGHT_BIT,))
.copy()
for bit, img_name in IMG_MAP.iteritems():
if self.state.player.bits.check_bit(bit):
bit_img = resources.get_image(img_name,
for bit, img_name in IMG_MAP.iteritems():
if self.state.player.bits.check_bit(bit):
bit_img = resources.get_image(img_name,
@@
-39,21
+39,35
@@
class RobotWidget(Widget):
surface.blit(self.surface, self.rect)
def handle_event(self, ev):
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.type == pgl.KEYDOWN:
- if ev.key in
(pgl.K_UP, pgl.K_w)
:
+ if ev.key in
KEYS.UP
:
if self.state.player.move(BITS.NORTH):
if self.state.player.move(BITS.NORTH):
+ self.state.gameboard.change_mode()
+ PlayerMoved.post()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_DOWN, pgl.K_s)
:
+ if ev.key in
KEYS.DOWN
:
if self.state.player.move(BITS.SOUTH):
if self.state.player.move(BITS.SOUTH):
+ self.state.gameboard.change_mode()
+ PlayerMoved.post()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_LEFT, pgl.K_a)
:
+ if ev.key in
KEYS.LEFT
:
if self.state.player.move(BITS.WEST):
if self.state.player.move(BITS.WEST):
+ self.state.gameboard.change_mode()
+ PlayerMoved.post()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_RIGHT, pgl.K_d)
:
+ if ev.key in
KEYS.RIGHT
:
if self.state.player.move(BITS.EAST):
if self.state.player.move(BITS.EAST):
+ self.state.gameboard.change_mode()
+ PlayerMoved.post()
InvalidateTheWorld.post()
return True
InvalidateTheWorld.post()
return True
- super(RobotWidget, self).handle_event(ev)
+ if ev.key in (pgl.K_SPACE,):
+ self.state.gameboard.change_mode()
+ InvalidateTheWorld.post()
+ return True
+ return super(RobotWidget, self).handle_event(ev)