jketreno/peddlers-of-ketran
1
0
Fork 0
Code Issues 42 Activity

Fix volcano mode so everyone picks resources

Browse Source 
Fix bug if player connects without audio/video

Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
James Ketrenos 2022-05-31 12:48:11 -07:00
parent e87350f945
commit 4e8b4746dc
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/Resource.css
View File

@ -26,5 +26,5 @@
.Resource.Selected { .Resource.Selected {
filter: brightness(150%); filter: brightness(150%);
top: -1em; top: -50%;
} }

21
server/routes/games.js
View File

@ -987,7 +987,7 @@ const setPlayerName = (game, session, name) => {
} }
} }
let message, hasAudio = false; let message;
if (!session.name) { if (!session.name) {
message = `A new player has entered the lobby as ${name}.`; message = `A new player has entered the lobby as ${name}.`;
@ -1001,7 +1001,6 @@ const setPlayerName = (game, session, name) => {
session.name = name; session.name = name;
if (session.ws && (game.id in audio) if (session.ws && (game.id in audio)
&& session.name in audio[game.id]) { && session.name in audio[game.id]) {
hasAudio = true;
part(audio[game.id], session); part(audio[game.id], session);
} }
} else { } else {
@ -1023,8 +1022,11 @@ const setPlayerName = (game, session, name) => {
session.player.live = true; session.player.live = true;
} }
if (session.ws && hasAudio) { if (session.ws && session.hasAudio) {
join(audio[game.id], session); join(audio[game.id], session, {
hasVideo: session.video ? true : false,
hasAudio: session.audio ? true : false
});
} }
console.log(`${info}: ${message}`); console.log(`${info}: ${message}`);
addChatMessage(game, null, message); addChatMessage(game, null, message);
@ -3027,6 +3029,8 @@ const selectResources = (game, session, cards) => {
} else { } else {
addActivity(game, session, 'No players had that resource. Wa-waaaa.'); addActivity(game, session, 'No players had that resource. Wa-waaaa.');
} }
delete game.turn.active;
game.turn.actions = [];
break; break;
case 'year-of-plenty': case 'year-of-plenty':
@ -3036,6 +3040,8 @@ const selectResources = (game, session, cards) => {
}); });
addChatMessage(game, session, `${session.name} player Year of Plenty.` + addChatMessage(game, session, `${session.name} player Year of Plenty.` +
`They chose to receive ${display.join(', ')} from the bank.`); `They chose to receive ${display.join(', ')} from the bank.`);
delete game.turn.active;
game.turn.actions = [];
break; break;
case 'volcano': case 'volcano':
cards.forEach(type => { cards.forEach(type => {
@ -3043,10 +3049,13 @@ const selectResources = (game, session, cards) => {
session.player.resources++; session.player.resources++;
}); });
addChatMessage(game, session, `${session.name} player mined ${display.join(', ')} from the Volcano!`); addChatMessage(game, session, `${session.name} player mined ${display.join(', ')} from the Volcano!`);
if (!game.turn.select) {
delete game.turn.active;
game.turn.actions = [];
}
break; break;
} }
delete game.turn.active;
game.turn.actions = [];
sendUpdateToPlayer(game, session, { sendUpdateToPlayer(game, session, {
private: session.player private: session.player
}); });