From 5b47952204a127b47d4ca502cdb8b943a929a3f9 Mon Sep 17 00:00:00 2001
From: Mischa Untaga <99098079+MischaU8@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:25:54 +0100
Subject: click to claim states card

---
 rules.js | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/rules.js b/rules.js
index 93be76e..20703de 100644
--- a/rules.js
+++ b/rules.js
@@ -1606,6 +1606,10 @@ states.campaigning_add_cubes = {
 
 function after_campaigning_add_cube(us_state) {
 	if (player_cubes(us_state) === 4) {
+		if (can_claim_states_card(us_state)) {
+			goto_claim_states_card(us_state)
+			return
+		}
 		on_4th_cube(us_state)
 		if (check_victory())
 			return true
@@ -1625,6 +1629,40 @@ function end_campaigning_add_cube() {
 	goto_campaigning_assign()
 }
 
+function goto_claim_states_card(us_state) {
+	game.selected_us_state = us_state
+	game.state = 'claim_state_card'
+}
+
+states.claim_state_card = {
+	inactive: "claim States Card.",
+	prompt() {
+		view.prompt = `Claim the "${us_state_name(game.selected_us_state)}" States Card.`
+
+		for (let c of game.states_draw) {
+			if (US_STATES[game.selected_us_state].name === CARDS[c].name) {
+				gen_action_card(c)
+			}
+		}
+	},
+	card(c) {
+		array_remove_item(game.states_draw, c)
+		player_claimed().push(c)
+		log(`Claimed C${c}.`)
+		let s = game.selected_us_state
+		delete game.selected_us_state
+
+		// continue
+		if (game.vm) {
+			game.state = "vm_add_cubes"
+			after_vm_add_cube(s)
+		} else {
+			game.state = "campaigning_add_cubes"
+			after_campaigning_add_cube(s)
+		}
+	}
+}
+
 states.campaigning_move = {
 	inactive: "do Campaigning.",
 	prompt() {
@@ -2437,24 +2475,19 @@ states.vm_add_cubes = {
 		push_undo()
 		add_cube(game.vm.cube_color, s)
 		after_vm_add_cube(s)
-	}
+	},
 }
 
-function claim_states_card(us_state) {
+function can_claim_states_card(us_state) {
 	for (let c of game.states_draw) {
 		if (US_STATES[us_state].name === CARDS[c].name) {
-			array_remove_item(game.states_draw, c)
-			player_claimed().push(c)
-			log(`Claimed C${c}.`)
-			return
+			return true
 		}
 	}
+	return false
 }
 
 function on_4th_cube(us_state) {
-	// claim state cards when 4 cubes have been added
-	claim_states_card(us_state)
-
 	if (game.nineteenth_amendment) {
 		// replace cubes with checks / Xs
 		if (game.active === SUF) {
@@ -2467,6 +2500,10 @@ function on_4th_cube(us_state) {
 
 function after_vm_add_cube(us_state) {
 	if (player_cubes(us_state) === 4) {
+		if (can_claim_states_card(us_state)) {
+			goto_claim_states_card(us_state)
+			return
+		}
 		on_4th_cube(us_state)
 		if (game.nineteenth_amendment)
 			set_delete(game.vm.us_states, us_state)
-- 
cgit v1.2.3