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

Pre-ws rework

Browse Source 
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
James Ketrenos 2022-03-13 13:02:44 -07:00
parent 7863933126
commit 7270d29a81
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
server/routes/games.js
View File

@ -183,7 +183,7 @@ const processGameOrder = (game, player, dice) => {
/* If 'doneRolling' is FALSE then there are still players to roll */ /* If 'doneRolling' is FALSE then there are still players to roll */
if (!doneRolling || !processTies(players)) { if (!doneRolling || !processTies(players)) {
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
players: game.players, players: getFilteredPlayers(game),
chat: game.chat chat: game.chat
}) })
return; return;
@ -207,7 +207,7 @@ const processGameOrder = (game, player, dice) => {
addChatMessage(game, null, `It is ${game.turn.name}'s turn to place a settlement.`);4 addChatMessage(game, null, `It is ${game.turn.name}'s turn to place a settlement.`);4
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
players: game.players, players: getFilteredPlayers(game),
state: game.state, state: game.state,
direction: game.direction, direction: game.direction,
turn: game.turn, turn: game.turn,
@ -276,8 +276,6 @@ const distributeResources = (game, roll) => {
} }
} }
console.log(`Matched tiles: ${tiles.join(',')}.`);
const receives = { const receives = {
"O": { wood: 0, brick: 0, sheep: 0, wheat: 0, stone: 0 }, "O": { wood: 0, brick: 0, sheep: 0, wheat: 0, stone: 0 },
"R": { wood: 0, brick: 0, sheep: 0, wheat: 0, stone: 0 }, "R": { wood: 0, brick: 0, sheep: 0, wheat: 0, stone: 0 },
@ -356,9 +354,16 @@ const processRoll = (game, session, dice) => {
game.turn.roll = dice[0] + dice[1]; game.turn.roll = dice[0] + dice[1];
if (game.turn.roll !== 7) { if (game.turn.roll !== 7) {
distributeResources(game, game.turn.roll); distributeResources(game, game.turn.roll);
for (let id in game.sessions) {
if (game.sessions[id].player) {
sendUpdateToPlayer(game.sessions[id], {
private: game.sessions[id].player
});
}
}
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
turn: game.turn, turn: game.turn,
players: game.players, players: getFilteredPlayers(game),
chat: game.chat chat: game.chat
}); });
return; return;
@ -398,7 +403,7 @@ const processRoll = (game, session, dice) => {
} else { } else {
mustDiscard.forEach(player => { mustDiscard.forEach(player => {
addChatMessage(game, null, `The robber was rolled and ${player.name} must discard ${player.mustDiscard} resource cards!`); addChatMessage(game, null, `The robber was rolled and ${player.name} must discard ${player.mustDiscard} resource cards!`);
sendUpdateToPlayer(game, { sendUpdateToPlayer(session, {
private: game.player private: game.player
}); });
}); });
@ -406,7 +411,7 @@ const processRoll = (game, session, dice) => {
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
turn: game.turn, turn: game.turn,
players: game.players, players: getFilteredPlayers(game),
chat: game.chat chat: game.chat
}); });
} }
@ -877,7 +882,7 @@ const setPlayerName = (game, session, name) => {
private: session.player private: session.player
}); });
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
players: game.players, players: getFilteredPlayers(game),
unselected: getFilteredUnselected(game), unselected: getFilteredUnselected(game),
chat: game.chat chat: game.chat
}); });
@ -958,7 +963,7 @@ const setPlayerColor = (game, session, color) => {
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
active: game.active, active: game.active,
unselected: getFilteredUnselected(game), unselected: getFilteredUnselected(game),
players: game.players, players: getFilteredPlayers(game),
chat: game.chat chat: game.chat
}); });
return; return;
@ -977,7 +982,7 @@ const setPlayerColor = (game, session, color) => {
addChatMessage(game, session, `${session.name} has chosen to play as ${colorToWord(color)}.`); addChatMessage(game, session, `${session.name} has chosen to play as ${colorToWord(color)}.`);
const update = { const update = {
players: game.players, players: getFilteredPlayers(game),
chat: game.chat chat: game.chat
}; };
@ -1328,7 +1333,7 @@ const calculateRoadLengths = (game, session) => {
if (game.longestRoad !== longestPlayers[0].color) { if (game.longestRoad !== longestPlayers[0].color) {
game.longestRoad = longestPlayers[0].color; game.longestRoad = longestPlayers[0].color;
addChatMessage(game, session, addChatMessage(game, session,
`${player.name} now has the longest ` + `${longestPlayers[0].name} now has the longest ` +
`road (${longestRoad})!`); `road (${longestRoad})!`);
} }
} else { } else {
@ -2161,6 +2166,9 @@ const playCard = (game, session, card) => {
} }
} }
sendUpdateToPlayer(session, {
private: game.player
});
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
chat: game.chat, chat: game.chat,
activities: game.activities, activities: game.activities,
@ -2168,9 +2176,6 @@ const playCard = (game, session, card) => {
largestArmySize: game.largestArmySize, largestArmySize: game.largestArmySize,
turn: game.turn turn: game.turn
}); });
sendUpdateToPlayer(session, {
private: game.player
});
} }
const placeSettlement = (game, session, index) => { const placeSettlement = (game, session, index) => {
@ -2509,7 +2514,7 @@ const discard = (game, session, discards) => {
private: player private: player
}); });
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
players: game.players, players: getFilteredPlayers(game),
chat: game.chat, chat: game.chat,
turn: game.turn turn: game.turn
}); });
@ -2670,7 +2675,7 @@ const buySettlement = (game, session) => {
if (player.settlements < 1) { if (player.settlements < 1) {
return `You have already built all of your settlements.`; return `You have already built all of your settlements.`;
} }
corners = getValidCorners(game, session.color); const corners = getValidCorners(game, session.color);
if (corners.length === 0) { if (corners.length === 0) {
return `There are no valid locations for you to place a settlement.`; return `There are no valid locations for you to place a settlement.`;
} }
@ -2706,7 +2711,7 @@ const buyCity = (game, session) => {
if (player.city < 1) { if (player.city < 1) {
return `You have already built all of your cities.`; return `You have already built all of your cities.`;
} }
corners = getValidCorners(game, session.color, 'settlement'); const corners = getValidCorners(game, session.color, 'settlement');
if (corners.length === 0) { if (corners.length === 0) {
return `There are no valid locations for you to place a city.`; return `There are no valid locations for you to place a city.`;
} }
@ -2721,7 +2726,7 @@ const buyCity = (game, session) => {
const placeCity = (game, session, index) => { const placeCity = (game, session, index) => {
const player = session.player; const player = session.player;
index = parseInt(value); index = parseInt(index);
if (game.state !== 'normal') { if (game.state !== 'normal') {
return `You cannot place an item unless the game is active.`; return `You cannot place an item unless the game is active.`;
} }
@ -3508,7 +3513,7 @@ const wsConnect = async (ws, req) => {
session.lastActive = Date.now(); session.lastActive = Date.now();
if (session.name) { if (session.name) {
sendUpdateToPlayers(game, { sendUpdateToPlayers(game, {
players: game.players, players: getFilteredPlayers(game),
unselected: getFilteredUnselected(game) unselected: getFilteredUnselected(game)
}); });
} }