0.7.9 Definitive

main.lua

@@ -819,6 +819,7 @@ function love.load()
         ["gayTheme"] = love.audio.newSource("audio/theme2.mp3", "static"),
         ["gayTheme2"] = love.audio.newSource("audio/theme3.mp3", "static"),
         ["gayTheme3"] = love.audio.newSource("audio/theme4.mp3", "static"),
+        ["gayTheme4"] = love.audio.newSource("audio/theme5.mp3", "static"),
         ["beep"] = love.audio.newSource("audio/hit1.mp3", "static"),
         ["wallhit"] = love.audio.newSource("audio/hit2.wav", "static"),
         ["win"] = love.audio.newSource("win.wav", "static"),

music.lua

@@ -4,6 +4,7 @@ function musicController(orders, toggling)
             sounds['gayTheme']:stop()
             sounds['gayTheme2']:stop()
             sounds['gayTheme3']:stop()
+            sounds['gayTheme4']:stop()
             sounds['updateMusic']:play()
         elseif (areanuclear == 1) then 
             sounds['gayTheme']:setVolume(0)
@@ -13,13 +14,25 @@ function musicController(orders, toggling)
             sounds['updateMusic']:stop()
             sounds['gayTheme2']:stop()
             sounds['gayTheme3']:stop()
+            sounds['gayTheme4']:stop()
             sounds['gayTheme']:setPitch(1)
             sounds['gayTheme']:setLooping(true)
             sounds['gayTheme']:setVolume(0.5)
             sounds['gayTheme']:play()
-         elseif gameState == 'play' and player1score > ptw*0.8 or player2score > ptw*0.8 and areanuclear == 0 then 
+        elseif gameState == 'play' and areanuclear == 0 and ((AGAINST_AI == 1 and player1score >= ptw*0.8 and player2score < ptw*0.8) or (globalState == "nettest" and player1score > ptw*0.8 and player2score <= ptw*0.8) or (globalState == "clienttest" and player2score > ptw*0.8 and player1score <= ptw*0.8)) then 
             --print(ptw*0.8)
             sounds['gayTheme']:stop()
+            sounds['gayTheme2']:stop()
+            sounds['gayTheme3']:stop()
+            sounds['updateMusic']:stop()
+            sounds['gayTheme4']:setPitch(1)
+            sounds['gayTheme4']:setLooping(true)
+            sounds['gayTheme4']:setVolume(0.5)
+            sounds['gayTheme4']:play() 
+         elseif gameState == 'play' and player1score >= ptw*0.8 or player2score > ptw*0.8 and areanuclear == 0 then 
+            --print(ptw*0.8)
+            sounds['gayTheme']:stop()
+            sounds['gayTheme4']:stop()
             sounds['gayTheme3']:stop()
             sounds['updateMusic']:stop()
             sounds['gayTheme2']:setPitch(1)
@@ -30,6 +43,7 @@ function musicController(orders, toggling)
             --print(ptw-4)
             sounds['gayTheme']:stop()
             sounds['gayTheme2']:stop()
+            sounds['gayTheme4']:stop()
             sounds['updateMusic']:stop()
             sounds['gayTheme3']:setPitch(1)
             sounds['gayTheme3']:setLooping(true)
@@ -42,6 +56,7 @@ function musicController(orders, toggling)
         sounds['gayTheme']:stop()
         sounds['gayTheme3']:stop()
         sounds['gayTheme2']:stop()
+        sounds['gayTheme4']:stop()
         sounds['updateMusic']:stop()
             mute = true 
         else 

readme.md

@@ -18,4 +18,13 @@ To play the game on Linux, just launch the ./debuggame.sh and enjoy the game!
 To play on Linux like a normie, you can <a href = "https://madi-wka.club/NuclearPongLinux.tar.gz">Download</a> the latest release (may be outdated compared to the source version), or you can download the LOVE file from the releases tab.
 To play on Windows, download a Windows executable from the releases tab! 
 # Changes
-<p>0.7.8 is here! With this new update, a ton of graphical bugs are fixed, and the menu has been revamped! The android version got a treat as well: the controls are now not just two buttons on each side of the screen, but they instead track your finger and try to place the paddle under it! 
+<p>0.7.9 is here! Changelog:
+<ul>
+<li>Added pause menu (hit escape on PC and hit the H button on Android.</li>
+<li>Added win and lose animations</li>
+<li>Fixed musical bugs</li>
+<li>Fixed multiplayer second player lag that came with 0.7.8</li>
+<li>Fixed touch controls on android: controls are no longer dependant on the screen ratio</li>
+<li>Added different tracks for when you are losing or winning (singleplayer/online only)</li>
+</ul>
+</p>

src/baseGame.lua

@@ -394,7 +394,7 @@ function goalManager()
                 for i = 1, maxBalls do
                     ball[i]:reset(i, 2)
                 end
-                if (player2score+1 >= ptw and gameMode ~= "practice") then
+                if (player2score+1 == ptw+maxBalls-1 and gameMode ~= "practice") then
                     for i = 1, maxBalls do
                         ball[i]:reset(i)
                     end
@@ -436,7 +436,7 @@ function goalManager()
     
                 AI_SPEED = difficultyl 
                 
-                if (player1score+1 >= ptw) then
+                if (player1score+1 == ptw+maxBalls-1) then
                     ball[i]:reset(i)
     
                     sounds["win"]:play()
@@ -599,11 +599,26 @@ function winDraw(who)
 
     love.graphics.setColor(0, 0, 0, 1)
     if who == 1 then 
-        
     love.graphics.circle("fill", player2.x, player2.y, explosionRange * 100, 100)
+    love.graphics.setColor(0.7, 0.1, 0.1, 1)
+    love.graphics.circle("fill", player2.x, player2.y, explosionRange * 90, 100)  
+    love.graphics.setColor(0.1, 0.7, 0.1, 1)
+    love.graphics.circle("fill", player2.x, player2.y, explosionRange * 80, 100)
+    love.graphics.setColor(0.1, 0.1, 0.7, 1)
+    love.graphics.circle("fill", player2.x, player2.y, explosionRange * 70, 100)
+    love.graphics.setColor(0, 0, 0, 1)
+    love.graphics.circle("fill", player2.x, player2.y, explosionRange * 60, 100)
     print("cicrleexplostion at " .. explosionRange)
     else 
-    love.graphics.circle("fill", player1.x, player1.y, explosionRange * 100, 100)
+        love.graphics.circle("fill", player1.x, player1.y, explosionRange * 100, 100)
+    love.graphics.setColor(0.7, 0.1, 0.1, 1)
+    love.graphics.circle("fill", player1.x, player1.y, explosionRange * 90, 100)  
+    love.graphics.setColor(0.1, 0.7, 0.1, 1)
+    love.graphics.circle("fill", player1.x, player1.y, explosionRange * 80, 100)
+    love.graphics.setColor(0.1, 0.1, 0.7, 1)
+    love.graphics.circle("fill", player1.x, player1.y, explosionRange * 70, 100)
+    love.graphics.setColor(0, 0, 0, 1)
+    love.graphics.circle("fill", player1.x, player1.y, explosionRange * 60, 100)
     end 
     love.graphics.setColor(1, 1, 1, 1)
     love.graphics.printf(TEXT, 0, 20, VIRTUAL_WIDTH, "center")

src/constantvars.lua

@@ -1,4 +1,5 @@
 VIRTUAL_WIDTH = 1280
 VIRTUAL_HEIGHT = 720
 WINDOW_WIDTH = 1280
-WINDOW_HEIGHT = 720
+WINDOW_HEIGHT = 720
+isAndroid = false