From c08b50f70493e8c837ea58ecfdd6d0eb42f507aa Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Thu, 2 Feb 2023 10:32:24 +0100
Subject: Fix Ransom + Remove after battle.

---
 play.html | 4 ----
 play.js   | 2 +-
 rules.js  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/play.html b/play.html
index 15b4411..d623ec0 100644
--- a/play.html
+++ b/play.html
@@ -138,10 +138,6 @@ body.Teutons #plan_actions .russian { display: none }
 
 /* BATTLE GRID WITH LORD MATS */
 
-#battle_panel {
-	width: 1275px;
-}
-
 #battle_grid {
 	display: grid;
 	grid-template-columns: auto auto auto;
diff --git a/play.js b/play.js
index b977b6f..29011f8 100644
--- a/play.js
+++ b/play.js
@@ -1704,7 +1704,7 @@ function update_battle() {
 }
 
 function is_lord_in_battle(lord) {
-	if (view.battle) {
+	if (view.battle && view.battle.array) {
 		for (let i = 0; i < 12; ++i)
 			if (view.battle.array[i] === lord)
 				return true
diff --git a/rules.js b/rules.js
index 538126d..07f4723 100644
--- a/rules.js
+++ b/rules.js
@@ -9488,8 +9488,8 @@ states.battle_remove = {
 			disband_lord(lord, true)
 			remove_legate_if_endangered(game.battle.where)
 			lift_sieges()
+			goto_battle_remove()
 		}
-		goto_battle_remove()
 	},
 }
 
-- 
cgit v1.2.3