Factor out flash light into utils.

[naja.git] / naja / widgets / game_bits.py

diff --git a/naja/widgets/game_bits.py b/naja/widgets/game_bits.py
index 973c2b80f20abd80f524d002554b173995977088..a78863c6804de118d4796d0e42976d606c7388a3 100644 (file)
--- a/naja/widgets/game_bits.py
+++ b/naja/widgets/game_bits.py
@@ -8,6 +8,7 @@ from naja.constants import BIT_SIZE
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.widgets.base import Widget
+from naja.widgets.text import TextWidget
 
 
 class GameBitsWidget(Widget):
@@ -20,20 +21,34 @@ class GameBitsWidget(Widget):
 
     def prepare(self):
         self.surface = pygame.Surface(BIT_SIZE)
+
+        size = BIT_SIZE[1]
+
+        zero = TextWidget((0, 0), '0', fontsize=24, colour='white')
+        one = TextWidget((0, 0), '1', fontsize=24, colour='white')
+        zero.prepare()
+        zero.pos = (0, (size - zero.size[1]))
+        one.pos = zero.pos
+
         health = self.state.gameboard.health
+        max_health = self.state.gameboard.max_health
         wins = self.state.gameboard.wins
+        wins_required = self.state.gameboard.wins_required
 
         bits = []
-        bits.extend(
-            (i < health, 'health', (EIGHT_BIT,)) for i in range(4))
-        bits.extend(
-            (i < wins, 'win', (EIGHT_BIT,)) for i in range(4))
+        bits.extend((i < health, 'health') for i in range(max_health))
+        bits.extend((i < wins, 'win') for i in range(wins_required))
 
-        for pos, (is_set, image, transforms) in enumerate(bits):
+        for pos, (is_set, image) in enumerate(bits):
             img = resources.get_image(
                 'bits', '%s_%s.png' % (image, 'on' if is_set else 'off'),
-                transforms=transforms)
+                transforms=(EIGHT_BIT,))
             self.surface.blit(img, (img.get_width() * pos, 0))
+            if is_set:
+                one.render(self.surface)
+            else:
+                zero.render(self.surface)
+            one.pos = zero.pos = (zero.pos[0] + size, zero.pos[1])
 
     def draw(self, surface):
         surface.blit(self.surface, self.pos)