diff --git a/src/Roster.jsx b/src/Roster.jsx index d677bec..8e57ef8 100644 --- a/src/Roster.jsx +++ b/src/Roster.jsx @@ -142,7 +142,7 @@ const Unit = ({ unit, index, catalog, onePerPage }) => { range: "Melee", damage: "1", type: "Melee", - str: "0", + str: "+0", ap: "0", }); } diff --git a/src/Weapons.jsx b/src/Weapons.jsx index 86b28dc..3a8b0bf 100644 --- a/src/Weapons.jsx +++ b/src/Weapons.jsx @@ -292,7 +292,12 @@ const getWeaponClassNames = (weapons, index) => { const calculateWeaponStrength = (strModel, strWeapon) => { if (strWeapon.startsWith("User")) return strModel; - if (strWeapon.startsWith("x")) + if (strWeapon.startsWith("x")) { return strModel * parseInt(strWeapon.replace("x", "")); - return strModel + parseInt(strWeapon, 10); + } + if (strWeapon.includes("+")) { + return strModel + parseInt(strWeapon, 10); + } + if (!strWeapon) return strModel; + return parseInt(strWeapon, 10); };