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

game: multiplayer: work

Browse Source
This commit is contained in:
starnakin
2024-05-15 13:41:24 +02:00
parent efd8d53f6c
commit 400a91df3e
8 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
django/frontend/static/js/api/game/pong/PongGame.js
View File

@ -149,8 +149,6 @@ export class PongGame extends AGame
*/
async _receive(data)
{
console.log(data)
if (this._inited === false && data.detail === "init_game")
{
this._initGame(data);
@ -167,6 +165,16 @@ export class PongGame extends AGame
await this._receiveFinish(data);
else if (data.detail === "start")
await this._receiveStart();
else if (data.detail === "eliminated")
await this._receiveEliminated(data)
}
async _receiveEliminated(data)
{
console.log('bozo')
let eliminated = this.players.find(player => player.id === data.eliminated_id)
eliminated.isEliminated = true;
console.log(eliminated)
}
async _receiveFinish(data)
@ -194,7 +202,6 @@ export class PongGame extends AGame
}
player.score.push(data.timestamp)
console.log(player)
await this._goalHandler(player);
}

5
django/frontend/static/js/api/game/pong/PongMyPlayer.js
View File

@ -12,10 +12,11 @@ export class PongMyPlayer extends PongPlayer
* @param {Segment} rail
* @param {[Number]} score
* @param {Position} position
* @param {Boolean} isEliminated
*/
constructor(client, game, score, rail, position = new Position(0.5))
constructor(client, game, score, rail, position = new Position(0.5), isEliminated)
{
super(client, game, client.me.id, client.me.username, client.me.avatar, score, rail, position, true);
super(client, game, client.me.id, client.me.username, client.me.avatar, score, rail, position, true, isEliminated);
/**
* @type {Client}
*/

3
django/frontend/static/js/api/game/pong/PongPlayer.js
View File

@ -65,8 +65,7 @@ export class PongPlayer extends APlayer
{
if (this.isConnected === false || this.isEliminated === true)
{
ctx.moveTo(this.rail.start.x, this.rail.start.y);
ctx.lineTo(this.rail.stop.x, this.rail.stop.y);
this.rail.draw(ctx)
return;
}

2
django/frontend/static/js/views/PongOnlineView.js
View File

@ -71,6 +71,7 @@ export default class PongOnlineView extends AbstractAuthenticatedView
myPlayer.score,
myPlayer.rail,
myPlayer.position,
myPlayer.isEliminated
);
myPlayer = this.myPlayer;
@ -87,7 +88,6 @@ export default class PongOnlineView extends AbstractAuthenticatedView
keyPressHandler(event)
{
console.log("bozo")
if (!this.keysPressed.includes(event.key))
this.keysPressed.push(event.key);
}