Merge pull request #263 from kateract/master

Add Saving to Micro2048

Author: masonova1

Micro2048/Micro2048.py

@@ -1,13 +1,15 @@
 import math
 import random
+import json
+from thumbySaves import saveData
 z = __import__('/Games/Micro2048/obnlib')
 
 APP_CODE = "#H01"
 APP_NAME = "MICRO 2048"
 APP_RELEASE = "2022"
 APP_VERSION = "V0.1"
 APP_FPS = 50
-
+saveData.setName('Micro2048')
 #------------------------------------------------------------------------------
 
 IMAGE_TITLE = z.Image(
@@ -69,6 +71,7 @@ def menu_continue(self):
     def menu_new_game(self):
         global continuable
         continuable = False
+        saveData.delItem('boardState')
         self.start = True
 
     def menu_sound(self):
@@ -148,7 +151,10 @@ class GameState:
 
     def __init__(self):
         global continuable
-        continuable = False
+        if saveData.hasItem('boardState') == False:
+            continuable = False
+        else:
+            continuable = True
 
     def prepare(self):
         global continuable
@@ -161,6 +167,22 @@ def prepare(self):
             self.anim = 0
             self.gameover = False
             continuable = True
+        else:
+            self.field = Field()
+            self.work = None
+            self.backup = None
+            self.anim = 0
+            self.gameover = False
+            mapData = saveData.getItem('boardState')
+            jdata = json.loads(mapData)
+            for i in range(0, FIELD_SIZE):
+                for j in self.field.field_range():
+                    if jdata[i][j] >= 0:
+                        self.field.restore_panel(j, i, jdata[i][j])
+            if self.field.is_playable() == False:
+                self.gameover = True;
+
+            
         self.idle = 0
         self.undo_msg = 0
         self.shake = 0.0
@@ -185,6 +207,7 @@ def update(self):
                 self.shake = 0.0
                 z.play("O4S4>C<GE", 15)
             elif z.btn_d(z.BTN_B):
+                self.saveGameState()
                 global continuable
                 continuable = not self.gameover
                 next_state = TitleState.ID
@@ -206,6 +229,7 @@ def update(self):
                 self.field = self.work
                 self.work = None
                 self.field.add_new_panel()
+                self.saveGameState()
                 value, high = self.field.upgrade_panels()
                 if value >= 0:
                     z.play(UP_MML[value], value)
@@ -218,6 +242,16 @@ def update(self):
                     z.play("O4S6ED+DS8C+C<BS12A+A", 20)
                 self.anim = 0
         return next_state
+        
+    def saveGameState(self):
+        mapData = [[-1]*FIELD_SIZE for i in self.field.field_range()]
+        for i in range(0, FIELD_SIZE):
+            for j in self.field.field_range():
+                if self.field.panels[i][j]:
+                    mapData[i][j] = self.field.panels[i][j].value
+        json_data = json.dumps(mapData)
+        saveData.setItem('boardState', json_data)
+        saveData.save() 
 
     def draw(self):
         z.cls()
@@ -247,6 +281,7 @@ def __init__(self, value, up=False, fresh=False):
 class Field:
 
     def __init__(self, src=None):
+        
         self.panels = [[None]*FIELD_SIZE for i in self.field_range()]
         self.vx = 0
         self.vy = 0
@@ -323,7 +358,11 @@ def put_slid_panel(self, px, py, vx, vy, value):
         if not up:
             self.empty -= 1
         return move
-
+    
+    def restore_panel(self, x, y, value):
+        self.panels[y][x] = Panel(value, fresh=True)
+        self.empty -= 1
+    
     def add_new_panel(self):
         x = 0
         y = 0