From 1a3e1f96466a88bc1fb4b215c663534bb874c72f Mon Sep 17 00:00:00 2001
From: madiwka3 <madi.turgunov.03@gmail.com>
Date: Tue, 18 Aug 2020 18:14:15 +0600
Subject: [PATCH] Paddle speed is now synced
---
main.lua | 9 +++++----
src/baseGame.lua | 6 ------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/main.lua b/main.lua
index b0bf1bd..33fe6d9 100644
--- a/main.lua
+++ b/main.lua
@@ -777,6 +777,7 @@ function nettest(dt)
'|' .. gameState ..
'|' .. tostring(ball[i].dx) ..
'|' .. tostring(ballSpeed) ..
+ '|' .. tostring(paddle_SPEED) ..
"|HOST")
print("SENT: " .. lastSentKey)
ts = 0
@@ -846,16 +847,16 @@ function clienttest(dt)
print("SENT TO SERVER:" .. lastSentKey)
confirmation = "N"
local p = split(data, '|')
- if p[14] then
- if p[14] ~= "HOST" then
+ if p[15] then
+ if p[15] ~= "HOST" then
confirmation = "U"
end
- if tonumber(p[15]) > 90 then
+ if tonumber(p[16]) > 90 then
confirmation = "L"
end
for i = 1, maxBalls do
local die = tonumber(p[2])
- lastSentKeyClient, ball[i].dy, player1.y, player1score, player2score, player1nukescore, player2nukescore, ball[i].x, ball[i].y, gameState, ball[i].dx, ballSpeed = 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])
+ 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])
end
end
end
diff --git a/src/baseGame.lua b/src/baseGame.lua
index 1955c3e..3758fd9 100644
--- a/src/baseGame.lua
+++ b/src/baseGame.lua
@@ -1057,18 +1057,12 @@ function clientsBaseGame(dt)
if (striken == 1) then
player1nukescore = player1nukescore * 1.2
- if (synctype == 0) then
- paddle_SPEED = paddle_SPEED * 1.10
- elseif (synctype == 1) then
- paddle_SPEED = ballSpeed / 10
- end
if (synctype == 0) then
AI_SPEED = AI_SPEED * 1.10
end
if (synctype == 1) then
AI_SPEED = ballSpeed * 1.1 / 10
end
- ballSpeed = ballSpeed * 1.10
end
player1nukescore = player1nukescore + 10
ball[i].dx = -ball[i].dx