From 0c5003d45e57223eca4a995952517648a9baa465 Mon Sep 17 00:00:00 2001 From: Jeremy Thurgood Date: Fri, 16 May 2014 12:00:54 +0200 Subject: [PATCH] Use location bit glyphs in action text. --- naja/actions.py | 17 ++++++++++++----- naja/widgets/info_area.py | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/naja/actions.py b/naja/actions.py index 0c6a811..34c84f6 100644 --- a/naja/actions.py +++ b/naja/actions.py @@ -1,4 +1,5 @@ from naja.constants import BITS, CHESS_PIECES +from naja.utils import bit_glyphs class LocationAction(object): @@ -13,7 +14,7 @@ class LocationAction(object): self.required_bits = required_bits self.data = data - def get_text(self): + def get_text(self, location=None): substitutions = self.data.copy() if 'direction' in self.data: @@ -27,6 +28,12 @@ class LocationAction(object): if 'chesspiece' in self.data: substitutions['chesspiece_name'] = self.data['chesspiece'].lower() + if location is None: + substitutions['location_bits'] = 'bits specified by this location' + else: + substitutions['location_bits'] = bit_glyphs( + location.bitwise_operand) + return self.TEXT % substitutions def check_available(self, player): @@ -66,21 +73,21 @@ class LoseHealthOrMSB(LocationAction): class SetBits(LocationAction): - TEXT = "Set bits specified by this location." + TEXT = "Set %(location_bits)s." def perform_action(self, board, location): board.player.bits.set_bits(location.bitwise_operand) class ToggleBits(LocationAction): - TEXT = "Toggle bits specified by this location." + TEXT = "Toggle %(location_bits)s." def perform_action(self, board, location): board.player.bits.toggle_bits(location.bitwise_operand) class LoseHealthOrMSBAndSetBits(LocationAction): - TEXT = "Lose HEALTH or MSB, then set bits specified by this location." + TEXT = "Lose HEALTH or MSB, then set %(location_bits)s." USES_MSB = True def perform_action(self, board, location): @@ -100,7 +107,7 @@ class AcquireWinToken(LocationAction): class GainHealthAndClearBitsOrMSB(LocationAction): - TEXT = "Gain HEALTH, then clear bits specified by this location or MSB." + TEXT = "Gain HEALTH, then clear %(location_bits)s or MSB." USES_MSB = True def perform_action(self, board, location): diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index 0022b73..2f75a63 100644 --- a/naja/widgets/info_area.py +++ b/naja/widgets/info_area.py @@ -86,7 +86,7 @@ class InfoAreaWidget(Widget): text_colour = PALETTE.BLACK if action_viable else PALETTE.GREY text = TextBoxWidget( - (x_offset, y_offset), action.get_text(), + (x_offset, y_offset), action.get_text(self.card), box_width=(INFO_SIZE[0] - 16) // EIGHT_BIT_SCALE, fontsize=28, colour=text_colour) text.render(self.surface) -- 2.34.1