From 0678cfbea57eec1e154a2cfb1534bd1df116ccc3 Mon Sep 17 00:00:00 2001
From: teisuru <31881306+teisuru@users.noreply.github.com>
Date: Thu, 15 Feb 2024 12:07:03 +0100
Subject: fix muster lord at seat

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

diff --git a/rules.js b/rules.js
index 94f3607..87c3890 100644
--- a/rules.js
+++ b/rules.js
@@ -5156,7 +5156,7 @@ states.muster_lord_at_seat = {
 
 		if (!found) {
 			for (let lord = first_friendly_lord; lord <= last_friendly_lord; lord++) {
-				if (is_lord_on_map(lord) && is_friendly_locale(data.lords[lord].seat)) {
+				if ((is_lord_on_map(lord) || is_lord_on_calendar(lord)) && is_friendly_locale(data.lords[lord].seat)) {
 					gen_action_locale(data.lords[lord].seat)
 				}
 			}
@@ -10628,7 +10628,9 @@ function disband_lord(lord, permanently = false) {
 
 	for (let x = 0; x < FORCE_TYPE_COUNT; ++x) {
 		set_lord_forces(lord, x, 0)
-		set_lord_routed_forces(lord, x, 0)
+		if (get_lord_routed_forces(lord, x) > 0) {
+			set_lord_routed_forces(lord, x, 0)
+		}
 	}
 
 	set_lord_moved(lord, 0)
-- 
cgit v1.2.3