From 19c04c7edeebf0d643eefecd3c2e75c3ebb67443 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 14 Jul 2023 12:57:20 +0200 Subject: Don't skip buy/trash cards phase during final turn. Combinations of Pax Deorum, Demagogue, and Ludi Saeculares could mean you need to draw a hand of cards during your last turn. --- rules.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/rules.js b/rules.js index f1fa955..c3f021e 100644 --- a/rules.js +++ b/rules.js @@ -4939,17 +4939,10 @@ function goto_buy_trash_discard() { else log("Played no cards.") - if (game.end) { - // Skip rest of turn... - for (let c of game.played) - set_add(current_discard(), c) - game.played.length = 0 - goto_end_of_turn() - } else if (current_hand().length > 0) { + if (current_hand().length > 0) game.state = "buy_trash_discard" - } else { + else goto_buy_trash() - } } states.buy_trash_discard = { @@ -5172,10 +5165,6 @@ states.flip_inactive_barbarians = { } function goto_refill_hand() { - if (game.end) { - end_refill_hand() - return - } game.state = "refill_hand" resume_refill_hand() } -- cgit v1.2.3