projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better menus, no default game.
[naja.git]
/
naja
/
widgets
/
board.py
diff --git
a/naja/widgets/board.py
b/naja/widgets/board.py
index aa608cef8673c8a4df1b19739b471bbf064c4d25..b168c6b35ec3a706ad279285a9a99bf6daa65eea 100644
(file)
--- a/
naja/widgets/board.py
+++ b/
naja/widgets/board.py
@@
-3,8
+3,9
@@
Widget that holds the game tiles.
"""
import pygame.locals as pgl
"""
import pygame.locals as pgl
-from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS,
MOVE,
ACT
+from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, ACT
from naja.events import finish_event
from naja.events import finish_event
+from naja.sound import sound
from naja.widgets.base import Widget
from naja.widgets.tile import TileWidget
from naja.widgets.base import Widget
from naja.widgets.tile import TileWidget
@@
-18,8
+19,9
@@
class BoardWidget(Widget):
super(BoardWidget, self).__init__(pos, BOARD_SIZE)
self.info = info
self.state = state
super(BoardWidget, self).__init__(pos, BOARD_SIZE)
self.info = info
self.state = state
- self.pos = (2, 2)
+ self.
card_
pos = (2, 2)
self._tiles = []
self._tiles = []
+ self.legal = False
for y in range(0, 5):
for x in range(0, 5):
tile_pos = (pos[0] + x * TILE_SIZE[0],
for y in range(0, 5):
for x in range(0, 5):
tile_pos = (pos[0] + x * TILE_SIZE[0],
@@
-28,42
+30,61
@@
class BoardWidget(Widget):
def prepare(self):
for tile in self._tiles:
def prepare(self):
for tile in self._tiles:
- tile.set_highlight(self.pos)
+ tile.set_highlight(self.
card_
pos)
tile.prepare()
self.size = BOARD_SIZE
tile.prepare()
self.size = BOARD_SIZE
- if self.state.gameboard.player_mode
in (ACT, MOVE)
:
- self.pos = self.state.player.position
+ if self.state.gameboard.player_mode
== ACT
:
+ self.
card_
pos = self.state.player.position
def draw(self, surface):
for tile in self._tiles:
tile.draw(surface)
def draw(self, surface):
for tile in self._tiles:
tile.draw(surface)
+ def update_card_pos(self, card_pos):
+ self.card_pos = card_pos
+ self.info.set_position(self.card_pos)
+ self.legal = self.card_pos in self.state.player.legal_moves()
+ sound.play_sound('zoop.ogg', volume=0.05)
+
def change_pos(self, offset):
def change_pos(self, offset):
- tpos = (offset[0] + self.
pos[0], offset[1] + self.
pos[1])
+ tpos = (offset[0] + self.
card_pos[0], offset[1] + self.card_
pos[1])
if tpos[0] < 0 or tpos[1] < 0 or tpos[0] > 4 or tpos[1] > 4:
return False
if tpos[0] < 0 or tpos[1] < 0 or tpos[0] > 4 or tpos[1] > 4:
return False
- self.pos = tpos
- self.info.set_position(self.pos)
+ self.update_card_pos(tpos)
return True
return True
+ def next_viable_pos(self):
+ moves = self.state.player.legal_moves()
+ try:
+ idx = moves.index(self.card_pos)
+ idx = (idx + 1) % len(moves)
+ except ValueError:
+ idx = 0
+ self.update_card_pos(moves[idx])
+
def handle_event(self, ev):
def handle_event(self, ev):
- if self.state.gameboard.player_mode
in (ACT, MOVE)
:
+ if self.state.gameboard.player_mode
== ACT
:
return super(BoardWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if ev.key in KEYS.UP:
if self.change_pos((0, -1)):
return finish_event()
return super(BoardWidget, self).handle_event(ev)
if ev.type == pgl.KEYDOWN:
if ev.key in KEYS.UP:
if self.change_pos((0, -1)):
return finish_event()
- if ev.key in KEYS.DOWN:
+
el
if ev.key in KEYS.DOWN:
if self.change_pos((0, +1)):
return finish_event()
if self.change_pos((0, +1)):
return finish_event()
- if ev.key in KEYS.LEFT:
+
el
if ev.key in KEYS.LEFT:
if self.change_pos((-1, 0)):
return finish_event()
if self.change_pos((-1, 0)):
return finish_event()
- if ev.key in KEYS.RIGHT:
+
el
if ev.key in KEYS.RIGHT:
if self.change_pos((+1, 0)):
return finish_event()
if self.change_pos((+1, 0)):
return finish_event()
- if ev.key in KEYS.SWITCH:
- self.state.gameboard.change_mode(MOVE)
- self.info.set_position(self.state.player.position)
+ elif ev.key in KEYS.SWITCH:
+ self.next_viable_pos()
return finish_event()
return finish_event()
+ elif ev.key in KEYS.SELECT:
+ if self.state.player.set_position(self.card_pos):
+ self.state.gameboard.change_mode(ACT)
+ self.info.set_position(self.card_pos)
+ sound.play_sound('chirp.ogg', volume=0.5)
+ return finish_event()
return super(BoardWidget, self).handle_event(ev)
return super(BoardWidget, self).handle_event(ev)