Merge branch 'master' of ctpug.org.za:tabakrolletjie

diff --git a/TODO.txt b/TODO.txt
index e4bdbd7c4f3a8835676c03225704196e8aeb7717..44d86965117e875a20e5a63354cd52b79dcffb91 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,7 +1,6 @@
 TODO
 ====
 
-* Save game
 * Five levels
 * Add placement error sounds
 * Add sound for battery going dead
@@ -24,3 +23,4 @@ Done
 * Eye colour
 * Seralize light on / off and colour selection state across day / night transition
 * More sounds
+* Save game

diff --git a/tabakrolletjie/gamestate.py b/tabakrolletjie/gamestate.py
index 6f6725b8e0bda36ef5a031946306194d0496b0e2..afe842dde40a2d01ba696c6ccf2e487ba6697751 100644 (file)
--- a/tabakrolletjie/gamestate.py
+++ b/tabakrolletjie/gamestate.py
@@ -55,3 +55,24 @@ class GameState(object):
 
     def update_lights(self, lights):
         self._state["station"]["lights"] = lights.serialize_lights()
+
+    def serialize(self):
+        result = {
+            "station": self._state["station"],
+            "turnips": self._state["turnips"],
+            "seeds": self._state['seeds'],
+            "harvested": self.harvested,
+            "eaten": self.eaten,
+            "days": self.days,
+            "resistances": self.resistances,
+        }
+        return result
+
+    def load_from_json(self, json_data):
+        self._state["station"] = dict(**json_data["station"])
+        self._state["turnips"] = json_data["turnips"]
+        self._state["seeds"] = json_data["seeds"]
+        self.harvested = json_data["harvested"]
+        self.eaten = json_data["harvested"]
+        self.days = json_data["days"]
+        self.resistances = dict(**json_data["resistances"])

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 7f73ad288a17342946d91a928577220da0e86ddb..d19b0c6e526e68118be0fca16b005bd13b836f9b 100644 (file)
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -15,7 +15,7 @@ from ..lights import LightManager, light_fitting_by_type, check_space_for_light
 from ..infobar import InfoBar
 from ..obstacles import ObstacleManager
 from ..events import SceneChangeEvent
-from ..utils import debug_timer, shadowed_text
+from ..utils import debug_timer, shadowed_text, write_save_file
 from ..loader import loader
 from ..transforms import Overlay, Alpha, ColourWedges
 
@@ -53,6 +53,8 @@ class DayScene(BaseScene):
             self._draw_you_lose(gamestate)
         elif gamestate.harvested >= gamestate.turnip_target:
             self._draw_you_win(gamestate)
+        else:
+            write_save_file(gamestate.serialize())
         self._ending = False
 
     def _draw_you_lose(self, gamestate):

diff --git a/tabakrolletjie/scenes/menu.py b/tabakrolletjie/scenes/menu.py
index 67336112c6c3e7a65151bfb524d23117bf1c7369..89b531e2621d78f69ec75e7869fb880104c5e3b5 100644 (file)
--- a/tabakrolletjie/scenes/menu.py
+++ b/tabakrolletjie/scenes/menu.py
@@ -7,7 +7,7 @@ from ..events import QuitEvent, SceneChangeEvent
 from ..loader import loader
 from ..constants import FONTS
 from ..widgets import TextButton, SpacerButton
-from ..utils import save_file_exists
+from ..utils import save_file_exists, get_save_data
 
 
 class MenuScene(BaseScene):
@@ -50,11 +50,12 @@ class MenuScene(BaseScene):
                 return button.name
         return None
 
-    def _do_day(self):
+    def _do_load_save(self, gamestate):
+        gamestate.load_from_json(get_save_data())
         from .day import DayScene
         SceneChangeEvent.post(scene=DayScene())
 
-    def _do_load_level(self):
+    def _start_new_game(self):
         from .load_level import LoadLevelScene
         SceneChangeEvent.post(scene=LoadLevelScene())
 
@@ -72,15 +73,15 @@ class MenuScene(BaseScene):
             elif ev.key == pgl.K_d:
                 self._do_day()
             elif ev.key == pgl.K_l:
-                self._do_load_level()
+                self._start_new_game()
             elif ev.key == pgl.K_h:
                 self._do_help()
         elif ev.type == pgl.MOUSEBUTTONDOWN:
             pressed = self._get_pressed(ev)
             if pressed == 'new game':
-                self._do_load_level()
+                self._start_new_game()
             elif pressed == 'continue':
-                self._do_day()
+                self._do_load_save(gamestate)
             elif pressed == 'help':
                 self._do_help()
             elif pressed == 'quit':

diff --git a/tabakrolletjie/turnip.py b/tabakrolletjie/turnip.py
index b67196a525da4d00d19c024aee3880399194a49c..b1bb5a4571f330027fe0b2ea74491636b60e1560 100644 (file)
--- a/tabakrolletjie/turnip.py
+++ b/tabakrolletjie/turnip.py
@@ -24,7 +24,7 @@ class Turnip(object):
         self._age = kwargs.get('age', 0)
         self._pos = kwargs.get('pos', (0, 0))
         space = kwargs.get('space', None)
-        self._rotation = 90 * (hash(self._pos) % 4)
+        self._rotation = 90 * (hash(tuple(self._pos)) % 4)
         self._update_image()
         self.eaten = False  # Flag for boyd
         self._body = pymunk.Body(0, 0, pymunk.Body.STATIC)

diff --git a/tabakrolletjie/utils.py b/tabakrolletjie/utils.py
index 19364c2b013c46279e94d6eed8b3282002e8a45d..b237467ded10e499d5b8f4b69c76816d87a6c25e 100644 (file)
--- a/tabakrolletjie/utils.py
+++ b/tabakrolletjie/utils.py
@@ -95,6 +95,13 @@ def save_file_exists():
     return os.path.isfile(savefile)
 
 
+def get_save_data():
+    savefile = get_save_file_name()
+    with open(savefile, 'rb') as f:
+        data = json.load(f)
+    return data
+
+
 def write_save_file(json_data):
     save_dir = save_location()
     if not os.path.exists(save_dir):