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

Merge branch 'main' of codeberg.org:adrien-lsh/ft_transcendence

Browse Source
This commit is contained in:
Namonay
2024-05-15 14:01:04 +02:00
parent 4eee8895ca 28d96dc4d6
commit eca5f22d50
13 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/frontend/static/js/api/Notice.js
View File

@ -24,8 +24,6 @@ export default class Notice {
this._socket.onmessage = async message => {
const data = JSON.parse(message.data);
console.log(data);
if (data.type === 'friend_request') {
this.friend_request(data.author);
} else if (data.type === 'new_friend') {

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;
}

4
django/frontend/static/js/views/PongOfflineView.js
View File

@ -280,8 +280,8 @@ class Game {
PADDLESPEED: 3,
BALLRADIUS: 5,
BALLSPEED: 2,
BALLMAXSPEED: 4,
BALLSPEEDINCR: 0.15,
BALLMAXSPEED: 10,
BALLSPEEDINCR: 0.2,
MAXBOUNCEANGLE: 10 * (Math.PI / 12),
MAXSCORE: 2
};

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);
}

7
django/frontend/static/js/views/Search.js
View File

@ -31,11 +31,6 @@ export default class extends AbstractView {
this.profiles.filter(user => user.username.toLowerCase().startsWith(search) == true).forEach(async (user) => {
if (user.id == null) {
console.log("list User one with id null;");
return;
}
const new_user = document.createElement("li");
// username
@ -46,7 +41,7 @@ export default class extends AbstractView {
if (this.logged && user.id == client.me.id)
username.style.color = "green";
else {
const online = user.online;
let online = (await client.profiles.getProfile(user.username)).online;
if (online == undefined)
username.style.color = "gray";
else if (online == true)