Game

- fix english
    - add pfp on scoreboard

docker-compose/requirements/djangoserver/file/server/server/Game.py

@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/09/13 16:20:58 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/08 10:50:47 by tomoron          ###   ########.fr        #
+#    Updated: 2024/10/08 17:44:34 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -110,8 +110,8 @@ class Game:
 				self.p2.skin = skin
 			if(self.p2 != None and self.p1 != None):
 				print("both players here, send opponent to both players")
-				self.p1.socket.sync_send({"type":"game", "content":{"action":1,"id":self.p2.socket.id,"username":self.p2.socket.username, "skin":self.p2.skin}})
-				self.p2.socket.sync_send({"type":"game", "content":{"action":1,"id":self.p1.socket.id,"username":self.p1.socket.username, "skin":self.p1.skin}})
+				self.p1.socket.sync_send({"type":"game", "content":{"action":1,"id":self.p2.socket.id,"username":self.p2.socket.username, "skin":self.p2.skin, 'pfpOpponent':self.p2.socket.pfp, 'pfpSelf':self.p1.socket.pfp}})
+				self.p2.socket.sync_send({"type":"game", "content":{"action":1,"id":self.p1.socket.id,"username":self.p1.socket.username, "skin":self.p1.skin, 'pfpOpponent':self.p1.socket.pfp, 'pfpSelf':self.p2.socket.pfp}})
 		except Exception as e:
 			socket.sendError("invalid request", 9005, e)
 

docker-compose/requirements/djangoserver/file/server/server/templates/multiOnlineGamePage.html

@@ -3,7 +3,7 @@
 	<p id="ping">0 ms</p>
 </div>
 <div id="endGameDiv">
-	<p id="endGameText">You lose...</p>
+	<p id="endGameText">You lost...</p>
 	<p id="endGameScore">0 - 0</p>
 	<p id="endGameSimpleText">You will be redirected to the lobby in 5 seconds</p>
 </div>

docker-compose/requirements/djangoserver/file/server/server/urls.py

@@ -25,9 +25,9 @@ urlpatterns = [
 	path("multiOnlineGamePage", views.multiOnlineGamePage, name='multiOnlineGamePage'),
 	path("waitingGamePage", views.waitingGamePage, name='waitingGamePage'),
 	path("profilPage", views.profilPage, name='profilPage'),
-	path("game", views.game, name='game'),
+	# path("game", views.game, name='game'),
 	path("wait_game", views.game, name='wait_game'),
-	#path("tournament", views.tournament, name='tournament'),
+	path("tournament", views.tournament, name='tournament'),
     path("login42", views.login42, name='login42'),
     path("logout", views.logout, name='logout'),
 	path("verify", views.verify, name='verify'),