March log

1 files changed, 5 insertions, 4 deletions

diff --git a/rules.js b/rules.js
index 625dd7f..feeb38a 100644
--- a/rules.js
+++ b/rules.js
@@ -582,7 +582,6 @@ function goto_march_space() {
 }
 
 function end_march_space() {
-	log_space(game.cmd.where, "March")
 	pop_summary()
 	game.state = "march"
 }
@@ -842,6 +841,7 @@ states.march = {
 	space(s) {
 		push_undo()
 		select_cmd_space(s, 1)
+		log_space(game.cmd.where, "March")
 		goto_march_space()
 	},
 	end_march: end_command
@@ -5059,6 +5059,8 @@ states.vm_place = {
 // VM: REPLACE
 
 function vm_replace() {
+	if (!game.decree)
+		game.decree = {}
 	game.vm.rs = piece_space(game.vm.p)
 	remove_piece(game.vm.p)
 	game.state = "vm_replace"
@@ -5082,6 +5084,7 @@ states.vm_replace = {
 	piece(p) {
 		push_undo()
 		p = place_piece(p, game.vm.rs)
+		game.decree.who = p
 		let rebel_p = vm_operand(3)
 		if (rebel_p) {
 			to_rebel(p)
@@ -5097,8 +5100,6 @@ states.vm_replace = {
 }
 
 function goto_rebel_or_obedient(s) {
-	if (!game.decree)
-		game.decree = {}
 	game.decree.where = s
 	game.state = "rebel_or_obedient"
 }
@@ -5117,7 +5118,7 @@ states.rebel_or_obedient = {
 	},
 	rebelling() {
 		push_undo()
-		let p = find_piece(game.decree.where, game.current, ELITE)
+		let p = game.decree.who
 		to_rebel(p)
 		log(`A ${piece_symbol(p)} in S${game.decree.where} to Rebel.`)
 		end_rebel_or_obedient()