X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fday.py;h=f0db831da1cd068fece25d289a98266c3c3e954a;hb=42c64c1b6e9bf55aa5bcfd3a83c9373084b4efa3;hp=5ba3881f329772ab7194a5f70f026b4349a5833f;hpb=bc34cd3ce9b75c6215604049b8882bdf79867cb9;p=tabakrolletjie.git diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py index 5ba3881..f0db831 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 @@ -20,7 +21,7 @@ from ..transforms import Overlay, Alpha, ColourWedges from ..constants import SCREEN_SIZE, FONTS, DEBUG from ..widgets import ImageButton -from ..turnip import Turnip, TurnipInvalidPosition +from ..turnip import Turnip, TurnipInvalidPosition, check_turnips class DayScene(BaseScene): @@ -29,13 +30,11 @@ 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._seeds = gamestate.seeds - self._harvested = gamestate.harvested self._paused = False self._tool = None self._light_colors = None @@ -45,18 +44,17 @@ class DayScene(BaseScene): # Tools self._light_toolbar = [] self._tools = self.create_tools(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_you_lose() - elif self._harvested >= gamestate.get_target(): - self._draw_you_win() + if gamestate.seeds == 0 and len(self._turnips) == 0: + self._draw_you_lose(gamestate) + elif gamestate.harvested >= gamestate.turnip_target: + self._draw_you_win(gamestate) - def _draw_you_lose(self): + def _draw_you_lose(self, gamestate): overlay = pygame.surface.Surface( (SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha() overlay.fill((0, 0, 0, 128)) @@ -70,7 +68,7 @@ class DayScene(BaseScene): (shadowed_text("Press a key to return to the menu", FONTS["sans"], 24), (350, 400))) - def _draw_you_win(self): + def _draw_you_win(self, gamestate): overlay = pygame.surface.Surface( (SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha() overlay.fill((0, 0, 0, 128)) @@ -79,7 +77,8 @@ class DayScene(BaseScene): (shadowed_text("You Win", FONTS["bold"], 48), (400, 280))) self._game_over_text.append( (shadowed_text( - "You have Successfully Harvested %d turnips" % self._harvested, + ("You have Successfully Harvested %d turnips" % + gamestate.harvested), FONTS["sans"], 24), (300, 350))) self._game_over_text.append( @@ -92,8 +91,8 @@ class DayScene(BaseScene): # Turnips grow at dawn seeds = turnip.grow() if seeds: - self._seeds += seeds - self._harvested += 1 + gamestate.seeds += seeds + gamestate.harvested += 1 else: self._turnips.append(turnip) @@ -125,8 +124,6 @@ class DayScene(BaseScene): def exit(self, gamestate): self._unset_cursor() - gamestate.seeds = self._seeds - gamestate.harvested = self._harvested turnip_data = [turnip.serialize() for turnip in self._turnips] gamestate.turnips = turnip_data @@ -135,6 +132,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)) @@ -144,7 +149,7 @@ class DayScene(BaseScene): self._lights.render_light(surface) self._obstacles.render(surface) self._lights.render_fittings(surface) - surface.blit(self._infobar, (120, 10), None) + self._infobar.render(surface, gamestate) for tool in self._tools: tool.render(surface) for light_tool in self._light_toolbar: @@ -172,7 +177,7 @@ class DayScene(BaseScene): self._light_toolbar = [] def _place_seed(self, gamestate, ev): - if self._seeds > 0: + if gamestate.seeds > 0: # plant seed # We don't want top-left to equal the mouse position, # since that looks weird, but we don't want to center @@ -182,8 +187,7 @@ class DayScene(BaseScene): try: turnip = Turnip(age=0, pos=pos, space=self._space) self._turnips.append(turnip) - self._seeds -= 1 - self._update_infobar(gamestate) + gamestate.seeds -= 1 except TurnipInvalidPosition: # TODO: Add error sound or something pass @@ -206,14 +210,16 @@ class DayScene(BaseScene): cfg = cfg.copy() cost = cfg.pop("cost") cfg.pop("available_colours") - if self._seeds > cost: + if gamestate.seeds > cost: pos = pymunk.pygame_util.from_pygame( ev.pos, pygame.display.get_surface()) # Bail if we're too close to an existing light if self._lights.nearest(pos, max_distance=25): return - self._seeds -= cost - self._update_infobar(gamestate) + # Also check turnips + if check_turnips(self._space, pos, max_distance=25): + return + gamestate.seeds -= cost cfg["position"] = pos cfg["colours"] = colours gamestate.station["lights"].append(cfg) @@ -301,18 +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.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)