From e08a469ad322a52ec4d1112bb521f2a45ab2090d Mon Sep 17 00:00:00 2001
From: PossiblyAxolotl <PossiblyAxolotl@users.noreply.github.com>
Date: Sat, 23 Apr 2022 15:48:23 -0600
Subject: [PATCH] menu sys more doned and also saving :)))

---
 Source/Main.lua           |  11 ++++-----
 Source/Map.lua            |   5 ++++
 Source/Menu.lua           |  48 +++++++++++++++++++++++++++++++++++---
 Source/gfx/bigrocket.png  | Bin 0 -> 312 bytes
 Source/gfx/bytes.png      | Bin 0 -> 499 bytes
 Source/gfx/play.png       | Bin 229 -> 0 bytes
 Source/levels/level.json  |   1 -
 Source/levels/level1.json |   2 +-
 8 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 Source/gfx/bigrocket.png
 create mode 100644 Source/gfx/bytes.png
 delete mode 100644 Source/gfx/play.png
 delete mode 100644 Source/levels/level.json

diff --git a/Source/Main.lua b/Source/Main.lua
index 7efcea1..cf2e923 100644
--- a/Source/Main.lua
+++ b/Source/Main.lua
@@ -5,6 +5,7 @@ import "Map"
 import "Menu"
 
 mode = "menu"
+map = "levels/level1.json"
 
 local gfx <const> = playdate.graphics
 local disp <const> = playdate.display
@@ -18,20 +19,16 @@ song1:play(0, 1)
 
 gfx.setColor(gfx.kColorWhite)
 -- {"START NEW GAME","CONTINUE","USER LEVELS", "EXIT"}
-local mainmenu = {}
-if playdate.datastore.read("savegame") then
-    mainmenu[4],mainmenu[3],mainmenu[2],mainmenu[1], mainmenu[0] = "START NEW GAME", "CONTINE", "USER LEVELS", "ABOUT THE CREATOR", "mainPlay"
-else
-    mainmenu[3],mainmenu[2],mainmenu[1], mainmenu[0] = "START NEW GAME", "USER LEVELS", "ABOUT THE CREATOR", "mainNoPlay"
-end
+
 createMenu(mainmenu)
 
 local menu = playdate.getSystemMenu()
 local menuItem, error = menu:addMenuItem("Main Menu", function()
+    mainMenuCreation()
     createMenu(mainmenu)
 end)
 
-addMap("levels/level.json")
+--addMap("levels/level.json")
 
 function playdate.update()
     if mode == "menu" then
diff --git a/Source/Map.lua b/Source/Map.lua
index 5080254..8ba217f 100644
--- a/Source/Map.lua
+++ b/Source/Map.lua
@@ -3,6 +3,11 @@ local tileTable <const> = gfx.imagetable.new("gfx/tiles")
 local tilemap <const> = gfx.tilemap.new()
 tilemap:setImageTable(tileTable)
 
+function addMapSave(_file)
+    playdate.datastore.write({level=_file},"savegame")
+    addMap(_file)
+end
+
 function addMap(_file)
     local level = json.decodeFile(_file)
     tilemap:setSize(level.dimensions.x,level.dimensions.y)
diff --git a/Source/Menu.lua b/Source/Menu.lua
index f89ef08..350cc3f 100644
--- a/Source/Menu.lua
+++ b/Source/Menu.lua
@@ -8,7 +8,22 @@ local menuitems = {}
 local menu = null
 
 local imgCursor = gfx.image.new("gfx/cursor")
+local imgBytes = gfx.image.new("gfx/bytes")
 assert(imgCursor)
+assert(imgBytes)
+
+mainmenu = {}
+function mainMenuCreation()
+    mainmenu = {}
+if playdate.datastore.read("savegame") then
+    map = playdate.datastore.read("savegame").level
+    mainmenu[4],mainmenu[3],mainmenu[2],mainmenu[1], mainmenu[0] = "CONTINUE", "START NEW GAME", "USER LEVELS", "ABOUT THE CREATOR", "mainPlay"
+else
+    mainmenu[3],mainmenu[2],mainmenu[1], mainmenu[0] = "START NEW GAME", "USER LEVELS", "ABOUT THE CREATOR", "mainNoPlay"
+end
+end
+
+mainMenuCreation()
 
 function createMenu(items)
     killPlayer()
@@ -40,10 +55,37 @@ function updateMenu()
 
     controlX = playdate.math.lerp(controlX, 20, 0.3)
     controlY = playdate.math.lerp(controlY, (20 * index) - 1, 0.5)
