From 9cda7c17cfb4085a55dab5acd6f1d8915a755488 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Sun, 29 May 2022 16:44:27 -0700 Subject: [PATCH] Volcano working! Signed-off-by: James Ketrenos --- client/src/Actions.js | 2 + client/src/ChooseCard.js | 31 +++++++++++---- server/routes/games.js | 84 ++++++++++++++++++++++++++++++++++------ 3 files changed, 99 insertions(+), 18 deletions(-) diff --git a/client/src/Actions.js b/client/src/Actions.js index 4ee430d..7c9b45e 100644 --- a/client/src/Actions.js +++ b/client/src/Actions.js @@ -166,6 +166,7 @@ const Actions = ({ (turn.actions.indexOf('place-road') !== -1 || turn.actions.indexOf('place-city') !== -1 || turn.actions.indexOf('place-settlement') !== -1); + if (tradeActive && (!turn || !turn.actions || turn.actions.indexOf('trade'))) { setTradeActive(false); @@ -190,6 +191,7 @@ const Actions = ({ { name && !inLobby && <>