From e9970bc0b2113c307ee79d3ece90bcfcb21ac5a7 Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Fri, 15 Nov 2024 15:41:25 +0100 Subject: [PATCH 1/5] Game - force ball pos reset --- .../requirements/nginx/static/javascript/lobbyPage/3d.js | 2 +- .../nginx/static/javascript/multiOnlineGame/Ball.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js index 892f4a9..3d2a954 100644 --- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js +++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js @@ -6,7 +6,7 @@ /* By: edbernar gameTime) - this.start -= content.game_time - gameTime + this.start -= content.game_time - gameTime + if (content.velocity[0] == 0 && content.velocity[1] == 0) + this.object.position.set(content.pos[0], this.limits.down, content.pos[1]); this.srvPos = { time : content.game_time, pos : [content.pos[0], content.pos[1]], From 620bfed8257d4b0cdd76198385538166d1e7634b Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Fri, 15 Nov 2024 16:37:25 +0100 Subject: [PATCH 2/5] Solo game - add event for resize --- .../javascript/multiLocalGame/multiLocalGamePage.js | 12 ++++++++++-- .../multiOnlineGame/multiOnlineGamePage.js | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js index 16b71aa..6ec4f92 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js +++ b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/multiLocalGamePage.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* multiLocalGamePage.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: hubourge +#+ +:+ +#+ */ +/* By: edbernar Date: Fri, 15 Nov 2024 17:09:16 +0100 Subject: [PATCH 3/5] change ball direction after point --- .../requirements/djangoserver/file/server/server/Game.py | 4 ++-- .../requirements/djangoserver/file/server/server/Player.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose/requirements/djangoserver/file/server/server/Game.py b/docker-compose/requirements/djangoserver/file/server/server/Game.py index bb376ec..564f773 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Game.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Game.py @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/11/13 16:21:18 by tomoron #+# #+# # -# Updated: 2024/11/13 16:30:41 by tomoron ### ########.fr # +# Updated: 2024/11/15 17:08:23 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -276,7 +276,7 @@ class Game: if(stop): self.ball.vel = [0, 0] else: - self.ball.setStartVel(self.lastWin == 2) + self.ball.setStartVel(self.lastWin == 1) self.sendNewBallInfo(True) self.gameStart = time.time() diff --git a/docker-compose/requirements/djangoserver/file/server/server/Player.py b/docker-compose/requirements/djangoserver/file/server/server/Player.py index 28db6d9..a6b460a 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Player.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Player.py @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/05 03:22:32 by tomoron #+# #+# # -# Updated: 2024/10/22 15:35:59 by tomoron ### ########.fr # +# Updated: 2024/11/15 16:43:28 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -40,12 +40,13 @@ class Player(): newPos = leftLimit if newPos < 0 else rightLimit return(newPos) - print("speed :", abs(newPos - self.pos["pos"]) * (1 / deltaTime)) if(abs(newPos - self.pos["pos"]) * (1 / deltaTime) > GameSettings.maxPlayerSpeed + GameSettings.playerSpeedTolerance): newMove = GameSettings.maxPlayerSpeed * deltaTime if(newPos - self.pos["pos"] < 0): newMove = -newMove print("\033[31mplayer is too fast") + print("speed :", abs(newPos - self.pos["pos"]) * (1 / deltaTime)) + print("time : ", deltaTime) newPos = self.pos["pos"] + newMove return(newPos) print("no problem") From 7469f60b7eed0d142bae802095ddb74326fff9d9 Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Fri, 15 Nov 2024 17:14:12 +0100 Subject: [PATCH 4/5] Game - fix bug ping --- .../static/javascript/multiOnlineGame/multiOnlineGamePage.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js index 5654fb3..76b3e67 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js @@ -6,7 +6,7 @@ /* By: edbernar Date: Fri, 15 Nov 2024 17:44:22 +0100 Subject: [PATCH 5/5] Game solo/multi - Fix player scale --- .../static/javascript/multiLocalGame/Ball.js | 4 +-- .../static/javascript/multiLocalGame/Map.js | 25 ++++++++++--------- .../javascript/multiOnlineGame/Player.js | 6 ++--- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Ball.js b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Ball.js index 6c6a5bd..cc4ce74 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Ball.js +++ b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Ball.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* Ball.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/28 15:58:03 by edbernar #+# #+# */ -/* Updated: 2024/09/14 00:19:46 by edbernar ### ########.fr */ +/* Updated: 2024/11/14 15:34:44 by hubourge ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js index 0aad816..7b9f1d5 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js +++ b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* Map.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/28 12:23:48 by edbernar #+# #+# */ -/* Updated: 2024/11/13 14:54:17 by edbernar ### ########.fr */ +/* Updated: 2024/11/14 15:33:50 by hubourge ### ########.fr */ /* */ /* ************************************************************************** */ @@ -59,16 +59,17 @@ class Map initialSpeed = 0.15; speed = 1; - if (Math.random() > 0.5) - { - vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; + vec2.z = 0 * initialSpeed; + // if (Math.random() > 0.5) + // { + // vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z); - } - else - { - vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; - vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z); - } + // } + // else + // { + // vec2.z = (Math.random() * 0.8 - 0.4) * initialSpeed; + // vec2.x = Math.sqrt(initialSpeed * initialSpeed - vec2.z * vec2.z); + // } setTimeout(() => { scoreElement.innerHTML = '3'; @@ -182,7 +183,7 @@ class Map { const value = 0.01; - for (let i = 1; i < 10; i++) + for (let i = 0; i < 10; i++) { setTimeout(() => { player.scale.z += value; diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js index c972479..ac59a0f 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* Player.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/18 00:30:31 by edbernar #+# #+# */ -/* Updated: 2024/11/13 15:23:47 by edbernar ### ########.fr */ +/* Updated: 2024/11/14 15:31:28 by hubourge ### ########.fr */ /* */ /* ************************************************************************** */ @@ -436,7 +436,7 @@ class Player const value = 0.004; - for (let i = 1; i < 10; i++) + for (let i = 0; i < 10; i++) { setTimeout(() => { object.scale.z += value;