From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 10 Sep 2016 15:55:02 +0000 (+0200)
Subject: Move harvested and seeds to gamestate.
X-Git-Tag: tabakrolletjie-v1.0.0~80
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=716bdd0332bd58ce9f15db1f7bd64d96f3c459e7;p=tabakrolletjie.git

Move harvested and seeds to gamestate.
---

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 8d39c2b..485952e 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -34,8 +34,6 @@ class DayScene(BaseScene):
         self._lights = LightManager(self._space, gamestate)
         self._battery = BatteryManager(gamestate)
         self._turnips = []
-        self._seeds = gamestate.seeds
-        self._harvested = gamestate.harvested
         self._paused = False
         self._tool = None
         self._light_colors = None
@@ -51,12 +49,12 @@ class DayScene(BaseScene):
             "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.get_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
 
@@ -172,7 +169,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,7 +179,7 @@ class DayScene(BaseScene):
             try:
                 turnip = Turnip(age=0, pos=pos, space=self._space)
                 self._turnips.append(turnip)
-                self._seeds -= 1
+                gamestate.seeds -= 1
                 self._update_infobar(gamestate)
             except TurnipInvalidPosition:
                 # TODO: Add error sound or something
@@ -206,13 +203,13 @@ 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
+            gamestate.seeds -= cost
             self._update_infobar(gamestate)
             cfg["position"] = pos
             cfg["colours"] = colours
@@ -304,10 +301,10 @@ class DayScene(BaseScene):
 
     def _update_infobar(self, gamestate):
         line1 = ("Day %d: Goal: %d Turnips. Turnips harvested: %d" % (
-            gamestate.days, gamestate.get_target(), self._harvested))
+            gamestate.days, gamestate.get_target(), gamestate.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,
+            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