scorescreen polish

8 files changed, 82 insertions, 49 deletions

diff --git a/Sound Effects Index.txt b/Sound Effects Index.txt
index 324309d..32c75d0 100644
--- a/Sound Effects Index.txt
+++ b/Sound Effects Index.txt
@@ -1,10 +1,7 @@
---NOTES--
-Have portal kill as music to sound above all SFX (AND SAVE ON TOKENS)
-
 CHANNELS
 --------
-0 Melody Track
-1 Bass Track / Player / Pickup / Portal Thruster Kill
+0 Music Track
+1 Music Track / Player / Pickup / Portal Thruster Kill
 2 Short SFX - Bullets / Basic Enemy Hits/Kills / Bomb Charge
 3 Long SFX - Tough Enemy/Bosses
 
@@ -13,8 +10,8 @@ SOUNDS
 00 Intro Transition
 01 Respawn
 02 Light Respawn
-03 Portal Shoot ---
-04 Portal Thruster Kill ---
+03 Portal Shoot
+04 Portal Thruster Kill
 05 Bomb Kill
 06 Bomb Explode
 07 Bomb Charge First Half
diff --git a/draw.lua b/draw.lua
index f5e67f1..5ed0c71 100644
--- a/draw.lua
+++ b/draw.lua
@@ -59,7 +59,7 @@ end
 --final score screen and outro transition
 if currentwave == 20 then
     menuscroll = lerp(menuscroll,1,0.05)
-    finalscorescreen(menuscroll,0)
+    finalscorescreen(menuscroll)
 
     --outro acid transition
     if isoutro then
diff --git a/musicplayer/music.p8 b/musicplayer/music.p8
index 5a160f4..8f665dd 100644
--- a/musicplayer/music.p8
+++ b/musicplayer/music.p8
@@ -337,7 +337,11 @@ d10e0020214222442228422304022142224422284223040221422244222842230402214222442228
 5d1c0008100530723413232072321c655072341323207242100001330007300093001c60013300184000e300100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
 5d1c1000100000723413232072321c6000723413232072321000007234132321f2321c600072341f23213232100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
 5d381000072440724213242072421c675072441c6751f242072440724213242072421c675072001c6001f200100000d200192000d200226000d2001e40010300100000d300104000f30022600193002b2001f200
-2138000022100221002910029100291002910029100291001b1001b10028100281002810004100101001c1001d1001d1002110021100211001d10021100291001f1001f100221002210022100221002210000000
+471200001f0111f0121f0121f0121f0121f0121f0121f0122101121012210122101215012210122d0122d0131d0121d0121d0121d0121d0121d0121d0121d0121f0111f0121f0121f012130121f0122b0122b013
+411200002201122012220122201222012220122201222012250112501225012250120d01219012250122501321012210122101221012210122101221012210122201122012220122201216012220122e0122e013
+41120000260112601226012260122601226012260122601228011280122801228012100121c01228012280132401224012240122401224012240122401224012260112601226012260120e0121a0122601226013
+5d1200000702213022070221302207022130220702213022090221502209022150220902215022090221502205022110220502211022050221102205022110220702213022070221302207022130220702213022
+5d120000100731302207022130221c675130220702213022100731502209022150221c675150220902215022100731102205022110221c675110220502211022100731302207022130221c675130220702213022
 __music__
 00 20616263
 00 20256263
@@ -368,6 +372,39 @@ __music__
 00 35346161
 00 35366161
 02 35236161
-00 35346161
-00 35366161
+01 7a3d7d7d
+00 3a3d3c3b
+00 413e657e
+00 3a3e3c3b
+00 413e657e
+02 3a3d3c3b
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+00 41424344
+04 05191514
 
diff --git a/musicplayer/objects_music.lua b/musicplayer/objects_music.lua
index 09895b3..fcb96da 100644
--- a/musicplayer/objects_music.lua
+++ b/musicplayer/objects_music.lua
@@ -31,7 +31,7 @@ function selectmusic()
     if tracknumber == -1 then
         tracknumber = 0
     elseif tracknumber == 0 then
