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 #139 from AlecM33/clean-up-transfer-mod-events

Browse Source 
don't emit killed event to person receiving mod powers
This commit is contained in:
Alec
2022-12-17 15:19:26 -05:00
committed by GitHub
parent bf6cfdf902 9cc06811eb
commit f082ad9e83
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/modules/game_state/states/Lobby.js
View File

@@ -76,7 +76,7 @@ export class Lobby {
setSocketHandlers () {
this.socket.on(globals.EVENT_IDS.PLAYER_JOINED, (player, gameIsFull) => {
toast(player.name + ' joined!', 'success', false, true, 'short');
toast(player.name + ' joined!', 'success', true, true, 'short');
this.stateBucket.currentGameState.people.push(player);
this.stateBucket.currentGameState.isFull = gameIsFull;
this.populatePlayers();

15
client/src/styles/game.css
View File

@@ -382,7 +382,7 @@ h1 {
#role-description {
overflow: auto;
position: absolute;
bottom: 8%;
bottom: 6%;
left: 50%;
transform: translate(-50%, 0);
font-size: 15px;
@@ -642,6 +642,7 @@ canvas {
text-shadow: 0 3px 4px rgb(0 0 0 / 55%);
margin: 5px 0 5px 25px;
width: 65px;
height: 25px;
}
#game-link:hover {
@@ -785,6 +786,14 @@ canvas {
font-size: 18px;
}
#game-people-container {
padding: 5px;
}
#players-alive-label {
font-size: 20px;
}
#client-name {
font-size: 20px;
}
@@ -810,8 +819,8 @@ canvas {
/* padding: 5px;*/
/*}*/
.game-player-name {
font-size: 16px;
.game-player-name, .game-player-role {
font-size: 14px;
}
#game-timer {

10
server/modules/GameManager.js
View File

@@ -175,12 +175,13 @@ class GameManager {
: accessCode;
};
transferModeratorPowers = (game, person, namespace, logger) => {
transferModeratorPowers = (socket, game, person, namespace, logger) => {
if (person && (person.out || person.userType === globals.USER_TYPES.SPECTATOR)) {
logger.debug('game ' + game.accessCode + ': transferring mod powers to ' + person.name);
if (game.moderator === person) {
person.userType = globals.USER_TYPES.MODERATOR;
this.namespace.to(person.socketId).emit(globals.EVENTS.SYNC_GAME_STATE);
socket.to(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, person.id);
} else {
const oldModerator = game.moderator;
if (game.moderator.userType === globals.USER_TYPES.TEMPORARY_MODERATOR) {
@@ -204,17 +205,18 @@ class GameManager {
}
};
killPlayer = (game, person, namespace, logger) => {
killPlayer = (socket, game, person, namespace, logger) => {
if (person && !person.out) {
logger.debug('game ' + game.accessCode + ': killing player ' + person.name);
if (person.userType !== globals.USER_TYPES.TEMPORARY_MODERATOR) {
person.userType = globals.USER_TYPES.KILLED_PLAYER;
}
person.out = true;
namespace.in(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, person.id);
// temporary moderators will transfer their powers automatically to the first person they kill.
if (game.moderator.userType === globals.USER_TYPES.TEMPORARY_MODERATOR) {
this.transferModeratorPowers(game, person, namespace, logger);
this.transferModeratorPowers(socket, game, person, namespace, logger);
} else {
namespace.in(game.accessCode).emit(globals.EVENT_IDS.KILL_PLAYER, person.id);
}
}
};

4
server/modules/SocketManager.js
View File

@@ -75,7 +75,7 @@ class SocketManager {
gameManager.getTimeRemaining(game, socket);
break;
case EVENT_IDS.KILL_PLAYER:
gameManager.killPlayer(game, game.people.find((person) => person.id === args.personId), namespace, this.logger);
gameManager.killPlayer(socket, game, game.people.find((person) => person.id === args.personId), namespace, this.logger);
break;
case EVENT_IDS.REVEAL_PLAYER:
gameManager.revealPlayer(game, args.personId);
@@ -85,7 +85,7 @@ class SocketManager {
if (!person) {
person = game.spectators.find((spectator) => spectator.id === args.personId);
}
gameManager.transferModeratorPowers(game, person, namespace, this.logger);
gameManager.transferModeratorPowers(socket, game, person, namespace, this.logger);
break;
case EVENT_IDS.CHANGE_NAME:
gameManager.changeName(game, args.data, ackFn);

19
spec/unit/server/modules/GameManager_Spec.js
View File

@@ -9,7 +9,7 @@ const GameStateCurator = require('../../../../server/modules/GameStateCurator');
const logger = require('../../../../server/modules/Logger.js')(false);
describe('GameManager', () => {
let gameManager, namespace;
let gameManager, namespace, socket;
beforeAll(() => {
spyOn(logger, 'debug');
@@ -17,12 +17,14 @@ describe('GameManager', () => {
const inObj = { emit: () => {} };
namespace = { in: () => { return inObj; }, to: () => { return inObj; } };
socket = { id: '123', emit: () => {}, to: () => { return { emit: () => {} }; } };
gameManager = new GameManager(logger, globals.ENVIRONMENT.PRODUCTION).getInstance();
gameManager.setGameSocketNamespace(namespace);
});
beforeEach(() => {
spyOn(namespace, 'to').and.callThrough();
spyOn(socket, 'to').and.callThrough();
});
describe('#transferModerator', () => {
@@ -43,7 +45,7 @@ describe('GameManager', () => {
moderator.id,
new Date().toJSON()
);
gameManager.transferModeratorPowers(game, personToTransferTo, namespace, logger);
gameManager.transferModeratorPowers(socket, game, personToTransferTo, namespace, logger);
expect(game.moderator).toEqual(personToTransferTo);
expect(personToTransferTo.userType).toEqual(USER_TYPES.MODERATOR);
@@ -69,7 +71,7 @@ describe('GameManager', () => {
new Date().toJSON()
);
game.spectators.push(personToTransferTo);
gameManager.transferModeratorPowers(game, personToTransferTo, namespace, logger);
gameManager.transferModeratorPowers(socket, game, personToTransferTo, namespace, logger);
expect(game.moderator).toEqual(personToTransferTo);
expect(personToTransferTo.userType).toEqual(USER_TYPES.MODERATOR);
@@ -95,7 +97,7 @@ describe('GameManager', () => {
tempMod.id,
new Date().toJSON()
);
gameManager.transferModeratorPowers(game, personToTransferTo, namespace, logger);
gameManager.transferModeratorPowers(socket, game, personToTransferTo, namespace, logger);
expect(game.moderator).toEqual(personToTransferTo);
expect(personToTransferTo.userType).toEqual(USER_TYPES.MODERATOR);
@@ -120,12 +122,13 @@ describe('GameManager', () => {
tempMod.id,
new Date().toJSON()
);
gameManager.transferModeratorPowers(game, personToTransferTo, namespace, logger);
gameManager.transferModeratorPowers(socket, game, personToTransferTo, namespace, logger);
expect(game.moderator).toEqual(personToTransferTo);
expect(personToTransferTo.userType).toEqual(USER_TYPES.MODERATOR);
expect(tempMod.userType).toEqual(USER_TYPES.MODERATOR);
expect(namespace.to).toHaveBeenCalledOnceWith(personToTransferTo.socketId);
expect(socket.to).toHaveBeenCalledWith(game.accessCode);
});
});
@@ -146,7 +149,7 @@ describe('GameManager', () => {
mod.id,
new Date().toJSON()
);
gameManager.killPlayer(game, player, namespace, logger);
gameManager.killPlayer(socket, game, player, namespace, logger);
expect(player.out).toEqual(true);
expect(player.userType).toEqual(USER_TYPES.KILLED_PLAYER);
@@ -169,11 +172,11 @@ describe('GameManager', () => {
tempMod.id,
new Date().toJSON()
);
gameManager.killPlayer(game, tempMod, namespace, logger);
gameManager.killPlayer(socket, game, tempMod, namespace, logger);
expect(tempMod.out).toEqual(true);
expect(tempMod.userType).toEqual(USER_TYPES.TEMPORARY_MODERATOR);
expect(namespace.in().emit).toHaveBeenCalled();
expect(namespace.in().emit).not.toHaveBeenCalled();
expect(gameManager.transferModeratorPowers).toHaveBeenCalled();
});
});