diff --git a/client/src/Trade.js b/client/src/Trade.js index 3b899b4..8f54ee6 100644 --- a/client/src/Trade.js +++ b/client/src/Trade.js @@ -104,7 +104,11 @@ const Trade = ({table}) => { const canMeetOffer = (player, offer) => { for (let i = 0; i < offer.gets.length; i++) { const get = offer.gets[i]; - if (player[get.type] < get.count) { + if (get.type === 'bank') { + if (player[player.gives[0].type] < get.count) { + return false; + } + } else if (player[get.type] < get.count) { return false; } } @@ -291,6 +295,7 @@ const Trade = ({table}) => { if (item.self) { /* Order direction is reversed for self */ source = { + name: item.name, gets: trade.gives, gives: trade.gets }; @@ -298,11 +303,11 @@ const Trade = ({table}) => { source = item; } const _gets = source.gets.length ? source.gets.map((get, index) =>
When you play this card, you will select 1 type of resource. + All other players must give you all their resource cards of that type.
>; break; case 'progress-year-of-plenty': diff --git a/server/routes/games.js b/server/routes/games.js index 8b621f2..68d76f9 100755 --- a/server/routes/games.js +++ b/server/routes/games.js @@ -1299,7 +1299,11 @@ const getValidRoads = (game, color) => { const canMeetOffer = (player, offer) => { for (let i = 0; i < offer.gets.length; i++) { const get = offer.gets[i]; - if (player[get.type] < get.count) { + if (get.type === 'bank') { + if (player[player.gives[0].type] < get.count) { + return false; + } + } else if (player[get.type] < get.count) { return false; } }