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

Fix #115 - add player color to offerRejected

Browse Source 
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
James Ketrenos 2022-06-20 12:20:14 -07:00
parent 784ea1ecee
commit d95335d59b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/Trade.js
View File

@ -442,7 +442,7 @@ const Trade = () => {
You have not made a trade offer. You have not made a trade offer.
</span>} </span>}
{ !isTurn && isSameOffer && isOfferValid && _gets !== 'nothing' && _gives !== 'nothing' && <span style={{fontWeight: 'bold'}}> {!isTurn && isSameOffer && !youWereRejected && isOfferValid && _gets !== 'nothing' && _gives !== 'nothing' && <span style={{fontWeight: 'bold'}}>
Your submitted offer agrees with {turn.name}'s terms. Your submitted offer agrees with {turn.name}'s terms.
</span> } </span> }
</> } </> }

4
server/routes/games.js
View File

@ -1962,6 +1962,10 @@ const trade = (game, session, action, offer) => {
other.offerRejected = {}; other.offerRejected = {};
} }
other.offerRejected[session.color] = true; other.offerRejected[session.color] = true;
if (!session.player.offerRejected) {
session.player.offerRejected = {};
}
session.player.offerRejected[offer.color] = true;
addActivity(game, session, `${session.name} rejected ${other.name}'s offer.`); addActivity(game, session, `${session.name} rejected ${other.name}'s offer.`);
return; return;
} }