Bug fixes

dualdebug.sh

@@ -0,0 +1,7 @@
+rm game.love 
+rm game.zip
+zip -r game * 
+mv game.zip game.love
+love game.love &
+love game.love
+rm game.love

main.lua

@@ -13,6 +13,7 @@ vec4 effect(vec4 color, Image image, vec2 uvs, vec2 screen_coords) {
 debug = true
 --GLOBAL VARIABLES
 gameMode = "normal"
+ts = 0
 globalState = "menu"
 timeIsSlow = false
 timeIsSlow2 = false
@@ -23,6 +24,7 @@ wall1width = 30
 nuclearanimation = 3
 easternum = 0
 ball_DIR = 0
+updaterate = 0.03
 RED = 255
 hitNum = {}
 hitNum[1] = 0
@@ -695,9 +697,10 @@ function speedControl()
 end
 
 function love.update(dt)
-    
+    print("IMPORTANT!!!!!" .. globalState .. gameState)
     staticanimatorcounter(dt)
     musicController('norm', 1)
+    ts = ts + dt 
     if debug then
         displayFPS()
     end
@@ -707,65 +710,76 @@ function love.update(dt)
     if globalState == "menu" then
         debugCheck(dt)
     end
+    
     if globalState == "nettest" then 
         basegame(dt)
-        nettest(dt)
+        if ts > updaterate then 
+            nettest(dt)
+            ts = ts - updaterate
+        end 
+        
     end
     if globalState == "clienttest" then
         if confirmation ~= "disconnected" then 
-            if confirmation == "up1" then lastSentKeyP2 = lastSentKeyClient lastSentKeyP1 = lastSentKey else 
-                lastSentKeyP1 = lastSentKeyClient lastSentKeyP2 = lastSentKey end 
+            lastSentKeyP1 = lastSentKeyClient
         clientsBaseGame(dt) 
         end
+        if ts > updaterate then 
         clienttest(dt)
+        ts = ts - updaterate
+    end 
     end
+   
+
 end
 serverinit = false 
 clientinit = false 
 function nettest(dt)
     if serverinit == false then 
-        local socket = require('socket')
+        local socket = require "socket"
+        local address, port = '45.76.95.31', 12345
         udp = socket.udp()
-        udp:setsockname('localhost', 142)
+        udp:setpeername(address, port)
         udp:settimeout(0)
         serverinit = true 
     end 
-    data, msg_or_ip, port_or_nil = udp:receivefrom()
-    if data then 
-    print(data .. "FROM " .. msg_or_ip)
+    for i = 1, maxBalls do 
+        print (tostring(ball[i].dy))
+    udp:send(tostring(lastSentKey) ..'|'.. tostring(ball[i].dy) .. '|' .. tostring(player2.y) .. '|' .. tostring(player1.y) .. '|' .. tostring(player1score) .. '|' .. tostring(player2score) .. '|' .. tostring(player1nukescore) .. '|' .. tostring(player2nukescore) .. "|confirmed|" .. tostring(ball[i].x) .. '|' .. tostring(ball[i].y) .. '|' .. gameState .. '|' .. tostring(ball[i].dx))
+    print("SENT: " .. lastSentKey)
     end 
+    data = udp:receive() 
 	if data then
 		local p = split(data, '|')
         lastSentKeyClient = p[1]
-        for i = 1, maxBalls do 
-            print (tostring(ball[i].dy))
-        udp:sendto(tostring(lastSentKey) ..'|'.. tostring(ball[i].dy) .. '|' .. tostring(player2.y) .. '|' .. tostring(player1.y) .. '|' .. tostring(player1score) .. '|' .. tostring(player2score) .. '|' .. tostring(player1nukescore) .. '|' .. tostring(player2nukescore), msg_or_ip, port_or_nil)
-        print("SENT: " .. lastSentKey)
-        end 
 	end
 end
 function clienttest(dt) 
     if clientinit == false then 
         local socket = require "socket"
-        local address, port = "45.76.95.31", 12345
+        local address, port = '45.76.95.31', 12345
         udp = socket.udp()
         udp:setpeername(address, port)
         udp:settimeout(0)
         clientinit = true 
     end
     udp:send(tostring(lastSentKey))
-    print(lastSentKey)
+    print("SENT TO SERVER:" ..  lastSentKey)
     data = udp:receive()
-    print(data)
+    --print(data)
 	if data then
         local p = split(data, '|')
         for i = 1, maxBalls do 
         local die = tonumber(p[2])
         print(p[2])
         print(p[2] + 0)
-        lastSentKeyClient, ball[i].dy, player2.y, player1.y, player1score, player2score, player1nukescore, player2nukescore, confirmation = p[1], die, tonumber(p[3]), tonumber(p[4]), tonumber(p[5]), tonumber(p[6]), tonumber(p[7]), tonumber(p[8]), p[9] 
+        print(tonumber(p[11]))
+        lastSentKeyClient, ball[i].dy, player2.y, player1.y, player1score, player2score, player1nukescore, player2nukescore, confirmation, ball[i].x, ball[i].y, gameState, ball[i].dx = p[1], die, tonumber(p[3]), tonumber(p[4]), tonumber(p[5]), tonumber(p[6]), tonumber(p[7]), tonumber(p[8]), p[9], tonumber(p[10]), tonumber(p[11]), p[12], tonumber(p[13])
         end 
-	end
+    else 
+        confirmation = "disconnected"
+    end
+    print(confirmation .. " recieved " .. lastSentKeyClient .. " AND ")
 
 end
 function wallbreaker(x, y)
@@ -1299,7 +1313,7 @@ function serveBot() --THIS IS USED TO CHANGE TEXT/BALL DIRECTION ON DIFFERENT SE
         if (gameMode ~= "practice") then
             TEXT = "PLAYER 1, serve!(q)"
         end
-        if ((globalState ~= "clienttest" and love.keyboard.isDown("q")) or gameMode == "practice" or (confirmation == "up1" and love.keyboard.isDown("q")) or (confirmation == "up2" and lastSentKeyP1 == "q") == "q" and globalState == "clienttest")) then
+        if ((globalState ~= "clienttest" and love.keyboard.isDown("q")) or (globalState == "clienttest" and lastSentKeyP1 == "q")) then
             TEXT = "Lets Begin!"
             ball_DIR = 1
             for i = 1, maxBalls do
