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

add: tictactoe: timers on catchup

Browse Source
This commit is contained in:
Namonay
2024-05-14 16:46:16 +02:00
parent aa01405988
commit 995a808974
5 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
django/frontend/static/js/api/game/tictactoe/TicTacToeGame.js
View File

@ -1,4 +1,4 @@
import { client, lang } from "../../../index.js";
import { client, lang, navigateTo } from "../../../index.js";
import { AGame } from "../AGame.js";
@ -50,7 +50,7 @@ class TicTacToe
this.game.finished = false;
if (this.turn)
this.setOutline(4, false);
this.printTimer();
this.printTimer(20);
break;
case 'game_move':
@ -59,7 +59,7 @@ class TicTacToe
this.map[messageData.targetMorpion][messageData.targetCase] = (this.sign == "x") ? 1 : 0;
this.printSign(messageData.targetMorpion, messageData.targetCase, (this.sign == "x") ? "o" : "x");
this.setOutline(this.currentMorpion, false);
this.printTimer();
this.printTimer(20);
break;
case 'game_end':
@ -68,6 +68,7 @@ class TicTacToe
this.printWin(messageData.winning_sign);
break;
case 'catchup':
this.game.finished = messageData.finished
this.map = messageData.morpion;
for (let i = 0; i < 9; i++)
{
@ -81,6 +82,7 @@ class TicTacToe
this.currentMorpion = messageData.currentMorpion;
if (this.turn)
this.setOutline(this.currentMorpion, false);
this.printTimer(Math.floor(messageData.timer));
}
}
@ -96,10 +98,15 @@ class TicTacToe
this.context.fillText((winning_sign == "o") ? lang.get("morpionWin") + "O" : lang.get("morpionWin") + "X", this.width / 2 - 85, this.height - this.gap / 2 + 10, 180);
}
printTimer()
printTimer(sec)
{
let sec = 20;
let turn = this.turn
let turn = this.turn;
if (sec <= 0)
{
this.game.send(JSON.stringify({"timerIsDue" : this.sign}))
return;
}
if (this.turn)
{
this.context.beginPath();
@ -115,10 +122,10 @@ class TicTacToe
this.context.fillStyle = "#1a1a1d";
this.context.fillRect(this.width / 2 - 40, 0, this.width / 2 + 40, this.gap - 10)
this.context.closePath();
if (sec == 0 || turn != this.turn || this.game.finished)
if (sec <= 0 || turn != this.turn || this.game.finished)
{
clearInterval(id);
if (sec == 0 && !this.turn && this.game.finished == false)
if (sec <= 0 && this.game.finished == false)
this.game.send(JSON.stringify({"timerIsDue" : this.sign}))
return;
}
@ -175,7 +182,7 @@ class TicTacToe
{
morpion.setOutline(this.currentMorpion, true);
morpion.sendCase(targetMorpion, targetCase);
morpion.printTimer()
morpion.printTimer(20)
}
else
morpion.incorrectCase();
@ -221,7 +228,7 @@ class TicTacToe
this.context.strokeStyle = "red";
targetX += this.rectsize / 2;
targetY += this.rectsize / 2;
this.context.arc(targetX, targetY, 15, 0, 2 * Math.PI);
this.context.arc(targetX, targetY, this.rectsize / 2 - 7, 0, 2 * Math.PI);
this.context.stroke();
this.context.closePath();
}

16
django/frontend/static/js/views/ProfilePageView.js
View File

@ -86,8 +86,7 @@ export default class extends AbstractView {
games.forEach(game => {
if (game.finished === false)
return
if (this.profile.id === game.winner.id)
if (this.profile.id === game.winner?.id)
win++;
else
lose++;
@ -114,10 +113,16 @@ export default class extends AbstractView {
let game_item = document.createElement("div");
game_item.className = "game-item";
game_item.style.backgroundColor = "grey";
if (game.started)
game_item.style.backgroundColor = "yellow";
if (game.finished)
if (game.finished && game.winner == null)
game_item.style.backgroundColor = "red";
else if (game.finished)
game_item.style.backgroundColor = this.profile.id === game.winner.id ? "green" : "red";
else if (game.started)
game_item.style.backgroundColor = "yellow";
let gametype = document.createElement("b");
gametype.innerText = `${(game.game_type == "tictactoe") ? lang.get("ticTacToeTitle") : "Pong"}`;
game_item.appendChild(gametype);
game.players.forEach(player => {
let player_score = document.createElement("a");
@ -128,7 +133,6 @@ export default class extends AbstractView {
game_item.appendChild(player_score);
});
a.appendChild(game_item);
game_list.appendChild(a);
});

8
django/frontend/static/js/views/TicTacToeOnlineView.js
View File

@ -1,12 +1,12 @@
import AbstractView from "./abstracts/AbstractView.js";
import { lang } from "../index.js";
import { TicTacToe } from "../api/game/tictactoe/TicTacToeGame.js"
export class TicTacToeOnlineView extends AbstractView
import AbstractAuthenticatedView from "./abstracts/AbstractAuthenticatedView.js";
import { navigateTo } from "../index.js"
export class TicTacToeOnlineView extends AbstractAuthenticatedView
{
constructor(params, titleKey)
{
super(params, lang.get('ticTacToeTitle'));
super(params, 'ticTacToeTitle');
this.params = params;
this.titleKey = titleKey;
this.game_id = params.id;