From ffcdc5f11cf7affa60d804c63fddba06dbb3b2e7 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sat, 20 Apr 2024 01:32:15 +0200
Subject: Rout Vassals in death check step.

---
 play.css |  4 ++--
 rules.ts | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/play.css b/play.css
index 3b41b6e..b6c0347 100644
--- a/play.css
+++ b/play.css
@@ -376,11 +376,11 @@ body.shift .exhausted  {
 }
 
 .unit.retinue.action {
-	box-shadow: 0 0 0 2px white;
+	box-shadow: 0 0 0 1px black, 0 0 0 4px white !important;
 }
 
 .unit.vassal.action {
-	box-shadow: 0 0 0 2px white;
+	box-shadow: 0 0 0 1px black, 0 0 0 4px white !important;
 }
 
 .unit.shape.action {
diff --git a/rules.ts b/rules.ts
index 914c7f6..603b036 100644
--- a/rules.ts
+++ b/rules.ts
@@ -7289,6 +7289,20 @@ states.battle_spoils = {
 function goto_death_or_disband() {
 	remove_battle_capability_troops()
 
+	// TODO: manually disband routed vassals
+
+	// Routed Vassals get disbanded
+	for (let lord of all_lords) {
+		if (is_lord_on_map(lord)) {
+			for_each_vassal_with_lord(lord, v => {
+				if (set_has(game.battle.routed_vassals, v)) {
+					array_remove(game.battle.routed_vassals, v)
+					disband_vassal(v)
+				}
+			})
+		}
+	}
+
 	if (has_defeated_lords()) {
 		if (is_bloody_thou_art_triggered())
 			game.state = "bloody_thou_art"
@@ -7597,18 +7611,6 @@ function end_warden_of_the_marches() {
 function goto_battle_aftermath() {
 	set_active(game.battle.attacker)
 
-	// Routed Vassals get disbanded
-	for (let lord of all_lords) {
-		if (is_lord_on_map(lord)) {
-			for_each_vassal_with_lord(lord, v => {
-				if (set_has(game.battle.routed_vassals, v)) {
-					array_remove(game.battle.routed_vassals, v)
-					disband_vassal(v)
-				}
-			})
-		}
-	}
-
 	// Events
 	discard_events("hold")
 
-- 
cgit v1.2.3