Git_Mirror/Werewolf
1
0
Fork 0
mirror of https://github.com/AlecM33/Werewolf.git synced 2025-12-26 15:57:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from AlecM33/custom-role-saving

Browse Source 
Confirm player death, fix join bug
This commit is contained in:
Alec Maier
2020-04-18 17:11:14 -04:00
committed by GitHub
parent 6e8b680958 0a583c01cb
commit 82e0f24485
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@@ -109,7 +109,7 @@ io.on('connection', function(socket) {
});
socket.on('joinGame', function(playerInfo) {
const game = activeGames[Object.keys(activeGames).find((key) => key === playerInfo.code)];
if (game && game.players.length < game.size) {
if (game && game.players.length < game.size && !game.players.find((player) => player.id === playerInfo.id)) {
game.players.push({name: playerInfo.name, id: playerInfo.id});
console.log(playerInfo.name + " joined the game!");
socket.emit('success');

4
static/game.js
View File

@@ -340,7 +340,9 @@ function endGameDueToTimeExpired() {
}
function killPlayer() {
socket.emit("killPlayer", currentGame.players.find((player) => player.id === sessionStorage.getItem("id")).id, currentGame.accessCode);
if(confirm("Are you sure you are dead?")) {
socket.emit("killPlayer", currentGame.players.find((player) => player.id === sessionStorage.getItem("id")).id, currentGame.accessCode);
}
}
function renderLobby() {

8
static/join.js
View File

@@ -3,12 +3,14 @@ import { utility } from './util.js'
// respond to the game state received from the server
socket.on('joinError', function(message) {
document.getElementById("code").classList.add("error");
document.getElementById("join-error").innerText = message;
document.getElementById("join-btn").classList.remove('disabled');
document.getElementById("code").classList.add("error");
document.getElementById("join-error").innerText = message;
});
// respond to the game state received from the server
socket.on('success', function() {
document.getElementById("join-btn").classList.remove('disabled');
if (document.getElementById("code").classList.contains("error")) {
document.getElementById("code").classList.remove("error");
document.getElementById("join-error").innerText = "";
@@ -21,6 +23,7 @@ socket.on('success', function() {
});
document.getElementById("join-btn").addEventListener("click", function() {
document.getElementById("join-btn").classList.add('disabled');
if (document.getElementById("name").value.length > 0) {
const code = document.getElementById("code").value.toString().trim().toLowerCase();
if (document.getElementById("name").classList.contains("error")) {
@@ -33,6 +36,7 @@ document.getElementById("join-btn").addEventListener("click", function() {
const playerInfo = {name: document.getElementById("name").value, id: playerId, code: code};
socket.emit('joinGame', playerInfo);
} else {
document.getElementById("join-btn").classList.remove('disabled');
document.getElementById("name").classList.add("error");
document.getElementById("name-error").innerText = "Name is required.";
}

3
static/styles.css
View File

@@ -918,9 +918,8 @@ label {
opacity: 0.5;
color: gray;
background-color: white;
border: none;
pointer-events: none;
border: none;
}
.hidden {