projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://ctpug.org.za/naja
[naja.git]
/
naja
/
widgets
/
info_area.py
diff --git
a/naja/widgets/info_area.py
b/naja/widgets/info_area.py
index 453e379d1be743a52891a565e9ae4442bc72b77a..1ff6bbbd92168e52ec12c4a489cf6f54638f95a7 100644
(file)
--- a/
naja/widgets/info_area.py
+++ b/
naja/widgets/info_area.py
@@
-17,6
+17,7
@@
from naja.utils import bit_glyphs
from naja.widgets.base import Widget
from naja.widgets.tile import BIT_MAP
from naja.widgets.text import TextBoxWidget, TextWidget
from naja.widgets.base import Widget
from naja.widgets.tile import BIT_MAP
from naja.widgets.text import TextBoxWidget, TextWidget
+from naja import constants
HINTS = {
HINTS = {
@@
-43,6
+44,8
@@
class InfoAreaWidget(Widget):
self.chosen = None
self.card_position = state.player.position
self.set_position(state.player.position)
self.chosen = None
self.card_position = state.player.position
self.set_position(state.player.position)
+ self.flash_count = 0
+ self.flash_light = True
def prepare(self):
if self.state.gameboard.player_mode == ACT:
def prepare(self):
if self.state.gameboard.player_mode == ACT:
@@
-113,7
+116,7
@@
class InfoAreaWidget(Widget):
def prepare_action(self, choice, action, y_offset, box_width):
x_offset = INFO_LEFT_PADDING
def prepare_action(self, choice, action, y_offset, box_width):
x_offset = INFO_LEFT_PADDING
- glyphs_x_offset =
0
+ glyphs_x_offset =
2
glyphs_y_offset = y_offset
y_offset += ACTION_TEXT_OFFSET
action_viable = action.check_available(self.state.player)
glyphs_y_offset = y_offset
y_offset += ACTION_TEXT_OFFSET
action_viable = action.check_available(self.state.player)
@@
-128,7
+131,13
@@
class InfoAreaWidget(Widget):
border_colour = None
if choice == self.chosen:
border_colour = None
if choice == self.chosen:
- border_colour = PALETTE.GREEN if action_viable else PALETTE.ORANGE
+ if self.flash_light:
+ border_colour = (PALETTE.GREEN if action_viable else
+ PALETTE.ORANGE)
+ else:
+ border_colour = (PALETTE.DARK_GREEN if action_viable else
+ PALETTE.DARK_RED)
+
if border_colour:
bottom = y_offset + text.surface.get_rect().height
right = text.surface.get_rect().width + x_offset
if border_colour:
bottom = y_offset + text.surface.get_rect().height
right = text.surface.get_rect().width + x_offset
@@
-179,6
+188,11
@@
class InfoAreaWidget(Widget):
self.chosen = None
def draw(self, surface):
self.chosen = None
def draw(self, surface):
+ self.flash_count += 1
+ if self.flash_count >= (constants.FPS // 2):
+ self.flash_light = not self.flash_light
+ self.flash_count = 0
+ self.prepare()
surface.blit(self.surface, self.pos)
def next_action(self, viable_only=False, step=1):
surface.blit(self.surface, self.pos)
def next_action(self, viable_only=False, step=1):