From 4e8a669a912b853b5fe294b19fceab9f28800781 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sat, 31 Jul 2021 00:58:38 +0200
Subject: hammer: Reset last-used border state after defection battle regroups.

---
 rules.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules.js b/rules.js
index eef7af0..337f982 100644
--- a/rules.js
+++ b/rules.js
@@ -1937,18 +1937,22 @@ states.regroup = {
 	},
 	end_regroup: function () {
 		print_turn_log("regroups");
+		game.attacker[game.where] = null;
 		game.where = null;
 		clear_undo();
 		game.active = game.battle_active;
 		delete game.battle_active;
 		if (game.battle_reason === 'herald') {
 			delete game.battle_reason;
+			game.last_used = {};
 			end_player_turn();
 		} else if (game.battle_reason === 'pillage') {
 			delete game.battle_reason;
+			game.last_used = {};
 			end_player_turn();
 		} else if (game.battle_reason === 'coronation') {
 			delete game.battle_reason;
+			game.last_used = {};
 			resume_coronation();
 		} else {
 			delete game.battle_reason;
-- 
cgit v1.2.3