starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

game: add: pladdle can move online with ping

Browse Source
This commit is contained in:
starnakin 2024-01-18 14:40:31 +01:00
parent 251e9b032a
commit b0861b0ec0
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/static/js/api/game/Game.js
View File

@ -118,23 +118,28 @@ class Game
if (index === -1) if (index === -1)
return return
this.players.splice(index, 1); this.players.splice(index, 1);
} }
_receive_paddle_position(data) _receive_update_paddle(data)
{ {
data.players.forEach((player_data) => { console.log(data)
let player = this.players.find((player) => player.id === player_data.id); let player = this.players.find((player) => player.id === data.user_id);
if (player === null) if (player === null)
return {
player.update_pos(player_data.position, player_data.time); this._receive_player_join(data);
}) return;
}
player.update_pos(data.position.position, data.position.time);
} }
_receive(data) _receive(data)
{ {
if (data.detail === "paddle_position") if (data.detail === "update_paddle")
this._receive_paddle_position(data); this._receive_update_paddle(data);
else if (data.detail === "update_ball") else if (data.detail === "update_ball")
this._update_ball(data); this._update_ball(data);
else if (data.detail === "init_game") else if (data.detail === "init_game")

9
games/objects/Player.py
View File

@ -11,13 +11,16 @@ from typing import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from ...transcendence.abstract.AbstractRoomMember import AbstractRoomMember from ...transcendence.abstract.AbstractRoomMember import AbstractRoomMember
from .Game import Game
class Player(Spectator): class Player(Spectator):
def __init__(self, user_id: int, socket: WebsocketConsumer, rail_start_x: float, rail_start_y: float, rail_stop_x: float, rail_stop_y: float) -> None: def __init__(self, game: Game, user_id: int, socket: WebsocketConsumer, rail_start_x: float, rail_start_y: float, rail_stop_x: float, rail_stop_y: float) -> None:
super().__init__(user_id, socket) super().__init__(user_id, socket)
self.game: Game = game
self.position: Position = Position(0.5, 0) self.position: Position = Position(0.5, 0)
self.nb_goal: int = 0 self.nb_goal: int = 0
@ -93,7 +96,9 @@ class Player(Spectator):
self.position = new_position self.position = new_position
if (invalid_pos): if (invalid_pos):
self.game_member.send("update_paddle", self.to_dict()) self.send("update_paddle", self.to_dict())
self.game.broadcast("update_paddle", self.to_dict(), [self])
def to_dict(self): def to_dict(self):