X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=8d39c2b2d72f34d4e5c16aa9745a459ba8b66328;hb=7c0eb5c9435ada37f7855170049ba6cccad2d172;hp=017675432ce71828a012c7e015cd1f10c6125978;hpb=b4d0997da0f17f5277c473a2d2ca708573181295;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 0176754..8d39c2b 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,16 +45,18 @@ 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)
         # Check if we've lost
         self._game_over_text = []
         if self._seeds == 0 and len(self._turnips) == 0:
-            self._draw_game_over_text()
+            self._draw_you_lose()
+        elif self._harvested >= gamestate.get_target():
+            self._draw_you_win()
 
-    def _draw_game_over_text(self):
+    def _draw_you_lose(self):
         overlay = pygame.surface.Surface(
             (SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha()
         overlay.fill((0, 0, 0, 128))
@@ -63,10 +65,26 @@ class DayScene(BaseScene):
             (shadowed_text("You Lost", FONTS["bold"], 48), (400, 280)))
         self._game_over_text.append(
             (shadowed_text("You have no seeds and no turnips growing",
-                           FONTS["sans"], 24), (250, 350)))
+                           FONTS["sans"], 24), (300, 350)))
         self._game_over_text.append(
             (shadowed_text("Press a key to return to the menu",
-                           FONTS["sans"], 24), (250, 400)))
+                           FONTS["sans"], 24), (350, 400)))
+
+    def _draw_you_win(self):
+        overlay = pygame.surface.Surface(
+            (SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha()
+        overlay.fill((0, 0, 0, 128))
+        self._game_over_text.append((overlay, (0, 250)))
+        self._game_over_text.append(
+            (shadowed_text("You Win", FONTS["bold"], 48), (400, 280)))
+        self._game_over_text.append(
+            (shadowed_text(
+                "You have Successfully Harvested %d turnips" % self._harvested,
+                FONTS["sans"], 24),
+             (300, 350)))
+        self._game_over_text.append(
+            (shadowed_text("Press a key to return to the menu",
+                           FONTS["sans"], 24), (350, 400)))
 
     def grow_turnips(self, gamestate):
         for turnip_data in gamestate.turnips:
@@ -126,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, (50, 10), None)
         for tool in self._tools:
             tool.render(surface)
         for light_tool in self._light_toolbar:
@@ -165,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
@@ -195,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)
@@ -284,9 +302,18 @@ 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. Battery: %d/%d" % (
+            self._seeds, len(self._turnips), self._battery.current,
+            self._battery.max))
+        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)