-        playsong(-1,0)
+        playsong(31)
     elseif tracknumber == 1 then
         playsong(0)
     elseif tracknumber == 2 then
@@ -39,21 +39,21 @@ function selectmusic()
     elseif tracknumber == 3 then
         playsong(17)
     elseif tracknumber == 4 then
-        playsong(-1,0)
+        playsong(17)
     end
 end
 
 function updatetracktitlepos()
     if tracknumber == 0 then
-        newtracktitleposition = -16
+        newtracktitleposition = -4
     elseif tracknumber == 1 then
-        newtracktitleposition = 145
+        newtracktitleposition = 167
     elseif tracknumber == 2 then
-        newtracktitleposition = 313
+        newtracktitleposition = 336
     elseif tracknumber == 3 then
-        newtracktitleposition = 493
+        newtracktitleposition = 517
     elseif tracknumber == 4 then
-        newtracktitleposition = 685
+        newtracktitleposition = 660
     end
 end
 
diff --git a/musicplayer/ui_music.lua b/musicplayer/ui_music.lua
index 7252881..387b174 100644
--- a/musicplayer/ui_music.lua
+++ b/musicplayer/ui_music.lua
@@ -51,10 +51,10 @@ function mainmenutext(x,y,currentlyplaying)
     -- y = 62
     x -= 1
 
-    printdropshadow("(\139) track selection (\145)\n",x,y,9,2)
+    printdropshadow("(\139) track selection (\145)",x,y,9,2)
 
     poke(0x5f58, 0x9 | 0x4) --makes score BIG
-    printdropshadow("mENU mUSE          bATTLE bASS          bOSSY bEATS          fISSURE fINALE          vICTORY vESSLE",x-tracktitleposition+circletimex,y+18+circletimey,11,3)
+    printdropshadow("iDLE iNERTIA         bATTLE bEATS         pADRONE pANIC         fISSURE fINALE         vICTORY vESSLE",x-tracktitleposition+circletimex,y+18+circletimey,11,3)
     poke(0x5f58)
 end
 
diff --git a/musicplayer/update_music.lua b/musicplayer/update_music.lua
index 0f5e236..3e79211 100644
--- a/musicplayer/update_music.lua
+++ b/musicplayer/update_music.lua
@@ -48,4 +48,4 @@ menuitem(2, autoplaymenutext, function() autoplay = not autoplay end)
 
 if btnp(4) and btnp(5) then music(-1,3000) end
 
-tracktitleposition = lerp(tracktitleposition,newtracktitleposition,.03)
\ No newline at end of file
+tracktitleposition = lerp(tracktitleposition,newtracktitleposition,0.03)
\ No newline at end of file
diff --git a/players.lua b/players.lua
index 4765096..1da8a55 100644
--- a/players.lua
+++ b/players.lua
@@ -72,33 +72,35 @@ function addplayer(x, y, sprite, spriteup, spritedwn, bulletsprite)
 
     function player:update()
         --movement
-        if player.health > 0 then -- can only input if alive!!!
-            if btn(0, player.id) then
-                player.x -= 1
-            elseif btn(1, player.id) then
-                player.x += 1
-            end
-            if btn(2, player.id) then
-                player.y -= 1
-                player.ymov = 1
-            elseif btn(3, player.id) then
-                player.y += 1
-                player.ymov = -1
-            else
-                player.ymov = 0
+        if currentwave ~= 20 then
+            if player.health > 0 then -- can only input if alive!!!
+                if btn(0, player.id) then
+                    player.x -= 1
+                elseif btn(1, player.id) then
+                    player.x += 1
+                end
+                if btn(2, player.id) then
+                    player.y -= 1
+                    player.ymov = 1
+                elseif btn(3, player.id) then
+                    player.y += 1
+                    player.ymov = -1
+                else
+                    player.ymov = 0
+                end
             end
