reorg collect

1 files changed, 37 insertions, 35 deletions

diff --git a/rules.js b/rules.js
index 1b4b91e..1af6dfc 100644
--- a/rules.js
+++ b/rules.js
@@ -403,12 +403,6 @@ function goto_cavalry(n, next) {
 	game.state = "cavalry"
 }
 
-function goto_collect() {
-	init_decree("Collect")
-	game.decree.n = 1
-	game.state = "collect"
-}
-
 function goto_compromising_gifts() {
 	if (game.inf[game.cmd.who] === 0)
 		end_card()
@@ -707,26 +701,6 @@ states.cavalry = {
 	}
 }
 
-states.collect = {
-	prompt() {
-		if (game.decree.n > 0) {
-			view.prompt = `Collect Tribute: Collect ${collect_count()} from half the Tributaries prosperity`
-			gen_action_resources(DS)
-		} else {
-			view.prompt = "Collect Tribute: Done."
-			view.actions.end_collect = 1
-		}
-	},
-	resources(f) {
-		let c = collect_count()
-		add_resources(DS, c)
-		logi_resources(DS, c)
-		game.decree.n = 0
-		goto_cavalry(2, "collect")
-	},
-	end_collect: end_decree,
-}
-
 states.compromising_gifts = {
 	prompt() {
 		view.prompt = "Compromising gifts: Reduce your influence by one to gain two Resources and two Cavalry tokens"
@@ -1082,15 +1056,6 @@ function conscript_count() {
 	return 1
 }
 
-function can_collect() {
-	return collect_count() > 0
-}
-
-function collect_count() {
-	let c =  Math.floor(game.prosperity[DS])
-	return Math.floor(game.prosperity[0] / 2)
-}
-
 function can_govern() {
 	for (let s = first_space; s <= last_space; ++s)
 		if (can_govern_in_space(s))
@@ -1235,6 +1200,43 @@ function tax_count() {
 	return count_pieces_on_map(VE, DISC) + game.prosperity[VE]
 }
 
+/* DELHI SULTANATE DECREES */
+
+function can_collect() {
+	return collect_count() > 0
+}
+
+function collect_count() {
+	let c =  Math.floor(game.prosperity[DS])
+	return Math.floor(game.prosperity[0] / 2)
+}
+
+function goto_collect() {
+	init_decree("Collect")
+	game.decree.n = 1
+	game.state = "collect"
+}
+
+states.collect = {
+	prompt() {
+		if (game.decree.n > 0) {
+			view.prompt = `Collect Tribute: Collect ${collect_count()} from half the Tributaries prosperity`
+			gen_action_resources(DS)
+		} else {
+			view.prompt = "Collect Tribute: Done."
+			view.actions.end_collect = 1
+		}
+	},
+	resources(f) {
+		let c = collect_count()
+		add_resources(DS, c)
+		logi_resources(DS, c)
+		game.decree.n = 0
+		goto_cavalry(2, "collect")
+	},
+	end_collect: end_decree,
+}
+
 /* REBELS DECREES */
 
 function can_build() {