X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=0022b7351868c37efe0d0701c193ecc3a4c75502;hb=3a29cd975cba07c2b0683e2d5449de37de9842f3;hp=85f4bda09e0fbc1fd032f75edfca4444e7a95e38;hpb=3443cae10f8d3e3ff6684034eba9e6a372dd2d52;p=naja.git diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index 85f4bda..0022b73 100644 --- a/naja/widgets/info_area.py +++ b/naja/widgets/info_area.py @@ -5,11 +5,12 @@ import pygame import pygame.locals as pgl from naja.constants import (INFO_SIZE, EIGHT_BIT_SCALE, ACT, KEYS, - EXAMINE) + EXAMINE, PALETTE) from naja.events import finish_event from naja.resources import resources from naja.resources.mutators import EIGHT_BIT from naja.sound import sound +from naja.utils import bit_glyphs from naja.widgets.base import Widget from naja.widgets.tile import BIT_MAP @@ -48,14 +49,20 @@ class InfoAreaWidget(Widget): self.surface.fill((0, 0, 0)) # Extract actions and such from the card title = TextWidget((0, 0), TITLES[self.state.gameboard.player_mode], - colour=(255, 255, 255)) + colour=PALETTE.WHITE) title.render(self.surface) y_offset = title.surface.get_rect().height + 8 # TODO: Make this better. bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0' for bit in reversed(range(8))) - card_bits = TextWidget((0, y_offset), bits_text, colour=(255, 255, 0)) + if self.card.bitwise_operand: + bits_text = '%s %s' % ( + bits_text, bit_glyphs(self.card.bitwise_operand)) + card_bits = TextBoxWidget((0, y_offset), bits_text, + box_width=INFO_SIZE[0], + colour=PALETTE.LIGHT_TURQUOISE, + bg_colour=PALETTE.BLACK) card_bits.render(self.surface) y_offset += card_bits.surface.get_rect().height + 8 @@ -74,22 +81,25 @@ class InfoAreaWidget(Widget): self.surface.blit(hint.surface, (4, y_offset)) def prepare_action(self, choice, action, y_offset): + x_offset = 18 + action_viable = action.check_available(self.state.player) + text_colour = PALETTE.BLACK if action_viable else PALETTE.GREY + text = TextBoxWidget( - (18, y_offset), action.get_text(), + (x_offset, y_offset), action.get_text(), box_width=(INFO_SIZE[0] - 16) // EIGHT_BIT_SCALE, - fontsize=28) + fontsize=28, colour=text_colour) text.render(self.surface) - # self.chosen may be None, in which case we don't draw the border. + + border_colour = None if choice == self.chosen: - if not action.check_available(self.state.player): - colour = (255, 0, 0, 255) - else: - colour = (255, 255, 0, 128) + border_colour = PALETTE.GREEN if action_viable else PALETTE.ORANGE + if border_colour: bottom = y_offset + text.surface.get_rect().height - right = text.surface.get_rect().width + 12 - pygame.draw.lines(self.surface, colour, True, - [(18, y_offset), (right, y_offset), - (right, bottom), (18, bottom)], 4) + right = text.surface.get_rect().width + x_offset + pygame.draw.lines(self.surface, border_colour, True, + [(x_offset, y_offset), (right, y_offset), + (right, bottom), (x_offset, bottom)], 4) if action.required_bits: img_name = BIT_MAP[action.required_bits].replace( '.png', '_small.png') @@ -110,36 +120,49 @@ class InfoAreaWidget(Widget): def draw(self, surface): surface.blit(self.surface, self.pos) + def next_action(self, viable_only=False, step=1): + num_actions = len(self.card.actions) + if num_actions == 0: + return + player = self.state.player + chosen = self.chosen + for i in range(num_actions - 1): + # loop through each action at most once. + chosen = (chosen + step) % num_actions + action = self.card.actions[chosen] + if not viable_only or action.check_available(player): + sound.play_sound('zoop.ogg', volume=0.05) + self.chosen = chosen + + def prev_action(self, viable_only=False): + return self.next_action(viable_only=viable_only, step=-1) + + def try_perform_action(self): + player = self.state.player + action = self.card.actions[self.chosen] + if not action.check_available(player): + sound.play_sound('error.ogg') + else: + sound.play_sound('chirp.ogg', volume=0.5) + action.perform_action(self.state.gameboard, self.card) + self.state.gameboard.replace_card(player.position) + self.state.gameboard.change_mode(EXAMINE) + self.set_position(player.position) + def handle_event(self, ev): if self.state.gameboard.player_mode == EXAMINE: return super(InfoAreaWidget, self).handle_event(ev) if ev.type == pgl.KEYDOWN: if ev.key in KEYS.SELECT: - player = self.state.player - action = self.card.actions[self.chosen] - if not action.check_available(player): - sound.play_sound('error.ogg') - else: - action.perform_action(self.state.gameboard, self.card) - self.state.gameboard.replace_card(player.position) - self.state.gameboard.change_mode(EXAMINE) - self.set_position(player.position) + self.try_perform_action() return finish_event() if ev.key in KEYS.UP: - if self.chosen > 0: - self.chosen -= 1 - sound.play_sound('change_action.ogg') + self.next_action() return finish_event() if ev.key in KEYS.DOWN: - if self.chosen + 1 < len(self.card.actions): - sound.play_sound('change_action.ogg') - self.chosen += 1 + self.prev_action() return finish_event() if ev.key in KEYS.SWITCH: - sound.play_sound('change_action.ogg') - if self.chosen + 1 < len(self.card.actions): - self.chosen += 1 - else: - self.chosen = 0 + self.next_action(viable_only=True) return finish_event() return super(InfoAreaWidget, self).handle_event(ev)