From 163e2eaa1803c26231bc24bb0b6fe33239296f3c Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Thu, 15 Jul 2021 13:06:44 +0200
Subject: crusader: Improve UI for sending Asasssins event.

---
 rules.js | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'rules.js')

diff --git a/rules.js b/rules.js
index 9e3cc1c..1feae19 100644
--- a/rules.js
+++ b/rules.js
@@ -1342,31 +1342,44 @@ states.assassins = {
 states.assassins_show_1 = {
 	prompt: function (view, current) {
 		view.assassinate = game.who;
+		view.who = ASSASSINS;
 		if (is_inactive_player(current))
 			return view.prompt = "Assassins: Waiting for " + game.active + ".";
 		view.prompt = "Assassins: The assassins target " + block_name(game.who) + " in " + game.where + ".";
 		gen_action(view, 'next');
+		gen_action(view, 'block', game.who);
+		gen_action(view, 'block', ASSASSINS);
 	},
-	next: function () {
-		assassinate(game.who, game.where);
-		game.state = 'assassins_show_2';
-	},
+	next: assassins_next_1,
+	block: assassins_next_1,
+}
+
+function assassins_next_1() {
+	assassinate(game.who, game.where);
+	game.state = 'assassins_show_2';
 }
 
 states.assassins_show_2 = {
 	prompt: function (view, current) {
 		view.assassinate = game.who;
+		view.who = ASSASSINS;
 		if (is_inactive_player(current))
 			return view.prompt = "Assassins: Waiting for " + game.active + ".";
 		view.prompt = "Assassins: The assassins hit " + block_name(game.who) + " in " + game.where + ".";
 		gen_action(view, 'next');
+		gen_action(view, 'block', ASSASSINS);
+		gen_action(view, 'town', MASYAF);
 	},
-	next: function () {
-		game.location[ASSASSINS] = MASYAF;
-		game.who = null;
-		game.where = null;
-		end_player_turn();
-	},
+	next: assassins_next_2,
+	block: assassins_next_2,
+	town: assassins_next_2,
+}
+
+function assassins_next_2() {
+	game.location[ASSASSINS] = MASYAF;
+	game.who = null;
+	game.where = null;
+	end_player_turn();
 }
 
 function assassinate(who, where) {
-- 
cgit v1.2.3