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
/
info_area.py
diff --git
a/naja/widgets/info_area.py
b/naja/widgets/info_area.py
index 40bc75b662a758920a1ccc7855b12cd8571b0aae..a2956a0d139a4d1d1cd369fed03cccddf6769228 100644
(file)
--- a/
naja/widgets/info_area.py
+++ b/
naja/widgets/info_area.py
@@
-4,8
+4,8
@@
Widget for the game board information area.
import pygame
import pygame.locals as pgl
import pygame
import pygame.locals as pgl
-from naja.constants import INFO_SIZE, EIGHT_BIT_SCALE, MOVE, ACT
-from naja.events import InvalidateTheWorld
+from naja.constants import INFO_SIZE, EIGHT_BIT_SCALE, MOVE, ACT
, KEYS
+from naja.events import InvalidateTheWorld
, PlayerMoved
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT
@@
-32,15
+32,12
@@
class InfoAreaWidget(Widget):
"""
def __init__(self, pos, state):
super(InfoAreaWidget, self).__init__(pos, INFO_SIZE)
"""
def __init__(self, pos, state):
super(InfoAreaWidget, self).__init__(pos, INFO_SIZE)
- self.card = None
self.state = state
self.state = state
- self.
chosen = 0
+ self.
set_position(state.player.position)
def prepare(self):
self.surface = pygame.surface.Surface(INFO_SIZE)
self.surface.fill((0, 0, 0))
def prepare(self):
self.surface = pygame.surface.Surface(INFO_SIZE)
self.surface.fill((0, 0, 0))
- # Quick hack for testing
- self.card = self.state.board_locations[self.state.player.position]
# Extract actions and such from the card
title = TextWidget((0, 0), TITLES[self.state.gameboard.player_mode],
colour=(255, 255, 255))
# Extract actions and such from the card
title = TextWidget((0, 0), TITLES[self.state.gameboard.player_mode],
colour=(255, 255, 255))
@@
-72,17
+69,22
@@
class InfoAreaWidget(Widget):
y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
self.surface.blit(hint.surface, (0, y_offset))
y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
self.surface.blit(hint.surface, (0, y_offset))
- def set_card(self, card):
- self.card = card
+ def set_position(self, position):
+ self.card = self.state.board_locations[position]
+ self.chosen = 0
def draw(self, surface):
surface.blit(self.surface, self.pos)
def handle_event(self, ev):
def draw(self, surface):
surface.blit(self.surface, self.pos)
def handle_event(self, ev):
+ if PlayerMoved.matches(ev):
+ self.set_position(self.state.player.position)
+ return False
+
if self.state.gameboard.player_mode == MOVE:
return super(InfoAreaWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if self.state.gameboard.player_mode == MOVE:
return super(InfoAreaWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
- if ev.key in
(pgl.K_RETURN, pgl.K_KP_ENTER)
:
+ if ev.key in
KEYS.SELECT
:
action = self.card.actions[self.chosen]
if not action.check_available(self.state.gameboard.player):
print "BEEP!"
action = self.card.actions[self.chosen]
if not action.check_available(self.state.gameboard.player):
print "BEEP!"
@@
-91,12
+93,12
@@
class InfoAreaWidget(Widget):
self.state.gameboard.change_mode()
InvalidateTheWorld.post()
return True
self.state.gameboard.change_mode()
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_UP, pgl.K_w, pgl.K_COMMA)
:
+ if ev.key in
KEYS.UP
:
if self.chosen > 0:
self.chosen -= 1
InvalidateTheWorld.post()
return True
if self.chosen > 0:
self.chosen -= 1
InvalidateTheWorld.post()
return True
- if ev.key in
(pgl.K_DOWN, pgl.K_s, pgl.K_o)
:
+ if ev.key in
KEYS.DOWN
:
if self.chosen + 1 < len(self.card.actions):
self.chosen += 1
InvalidateTheWorld.post()
if self.chosen + 1 < len(self.card.actions):
self.chosen += 1
InvalidateTheWorld.post()