diff --git a/assets/images/roles/Villager.png b/assets/images/roles/Villager.png deleted file mode 100644 index 63e1e80..0000000 Binary files a/assets/images/roles/Villager.png and /dev/null differ diff --git a/assets/images/roles/villager.png b/assets/images/roles/villager.png new file mode 100644 index 0000000..dbef86f Binary files /dev/null and b/assets/images/roles/villager.png differ diff --git a/server.js b/server.js index 7b568b7..29de817 100644 --- a/server.js +++ b/server.js @@ -61,25 +61,29 @@ server.listen(process.env.PORT || 5000, function() { function teamWon(game) { let wolvesAlive = 0; let villagersAlive = 0; + let totalAlive = 0; let hunterAlive = false; for (const player of game.players) { if (player.card.team === "good" && !player.dead) { - villagersAlive++; + villagersAlive ++; } if (player.card.role === "Werewolf" && !player.dead) { - wolvesAlive++; + wolvesAlive ++; } if (player.card.role === "Hunter" && !player.dead) { hunterAlive = true; } + if (!player.dead) { + totalAlive ++; + } } if (wolvesAlive === 0) { return "village" } - if ((wolvesAlive === villagersAlive) && (wolvesAlive + villagersAlive !== 2)) { + if ((wolvesAlive === villagersAlive) && (totalAlive !== 2)) { return "wolf"; } - if (wolvesAlive + villagersAlive === 2) { + if (totalAlive === 2) { return hunterAlive ? "village" : "wolf" } return false;