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 branch 'master' of https://github.com/AlecM33/Werewolf

Browse Source
This commit is contained in:
Alec Maier
2019-09-09 23:53:58 -04:00
parent 7d647512e3 40c22f769f
commit 4571ee33df
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server.js
View File

@@ -145,26 +145,30 @@ io.on('connection', function(socket) {
});
socket.on("timerExpired", function(code) {
let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
game.winningTeam = "wolf";
game.state = "ended";
io.to(code).emit('state', game);
});
socket.on('killPlayer', function(id, code) {
let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
let player = game.players.find((player) => player.id === id);
game.players.find((player) => player.id === id).dead = true;
game.message = player.name + ", a " + player.card.role + ", has been killed!";
const winCheck = teamWon(game);
if (winCheck === "wolf") {
if (game) {
game.winningTeam = "wolf";
game.state = "ended";
io.to(code).emit('state', game);
} else if (winCheck === "village") {
game.winningTeam = "village";
game.state = "ended";
io.to(code).emit('state', game);
} else {
io.to(code).emit('state', game);
}
});
socket.on('killPlayer', function(id, code) {
let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
if (game) {
let player = game.players.find((player) => player.id === id);
game.players.find((player) => player.id === id).dead = true;
game.message = player.name + ", a " + player.card.role + ", has been killed!";
const winCheck = teamWon(game);
if (winCheck === "wolf") {
game.winningTeam = "wolf";
game.state = "ended";
io.to(code).emit('state', game);
} else if (winCheck === "village") {
game.winningTeam = "village";
game.state = "ended";
io.to(code).emit('state', game);
} else {
io.to(code).emit('state', game);
}
}
});
});

4
static/join.js
View File

@@ -17,12 +17,12 @@ socket.on('success', function() {
if (sessionStorage.getItem("host")) {
sessionStorage.removeItem("host");
}
window.location.replace('/' + document.getElementById("code").value.toString().trim());
window.location.replace('/' + document.getElementById("code").value.toString().trim().toLowerCase());
});
document.getElementById("join-btn").addEventListener("click", function() {
if (document.getElementById("name").value.length > 0) {
const code = document.getElementById("code").value.toString().trim();
const code = document.getElementById("code").value.toString().trim().toLowerCase();
if (document.getElementById("name").classList.contains("error")) {
document.getElementById("name").classList.remove("error");
document.getElementById("name-error").innerText = "";

8
static/styles.css
View File

@@ -24,8 +24,8 @@
.card {
padding: 0.5em;
width: 8em;
height: 11.5em;
width: 7em;
height: 10.5em;
font-size: 0.9em;
margin: 0 0.7em 0.7em 0;
}
@@ -397,8 +397,8 @@ button {
#card-select-header button {
margin-right: 1em;
width: 11em;
padding: 1em;
width: 10em;
padding: 0.8em;
}
#card-select-header span {