@@ -1321,7 +1335,7 @@ function serveBot() --THIS IS USED TO CHANGE TEXT/BALL DIRECTION ON DIFFERENT SE
             gameState = "play"
             
         end
-        if (((confirmation == "up1" and lastSentKeyP2 == "p") or ((globalState ~= "clienttest" or confirmation == "up2") and love.keyboard.isDown("p")))and AGAINST_AI == 0) then
+        if (((globalState == "nettest" and lastSentKeyClient == "p") or ((globalState ~= "nettest") and love.keyboard.isDown("p")))and AGAINST_AI == 0) then
             TEXT = "Lets Begin"
             ball_DIR = -1
             for i = 1, maxBalls do

src/baseGame.lua

@@ -28,9 +28,9 @@ function basegame(dt)
             player1.dy = 0
         end
         if (AGAINST_AI == 0) then
-            if ((confirmation == "up2" and love.keyboard.isDown(p2control.up)) or lastSentKeyP2 == p2control.up) then
+            if ((globalState ~= "nettest" and love.keyboard.isDown(p2control.up)) or lastSentKeyClient == p2control.up) then
                 player2.dy = (paddle_SPEED + p2bonus) * -1
-            elseif ((confirmation == "up2" and love.keyboard.isDown(p2control.down)) or lastSentKeyP2 == p2control.down) then
+            elseif ((globalState ~= "nettest" and love.keyboard.isDown(p2control.down)) or lastSentKeyClient == p2control.down) then
                 player2.dy = paddle_SPEED + p2bonus
             else
                 player2.dy = 0
@@ -42,6 +42,7 @@ function basegame(dt)
                 
                 if (areanuclear == 0 and striken == 1 and (player1score > ptw-2 or player2score > ptw-2)) then
                    --print("Calling animation")
