From 23617e4ca4cb091ad5f4bb55caee87c427993525 Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Sat, 10 Sep 2016 18:38:36 +0200 Subject: [PATCH] Switch day to infobar. --- tabakrolletjie/scenes/day.py | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py index 0a08152..17506fd 100644 --- a/tabakrolletjie/scenes/day.py +++ b/tabakrolletjie/scenes/day.py @@ -12,6 +12,7 @@ import pymunk.pygame_util from .base import BaseScene from ..battery import BatteryManager from ..lights import LightManager, light_fitting_by_type +from ..infobar import InfoBar from ..obstacles import ObstacleManager from ..events import SceneChangeEvent from ..utils import debug_timer, shadowed_text @@ -29,10 +30,10 @@ class DayScene(BaseScene): def enter(self, gamestate): self._space = pymunk.Space() - 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) + self._infobar = InfoBar("day", battery=self._battery, scene=self) self._turnips = [] self._paused = False self._tool = None @@ -43,7 +44,7 @@ class DayScene(BaseScene): # Tools self._light_toolbar = [] self._tools = self.create_tools(gamestate) - self._update_infobar(gamestate) + self._infobar.update(gamestate) # Background self._soil = loader.load_image( "textures", "soil.png", transform=self.BRIGHTNESS) @@ -132,6 +133,14 @@ class DayScene(BaseScene): from .night import NightScene SceneChangeEvent.post(scene=NightScene()) + @property + def turnip_count(self): + return len(self._turnips) + + @property + def power_usage(self): + return int(self._lights.total_power_usage()) + @debug_timer("day.render") def render(self, surface, gamestate): surface.blit(self._soil, (0, 0)) @@ -141,7 +150,7 @@ class DayScene(BaseScene): self._lights.render_light(surface) self._obstacles.render(surface) self._lights.render_fittings(surface) - surface.blit(self._infobar, (50, 10), None) + self._infobar.render(surface) for tool in self._tools: tool.render(surface) for light_tool in self._light_toolbar: @@ -180,7 +189,7 @@ class DayScene(BaseScene): turnip = Turnip(age=0, pos=pos, space=self._space) self._turnips.append(turnip) gamestate.seeds -= 1 - self._update_infobar(gamestate) + self._infobar.update(gamestate) except TurnipInvalidPosition: # TODO: Add error sound or something pass @@ -210,7 +219,7 @@ class DayScene(BaseScene): if self._lights.nearest(pos, max_distance=25): return gamestate.seeds -= cost - self._update_infobar(gamestate) + self._infobar.update(gamestate) cfg["position"] = pos cfg["colours"] = colours gamestate.station["lights"].append(cfg) @@ -298,19 +307,3 @@ class DayScene(BaseScene): def tick(self, gamestate): if not self._paused: self._lights.tick() - - def _update_infobar(self, gamestate): - line1 = ("Day %d: Goal: %d Turnips. Turnips harvested: %d" % ( - gamestate.days, gamestate.turnip_target, gamestate.harvested)) - line1_img = self._infobar_font.render(line1, True, (255, 255, 255)) - line2 = ("Turnip Stocks: Seeds: %s. Planted: %d. Battery: %d/%d" % ( - gamestate.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) -- 2.34.1