X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=c46c93da04a4b378e6a0739440034af3aa981915;hb=72a347097e53a92bedda692da7cdb34f8b370437;hp=1ba34d0b27ed235748b0426359faf50d4a2bc217;hpb=4703c51496baf975ee4bff9465b4ed26950688d5;p=naja.git

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 1ba34d0..c46c93d 100644
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -44,28 +44,16 @@ class InfoAreaWidget(Widget):
                            colour=(255, 255, 255))
         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))
+        card_bits.render(self.surface)
+        y_offset += card_bits.surface.get_rect().height + 8
+
         for choice, action in enumerate(self.card.actions):
-            if action.required_bits:
-                img_name = BIT_MAP[action.required_bits].replace(
-                    '.png', '_small.png')
-                img = resources.get_image(img_name,
-                                          transforms=(EIGHT_BIT,))
-                self.surface.blit(img, (0, y_offset))
-                y_offset += 8
-            text = TextBoxWidget(
-                (12, y_offset), action.TEXT,
-                box_width=(INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE,
-                fontsize=28)
-            text.render(self.surface)
-            # self.chosen may be None, in which case we don't draw the border.
-            if choice == self.chosen:
-                colour = (255, 255, 0, 128)
-                bottom = y_offset + text.surface.get_rect().height
-                right = text.surface.get_rect().width + 12
-                pygame.draw.lines(self.surface, colour, True,
-                                  [(12, y_offset), (right, y_offset),
-                                   (right, bottom), (12, bottom)], 4)
-            y_offset += text.surface.get_rect().height + 16
+            y_offset = self.prepare_action(choice, action, y_offset)
         # We cheat horribly for layout reasons
         hint = TextBoxWidget((0, 0), HINTS[self.state.gameboard.player_mode],
                              box_width=INFO_SIZE[0] // EIGHT_BIT_SCALE)
@@ -73,6 +61,30 @@ class InfoAreaWidget(Widget):
         y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
         self.surface.blit(hint.surface, (0, y_offset))
 
+    def prepare_action(self, choice, action, y_offset):
+        if action.required_bits:
+            img_name = BIT_MAP[action.required_bits].replace(
+                '.png', '_small.png')
+            img = resources.get_image(img_name,
+                                      transforms=(EIGHT_BIT,))
+            self.surface.blit(img, (0, y_offset))
+            y_offset += 8
+        text = TextBoxWidget(
+            (12, y_offset), action.TEXT,
+            box_width=(INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE,
+            fontsize=28)
+        text.render(self.surface)
+
+        # self.chosen may be None, in which case we don't draw the border.
+        if choice == self.chosen:
+            colour = (255, 255, 0, 128)
+            bottom = y_offset + text.surface.get_rect().height
+            right = text.surface.get_rect().width + 12
+            pygame.draw.lines(self.surface, colour, True,
+                              [(12, y_offset), (right, y_offset),
+                               (right, bottom), (12, bottom)], 4)
+        return y_offset + text.surface.get_rect().height + 16
+
     def set_position(self, position):
         self.card = self.state.board_locations[position]
         if self.state.gameboard.player_mode == ACT: