From 5e117873ea331e828401fa6367824ff63036086b Mon Sep 17 00:00:00 2001
From: Mischa Untaga <99098079+MischaU8@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:33:34 +0100
Subject: fix strategy select

---
 rules.js | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'rules.js')

diff --git a/rules.js b/rules.js
index 513412e..fcb5f6f 100644
--- a/rules.js
+++ b/rules.js
@@ -741,7 +741,7 @@ states.strategy_phase = {
 	defer() {
 		log(`Opposition deferred.`)
 		game.active = SUF
-		game.state = 'strategy_phase_select_strategy_card'
+		game.state = 'select_strategy_card'
 	},
 	match () {
 		log(`Opposition matched.`)
@@ -1704,7 +1704,7 @@ function vm_remove_congress() {
 function vm_roll() {
 	game.vm.count = vm_operand(1)
 	game.vm.d = vm_operand(2)
-	goto_vm_roll_dice()
+	game.state = "vm_roll"
 }
 
 function vm_move_each_player_campaigner_free() {
@@ -1718,11 +1718,12 @@ function vm_move_each_player_campaigner_free() {
 }
 
 function vm_select_strategy_card() {
-	goto_vm_select_strategy_card()
+	game.state = "select_strategy_card"
 }
 
 function vm_select_us_state() {
-	goto_vm_select_us_state()
+	game.state = "vm_select_us_state"
+	delete game.vm.selected_us_state
 }
 
 function vm_persistent() {
@@ -2239,10 +2240,6 @@ function roll_ndx_count_success(n, x, color="B", prefix="Rolled") {
 	return result
 }
 
-function goto_vm_roll_dice() {
-	game.state = "vm_roll"
-}
-
 states.vm_roll = {
 	inactive: "roll dice.",
 	prompt() {
@@ -2273,11 +2270,6 @@ states.vm_roll = {
 	}
 }
 
-function goto_vm_select_us_state() {
-	game.state = "vm_select_us_state"
-	delete game.vm.selected_us_state
-}
-
 states.vm_select_us_state = {
 	inactive: "select a state.",
 	prompt() {
@@ -2302,10 +2294,6 @@ states.vm_select_us_state = {
 	}
 }
 
-function goto_vm_select_strategy_card() {
-	game.state = "select_strategy_card"
-}
-
 states.move_each_player_campaigner_free = {
 	inactive: "move a campaigner.",
 	prompt() {
-- 
cgit v1.2.3