+            player.x = mid(0, player.x, 120)
+        else
+            player.x = lerp(player.x, 200, 0.01) --slides the ship offscreen duing the scorescreen
         end
-        player.x = mid(0, player.x, 120)
         player.y = mid(0, player.y, 120)
 
         --particles from rockets, and smoke/sparks from damage
         player.particlecooldown -= ft
         if player.particlecooldown < 0 and player.health > 0 then
             for i = 0, 1, 1 do
-                addcircle(player.x-1, player.y+i*7, -0.5, 0, 1.5, 0.5, 9)
+                addcircle(player.x-1, player.y+i*7, -0.5, 0, 1.5, 0.5, 9) --thruster fx
             end
-            -- addcircle(player.x-1, player.y, -0.5, 0, 1.5, 0.5, 9)
-            -- addcircle(player.x-1, player.y+7, -0.5, 0, 1.5, 0.5, 9)
             if player.health < 3 then --sparks
                 addcircle(player.x+rnd(8), player.y+rnd(8), rnd(1.5)-0.75, -1.5, 1, rnd(1)+0.5, rnd({9,10}), -0.1)
             end
@@ -111,10 +113,7 @@ function addplayer(x, y, sprite, spriteup, spritedwn, bulletsprite)
         --shooting after cooldown
         player.shootcooldown -= ft
         player.inv -= ft
-        if (btn(4, player.id) or alwaysfire) and player.shootcooldown < 0 and player.health > 0 then
-            --for i = 1, 4, 1 do
-                --addcircle(player.x+3, player.y+4, rnd(1)+0.5, rnd(1)-0.5, 1.5, rnd(0.4), 12) 
-            --end
+        if (btn(4, player.id) or alwaysfire) and player.shootcooldown < 0 and player.health > 0 and currentwave ~= 20 then
             addbullet(player.x+3, player.y, 2, 0, true, bulletsprite)
             if player.shoot3 then
                 addbullet(player.x+3, player.y+3, 2, 0.25, true, bulletsprite)
diff --git a/ui.lua b/ui.lua
index e7f7875..12ec365 100644
--- a/ui.lua
+++ b/ui.lua
@@ -98,7 +98,7 @@ function credits(x,y)
 end
 
 --Ending screen
-function finalscorescreen(x,y)
+function finalscorescreen(x)
     local playercolour0 = 12
     local playercolour1 = 15
     if coopmode then
@@ -107,19 +107,19 @@ function finalscorescreen(x,y)
     end
 
     poke(0x5f58, 0x9 | 0x4) --makes score BIG
-    printdropshadow("vICTORY!", x+32,y+18,6,5)
-    printdropshadow(scorewithzeros(tostring(currentscore),4),x+48+circletimex,y+50+circletimey,playercolour0,playercolour1) --2P high score
+    printdropshadow("vICTORY!", x+32,18,6,5)
+    printdropshadow(scorewithzeros(tostring(currentscore),4),x+48+circletimex,50+circletimey,playercolour0,playercolour1) --2P high score
     poke(0x5f58)
     -- printdropshadow("fINAL sCORE", x+43,y+22,6,5)
     if (coopmode and currentscore > highscore1) or (not coopmode and currentscore > highscore0) then
         if flashtime then
-            printdropshadow("! new high score !", x+27,y+34,11,3)
+            printdropshadow("! new high score !", x+27,34,11,3)
         end
     end
 
-    printdropshadow("   THANKS FOR PLAYING\nPRESS (❎ ⁙ 🅾️) TO RETRY", x+15,y+80,11,3)
+    printdropshadow("   THANKS FOR PLAYING\nPRESS (❎ ⁙ 🅾️) TO RETRY", x+15,80,11,3)
 
-    printdropshadow("MADE WITH ♥ IN VANCOUVER\n       ◆ 2022 ◆", x+14,y+113,9,2)
+    printdropshadow("MADE WITH ♥ IN VANCOUVER\n       ◆ 2022 ◆", x+14,113,9,2)
     -- printdropshadow("◆ 2022 ◆", x+42,y+118,11,3)
 end