minor fixups
This commit is contained in:
parent
26d7a3d08a
commit
52e511e443
2 changed files with 44 additions and 46 deletions
|
|
@ -49,7 +49,7 @@
|
||||||
<span class="text-gray-400">local games keys for the left paddle:
|
<span class="text-gray-400">local games keys for the left paddle:
|
||||||
<br />
|
<br />
|
||||||
up:
|
up:
|
||||||
<kbd class="disp-key">O</kbd>
|
<kbd class="disp-key">P</kbd>
|
||||||
down:
|
down:
|
||||||
<kbd class="disp-key">L</kbd>
|
<kbd class="disp-key">L</kbd>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,6 @@ function gameJoinButtons(socket : CSocket, inTournament : boolean, currentGame :
|
||||||
tournament : HTMLButtonElement, queue : HTMLButtonElement, localGame : HTMLButtonElement, ready : HTMLButtonElement)
|
tournament : HTMLButtonElement, queue : HTMLButtonElement, localGame : HTMLButtonElement, ready : HTMLButtonElement)
|
||||||
{
|
{
|
||||||
tournament.addEventListener("click", () => {
|
tournament.addEventListener("click", () => {
|
||||||
showInfo(`Button State: ${tournament.innerText}`);
|
|
||||||
switch (tournament.innerText) {
|
switch (tournament.innerText) {
|
||||||
case TourBtnState.AbleToStart:
|
case TourBtnState.AbleToStart:
|
||||||
socket.emit("tourStart");
|
socket.emit("tourStart");
|
||||||
|
|
@ -133,15 +132,18 @@ function gameJoinButtons(socket : CSocket, inTournament : boolean, currentGame :
|
||||||
showError("You can't queue up currently !");
|
showError("You can't queue up currently !");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (queue.innerText !== QueueState.Iddle) {
|
switch (queue.innerText) {
|
||||||
if (queue.innerText === QueueState.InQueu) {
|
case (QueueState.Iddle) :
|
||||||
socket.emit("dequeue");
|
|
||||||
queue.innerText = QueueState.Iddle;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
queue.innerText = QueueState.InQueu;
|
queue.innerText = QueueState.InQueu;
|
||||||
socket.emit("enqueue");
|
socket.emit("enqueue");
|
||||||
|
break ;
|
||||||
|
case (QueueState.InQueu) :
|
||||||
|
queue.innerText = QueueState.Iddle;
|
||||||
|
socket.emit("dequeue");
|
||||||
|
break ;
|
||||||
|
default :
|
||||||
|
showError("Queue event are disabled currently");
|
||||||
|
}
|
||||||
});
|
});
|
||||||
localGame.addEventListener("click", () => {
|
localGame.addEventListener("click", () => {
|
||||||
if (
|
if (
|
||||||
|
|
@ -157,7 +159,6 @@ function gameJoinButtons(socket : CSocket, inTournament : boolean, currentGame :
|
||||||
localGame.innerText = "playing";
|
localGame.innerText = "playing";
|
||||||
});
|
});
|
||||||
ready.addEventListener("click", () => {
|
ready.addEventListener("click", () => {
|
||||||
showInfo("rdy-evt");
|
|
||||||
switch (ready.innerText) {
|
switch (ready.innerText) {
|
||||||
case ReadyState.readyDown:
|
case ReadyState.readyDown:
|
||||||
socket.emit("readyUp");
|
socket.emit("readyUp");
|
||||||
|
|
@ -202,20 +203,11 @@ function resetPureBoard(batLeft: HTMLDivElement, batRight: HTMLDivElement, playe
|
||||||
playerL.innerText = "";
|
playerL.innerText = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
function keys_listen_setup(document : Document, currentGame : currentGameInfo | null, socket : CSocket,
|
function keys_listen_setup(currentGame : currentGameInfo | null, socket : CSocket,
|
||||||
|
keys : Record<string, boolean>,
|
||||||
playHow : HTMLDivElement, playHow_b : HTMLButtonElement,
|
playHow : HTMLDivElement, playHow_b : HTMLButtonElement,
|
||||||
tourScoreScreen : HTMLDivElement, queue : HTMLButtonElement)
|
tourScoreScreen : HTMLDivElement, queue : HTMLButtonElement)
|
||||||
{
|
{
|
||||||
const keys: Record<string, boolean> = {};
|
|
||||||
|
|
||||||
document.addEventListener("keydown", (e) => {
|
|
||||||
keys[e.key.toLowerCase()] = true;
|
|
||||||
});
|
|
||||||
document.addEventListener("keyup", (e) => {
|
|
||||||
keys[e.key.toLowerCase()] = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
setInterval(() => {
|
|
||||||
const keysP1 = {up:'w', down:'s'};
|
const keysP1 = {up:'w', down:'s'};
|
||||||
const keysP2 = {up:'p', down:'l'};
|
const keysP2 = {up:'p', down:'l'};
|
||||||
|
|
||||||
|
|
@ -237,7 +229,6 @@ function keys_listen_setup(document : Document, currentGame : currentGameInfo |
|
||||||
if (currentGame.game.local && keys[keysP2.up] !== keys[keysP2.down])
|
if (currentGame.game.local && keys[keysP2.up] !== keys[keysP2.down])
|
||||||
packet.moveRight = keys[keysP2.up] ? "up" : "down";
|
packet.moveRight = keys[keysP2.up] ? "up" : "down";
|
||||||
socket.emit("gameMove", packet);
|
socket.emit("gameMove", packet);
|
||||||
}, 1000 / 60);
|
|
||||||
}
|
}
|
||||||
function render(state: GameUpdate, playBatL : HTMLDivElement, playBatR : HTMLDivElement, ball :HTMLDivElement, playInfo : HTMLDivElement) {
|
function render(state: GameUpdate, playBatL : HTMLDivElement, playBatR : HTMLDivElement, ball :HTMLDivElement, playInfo : HTMLDivElement) {
|
||||||
playBatL.style.top = `${state.left.paddle.y}px`;
|
playBatL.style.top = `${state.left.paddle.y}px`;
|
||||||
|
|
@ -480,7 +471,6 @@ function pongClient(
|
||||||
if (e === "registered") queue.innerText = QueueState.InQueu;
|
if (e === "registered") queue.innerText = QueueState.InQueu;
|
||||||
else if (e === "unregistered")
|
else if (e === "unregistered")
|
||||||
queue.innerText = QueueState.Iddle;
|
queue.innerText = QueueState.Iddle;
|
||||||
showInfo(`QueueEvent: ${e}`);
|
|
||||||
});
|
});
|
||||||
// ---
|
// ---
|
||||||
// queue evt end
|
// queue evt end
|
||||||
|
|
@ -530,24 +520,32 @@ function pongClient(
|
||||||
// ---
|
// ---
|
||||||
// init
|
// init
|
||||||
// ---
|
// ---
|
||||||
|
const keys: Record<string, boolean> = {};
|
||||||
|
document.addEventListener("keydown", (e) => {
|
||||||
|
keys[e.key.toLowerCase()] = true;
|
||||||
|
});
|
||||||
|
document.addEventListener("keyup", (e) => {
|
||||||
|
keys[e.key.toLowerCase()] = false;
|
||||||
|
});
|
||||||
|
|
||||||
|
setInterval(() => {keys_listen_setup(currentGame, socket, keys, playHow, playHow_b, tourScoreScreen, queue)}, 1000 / 60);
|
||||||
|
|
||||||
gameJoinButtons(socket, inTournament, currentGame, tournament, queue, localGame, ready);
|
gameJoinButtons(socket, inTournament, currentGame, tournament, queue, localGame, ready);
|
||||||
playhowButtons(playHow_b, playHow);
|
playhowButtons(playHow_b, playHow);
|
||||||
tourinfoButtons(tourInfo, tourScoreScreen);
|
tourinfoButtons(tourInfo, tourScoreScreen);
|
||||||
keys_listen_setup(document, currentGame, socket, playHow, playHow_b, tourScoreScreen, queue);
|
|
||||||
|
|
||||||
if (game_req_join != null) {
|
if (game_req_join != null) {
|
||||||
socket.emit("joinGame", game_req_join, (res: JoinRes) => {
|
socket.emit("joinGame", game_req_join, (res: JoinRes) => {
|
||||||
switch (res) {
|
switch (res) {
|
||||||
case JoinRes.yes:
|
case JoinRes.yes:
|
||||||
showInfo("JoinRes = yes");
|
showInfo("Joined game with success");
|
||||||
quitChat();
|
quitChat();
|
||||||
break;
|
break;
|
||||||
case JoinRes.no:
|
case JoinRes.no:
|
||||||
showInfo("JoinRes = no");
|
showInfo("You cannot access this game");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
showError("JoinRes switch fail:" + res);
|
showError("Joining game failed" + res);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
game_req_join = null;
|
game_req_join = null;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue