Reorg free_attack

1 files changed, 13 insertions, 11 deletions

diff --git a/rules.js b/rules.js
index 7cc6955..92cd9d8 100644
--- a/rules.js
+++ b/rules.js
@@ -2900,6 +2900,8 @@ function has_unmoved_piece(space, faction) {
 
 function has_valid_attackers(s, faction) {
 	let valid_attacker = false
+	console.log(game.decree)
+	console.log(game.cmd)
 	for_each_movable(faction, p => {
 		if (piece_space(p) === s && !set_has(game.cmd.pieces, p))
 			valid_attacker = true
@@ -5118,21 +5120,21 @@ function vm_remove_tributary() {
 // VM: ATTACK
 
 function vm_free_attack() {
+	let pieces = (game.cmd && game.cmd.pieces) ? game.cmd.pieces : []
+	game.cmd = {
+		type: "Attack",
+		limited: 1,
+		free: 1,
+		spaces: [],
+		selected: [],
+		pieces: pieces,
+		where: game.vm.s,
+	}
+
 	if (!can_attack_in_space(game.vm.s) && !(game.cmd && game.cmd.pieces))
 		vm_next()
 	else {
 		log_space(game.vm.s, "Attack")
-		let pieces = (game.cmd && game.cmd.pieces) ? game.cmd.pieces : []
-		game.cmd = {
-			type: "Attack",
-			limited: 1,
-			free: 1,
-			spaces: [],
-			selected: [],
-			pieces: pieces,
-			where: game.vm.s,
-		}
-
 		if (is_timurid())
 			game.cmd.attacker = MI
 		else