From dbb2be78bb20a2e6ffc70f8b84df21c6a829b306 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Fri, 28 Mar 2025 19:26:19 +0100
Subject: Improve "confirm_turn" prompts for fascist test and event.

---
 rules.js | 11 +++++++++--
 rules.ts | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/rules.js b/rules.js
index b81022d..a7c9248 100644
--- a/rules.js
+++ b/rules.js
@@ -311,7 +311,7 @@ function next(checkpoint = false) {
         const current_active = game.active;
         const next_active = get_next_active(node.p);
         if (next_active !== current_active && game.undo.length > 0) {
-            insert_before_active_node(create_state_node('confirm_turn', get_active_faction()));
+            insert_before_active_node(create_state_node('confirm_turn', get_active_faction(), { f: next_active }));
             game.state = 'confirm_turn';
             return;
         }
@@ -1141,7 +1141,14 @@ states.choose_medallion = {
 states.confirm_turn = {
     inactive: 'confirm their move',
     prompt() {
-        view.prompt = 'You will not be able to undo this action.';
+        if (game.fascist === 2)
+            view.prompt = 'Fascist Test: Done.';
+        else if (game.fascist === 1) {
+            let f = get_active_node_args().f;
+            view.prompt = `Fascist Event: ${f} needs to act.`;
+        }
+        else
+            view.prompt = 'You will not be able to undo this action.';
         gen_action('confirm');
     },
     confirm() {
diff --git a/rules.ts b/rules.ts
index cc1c0f6..2be983c 100644
--- a/rules.ts
+++ b/rules.ts
@@ -484,7 +484,7 @@ function next(checkpoint = false) {
 
     if (next_active !== current_active && game.undo.length > 0) {
       insert_before_active_node(
-        create_state_node('confirm_turn', get_active_faction())
+        create_state_node('confirm_turn', get_active_faction(), { f: next_active })
       );
       game.state = 'confirm_turn';
       return;
@@ -1437,7 +1437,13 @@ states.choose_medallion = {
 states.confirm_turn = {
   inactive: 'confirm their move',
   prompt() {
-    view.prompt = 'You will not be able to undo this action.';
+    if (game.fascist === 2)
+      view.prompt = 'Fascist Test: Done.'
+    else if (game.fascist === 1) {
+      let f = get_active_node_args().f
+      view.prompt = `Fascist Event: ${f} needs to act.`
+    } else
+      view.prompt = 'You will not be able to undo this action.'
     gen_action('confirm');
   },
   confirm() {
-- 
cgit v1.2.3