From 8148bf409dc791bf455d91128ec6d1d515011d2e Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sat, 22 Apr 2023 22:57:45 +0200
Subject: Revert "WIP extort" (DO NOT KEEP - ONLY FOR REPLAY)

This reverts commit d9f631cbdeb00c1d905be48106b2d0709cdf0591.

# Conflicts:
#	rules.js
---
 rules.js | 53 ++++++++++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'rules.js')

diff --git a/rules.js b/rules.js
index 266067c..98ffb42 100644
--- a/rules.js
+++ b/rules.js
@@ -4899,37 +4899,25 @@ function goto_extort() {
 
 states.extort = {
 	prompt() {
-		view.prompt = "Extort: Select space with Underground Guerrilla that you control."
-		for (let s = first_space; s <= last_space; ++s) {
-			if (set_has(game.sa.spaces, s))
-				continue
-			if (has_underground_guerrilla(s, game.current)) {
-				if (game.current === FARC && has_farc_control(s))
-					gen_action_space(s)
-				if (game.current === AUC && has_auc_control(s))
-					gen_action_space(s)
+		if (game.sa.where < 0) {
+			view.prompt = "Extort: Select space with Underground Guerrilla that you control."
+			for (let s = first_space; s <= last_space; ++s) {
+				if (set_has(game.sa.spaces, s))
+					continue
+				if (has_underground_guerrilla(s, game.current)) {
+					if (game.current === FARC && has_farc_control(s))
+						gen_action_space(s)
+					if (game.current === AUC && has_auc_control(s))
+						gen_action_space(s)
+				}
 			}
+		} else {
+			view.prompt = `Extort in ${space_name[game.sa.where]}.`
+			view.where = game.sa.where
+			gen_underground_guerrillas(game.sa.where, game.current)
 		}
 		view.actions.end_extort = 1
 	},
-	space(s) {
-		push_undo()
-		game.sa.where = s
-		set_add(game.sa.spaces, s)
-		game.state = "extort_space"
-	},
-	end_extort() {
-		push_undo()
-		end_extort()
-	},
-}
-
-states.extort_space = {
-	prompt() {
-		view.prompt = `Extort in ${space_name[game.sa.where]}.`
-		view.where = game.sa.where
-		gen_underground_guerrillas(game.sa.where, game.current)
-	},
 	piece(p) {
 		game.sa.count += 1
 		logi("S" + game.sa.where)
@@ -4938,8 +4926,15 @@ states.extort_space = {
 		game.sa.where = -1
 		if (!can_extort_again())
 			end_extort()
-		else
-			game.state = "extort"
+	},
+	space(s) {
+		push_undo()
+		game.sa.where = s
+		set_add(game.sa.spaces, s)
+	},
+	end_extort() {
+		push_undo()
+		end_extort()
 	},
 }
 
-- 
cgit v1.2.3