luxick/brevyscribe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add faction rules

Browse Source
This commit is contained in:
NilsUeter
2023-05-20 18:46:39 +02:00
parent e5b568b480
commit 71ad8d2690
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Roster.jsx
+4 -4
View File
@@ -28,7 +28,7 @@ export const Roster = ({ roster, onePerPage }) => {
marginBottom: "12px", marginBottom: "12px",
}} }}
> >
{name} [{cost.commandPoints} CP] {name} [{cost.commandPoints} CP, {cost.points} pts]
</div> </div>
{forces.map((force, index) => ( {forces.map((force, index) => (
<Force key={index} force={force} onePerPage={onePerPage} /> <Force key={index} force={force} onePerPage={onePerPage} />
@@ -38,8 +38,8 @@ export const Roster = ({ roster, onePerPage }) => {
}; };
const Force = ({ force, onePerPage }) => { const Force = ({ force, onePerPage }) => {
const { units, rules, catalog } = force; const { units, factionRules, rules, catalog } = force;
var mergedRules = new Map([...factionRules, ...rules]);
return ( return (
<div <div
style={{ style={{
@@ -56,7 +56,7 @@ const Force = ({ force, onePerPage }) => {
forceRules={rules} forceRules={rules}
/> />
))} ))}
<ForceRules rules={rules} onePerPage={onePerPage} /> <ForceRules rules={mergedRules} onePerPage={onePerPage} />
</div> </div>
); );
}; };