+                   print("AREA NUCLEAR?" .. areanuclear)
                     superanimator("tensehit", 1)
                 end
                 if gameMode == "practice" then
@@ -73,7 +74,10 @@ function basegame(dt)
                         sounds["nuclearhit"]:setPitch(1)
                         sounds["nuclearhit"]:play()
                     end
+                    print("AREA NUCLEAR?" .. areanuclear)
+                    if areanuclear == 0 then 
                     superanimator("tensehit", 1)
+                    end
                 else
                     if areanuclear == 0 then
                         sounds["beep"]:setPitch(ballSpeed / 250)
@@ -167,6 +171,7 @@ function basegame(dt)
                     (areanuclear == 0 and
                         (striken == 1 and (player1score > ptw-2 or player2score > ptw-2)))
                  then
+                    print("AREA NUCLEAR?" .. areanuclear)
                     superanimator("tensehit", 2)
                 end
                 if (ballSpeed > 200) then
@@ -186,7 +191,10 @@ function basegame(dt)
                     potentialnuke2 = 0
                     player2nukescore = 0
                     potentialstrike2 = 0
+                    print("AREA NUCLEAR?" .. areanuclear)
+                    if areanuclear == 0 then 
                     superanimator("tensehit", 2)
+                    end
                     if areanuclear == 0 then
                         sounds["striking"]:setPitch(ballSpeed / 250)
                         sounds["striking"]:play()
@@ -230,7 +238,7 @@ function basegame(dt)
                 ball[i].dx = -ball[i].dx
                 ball[i].x = player2.x - 30
 
-                if ((confirmation == "up2" and love.keyboard.isDown(p2control.up) ) or AI_SPEED < 0 or lastSentKeyP2 == p2control.up) then
+                if ((globalState ~= "nettest" and love.keyboard.isDown(p2control.up) ) or AI_SPEED < 0 or lastSentKeyClient == p2control.up) then
                     select = math.random(1, 5)
                     if select == 1 then
                         ball[i].dy = -1
@@ -243,7 +251,7 @@ function basegame(dt)
                     elseif select == 5 then
                         ball[i].dy = -2
                     end
-                elseif (confirmation == "up2" and love.keyboard.isDown(p2control.down)) or AI_SPEED > 0 or lastSentKeyP2 == p2control.down then
+                elseif (globalState ~= "nettest" and love.keyboard.isDown(p2control.down)) or AI_SPEED > 0 or lastSentKeyClient == p2control.down then
                     select = math.random(1, 5)
                     if select == 1 then
                         ball[i].dy = 1
@@ -448,20 +456,20 @@ end
 function powerAvailability()
     if (player1nukescore >= 20 and player1nukescore < 140) then
         potentialstrike1 = 1
-        if ((confirmation == "up1" and love.keyboard.isDown(p1control.super)) or (confirmation == "up2" and lastSentKeyP1 == p1control.super)) then
+        if (((globalState ~= "clienttest" and love.keyboard.isDown(p1control.super)) or (confirmation == "confirmed" and lastSentKeyP1 == p1control.super)) ) then
             player1striken = 1
             player1reverbav = 0
         end
     end
-    if (player1nukescore >= 140) and timeIsSlow2 == false and timeIsSlow == false and maxBalls == 1 and ball[1].x < VIRTUAL_WIDTH / 2  and ball[1].dx < 0 then
+    if (player1nukescore >= 140) and timeIsSlow2 == false and timeIsSlow == false then
         player1reverbav = 1
-        if ((confirmation == "up1" and love.keyboard.isDown(p1control.counter)) or (confirmation == "up2" and lastSentKeyP1 == p1control.counter)) then
+        if ((confirmation == "confirmed" and lastSentKeyP1 == p1control.counter) or (globalState ~= "clienttest" and love.keyboard.isDown(p1control.counter))) then
             powerControl(1, "special")
         end
     end
     if (player1nukescore >= 200) then
         potentialnuke1 = 1
