diff --git a/Source/Editor.lua b/Source/Editor.lua index e69ef3f..a7ed265 100644 --- a/Source/Editor.lua +++ b/Source/Editor.lua @@ -19,7 +19,7 @@ local pos1 = {x,y} local editor = "main" -local editorSongs = {"song1","song2","song5", "song6", "song7", "song8", "song9"} +local editorSongs = {"song1","song2","song5", "song6", "song7", "song8", "song9", "song10"} local selSong = "song2" local songIndexSel = 10 diff --git a/Source/Map.lua b/Source/Map.lua index d7b2f9f..159c569 100644 --- a/Source/Map.lua +++ b/Source/Map.lua @@ -33,6 +33,7 @@ function addMap(_file, rs) tilemap:setTileAtPosition(level.tiles[i].x,level.tiles[i].y,level.tiles[i].t) end + -- Add collision tiles = gfx.sprite.addWallSprites(tilemap, {0,1,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24}) song:stop() diff --git a/Source/Menu.lua b/Source/Menu.lua index 0358cca..104d1a7 100644 --- a/Source/Menu.lua +++ b/Source/Menu.lua @@ -200,7 +200,7 @@ function editLoad() createMenu(m) end -songlist = {"BACK","POV: YOU ARE A ROCKET","A LONELY, LOST SHIP", "LEVEL COMPLETE", "GAME COMPLETE", "CHIPVIBE2", "ORANGER CHIP","WACKMAN","HAUNTED HOUS", "SPOOKY ZONE"} +songlist = {"BACK","POV: YOU ARE A ROCKET","A LONELY, LOST SHIP", "LEVEL COMPLETE", "GAME COMPLETE", "CHIPVIBE2", "ORANGER CHIP","WACKMAN","HAUNTED HOUS", "SPOOKY ZONE","A HAPPY, FOUND SHIP"} songlist[0] = "musicbox" function menuButtonPress(name, index) diff --git a/Source/Musicbox.lua b/Source/Musicbox.lua index f4bfa7f..cdfac28 100644 --- a/Source/Musicbox.lua +++ b/Source/Musicbox.lua @@ -52,8 +52,11 @@ function updateBox() local time = playdate.getTime() if timeRate == true then local prefix = " AM" - if time.hour > 12 then prefix = " PM" end - playdate.graphics.drawText((time.hour % 12)..":"..time.minute..prefix,0,0) + if time.hour > 11 then prefix = " PM" end + if time.hour == 0 then time.hour = 24 end + local tt = (time.hour % 12) + if tt == 0 then tt = 12 end + playdate.graphics.drawText(tt..":"..time.minute..prefix,0,0) else playdate.graphics.drawText(time.hour..":"..time.minute,0,0) end @@ -65,7 +68,7 @@ function updateBox() playdate.graphics.drawText(songTitle, 200 - playdate.graphics.getTextSize(songTitle)/2,180) if math.floor(song:getOffset()) < math.floor(song:getLength()) then playdate.graphics.drawText(math.floor(song:getOffset()*100)/100,1,210) else playdate.graphics.drawText(math.floor(song:getLength()),1,210) end - playdate.graphics.drawText(math.floor(song:getLength()).."S",370,210) + playdate.graphics.drawText(math.floor(song:getLength()).."S",398- playdate.graphics.getTextSize(tostring(math.floor(song:getLength()))),210) if playdate.buttonJustPressed(playdate.kButtonUp) then if timeRate == true then timeRate = false else timeRate = true end diff --git a/Source/pdxinfo b/Source/pdxinfo index e1cf6ad..c502e30 100644 --- a/Source/pdxinfo +++ b/Source/pdxinfo @@ -3,6 +3,6 @@ author=PossiblyAxolotl description=Help a crew of rockets collect energy to get back home! bundleID=com.PossiblyAxolotl.RocketBytes launchSoundPath=launcher/rocketing -version=1.4.1 -buildNumber=10401 +version=1.4.2 +buildNumber=10402 imagePath=launcher \ No newline at end of file diff --git a/Source/sfx/song10.wav b/Source/sfx/song10.wav new file mode 100644 index 0000000..a19adcb Binary files /dev/null and b/Source/sfx/song10.wav differ diff --git a/Source/thankyous.txt b/Source/thankyous.txt index e54fed2..aa7cd34 100644 --- a/Source/thankyous.txt +++ b/Source/thankyous.txt @@ -5,4 +5,5 @@ Gant / Tiny Yellow Machine - playing the game on stream and being super supporti TinyYellowMachine & Guv Bubbs - Hosting the Playdate Community Awards My dad and mom - supporting me and passion all the people who donated to this project, even when they could have played it for free +You - playing my game You're all awesome \ No newline at end of file