From 9e425d69b5876c479dc28550604562be52885913 Mon Sep 17 00:00:00 2001 From: Madiwka Date: Wed, 19 Aug 2020 12:05:12 +0600 Subject: [PATCH] Changed ball serving --- eball.lua | 10 +++++++++- main.lua | 4 +++- src/baseGame.lua | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eball.lua b/eball.lua index aebe5bb..e58b44f 100644 --- a/eball.lua +++ b/eball.lua @@ -50,7 +50,15 @@ else self.dx = ball_DIR end self.disabled = false -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) diff --git a/main.lua b/main.lua index 2fd9454..1db50cc 100644 --- a/main.lua +++ b/main.lua @@ -214,6 +214,7 @@ function love.load() globalState = "nettest" AGAINST_AI = 0 gameState = "1serve" + ball[1]:reset(1, 1) end ) ) @@ -225,6 +226,7 @@ function love.load() globalState = "clienttest" AGAINST_AI = 0 gameState = "1serve" + ball[1]:reset(1, 1) end ) ) @@ -1125,7 +1127,7 @@ function love.keypressed(key) gameState = "1serve" resettinggenius() for i = 1, maxBalls do - ball[i]:reset(i) + ball[i]:reset(i, 1) end end else diff --git a/src/baseGame.lua b/src/baseGame.lua index 72263da..1d828ba 100644 --- a/src/baseGame.lua +++ b/src/baseGame.lua @@ -391,7 +391,7 @@ function goalManager() AI_SPEED = difficultyl / 10 for i = 1, maxBalls do - ball[i]:reset(i) + ball[i]:reset(i, 2) end if (player2score == ptw and gameMode ~= "practice") then for i = 1, maxBalls do