Fix pass with Exit Visas

1 files changed, 18 insertions, 1 deletions

diff --git a/rules.js b/rules.js
index 85b679a..19fb453 100644
--- a/rules.js
+++ b/rules.js
@@ -3053,6 +3053,14 @@ function is_auto_resolve(card) {
 			if (!game.state.startsWith('vm')) { log('No influence to remove') }
 			return true
 		}
+	} else if (card === C_DOMINO_THEORY) {
+		if (game.revolutions.filter(value => value === true).length < 2) {
+			if (!game.state.startsWith('vm')) { log('Democrat holds power in fewer than 2 countries') }
+			return true
+		} else if (!scoring_cards.some(card => game.strategy_discard.includes(card))) {
+			if (!game.state.startsWith('vm')) { log('No scoring cards in discard') }
+			return true
+		}
 	}
 	else {
 		return false
@@ -5255,6 +5263,7 @@ function vm_the_sinatra_doctrine() {
 
 function vm_the_third_way() {
 	log('-2VP')
+	game.vp -= 2
 	vm_next()
 }
 
@@ -6297,6 +6306,9 @@ states.vm_exit_visas_finish = {
 		if (game.temp > 0 ) {
 			view.prompt = 'Exit Visas: draw replacement cards.'
 			gen_action('draw')
+		} else {
+			view.prompt = 'Exit Visas: done.'
+			gen_action('done')
 		}
 	},
 	draw() {
@@ -6305,6 +6317,9 @@ states.vm_exit_visas_finish = {
 		game.temp = 0
 		vm_next()
 	},
+	done() {
+		vm_next()
+	}
 }
 
 states.vm_foreign_currency_debt_burden = {
@@ -8551,9 +8566,11 @@ CODE[88] = [ // Adamec*
 ]
 
 CODE[89] = [ // Domino Theory*
-	[ vm_prompt, 'Domino Theory: choose a Power Struggle card to play from the discard pile' ],
 	[ vm_permanently_remove ],
+	[ vm_if, ()=>!is_auto_resolve(C_DOMINO_THEORY) ],
+	[ vm_prompt, 'Domino Theory: choose a Power Struggle card to play from the discard pile' ],
 	[ vm_domino_theory ],
+	[ vm_endif ],
 	[ vm_return ],
 ]