From fbe07de1c083c60bda10ecca9788e5c02f83c07d Mon Sep 17 00:00:00 2001
From: chiefdaft <jelco@dds.nl>
Date: Sun, 20 Mar 2022 00:26:42 +0100
Subject: [PATCH] Bug fix score reset after Game Over, new icon

---
 apps/game1024/Changelog   | 6 +-----
 apps/game1024/app-icon.js | 2 +-
 apps/game1024/app.js      | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/game1024/Changelog b/apps/game1024/Changelog
index dd4ee3149..af0925b0f 100644
--- a/apps/game1024/Changelog
+++ b/apps/game1024/Changelog
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 0.01: Initial version
-0.02: Temporary intermediate version, bug fix, added descriptions
-=======
-0.01: New App!
 0.02: Temporary intermediate version
 0.03: Basic colors
->>>>>>> 49f2dae36dd66a567153baa1544cdc5d318b024e
+0.04: Bug fix score reset after Game Over, new icon
\ No newline at end of file
diff --git a/apps/game1024/app-icon.js b/apps/game1024/app-icon.js
index 3af366bc9..8e8b56d9f 100644
--- a/apps/game1024/app-icon.js
+++ b/apps/game1024/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwkBkQAWkAyVgQXYhnMACXAC/4X/C/4XH5s9CAvTmfcC5nf/4GGAAM8C5YOBGogWC//zC5XDC4ouB/vdBIJJCC4wnDC4c/CYXP//8C5APBC4pDDHQIXICwPzAQI2EC4QEB/oXHQYQXGCQQ0EF4wOBC6nNJQYXSPIgXaRQIvtC7jEEC5oqEa5QXIAoZ8B/gXQ774BAYgXPFYP/BAIJDC5wGCAAJGCC5PfOISREPQYXKABHdAogXRAAoX/C/4X/C+UAACgXYkQAW"))
+require("heatshrink").decompress(atob("mEwwkBkQAWkAyVgQXx5gAMCQOqAAeiC/4X/AAXdC6HP7gECn///oXH///+QXEn4XC4f/mf/AwQXEmczmQXD74QD7/8AQZHLFIPfC4QzC4ZICC5XPngXD/4CB5oXNIYQXG+YXSCYQXKkQXWU4oXbL5mjC5M/R5evC5PfniwBa5Gvd4gXE5/z7s/DQIXGl6PJ5v//5eCC46/F4YXCAgMzAoYXFkYXFABTvMC/4X0ACkCC/4XJu4AMCQOIAAeCC+0///zC6dz/8z/83C6V/CgN/+4XSn4DCF6ZcGC6Hyv53V+Z3WCgR3OkQAWA="))
\ No newline at end of file
diff --git a/apps/game1024/app.js b/apps/game1024/app.js
index 829b29ba9..71e2b3906 100644
--- a/apps/game1024/app.js
+++ b/apps/game1024/app.js
@@ -127,7 +127,8 @@ const snapshot = {
     for (let i = 0; i< this.dump.gridsize; i++) {
       this.dump.expVals[i] = 0;
     }
-    this.dump.score = scores.currentScore;
+    this.dump.score = 0;
+    this.dump.highScore = scores.highScore;
     this.dump.charIndex = charIndex;
     this.write();
     debug(console.log("reset D U M P E D!", this.dump));