Prompts.

1 files changed, 34 insertions, 5 deletions

diff --git a/rules.js b/rules.js
index e73ff63..21387a1 100644
--- a/rules.js
+++ b/rules.js
@@ -2366,7 +2366,7 @@ function goto_vm_place() {
 
 states.vm_place = {
 	prompt() {
-		event_prompt("Place " + game.vm.count + " cube.")
+		event_prompt()
 		if (game.vm.upto)
 			view.actions.skip = 1
 		for (let s of game.vm.spaces)
@@ -2428,7 +2428,7 @@ states.vm_move_disc = {
 
 states.vm_place_disc = {
 	prompt() {
-		event_prompt("Place a disc.")
+		event_prompt()
 		if (game.vm.upto)
 			view.actions.skip = 1
 		for (let s of game.vm.spaces)
@@ -2462,7 +2462,7 @@ function goto_vm_replace() {
 
 states.vm_replace = {
 	prompt() {
-		event_prompt("Replace " + game.vm.count + " cubes.")
+		event_prompt()
 		if (game.vm.upto)
 			view.actions.skip = 1
 		for (let s of game.vm.spaces)
@@ -2497,7 +2497,7 @@ function goto_vm_remove() {
 
 states.vm_remove = {
 	prompt() {
-		event_prompt("Remove " + game.vm.count + " cubes.")
+		event_prompt()
 		if (game.vm.upto)
 			view.actions.skip = 1
 		for (let s of game.vm.spaces)
@@ -2558,7 +2558,7 @@ function goto_vm_move() {
 
 states.vm_move = {
 	prompt() {
-		event_prompt("Move up to " + game.vm.count + " cubes.")
+		event_prompt()
 		view.actions.skip = 1
 		if (game.who < 0) {
 			for (let s of game.vm.a)
@@ -2971,11 +2971,13 @@ CODE[1] = [ // Jules Ducatel
 
 CODE[2] = [ // The Murder of Vincenzini
 	[ vm_increase_revolutionary_momentum ],
+	[ vm_prompt, "Remove up to 3 from Political." ],
 	[ vm_remove_up_to, 3, POLITICAL ],
 	[ vm_return ],
 ]
 
 CODE[3] = [ // Brassardiers
+	[ vm_prompt, "Replace 1 in a Military space where you are present." ],
 	[ vm_replace, 1, ()=>(where_present(MILITARY)) ],
 	[ vm_return ],
 ]
@@ -2984,8 +2986,10 @@ CODE[4] = [ // Jules Ferry
 	[ vm_prompt, "Place up to 2 in Republicans or replace 1 in National Assembly." ],
 	[ vm_switch, ["place","replace"] ],
 	[ vm_case, "place" ],
+	[ vm_prompt, "Place up to 2 in Republicans." ],
 	[ vm_place_up_to, 2, REPUBLICANS ],
 	[ vm_case, "replace" ],
+	[ vm_prompt, "Replace 1 in National Assembly." ],
 	[ vm_replace, 1, NATIONAL_ASSEMBLY ],
 	[ vm_endswitch ],
 	[ vm_return ],
@@ -2995,8 +2999,10 @@ CODE[5] = [ // Le Figaro
 	[ vm_prompt, "Place up to 2 in Press or replace 1 in Public Opinion." ],
 	[ vm_switch, ["place","replace"] ],
 	[ vm_case, "place" ],
+	[ vm_prompt, "Place up to 2 in Press." ],
 	[ vm_place_up_to, 2, PRESS ],
 	[ vm_case, "replace" ],
+	[ vm_prompt, "Replace 1 in Public Opinion." ],
 	[ vm_replace, 1, PUBLIC_OPINION ],
 	[ vm_endswitch ],
 	[ vm_return ],
@@ -3008,25 +3014,31 @@ CODE[6] = [ // Général Louis Valentin
 ]
 
 CODE[7] = [ // Général Espivent
+	[ vm_prompt, "Remove up to 2 from Social Movements." ],
 	[ vm_remove_up_to, 2, SOCIAL_MOVEMENTS ],
 	[ vm_return ],
 ]
 
 CODE[8] = [ // Les Amis de l'Ordre
+	[ vm_prompt, "Place 2 in Paris." ],
 	[ vm_place, 2, PARIS ],
 	[ vm_return ],
 ]
 
 CODE[9] = [ // Socialist Newspaper Ban
 	[ vm_increase_revolutionary_momentum ],
+	[ vm_prompt, "Remove up to 2 from Press." ],
 	[ vm_remove_up_to, 2, PRESS ],
 	[ vm_asm, ()=>game.snb=1 ],
 	[ vm_return ],
 ]
 
 CODE[10] = [ // Fortification of Mont-Valérien
+	[ vm_prompt, "Place up to 1 in Mont-Valérien." ],
 	[ vm_place_up_to, 1, MONT_VALERIEN ],
+	[ vm_asm, ()=>update_presence_and_control() ],
 	[ vm_if, ()=>(is_control(MONT_VALERIEN)) ],
+	[ vm_prompt, "You may place a Fortification in Mont-Valérien." ],
 	[ vm_may_place_disc, MONT_VALERIEN ],
 	[ vm_endif ],
 	[ vm_return ],
@@ -3039,6 +3051,7 @@ CODE[11] = [ // Adolphe Thiers
 ]
 
 CODE[12] = [ // Otto von Bismarck
+	[ vm_prompt, "Remove 1 blue cube from National Assembly." ],
 	[ vm_remove_own, NATIONAL_ASSEMBLY ],
 	[ vm_increase_prussian_collaboration ],
 	[ vm_ops, 2, MILITARY ],
@@ -3082,35 +3095,42 @@ CODE[17] = [ // Maréchal Macmahon
 ]
 
 CODE[18] = [ // Paule Minck
+	[ vm_prompt, "Replace 1 in a Military space where you are present." ],
 	[ vm_replace, 1, ()=>(where_present(MILITARY)) ],
 	[ vm_return ],
 ]
 
 CODE[19] = [ // Walery Wroblewski
+	[ vm_prompt, "Place one Barricade in a Paris space where you are present." ],
 	[ vm_place_disc, ()=>(where_present(PARIS)) ],
 	[ vm_return ],
 ]
 
 CODE[20] = [ // Banque de France
 	[ vm_decrease_revolutionary_momentum ],
+	[ vm_prompt, "Place up to 1 in Paris." ],
 	[ vm_place_up_to, 1, PARIS ],
+	[ vm_prompt, "You may place a Barricade in Paris." ],
 	[ vm_may_place_disc, PARIS ],
 	[ vm_return ],
 ]
 
 CODE[21] = [ // Le Réveil
 	[ vm_increase_revolutionary_momentum ],
+	[ vm_prompt, "Place up to 1 in Press." ],
 	[ vm_place_up_to, 1, PRESS ],
 	[ vm_return ],
 ]
 
 CODE[22] = [ // Execution of Generals
 	[ vm_increase_prussian_collaboration ],
+	[ vm_prompt, "Replace up to 2 in a Paris space where you are present." ],
 	[ vm_replace_up_to, 2, ()=>(where_present(PARIS)) ],
 	[ vm_return ],
 ]
 
 CODE[23] = [ // Les Cantinières
+	[ vm_prompt, "Place up to 2 in a Military space where you are present (may use removed)." ],
 	[ vm_place_removed_up_to, 2, ()=>(where_present(MILITARY)) ],
 	[ vm_return ],
 ]
@@ -3151,6 +3171,7 @@ CODE[28] = [ // Jaroslav Dombrowski
 
 CODE[29] = [ // Raoul Rigault
 	[ vm_increase_revolutionary_momentum ],
+	[ vm_prompt, "Move up to 2 from Catholic Church to Paris." ],
 	[ vm_move_up_to, 2, CATHOLIC_CHURCH, PARIS ],
 	[ vm_return ],
 ]
@@ -3192,19 +3213,23 @@ CODE[35] = [ // Conciliation
 	[ vm_prompt, "Move up to 2 from Public Opinion or Paris to the other." ],
 	[ vm_switch, ["public_opinion","paris"] ],
 	[ vm_case, "public_opinion" ],
+	[ vm_prompt, "Move up to 2 from Public Opinion to Paris." ],
 	[ vm_move_up_to, 2, PUBLIC_OPINION, PARIS ],
 	[ vm_case, "paris" ],
+	[ vm_prompt, "Move up to 2 from Paris to Public Opinion." ],
 	[ vm_move_up_to, 2, PARIS, PUBLIC_OPINION ],
 	[ vm_endswitch ],
 	[ vm_return ],
 ]
 
 CODE[36] = [ // Georges Clemenceau
+	[ vm_prompt, "Move up to 3 from Paris to Institutional." ],
 	[ vm_move_up_to, 3, PARIS, INSTITUTIONAL ],
 	[ vm_return ],
 ]
 
 CODE[37] = [ // Archbishop Georges Darboy
+	[ vm_prompt, "Move up to 4 from any spaces to Catholic Church." ],
 	[ vm_move_up_to, 4, ANY, CATHOLIC_CHURCH ],
 	[ vm_return ],
 ]
@@ -3241,8 +3266,10 @@ CODE[41] = [ // Freemason Parade
 	[ vm_prompt, "Place up to 2 or replace 1 in Institutional." ],
 	[ vm_switch, ["place","replace"] ],
 	[ vm_case, "place" ],
+	[ vm_prompt, "Place up to 2 in Institutional." ],
 	[ vm_place_up_to, 2, INSTITUTIONAL ],
 	[ vm_case, "replace" ],
+	[ vm_prompt, "Replace 1 in Institutional." ],
 	[ vm_replace, 1, INSTITUTIONAL ],
 	[ vm_endswitch ],
 	[ vm_return ],
@@ -3266,6 +3293,7 @@ CODE[42] = [ // Paris Cannons
 CODE[43] = [ // Aux Barricades!
 	[ vm_ops, 2, PARIS ],
 	[ vm_player, COMMUNE ],
+	[ vm_prompt, "You may place a Barricade in Butte-aux-Cailles." ],
 	[ vm_may_place_disc, BUTTE_AUX_CAILLES ],
 	[ vm_return ],
 ]
@@ -3276,6 +3304,7 @@ CODE[44] = [ // Commune's Stronghold
 	[ vm_case, "ops" ],
 	[ vm_ops, 2, MILITARY ],
 	[ vm_case, "remove" ],
+	[ vm_prompt, "Remove 1 from any space." ],
 	[ vm_remove, 1, ANY ],
 	[ vm_endswitch ],
 	[ vm_return ],