Git_Mirror/Werewolf
1
0
Fork 0
mirror of https://github.com/AlecM33/Werewolf.git synced 2026-01-01 16:59:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

flesh out killing players, display 0 on timerand remove play/pause button

Browse Source
This commit is contained in:
Alec
2021-12-08 00:13:13 -05:00
parent bad4e3dfc4
commit a66bc7b413
14 changed files with 157 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/GameManager.js
View File

@@ -88,6 +88,10 @@ class GameManager {
socketId: socket.id,
logLevel: this.logger.logLevel
});
} else {
if (game.timerParams && game.timerParams.timeRemaining === 0) {
this.namespace.to(socket.id).emit(globals.GAME_PROCESS_COMMANDS.GET_TIME_REMAINING, game.timerParams.timeRemaining, game.timerParams.paused);
}
}
}
});
@@ -96,10 +100,10 @@ class GameManager {
let game = this.activeGameRunner.activeGames[accessCode];
if (game) {
let person = game.people.find((person) => person.id === personId)
if (person) {
if (person && !person.out) {
this.logger.debug('game ' + accessCode + ': killing player ' + person.name);
person.out = true;
namespace.in(accessCode).emit(globals.CLIENT_COMMANDS.KILL_PLAYER, )
namespace.in(accessCode).emit(globals.CLIENT_COMMANDS.KILL_PLAYER, person.id)
}
}
})

10
server/modules/GameStateCurator.js
View File

@@ -11,11 +11,13 @@ function getGameStateBasedOnPermissions(game, person, gameRunner) {
? { name: person.name, cookie: person.cookie, userType: person.userType }
: {
name: person.name,
id: person.id,
cookie: person.cookie,
userType: person.userType,
gameRole: person.gameRole,
gameRoleDescription: person.gameRoleDescription,
alignment: person.alignment
alignment: person.alignment,
out: person.out
}
switch (person.userType) {
case globals.USER_TYPES.PLAYER:
@@ -27,10 +29,10 @@ function getGameStateBasedOnPermissions(game, person, gameRunner) {
deck: game.deck,
people: game.people
.filter((person) => {
return person.assigned === true && person.cookie !== client.cookie
return person.assigned === true
&& (person.userType !== globals.USER_TYPES.MODERATOR && person.userType !== globals.USER_TYPES.TEMPORARY_MODERATOR)
})
.map((filteredPerson) => ({ name: filteredPerson.name, userType: filteredPerson.userType })),
.map((filteredPerson) => ({ name: filteredPerson.name, id: filteredPerson.id, userType: filteredPerson.userType, out: filteredPerson.out })),
timerParams: game.timerParams,
isFull: game.isFull,
}
@@ -91,7 +93,7 @@ function mapPeopleForTempModerator(people, client) {
}
function mapPerson(person) {
return { name: person.name, userType: person.userType, out: person.out };
return { name: person.name, id: person.id, userType: person.userType, out: person.out };
}
module.exports = GameStateCurator;