-        if ((confirmation == "up1" and love.keyboard.isDown(p1control.super)) or (confirmation == "up2" and lastSentKeyP1 == p1control.super)) then
+        if ((confirmation == "confirmed" and lastSentKeyP1 == p1control.super)or (globalState ~= "clienttest" and love.keyboard.isDown(p1control.super))) then
             sounds["nuke"]:play()
             if areanuclear == 1 then
                 maxspeed = maxspeed + 50
@@ -490,15 +498,15 @@ function powerAvailability()
     if (player2nukescore >= 20 and player2nukescore <= 140) then
         potentialstrike2 = 1
         if (AGAINST_AI == 0) then
-            if ((confirmation == "up2" and love.keyboard.isDown(p2control.super)) or lastSentKeyP2 == p2control.super) then
+            if ((globalState ~= "nettest" and love.keyboard.isDown(p2control.super)) or lastSentKeyClient == p2control.super ) then
                 player2striken = 1
                 player2reverbav = 0
             end
         end
     end
-    if (player2nukescore >= 140) and timeIsSlow == false and timeIsSlow2 == false and maxBalls == 1 and ball[1].x > VIRTUAL_WIDTH / 2 and ball[1].dx > 0 then
+    if (player2nukescore >= 140) and timeIsSlow == false and timeIsSlow2 == false  then
         player2reverbav = 1
-        if (confirmation == "up2" and love.keyboard.isDown(p2control.counter)) or lastSentKeyP2 == p2control.counter then
+        if (globalState ~= "nettest" and love.keyboard.isDown(p2control.counter)) or lastSentKeyClient == p2control.counter then
             sounds["time"]:play()
             player2reverbav = false
             timeIsSlow2 = true
@@ -511,7 +519,7 @@ function powerAvailability()
     end
     if (player2nukescore >= 200) then
         potentialnuke2 = 1
-        if (((confirmation == "up2" and love.keyboard.isDown(p2control.super)) or lastSentKeyP2 == p2control.super) and AGAINST_AI == 0) then
+        if (((globalState ~= "nettest" and love.keyboard.isDown(p2control.super)) or lastSentKeyClient == p2control.super)) and AGAINST_AI == 0 then
             sounds["nuke"]:play()
             if areanuclear == 1 then
                 maxspeed = maxspeed + 50
@@ -557,7 +565,9 @@ end
 
 function nuclearDraw()
     love.graphics.setColor(1, 1, 1, 1)
-    love.graphics.circle("fill", ball[1].x, ball[1].y, explosionRange * 100, 100)
+    for i = 1, maxBalls do 
+    love.graphics.circle("fill", ball[i].x, ball[i].y, explosionRange * 100, 100)
+    end 
     player1.RED, player1.GREEN, player1.BLUE, player2.RED, player2.GREEN, player2.BLUE =
         nuclearanimation / 3,
         nuclearanimation / 3,
@@ -770,7 +780,7 @@ function displayPoints()
         else
             love.graphics.print(tostring("READY"), VIRTUAL_WIDTH / 2 - 500, VIRTUAL_HEIGHT / 60)
         end
