tweak prompts

1 files changed, 25 insertions, 25 deletions

diff --git a/rules.js b/rules.js
index 361ca62..d47f8bc 100644
--- a/rules.js
+++ b/rules.js
@@ -347,7 +347,7 @@ function start_game() {
 
 	valid_spaces_setup()
 	game.available_ops = 2
-	log_h1("Place starting Support Points")
+	log_h2("Starting Support Points")
 	log_side()
 }
 
@@ -510,22 +510,21 @@ exports.action = function (state, player, action, arg) {
 // ============= GAME STATES =======================
 
 states.place_starting_infl = {
-	inactive: 'place starting SPs',
+	inactive: 'place additional SPs',
 	prompt() {
-		if (game.temp === (game.starting_infl.length - 1) && game.available_ops === 0 ) {
-			view.prompt = 'Place starting SPs: done. Start Turn 1.'
-			gen_action("start")
+		let n = game.temp + 1
+		let m = game.starting_infl.length
+		view.prompt = `Setup ${n} / ${m}: `
+		if (game.available_ops > 0) {
+			view.prompt += `Place ${pluralize(game.available_ops, 'additional SP')}.`
+			for (let space_id of game.valid_spaces)
+				gen_action_space(space_id)
 		} else if (game.available_ops === 0) {
-			view.prompt = 'Place starting SPs: done.'
-			gen_action("done")
-			return
-		} else if ((game.starting_infl.length === 5 && game.temp > 2) || game.temp > 3) {
-			view.prompt = `Place your last ${pluralize(game.available_ops, 'starting SP')}.`
-		} else {
-			view.prompt = `Place ${pluralize(game.available_ops, 'starting SP')}.`
-		}
-		for (let space_id of game.valid_spaces) {
-			gen_action_space(space_id)
+			view.prompt += "Done."
+			if (n === m)
+				gen_action("start")
+			else
+				gen_action("done")
 		}
 	},
 	space(space) {
@@ -548,16 +547,17 @@ states.place_starting_infl = {
 }
 
 states.choose_card = {
-	inactive: 'choose a card',
+	inactive: 'play a card',
 	prompt() {
+		view.prompt = "Action Round: "
 		if (
 			(game.active === DEM && game.democrat_hand.length === 0) ||
 			(game.active === COM && game.communist_hand.length === 0)
 		) {
-			view.prompt = 'No cards remaining: you must pass.'
+			view.prompt += "No cards remaining."
 			gen_action('pass')
 		} else {
-			view.prompt = 'Choose a card.'
+			view.prompt += "Play a card."
 			let available_cards
 			if (game.active === DEM) {
 				available_cards = game.democrat_hand
@@ -591,7 +591,7 @@ states.choose_card = {
 }
 
 states.confirm_card = {
-	inactive: 'choose a card',
+	inactive: 'play a card',
 	prompt() {
 		let scoring_cards_count = count_scoring_cards()
 		view.prompt = `${pluralize(scoring_cards_count,'scoring card')} in hand with ${pluralize(8-game.round,'Action Round')} remaining. Scoring cards may not be held. Continue?`
@@ -604,10 +604,10 @@ states.confirm_card = {
 
 states.play_card = {
 	get inactive() {
-		return `play ${card_name[game.played_card]}.`
+		return `play ${quoted_card_name[game.played_card]}.`
 	},
 	prompt() {
-		view.prompt = `Play ${card_name[game.played_card]} for:`
+		view.prompt = "Play " + quoted_card_name[game.played_card] + "."
 
 		if (scoring_cards.includes(game.played_card)) {
 			gen_action('event')
@@ -6836,7 +6836,7 @@ states.vm_goodbye_lenin = {
 				gen_action('ops')
 			}
 		} else {
-			view.prompt = 'Communist has no red events. Play Goodbye Lenin for operations.'
+			view.prompt = `Communist has no red events. Play ${quoted_card_name[C_GOODBYE_LENIN]} for operations.'
 			gen_action('ops')
 		}
 	},
@@ -6866,7 +6866,7 @@ states.vm_goodbye_lenin_ops = {
 		return `resolve ${card_name[this_card()]}.`
 	},
 	prompt() {
-		view.prompt = `Play ${card_name[this_card()]} for:`
+		view.prompt = `Play ${quoted_card_name[this_card()]}.`
 		gen_action('influence')
 		gen_action('support_check')
 		if (
@@ -7093,7 +7093,7 @@ states.vm_kiss_of_death_finish = {
 		return `resolve ${card_name[game.played_card]}.`
 	},
 	prompt() {
-		view.prompt = `Play ${card_name[game.vm_event]} for the event.`
+		view.prompt = `Play ${quoted_card_name[game.vm_event]} for the event.`
 		gen_action('event')
 	},
 	event() {
@@ -8224,7 +8224,7 @@ states.vm_tst_8 = {
 states.vm_tst_8_ops = {
 	inactive: 'play card for operations',
 	prompt() {
-		view.prompt = `Play ${card_name[game.played_card]} for:`
+		view.prompt = `Play ${quoted_card_name[game.played_card]}.`
 		gen_action('influence')
 		gen_action('support_check')
 		if (