From dea6d3119e78bdd9cb459a1e56c1d71cfb4be747 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sat, 7 Oct 2023 17:25:11 +0200
Subject: Simplify gnarly if-statement in count_group_assets.

---
 rules.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/rules.js b/rules.js
index fef274c..f822600 100644
--- a/rules.js
+++ b/rules.js
@@ -1077,12 +1077,11 @@ function count_group_assets(type, group = game.group) {
 	let n = 0
 	for (let lord of group) {
 		n += get_lord_assets(lord, type)
-		if (
-			(game.state === "command" || game.state === "march_laden") &&
-			lord_has_capability(lord, AOW_LANCASTER_HAY_WAINS) &&
-			type === CART
-		)
-			n += get_lord_assets(lord, CART)
+		if (type === CART) {
+			if ((game.state === "command" || game.state === "march_laden"))
+				if (lord_has_capability(lord, AOW_LANCASTER_HAY_WAINS))
+					n += get_lord_assets(lord, CART)
+		}
 	}
 	return n
 }
@@ -3614,8 +3613,8 @@ states.parley = {
 	}
 }
 
-
 // === ACTION: LEVY VASSAL ===
+
 // 1) During Levy ONLY
 // 2) game.who location must be friendly and Vassal seat locale must be friendly
 // 3) there need to not be his vassal marker on the calendar (see vassal disband)
-- 
cgit v1.2.3