-    elseif (player1reverbav == 1 and potentialnuke1 == 0 and maxBalls == 1) then
+    elseif (player1reverbav == 1 and potentialnuke1 == 0 ) then
         love.graphics.print(
             tostring(
                 math.floor(player1nukescore) .. "[" .. p1control.super .. "]" .. " [" .. p1control.counter .. "]"
@@ -778,7 +788,7 @@ function displayPoints()
             VIRTUAL_WIDTH / 2 - 500,
             VIRTUAL_HEIGHT / 60
         )
-    elseif (potentialnuke1 == 1 and maxBalls == 1) then
+    elseif (potentialnuke1 == 1) then
         love.graphics.setColor(255, 0, 0, 255)
         love.graphics.print(
             tostring(
@@ -811,7 +821,7 @@ function displayPoints()
         else
             love.graphics.print(tostring("READY"), VIRTUAL_WIDTH / 2 + 430, VIRTUAL_HEIGHT / 60)
         end
-    elseif (potentialnuke2 == 1 and maxBalls == 1) then
+    elseif (potentialnuke2 == 1) then
         love.graphics.setColor(255, 0, 0, 255)
         love.graphics.print(
             tostring(math.floor(player2nukescore) .. "[" .. p2control.super .. "] [" .. p2control.counter .. "]"),
@@ -827,7 +837,7 @@ function displayPoints()
             VIRTUAL_HEIGHT / 60
         )
         love.graphics.setColor(255, 255, 255, 255)       
-    elseif (player2reverbav == 1 and potentialnuke2 == 0 and maxBalls == 1) then
+    elseif (player2reverbav == 1 and potentialnuke2 == 0 ) then
         love.graphics.print(
             tostring(math.floor(player2nukescore) .. "[" .. p2control.super .. "] [" .. p2control.counter .. "]"),
             VIRTUAL_WIDTH / 2 + 400,
@@ -949,7 +959,13 @@ function rules(query, i)
         end
     end 
 end 
-function clientsBaseGame(dt) 
+function clientsBaseGame(dt)
+    if confirmation == "confirmed" then 
+        player2.RED = 0
+        print("KEYS ARE: " .. confirmation .. " " .. lastSentKeyP1)
+    else 
+        TEXT = "DISCONNECTED"
+    end
     if gameMode == "reverse" then 
         reversegame(dt)
     end 
@@ -965,12 +981,23 @@ function clientsBaseGame(dt)
     if t < shakeDuration then
         t = t + dt
     end
-    if (lastSentKeyClient == p1control.up) then
-        player1.dy = (paddle_SPEED + p1bonus) * -1
-    elseif (lastSentKeyClient == p1control.down) then
-        player1.dy = paddle_SPEED + p1bonus
+    
+    if (lastSentKeyP1 == p1control.up) then
+        player1.dy = (paddle_SPEED + p2bonus) * -1
+        print("moving player1 up")
+    elseif (lastSentKeyP1 == p1control.down) then
+        player1.dy = paddle_SPEED + p2bonus
+        print("moving player1 down")
     else
         player1.dy = 0
+        print("stopping player")
+    end
+    if ((love.keyboard.isDown(p2control.up))) then
+        player2.dy = (paddle_SPEED + p2bonus) * -1
+    elseif ((love.keyboard.isDown(p2control.down))) then
+        player2.dy = paddle_SPEED + p2bonus
+    else
+        player2.dy = 0
     end
    --print("T = " .. tostring(t))
     serveBot()
@@ -985,6 +1012,7 @@ function clientsBaseGame(dt)
                 if (areanuclear == 0 and striken == 1 and (player1score > ptw-2 or player2score > ptw-2)) then
                    --print("Calling animation")
                     superanimator("tensehit", 1)
+                    print("AREA NUCLEAR?" .. areanuclear)
                 end
                 if gameMode == "practice" then
                     player1score = player1score + 1
@@ -1015,7 +1043,9 @@ function clientsBaseGame(dt)
                         sounds["nuclearhit"]:setPitch(1)
                         sounds["nuclearhit"]:play()
                     end
+                    if areanuclear == 0 then 
                     superanimator("tensehit", 1)
+                    end 
                 else
                     if areanuclear == 0 then
                         sounds["beep"]:setPitch(ballSpeed / 250)
@@ -1053,6 +1083,7 @@ function clientsBaseGame(dt)
                     (areanuclear == 0 and
                         (striken == 1 and (player1score > ptw-2 or player2score > ptw-2)))
                  then
+                    print("AREA NUCLEAR?" .. areanuclear)
                     superanimator("tensehit", 2)
                 end
                 if (ballSpeed > 200) then
@@ -1072,7 +1103,10 @@ function clientsBaseGame(dt)
                     potentialnuke2 = 0
                     player2nukescore = 0
                     potentialstrike2 = 0
+                    print("AREA NUCLEAR?" .. areanuclear)
+                    if areanuclear == 0 then 
                     superanimator("tensehit", 2)
+                    end
                     if areanuclear == 0 then
                         sounds["striking"]:setPitch(ballSpeed / 250)
                         sounds["striking"]:play()