X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fgamestate.py;h=9fe4fc85d3557ea0d991a48e664c3627b0912bf3;hb=923e068edb27b9b6d35359e496668038a1db6fa4;hp=f50d9f93ab28ed2599829d3634f34dd5a1e20b28;hpb=e01720bca61df6c69cfa8a49f7029e54b697ffde;p=tabakrolletjie.git

diff --git a/tabakrolletjie/gamestate.py b/tabakrolletjie/gamestate.py
index f50d9f9..9fe4fc8 100644
--- a/tabakrolletjie/gamestate.py
+++ b/tabakrolletjie/gamestate.py
@@ -1,16 +1,17 @@
 """ 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
+        self.resistances = {}
 
     @property
     def station(self):
@@ -26,13 +27,14 @@ 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):
@@ -40,6 +42,13 @@ class GameState(object):
 
     def set_station(self, station):
         self._state["station"] = station
+        self._state["turnips"] = []
+        self._state["seeds"] = None
+        self.resistances = {}
 
     def get_spawn_positions(self):
         return self._state["station"]["config"]["spawn positions"]
+
+    @property
+    def turnip_target(self):
+        return self._state["station"]["config"]["turnip target"]