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

game: add: goal statistic

Browse Source
This commit is contained in:
starnakin
2024-02-26 17:11:31 +01:00
committed by AdrienLSH
parent d961130de3
commit b9de0f3619
15 changed files with 335 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
games/routine.py
View File

@ -173,7 +173,7 @@ def wall_collision(ball_angle: float, wall: Segment) -> float:
return reflection_angle
async def paddle_collision(ball: Ball, impact: Point, player: Player, inc_x: float, inc_y: float):
async def paddle_collision(game: Game, impact: Point, player: Player, inc_x: float, inc_y: float):
diff_x: float = player.rail.stop.x - player.rail.start.x
diff_y: float = player.rail.stop.y - player.rail.start.y
@ -199,8 +199,7 @@ async def paddle_collision(ball: Ball, impact: Point, player: Player, inc_x: flo
hit_point: Point = Point(impact.x - inc_x, impact.y - inc_y)
if (not paddle.is_on(hit_point)):
player.nb_goal += 1
await SyncToAsync(player.game.broadcast)("goal", {"player": player.user_id, "nb_goal": player.nb_goal})
await SyncToAsync(game.goal)(player)
return None
paddle_angle: float = paddle.angle()
@ -235,7 +234,7 @@ async def collision(game: Game, impact_data: dict) -> bool:
if (player_hitted is None):
angle = wall_collision(game.ball.angle, segment)
else:
angle = await paddle_collision(game.ball, impact_data.get("impact"), player_hitted, impact_data.get("inc_x"), impact_data.get("inc_y"))
angle = await paddle_collision(game, impact_data.get("impact"), player_hitted, impact_data.get("inc_x"), impact_data.get("inc_y"))
if (angle is None):
return False