From: Neil <neil@dip.sun.ac.za>
Date: Sat, 10 Sep 2016 14:50:45 +0000 (+0200)
Subject: Rename info bar from toolbar to infobar. Add target number to infobar. Tweak rendering
X-Git-Tag: tabakrolletjie-v1.0.0~87
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=bc34cd3ce9b75c6215604049b8882bdf79867cb9;p=tabakrolletjie.git

Rename info bar from toolbar to infobar. Add target number to infobar. Tweak rendering
---

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index f426565..5ba3881 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -29,7 +29,7 @@ class DayScene(BaseScene):
 
     def enter(self, gamestate):
         self._space = pymunk.Space()
-        self._toolbar_font = loader.load_font(FONTS['sans'], size=20)
+        self._infobar_font = loader.load_font(FONTS['sans'], size=20)
         self._obstacles = ObstacleManager(self._space, gamestate)
         self._lights = LightManager(self._space, gamestate)
         self._battery = BatteryManager(gamestate)
@@ -45,7 +45,7 @@ class DayScene(BaseScene):
         # Tools
         self._light_toolbar = []
         self._tools = self.create_tools(gamestate)
-        self._update_toolbar(gamestate)
+        self._update_infobar(gamestate)
         # Background
         self._soil = loader.load_image(
             "textures", "soil.png", transform=self.BRIGHTNESS)
@@ -144,7 +144,7 @@ class DayScene(BaseScene):
         self._lights.render_light(surface)
         self._obstacles.render(surface)
         self._lights.render_fittings(surface)
-        surface.blit(self._toolbar, (120, 10), None)
+        surface.blit(self._infobar, (120, 10), None)
         for tool in self._tools:
             tool.render(surface)
         for light_tool in self._light_toolbar:
@@ -183,7 +183,7 @@ class DayScene(BaseScene):
                 turnip = Turnip(age=0, pos=pos, space=self._space)
                 self._turnips.append(turnip)
                 self._seeds -= 1
-                self._update_toolbar(gamestate)
+                self._update_infobar(gamestate)
             except TurnipInvalidPosition:
                 # TODO: Add error sound or something
                 pass
@@ -213,7 +213,7 @@ class DayScene(BaseScene):
             if self._lights.nearest(pos, max_distance=25):
                 return
             self._seeds -= cost
-            self._update_toolbar(gamestate)
+            self._update_infobar(gamestate)
             cfg["position"] = pos
             cfg["colours"] = colours
             gamestate.station["lights"].append(cfg)
@@ -302,9 +302,17 @@ class DayScene(BaseScene):
         if not self._paused:
             self._lights.tick()
 
-    def _update_toolbar(self, gamestate):
-        text = ("Day: %d: Turnip Stocks: Seeds: %d. Planted: %d. "
-                "Harvested: %d. Destroyed: %d" %
-                (gamestate.days, self._seeds, len(self._turnips),
-                 self._harvested, gamestate.eaten))
-        self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))
+    def _update_infobar(self, gamestate):
+        line1 = ("Day %d: Goal: %d Turnips. Turnips harvested: %d" %
+                 (gamestate.days, gamestate.get_target(), self._harvested))
+        line1_img = self._infobar_font.render(line1, True, (255, 255, 255))
+        line2 = ("Turnip Stocks: Seeds: %s. Planted: %d" %
+                 (self._seeds, len(self._turnips)))
+        line2_img = self._infobar_font.render(line2, True, (255, 255, 255))
+        width = max(line1_img.get_width(), line2_img.get_width()) + 10
+        height = line1_img.get_height() + line2_img.get_height() + 10
+        self._infobar = pygame.surface.Surface(
+            (width, height), pgl.SWSURFACE).convert_alpha()
+        self._infobar.fill((0, 0, 0, 64))
+        self._infobar.blit(line1_img, (5, 3), None)
+        self._infobar.blit(line2_img, (5, 8 + line1_img.get_height()), None)