X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fgamestate.py;h=27762a6d7e086c3dae50bff4226cfe4ee085708a;hb=0af42efcd7671a3980261c05890aa2f5c0ca2c9b;hp=03b5f23a1d424fe937124b0b1f8390ab86cfc58c;hpb=fe0e90aec05868f0193ed8e294618c900946e9d5;p=tabakrolletjie.git

diff --git a/tabakrolletjie/gamestate.py b/tabakrolletjie/gamestate.py
index 03b5f23..27762a6 100644
--- a/tabakrolletjie/gamestate.py
+++ b/tabakrolletjie/gamestate.py
@@ -1,15 +1,16 @@
 """ The game state. """
 
-from .loader import loader
-
 
 class GameState(object):
     def __init__(self):
         self._state = {
             "station": None,
             "turnips": [],
+            "seeds": None,
         }
         self.harvested = 0
+        self.eaten = 0
+        self.days = 0
 
     @property
     def station(self):
@@ -25,16 +26,25 @@ class GameState(object):
 
     @property
     def seeds(self):
-        if 'seeds' in self._state:
-            return self._state['seeds']
-        elif self._state["station"] and 'seeds' in self._state["station"]["config"]:
-            self._state['seeds'] = self._state["station"]["config"]["seeds"]
-            return self._state['seeds']
-        return 0
+        if self._state["seeds"] is None:
+            if (self._state["station"] and
+                        "seeds" in self._state["station"]["config"]):
+                self._state["seeds"] = self._state["station"]["config"]["seeds"]
+            else:
+                self._state["seeds"] = 0
+        return self._state["seeds"]
 
     @seeds.setter
     def seeds(self, value):
         self._state['seeds'] = value
 
-    def load_station(self, station):
-        self._state["station"] = loader.load_station(station)
+    def set_station(self, station):
+        self._state["station"] = station
+        self._state["turnips"] = []
+        self._state["seeds"] = None
+
+    def get_spawn_positions(self):
+        return self._state["station"]["config"]["spawn positions"]
+
+    def get_target(self):
+        return self._state["station"]["config"]["turnip target"]