From 20840e1dc2d15ebd7192140791db0bf162fe06d7 Mon Sep 17 00:00:00 2001
From: Madiwka <mainbox@madi-wka.club>
Date: Wed, 19 Aug 2020 11:58:49 +0600
Subject: [PATCH] change servebot

---
 eball.lua        | 13 +++++++++++--
 main.lua         | 10 +++++-----
 src/baseGame.lua |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/eball.lua b/eball.lua
index 9f28a05..aebe5bb 100644
--- a/eball.lua
+++ b/eball.lua
@@ -25,11 +25,20 @@ function eball:collides(paddle)
 	return true
 end
 end
-function eball:reset(ballnum)
+function eball:reset(ballnum, player)
 	if (gameMode == 'practice') then 
 		if (self.x < 1) then 
 			--love.window.setTitle(self.x)
-	self.x = VIRTUAL_WIDTH /2 - 2
+			if not player then 
+				self.x = VIRTUAL_WIDTH /2 - 2
+			elseif player == 1 then 
+				self.x = 50 
+			elseif player == 2 then 
+				self.x = VIRTUAL_WIDTH - 50
+			else 
+				self.x = VIRTUAL_WIDTH /2 - 2
+			end
+	
 	self.y = VIRTUAL_HEIGHT /2 - 2
 	self.dy = math.random(-1, 1)
 	self.dx = math.random(-1,1) 
diff --git a/main.lua b/main.lua
index bee8640..2fd9454 100644
--- a/main.lua
+++ b/main.lua
@@ -808,7 +808,7 @@ function nettest(dt)
         end
 
         
-        if (ball[1].x > VIRTUAL_WIDTH/2) and gameState ~= "play" then 
+        if (ball[1].x > VIRTUAL_WIDTH/2) then 
             die = tonumber(p[2])
             lastSentKeyClient, 
             ball[1].dy, 
@@ -893,7 +893,7 @@ function clienttest(dt)
             end 
             for i = 1, maxBalls do 
             local die = tonumber(p[2])
-            if (ball[i].x <= VIRTUAL_WIDTH/2) or gameState ~= "play" then 
+            if (ball[i].x <= VIRTUAL_WIDTH/2) then 
                 lastSentKeyClient, ball[i].dy, player1.y, player1score, player2score, player1nukescore, player2nukescore, ball[i].x, ball[i].y, gameState, ball[i].dx, ballSpeed, paddle_SPEED = p[1], die, tonumber(p[4]), tonumber(p[5]), tonumber(p[6]), tonumber(p[7]), tonumber(p[8]), tonumber(p[9]), tonumber(p[10]), p[11], tonumber(p[12]), tonumber(p[13]), tonumber(p[14])
             else 
                 lastSentKeyClient = p[1] 
@@ -1476,7 +1476,7 @@ function serveBot() --THIS IS USED TO CHANGE TEXT/BALL DIRECTION ON DIFFERENT SE
             TEXT = "Lets Begin!"
             ball_DIR = 1
             for i = 1, maxBalls do
-                ball[i]:reset(i)
+                ball[i]:reset(i, 1)
             end
             gameState = "play"
             
@@ -1488,7 +1488,7 @@ function serveBot() --THIS IS USED TO CHANGE TEXT/BALL DIRECTION ON DIFFERENT SE
             TEXT = ""
             ball_DIR = -1
             for i = 1, maxBalls do
-                ball[i]:reset(i)
+                ball[i]:reset(i, 2)
             end
 
             gameState = "play"
@@ -1498,7 +1498,7 @@ function serveBot() --THIS IS USED TO CHANGE TEXT/BALL DIRECTION ON DIFFERENT SE
             TEXT = "Lets Begin"
             ball_DIR = -1
             for i = 1, maxBalls do
-                ball[i]:reset(i)
+                ball[i]:reset(i, 2)
             end
             --love.window.setTitle("An atttttttt")
             gameState = "play"
diff --git a/src/baseGame.lua b/src/baseGame.lua
index c11c0c9..72263da 100644
--- a/src/baseGame.lua
+++ b/src/baseGame.lua
@@ -404,7 +404,7 @@ function goalManager()
                     if globalState ~= "clienttest" or (globalState == "clienttest" and gameState == "1serve") then 
                         gameState = "1serve"
                         serveBot()
-                        ball[i]:reset(i)
+                        ball[i]:reset(i, 1)
                     end 
                 end 
             end 
@@ -446,7 +446,7 @@ function goalManager()
                     gameState = "2serve"
                     serveBot()
     
-                    ball[i]:reset(i)
+                    ball[i]:reset(i, 2)
                     end