X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=5697b1996c7b4bf146385e4b3d40397e09d022fd;hb=a1c561e26fae79ce8a9570c9404975a8a0367d65;hp=34bbec746df01e9756ae092e31d1a9811922b96c;hpb=35a06a04c73ef08e058ffa957feda63a705fa96a;p=naja.git diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index 34bbec7..5697b19 100644 --- a/naja/widgets/info_area.py +++ b/naja/widgets/info_area.py @@ -7,7 +7,7 @@ import pygame.locals as pgl from naja.constants import ( INFO_SIZE, ACT, KEYS, EXAMINE, PALETTE, ACTION_TEXT_OFFSET, INFO_LEFT_PADDING, - INFO_RIGHT_PADDING, BIT_SIZE) + INFO_RIGHT_PADDING, BIT_SIZE, BITS) from naja.events import finish_event from naja.resources import resources from naja.resources.mutators import EIGHT_BIT, blender @@ -20,12 +20,12 @@ from naja.widgets.text import TextBoxWidget, TextWidget HINTS = { - ACT: ("Choose an action using the Up/Down keys.\n" - "Press Return to execute the action."), - EXAMINE: "Select a tile to examine using the arrow keys.", + ACT: "Choose an action using {NORTH,SOUTH} keys.\n" + "Press {RETURN} to execute it.", + EXAMINE: "Browse the tiles with {NORTH,SOUTH,EAST,WEST} keys.", } -HINT_LEGAL_MOVE = "\nPress Return to move to this tile." +HINT_LEGAL_MOVE = "\nPress {RETURN} to move to this tile." TITLES = { ACT: "Choose an Action", @@ -138,8 +138,10 @@ class InfoAreaWidget(Widget): [(x_offset, y_offset), (right, y_offset), (right, bottom), (x_offset, bottom)], 4) - if action.required_bits in BIT_MAP: - img_name = BIT_MAP[action.required_bits].replace( + required_keys = action.required_bits & frozenset([ + BITS.RED, BITS.GREEN, BITS.BLUE]) + if required_keys in BIT_MAP: + img_name = BIT_MAP[required_keys].replace( '.png', '_small.png') img = resources.get_image(img_name, transforms=(EIGHT_BIT,)) @@ -148,6 +150,14 @@ class InfoAreaWidget(Widget): else: glyphs_x_offset = INFO_LEFT_PADDING + if BITS.MSB in action.required_bits: + msb = resources.get_image('board/msb_lock_decoration.png', + transforms=(EIGHT_BIT,)) + msb_rect = msb.get_rect() + self.surface.blit( + msb, (glyphs_x_offset - msb_rect.width - 4, glyphs_y_offset) + ) + for glyph in action.get_glyphs(): img = resources.get_image( glyph, transforms=(EIGHT_BIT, blender(PALETTE.GREY)))