Fix #104 - send filtered player update after every resource count change
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
parent
d95335d59b
commit
4795baaf56
@ -261,7 +261,8 @@ const processVolcano = (game, session, dice) => {
|
|||||||
state: game.state,
|
state: game.state,
|
||||||
chat: game.chat,
|
chat: game.chat,
|
||||||
dice: game.dice,
|
dice: game.dice,
|
||||||
placements: game.placements
|
placements: game.placements,
|
||||||
|
players: getFilteredPlayers(game)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -769,7 +770,7 @@ const adminActions = (game, action, value, query) => {
|
|||||||
if (!parts) {
|
if (!parts) {
|
||||||
return `Unable to parse give request.`;
|
return `Unable to parse give request.`;
|
||||||
}
|
}
|
||||||
const type = parts[1], card = parts[3];
|
const type = parts[1], card = parts[3] || 1;
|
||||||
|
|
||||||
for (let id in game.sessions) {
|
for (let id in game.sessions) {
|
||||||
if (game.sessions[id].name === game.turn.name) {
|
if (game.sessions[id].name === game.turn.name) {
|
||||||
@ -2186,7 +2187,7 @@ const placeRobber = (game, session, robber) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (game.robber === robber) {
|
if (game.robber === robber) {
|
||||||
return `You must move the robber to a new location!`;
|
return `You must move the robber to a new location!`;
|
||||||
}
|
}
|
||||||
game.robber = robber;
|
game.robber = robber;
|
||||||
game.turn.placedRobber = true;
|
game.turn.placedRobber = true;
|
||||||
@ -2636,7 +2637,8 @@ const placeSettlement = (game, session, index) => {
|
|||||||
activities: game.activities,
|
activities: game.activities,
|
||||||
mostPorts: game.mostPorts,
|
mostPorts: game.mostPorts,
|
||||||
turn: game.turn,
|
turn: game.turn,
|
||||||
chat: game.chat
|
chat: game.chat,
|
||||||
|
players: getFilteredPlayers(game)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2924,9 +2926,11 @@ const discard = (game, session, discards) => {
|
|||||||
}
|
}
|
||||||
sum += parseInt(discards[type]);
|
sum += parseInt(discards[type]);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
if (sum !== player.mustDiscard) {
|
if (sum !== player.mustDiscard) {
|
||||||
return `You need to discard ${player.mustDiscard} cards.`;
|
return `You need to discard ${player.mustDiscard} cards.`;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
for (let type in discards) {
|
for (let type in discards) {
|
||||||
const count = parseInt(discards[type]);
|
const count = parseInt(discards[type]);
|
||||||
@ -3138,7 +3142,8 @@ const selectResources = (game, session, cards) => {
|
|||||||
sendUpdateToPlayers(game, {
|
sendUpdateToPlayers(game, {
|
||||||
turn: game.turn,
|
turn: game.turn,
|
||||||
chat: game.chat,
|
chat: game.chat,
|
||||||
activities: game.activities
|
activities: game.activities,
|
||||||
|
players: getFilteredPlayers(game)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3273,7 +3278,8 @@ const placeCity = (game, session, index) => {
|
|||||||
placements: game.placements,
|
placements: game.placements,
|
||||||
turn: game.turn,
|
turn: game.turn,
|
||||||
chat: game.chat,
|
chat: game.chat,
|
||||||
activities: game.activities
|
activities: game.activities,
|
||||||
|
players: getFilteredPlayers(game)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4274,14 +4280,11 @@ router.ws("/ws/:id", async (ws, req) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sendUpdateToPlayer(game, session, {
|
|
||||||
private: session.player
|
|
||||||
});
|
|
||||||
sendUpdateToPlayers(game, {
|
sendUpdateToPlayers(game, {
|
||||||
players: getFilteredPlayers(game),
|
|
||||||
turn: game.turn,
|
turn: game.turn,
|
||||||
activities: game.activities,
|
activities: game.activities,
|
||||||
chat: game.chat
|
chat: game.chat,
|
||||||
|
players: getFilteredPlayers(game)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -4447,7 +4450,8 @@ const getFilteredGameForPlayer = (game, session) => {
|
|||||||
order: (session.color in game.players) ? game.players[session.color].order : 0,
|
order: (session.color in game.players) ? game.players[session.color].order : 0,
|
||||||
private: player,
|
private: player,
|
||||||
sessions: reducedSessions,
|
sessions: reducedSessions,
|
||||||
layout: layout
|
layout: layout,
|
||||||
|
players: getFilteredPlayers(game),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user