Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2025-12-16 14:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

pbl solved

Browse Source
This commit is contained in:
Theouche 2024-08-07 17:26:16 +02:00
parent 67dbd4b583
commit 9daf75b35e
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -34,6 +34,8 @@ ps:
db-shell: db-shell:
$(COMPOSE) exec db psql -U 42student players_db $(COMPOSE) exec db psql -U 42student players_db
re : destroy down up
help: help:
@echo "Usage:" @echo "Usage:"
@echo " make build [c=service] # Build images" @echo " make build [c=service] # Build images"

36
pong/game/game.py
View File

@ -29,11 +29,7 @@ class Game:
self.p2_mov = 0 self.p2_mov = 0
self.bt1 = 0 self.bt1 = 0
self.bt2 = 0 self.bt2 = 0
self.last_update_time = 0
self.update_interval = 1
if self.botgame:
self.bot_player = BotPlayer(self.game_state, self.speed)
async def start_game(self): async def start_game(self):
print(f"- Game #{self.game_id} STARTED") print(f"- Game #{self.game_id} STARTED")
@ -42,11 +38,7 @@ class Game:
async def game_loop(self): async def game_loop(self):
while True: while True:
if self.botgame: if self.botgame:
current_time = asyncio.get_event_loop().time() await self.update_bot_position()
if current_time - self.last_update_time >= self.update_interval:
await self.update_bot_position()
self.last_update_time = current_time
#await self.update_bot_position()
await self.handle_pad_movement() await self.handle_pad_movement()
self.update_game_state() self.update_game_state()
@ -62,30 +54,6 @@ class Game:
elif self.game_state['player2_position'] + 80 > target_y: elif self.game_state['player2_position'] + 80 > target_y:
self.game_state['player2_position'] = max(self.game_state['player2_position'] - (5 * self.speed), 0) self.game_state['player2_position'] = max(self.game_state['player2_position'] - (5 * self.speed), 0)
""" async def update_bot_position(self):
target_y = self.predict_ball_position()
current_pos = self.game_state['player2_position']
if abs(current_pos - target_y) < 5: # Add some randomness to mimic human error
return
if current_pos < target_y:
self.game_state['player2_position'] = min(current_pos + (5 * self.speed), 300)
else:
self.game_state['player2_position'] = max(current_pos - (5 * self.speed), 0)
def predict_ball_position(self):
ball_pos = self.game_state['ball_position']
ball_velocity = self.game_state['ball_velocity']
# Simple prediction of ball position in future, considering only current velocity
predicted_y = ball_pos['y'] + ball_velocity['y']
# Handle ball rebounding off the top or bottom of the game area
if predicted_y < 0 or predicted_y > 300: # Assuming game height is 300
predicted_y = 300 - abs(predicted_y % 300)
return predicted_y """
def update_game_state(self): def update_game_state(self):
# Update ball position # Update ball position