-    print(index)
-    imgCursor:draw(3,controlY + (243 - (20 * #menuitems)))
     for i = 1, #menuitems, 1 do
         local item = menuitems[i]
         gfx.drawText(item.name,controlX,item.y)
     end
-end
\ No newline at end of file
+    imgCursor:draw(controlX - 17,controlY + (243 - (20 * #menuitems)))
+
+    if playdate.buttonJustPressed(playdate.kButtonA) then
+        menuButtonPress(menuitems[#menuitems - index].name)
+    end
+
+    imgBytes:draw(0,0)
+end
+
+function menuButtonPress(name)
+    if name == "START NEW GAME" and menu == "mainPlay" then
+        local m = {}
+        m[0], m[1], m[2] = "newgame", "CANCEL", "CONFIRM"
+        createMenu(m)
+    
+    elseif name == "START NEW GAME" or name == "CONFIRM" then
+        addMapSave("levels/level1.json")
+    
+    elseif name == "CONTINUE" then
+        addMap(map)
+
+    elseif name == "ABOUT THE CREATOR" then
+        local m = {}
+        m[0],m[1] = "about", "BACK"
+        createMenu(m)
+    
+    elseif name == "BACK" or name == "CANCEL" then
+        createMenu(mainmenu)
+    end
+end
diff --git a/Source/gfx/bigrocket.png b/Source/gfx/bigrocket.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6e09f8c98aeb507465409ad1be2d6e10bb966da
GIT binary patch
literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800030Nkl<ZScUDE
z$rgh!2t^+~{r_KnT{tu<AVaMivsB?;lSmM_c?ii){1PnH1g{QUL?9xg$lnAwg8`r=
zQ4!d{yAoLe72c7^2)OX7L{uOIuSi4$Qt+(AJDnMTRXa+eCxz(n_9RV^c5lvanx(!1
z4-QN-kgcp?firkjqEm{0G9H0PAS@8w-O;ZlEfA5&!U4M!n-ovNft#({z7%txsPa};
z?7&(tjx$g?^)h40&&fo9?;f}uu843Ha38L;?$M=l`+?>^!y50Npd{7lSI+V9GDTxa
z>PuiW5uv}RY;3kA6P{b7cJo2ttcA(~#yD-cZ$FH*DZRQNY<M3hn2Jkv!^k240000<
KMNUMnLSTZHTY|X&

literal 0
HcmV?d00001

diff --git a/Source/gfx/bytes.png b/Source/gfx/bytes.png
new file mode 100644
index 0000000000000000000000000000000000000000..848ef7d86de3ad71f5b3a54f481861d99237cf28
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq0040S001Qj1^@s6bzufE0005HNkl<Zc%1E<
z(Ut-s2!>}mz5grQ)tuA1A^bwlFY#S%1*1eLB6}P~QQXh@_II1mvFi3Z$XLDX?6Z(D
zEIKqi-(R#gw&gtKxl6i|4l>pyt3B)bTzmFt3`B>8r!Ml3%Ua|Y?2VRUz(*%qfAP|L
zBOOgX5@d{CcI7<1j3RMn??H7u-;iey*JQMPn2MR@l!l$6<(rJ0$hwb7^E!pkHTmuN
z=tMNrTtz=GZ9c4aMDw_N0)-!UcDfQYgUl9j64BY|3VwF)lh`^tz2of3NVF5tX!V>U
zrHG6iV+-6))asRebXe<~5mB{b3<kVTv_=E#{+fc(RTNT++Wji3XRESXQ4|bhTqcmE
zow;kkY{%B;L<yv3%G@<zwIh=g(JlklRS32tlM~^nn!(cnU>z5=Bb5_7X7)GlQE8@&
zK%0YVM`kCQkm|3@_1MgNVh_?2w6ea6-nOXnDV;cTqrV~oqw34Q6p08@MBcHMqPH`-
zveS!QIumB)D?7cP@a(i2r3h)QnX5d<kvkGuBCjX9`yr<jS^G_`od%Vi>hPW3{{o*~
p*$qO7_y-&Gh+&cc`c+hsfESaB%%66N7;pdp002ovPDHLkV1lu&?X~~_

literal 0
HcmV?d00001

diff --git a/Source/gfx/play.png b/Source/gfx/play.png
deleted file mode 100644
index ed6115408b4265b9488d815f746acd1ff5e38d06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 229
zcmV<B02=>^P)<h;3K|Lk000e1NJLTq001}u000sQ1^@s64zV3h00022Nkl<ZNQvc_
z(GGwh2mqn=|G#W6R_H(wt(DwUlN#hrh6n%&Y@o27l(>eJ-<z+9Z_c8A1491el-eQ@
zuMImNitm`XMl-J?9~)oZ;9f6~ohcwYV?DDHl8Hz1#WVO}5a2di8<x&yJcGSmZ4|A0
zbEV{ZOkF&lL8+^Oe^P0pb<t7c86><lTh{S8>N24Xc43%hr<$>{yg_;{y!SfqeX{Fb
fXUNaKx4gjvxW7g<hH;eQ00000NkvXXu0mjfK!{)#

diff --git a/Source/levels/level.json b/Source/levels/level.json
deleted file mode 100644
index dbfdc41..0000000
--- a/Source/levels/level.json
+++ /dev/null
@@ -1 +0,0 @@
-{"dimensions":{"x":22,"y":17},"rocket":{"x":70.4,"y":125.6},"tiles":[{"t":2,"x":2,"y":1},{"t":2,"x":14,"y":1},{"t":2,"x":14,"y":5},{"t":2,"x":22,"y":5},{"t":2,"x":8,"y":6},{"t":2,"x":2,"y":12},{"t":2,"x":8,"y":12},{"t":2,"x":11,"y":12},{"t":2,"x":14,"y":12},{"t":2,"x":8,"y":17},{"t":2,"x":22,"y":17},{"t":3,"x":3,"y":1},{"t":3,"x":4,"y":1},{"t":3,"x":5,"y":1},{"t":3,"x":6,"y":1},{"t":3,"x":7,"y":1},{"t":3,"x":8,"y":1},{"t":3,"x":9,"y":1},{"t":3,"x":10,"y":1},{"t":3,"x":11,"y":1},{"t":3,"x":12,"y":1},{"t":3,"x":13,"y":1},{"t":3,"x":15,"y":5},{"t":3,"x":16,"y":5},{"t":3,"x":17,"y":5},{"t":3,"x":18,"y":5},{"t":3,"x":19,"y":5},{"t":3,"x":20,"y":5},{"t":3,"x":21,"y":5},{"t":3,"x":3,"y":12},{"t":3,"x":4,"y":12},{"t":3,"x":5,"y":12},{"t":3,"x":6,"y":12},{"t":3,"x":7,"y":12},{"t":3,"x":9,"y":12},{"t":3,"x":10,"y":12},{"t":3,"x":9,"y":17},{"t":3,"x":10,"y":17},{"t":3,"x":11,"y":17},{"t":3,"x":12,"y":17},{"t":3,"x":13,"y":17},{"t":3,"x":14,"y":17},{"t":3,"x":15,"y":17},{"t":3,"x":16,"y":17},{"t":3,"x":17,"y":17},{"t":3,"x":18,"y":17},{"t":3,"x":19,"y":17},{"t":3,"x":20,"y":17},{"t":3,"x":21,"y":17},{"t":4,"x":2,"y":2},{"t":4,"x":14,"y":2},{"t":4,"x":2,"y":3},{"t":4,"x":14,"y":3},{"t":4,"x":2,"y":4},{"t":4,"x":14,"y":4},{"t":4,"x":2,"y":5},{"t":4,"x":2,"y":6},{"t":4,"x":14,"y":6},{"t":4,"x":22,"y":6},{"t":4,"x":2,"y":7},{"t":4,"x":8,"y":7},{"t":4,"x":14,"y":7},{"t":4,"x":22,"y":7},{"t":4,"x":2,"y":8},{"t":4,"x":8,"y":8},{"t":4,"x":14,"y":8},{"t":4,"x":22,"y":8},{"t":4,"x":2,"y":9},{"t":4,"x":8,"y":9},{"t":4,"x":14,"y":9},{"t":4,"x":22,"y":9},{"t":4,"x":2,"y":10},{"t":4,"x":8,"y":10},{"t":4,"x":14,"y":10},{"t":4,"x":22,"y":10},{"t":4,"x":2,"y":11},{"t":4,"x":8,"y":11},{"t":4,"x":14,"y":11},{"t":4,"x":22,"y":11},{"t":4,"x":22,"y":12},{"t":4,"x":8,"y":13},{"t":4,"x":22,"y":13},{"t":4,"x":8,"y":14},{"t":4,"x":22,"y":14},{"t":4,"x":8,"y":15},{"t":4,"x":22,"y":15},{"t":4,"x":8,"y":16},{"t":4,"x":22,"y":16}]}
\ No newline at end of file
diff --git a/Source/levels/level1.json b/Source/levels/level1.json
index 23e8dd5..6eaf0a7 100644
--- a/Source/levels/level1.json
+++ b/Source/levels/level1.json
@@ -1 +1 @@
-{"tiles":[{"x":1,"y":1,"t":2},{"x":2,"y":1,"t":3},{"x":3,"y":1,"t":3},{"x":4,"y":1,"t":2}],"dimensions":{"x":4,"y":2}}
\ No newline at end of file
+{"bigrocket":{"x":70.4,"y":125.6},"dimensions":{"x":22,"y":17},"rocket":{"x":70.4,"y":125.6},"tiles":[{"t":2,"x":2,"y":1},{"t":2,"x":14,"y":1},{"t":2,"x":14,"y":5},{"t":2,"x":22,"y":5},{"t":2,"x":8,"y":6},{"t":2,"x":2,"y":12},{"t":2,"x":8,"y":12},{"t":2,"x":11,"y":12},{"t":2,"x":14,"y":12},{"t":2,"x":8,"y":17},{"t":2,"x":22,"y":17},{"t":3,"x":3,"y":1},{"t":3,"x":4,"y":1},{"t":3,"x":5,"y":1},{"t":3,"x":6,"y":1},{"t":3,"x":7,"y":1},{"t":3,"x":8,"y":1},{"t":3,"x":9,"y":1},{"t":3,"x":10,"y":1},{"t":3,"x":11,"y":1},{"t":3,"x":12,"y":1},{"t":3,"x":13,"y":1},{"t":3,"x":15,"y":5},{"t":3,"x":16,"y":5},{"t":3,"x":17,"y":5},{"t":3,"x":18,"y":5},{"t":3,"x":19,"y":5},{"t":3,"x":20,"y":5},{"t":3,"x":21,"y":5},{"t":3,"x":3,"y":12},{"t":3,"x":4,"y":12},{"t":3,"x":5,"y":12},{"t":3,"x":6,"y":12},{"t":3,"x":7,"y":12},{"t":3,"x":9,"y":12},{"t":3,"x":10,"y":12},{"t":3,"x":9,"y":17},{"t":3,"x":10,"y":17},{"t":3,"x":11,"y":17},{"t":3,"x":12,"y":17},{"t":3,"x":13,"y":17},{"t":3,"x":14,"y":17},{"t":3,"x":15,"y":17},{"t":3,"x":16,"y":17},{"t":3,"x":17,"y":17},{"t":3,"x":18,"y":17},{"t":3,"x":19,"y":17},{"t":3,"x":20,"y":17},{"t":3,"x":21,"y":17},{"t":4,"x":2,"y":2},{"t":4,"x":14,"y":2},{"t":4,"x":2,"y":3},{"t":4,"x":14,"y":3},{"t":4,"x":2,"y":4},{"t":4,"x":14,"y":4},{"t":4,"x":2,"y":5},{"t":4,"x":2,"y":6},{"t":4,"x":14,"y":6},{"t":4,"x":22,"y":6},{"t":4,"x":2,"y":7},{"t":4,"x":8,"y":7},{"t":4,"x":14,"y":7},{"t":4,"x":22,"y":7},{"t":4,"x":2,"y":8},{"t":4,"x":8,"y":8},{"t":4,"x":14,"y":8},{"t":4,"x":22,"y":8},{"t":4,"x":2,"y":9},{"t":4,"x":8,"y":9},{"t":4,"x":14,"y":9},{"t":4,"x":22,"y":9},{"t":4,"x":2,"y":10},{"t":4,"x":8,"y":10},{"t":4,"x":14,"y":10},{"t":4,"x":22,"y":10},{"t":4,"x":2,"y":11},{"t":4,"x":8,"y":11},{"t":4,"x":14,"y":11},{"t":4,"x":22,"y":11},{"t":4,"x":22,"y":12},{"t":4,"x":8,"y":13},{"t":4,"x":22,"y":13},{"t":4,"x":8,"y":14},{"t":4,"x":22,"y":14},{"t":4,"x":8,"y":15},{"t":4,"x":22,"y":15},{"t":4,"x":8,"y":16},{"t":4,"x":22,"y":16}]}
\ No newline at end of file