innocuous-symmetry/splendor-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Mikayla Dobson
2022-08-12 15:06:11 -05:00
parent 15e32503e3 fb38130c17
commit 3234966629
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Player/ActionMethods/buyCardActions.ts
View File

@@ -44,10 +44,10 @@ export const buyCard = (state: AppState, setState: setStateType, card: CardData)
// shift turn order and identify current player in new player state // shift turn order and identify current player in new player state
const { newPlayers, roundIncrement } = turnOrderUtil(prev, currentPlayer); const { newPlayers, roundIncrement } = turnOrderUtil(prev, currentPlayer);
const idx = newPlayers.indexOf(currentPlayer); const idx = newPlayers.indexOf(currentPlayer);
const updatedPlayer = newPlayers[idx];
const newResourcePool = prev.gameboard.tradingResources; const newResourcePool = prev.gameboard.tradingResources;
const cardCost = card.resourceCost; const cardCost = card.resourceCost;
const updatedPlayer = newPlayers[idx];
const totalBuyingPower = getTotalBuyingPower(updatedPlayer); const totalBuyingPower = getTotalBuyingPower(updatedPlayer);
let availableGold = updatedPlayer.inventory['gold'] || 0; let availableGold = updatedPlayer.inventory['gold'] || 0;