diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx index a689856..856a697 100644 --- a/src/components/Card/Card.tsx +++ b/src/components/Card/Card.tsx @@ -1,4 +1,3 @@ - import { v4 } from 'uuid'; import { CardProps } from '../../util/propTypes'; import { ResourceCost } from '../../util/types'; @@ -10,6 +9,8 @@ const { buyCard, tooExpensive } = buyCardActions; export default function Card({ data, state, setState }: CardProps) { const currentPlayer = useCurrentPlayer(state); + if (!data) return
; + return (
diff --git a/src/components/Player/ActionMethods/buyCardActions.ts b/src/components/Player/ActionMethods/buyCardActions.ts index 59546e1..14a55b2 100644 --- a/src/components/Player/ActionMethods/buyCardActions.ts +++ b/src/components/Player/ActionMethods/buyCardActions.ts @@ -57,12 +57,10 @@ export const buyCard = (state: AppState, setState: setStateType, card: CardData) newResourcePool[typedKey] = adjustedResourcePoolValue; } - console.log(newResourcePool); - console.log(newPlayerInventory); - // connect modified player state to updated list of all players updatedPlayer.inventory = newPlayerInventory; updatedPlayer.cards = [...updatedPlayer.cards, card]; + updatedPlayer.points = updatedPlayer.points + (card.points || 0); newPlayers[idx] = updatedPlayer; // attempt to queue replacement card from full deck diff --git a/src/components/Player/Player.tsx b/src/components/Player/Player.tsx index fbd40ed..503c131 100644 --- a/src/components/Player/Player.tsx +++ b/src/components/Player/Player.tsx @@ -86,7 +86,7 @@ export default function Player({ player, state, setState }: PlayerProps) { {/* Dynamic data from state */}
-

Score: {dynamic?.points}

+

Score: {dynamic && dynamic.points}

{dynamic?.turnActive ? "It's your turn!" : "..."}