X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fboard.py;h=ac0ec886af225061790d75cb22fd4b2d5509b645;hb=a493894e2df2717c113687acf8f259cf6ee6e436;hp=32fb5af8c52a3849e110c55a9eb90a5ee9caa24c;hpb=be088f5c8929a0036806a3f533ffe345b9ad7159;p=naja.git

diff --git a/naja/widgets/board.py b/naja/widgets/board.py
index 32fb5af..ac0ec88 100644
--- a/naja/widgets/board.py
+++ b/naja/widgets/board.py
@@ -3,12 +3,13 @@ Widget that holds the game tiles.
 """
 import pygame.locals as pgl
 
-from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, ACT
-from naja.events import finish_event
+from naja.constants import BOARD_SIZE, TILE_SIZE, KEYS, FPS
+from naja.events import InvalidateTheWorld, finish_event
 from naja.sound import sound
 
 from naja.widgets.base import Widget
 from naja.widgets.tile import TileWidget
+from naja.utils import Flashlight
 
 
 class BoardWidget(Widget):
@@ -22,6 +23,7 @@ class BoardWidget(Widget):
         self.card_pos = state.player.position
         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],
@@ -30,20 +32,20 @@ class BoardWidget(Widget):
 
     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):
+        if self.flash_light.tick():
+            self.prepare()
         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()
+        self.info.set_position(self.card_pos, legal=self.legal)
         sound.play_sound('zoop.ogg', volume=0.05)
 
     def change_pos(self, offset):
@@ -62,9 +64,13 @@ class BoardWidget(Widget):
             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)
+        if InvalidateTheWorld.matches(ev):
+            self.flash_light.reset()
         if ev.type == pgl.KEYDOWN:
             if ev.key in KEYS.UP:
                 if self.change_pos((0, -1)):
@@ -78,13 +84,4 @@ class BoardWidget(Widget):
             elif ev.key in KEYS.RIGHT:
                 if self.change_pos((+1, 0)):
                     return finish_event()
-            elif ev.key in KEYS.SWITCH:
-                self.next_viable_pos()
-                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)