From 71ad8d269085d98da37588b21c2422b4b730f8bd Mon Sep 17 00:00:00 2001
From: NilsUeter <nils.ueter@gmail.com>
Date: Sat, 20 May 2023 18:46:39 +0200
Subject: [PATCH] add faction rules

---
 src/Roster.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Roster.jsx b/src/Roster.jsx
index d38a924..508bf7c 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -28,7 +28,7 @@ export const Roster = ({ roster, onePerPage }) => {
 					marginBottom: "12px",
 				}}
 			>
-				{name} [{cost.commandPoints} CP]
+				{name} [{cost.commandPoints} CP, {cost.points} pts]
 			</div>
 			{forces.map((force, index) => (
 				<Force key={index} force={force} onePerPage={onePerPage} />
@@ -38,8 +38,8 @@ export const Roster = ({ roster, onePerPage }) => {
 };
 
 const Force = ({ force, onePerPage }) => {
-	const { units, rules, catalog } = force;
-
+	const { units, factionRules, rules, catalog } = force;
+	var mergedRules = new Map([...factionRules, ...rules]);
 	return (
 		<div
 			style={{
@@ -56,7 +56,7 @@ const Force = ({ force, onePerPage }) => {
 					forceRules={rules}
 				/>
 			))}
-			<ForceRules rules={rules} onePerPage={onePerPage} />
+			<ForceRules rules={mergedRules} onePerPage={onePerPage} />
 		</div>
 	);
 };