X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=06a0f78a3baaceca3047c8e40af29f38b07b46ef;hb=db2d56a0ea2ac661367084276a74ff45ca247520;hp=9e8fe8508056dae9bc61a4e93ccd547c772514d9;hpb=35a06a04c73ef08e058ffa957feda63a705fa96a;p=naja.git diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py index 9e8fe85..06a0f78 100644 --- a/naja/widgets/tile.py +++ b/naja/widgets/tile.py @@ -94,10 +94,12 @@ class TileWidget(Widget): self.surface.blit(img, (TILE_SIZE[0] - 20, 0)) def _prepare_lock(self, action, y_offset): - if action.required_bits not in BIT_MAP: + required_keys = action.required_bits & frozenset([ + BITS.RED, BITS.GREEN, BITS.BLUE]) + if required_keys not in BIT_MAP: return 4 - img_name = BIT_MAP[action.required_bits] + img_name = BIT_MAP[required_keys] if self.board_pos != self.state.player.position: x_offset = 0 @@ -111,8 +113,18 @@ class TileWidget(Widget): y_offset += LOCK_HEIGHT - SMALL_LOCK_HEIGHT - 2 img = resources.get_image(img_name, transforms=(EIGHT_BIT,)) + img_rect = img.get_rect() self.surface.blit(img, (x_offset, y_offset)) - return x_offset + img.get_width() + 2 + + 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, (x_offset + img_rect.width - msb_rect.width, y_offset) + ) + + return x_offset + img_rect.width + 2 def _prepare_action(self, action, y_offset): x_offset = self._prepare_lock(action, y_offset)