projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
One. Extra. Line!
[naja.git]
/
naja
/
widgets
/
board.py
diff --git
a/naja/widgets/board.py
b/naja/widgets/board.py
index f9bb80c189cb32baa1bf4f8296707db38c871909..e6eafa5e8a429468f39fcfe51b70927b68ef0160 100644
(file)
--- a/
naja/widgets/board.py
+++ b/
naja/widgets/board.py
@@
-3,11
+3,13
@@
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, ACT
+from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, ACT
, FPS
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
+from naja.utils import Flashlight
class BoardWidget(Widget):
class BoardWidget(Widget):
@@
-18,9
+20,10
@@
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.card_pos =
(2, 2)
+ self.card_pos =
state.player.position
self._tiles = []
self.legal = False
self._tiles = []
self.legal = False
+ self.flash_light = Flashlight(FPS // 2)
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],
@@
-29,13
+32,15
@@
class BoardWidget(Widget):
def prepare(self):
for tile in self._tiles:
def prepare(self):
for tile in self._tiles:
- tile.set_highlight(self.card_pos)
+ tile.set_highlight(self.card_pos
, self.flash_light.on
)
tile.prepare()
self.size = BOARD_SIZE
if self.state.gameboard.player_mode == ACT:
self.card_pos = self.state.player.position
def draw(self, surface):
tile.prepare()
self.size = BOARD_SIZE
if self.state.gameboard.player_mode == ACT:
self.card_pos = self.state.player.position
def draw(self, surface):
+ if self.flash_light.tick():
+ self.prepare()
for tile in self._tiles:
tile.draw(surface)
for tile in self._tiles:
tile.draw(surface)
@@
-43,6
+48,7
@@
class BoardWidget(Widget):
self.card_pos = card_pos
self.info.set_position(self.card_pos)
self.legal = self.card_pos in self.state.player.legal_moves()
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):
tpos = (offset[0] + self.card_pos[0], offset[1] + self.card_pos[1])
def change_pos(self, offset):
tpos = (offset[0] + self.card_pos[0], offset[1] + self.card_pos[1])
@@
-60,6
+66,10
@@
class BoardWidget(Widget):
idx = 0
self.update_card_pos(moves[idx])
idx = 0
self.update_card_pos(moves[idx])
+ def force_skip_animation(self):
+ for tile in self._tiles:
+ tile.animation = 0
+
def handle_event(self, ev):
if self.state.gameboard.player_mode == ACT:
return super(BoardWidget, self).handle_event(ev)
def handle_event(self, ev):
if self.state.gameboard.player_mode == ACT:
return super(BoardWidget, self).handle_event(ev)
@@
-83,5
+93,6
@@
class BoardWidget(Widget):
if self.state.player.set_position(self.card_pos):
self.state.gameboard.change_mode(ACT)
self.info.set_position(self.card_pos)
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 finish_event()
return super(BoardWidget, self).handle_event(ev)