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] {forces.map((force, index) => ( @@ -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 (
{ forceRules={rules} /> ))} - +
); };