fix melee and ranged weapons with same name not both appearing

src/10th/Roster.jsx

@@ -67,32 +67,18 @@ const Unit = ({ unit, index, catalog, onePerPage, forceRules }) => {
 	const [image, setImage] = useState(null);
 	let {
 		name,
-		weapons,
+		meleeWeapons,
+		rangedWeapons,
 		abilities,
 		keywords,
 		factions,
 		rules,
 		modelStats,
 		modelList,
-		spells,
 		cost,
-		woundTracker,
 	} = unit;
 
-	const meleeWeapons = weapons
-		.filter(
-			(weapon) =>
-				(weapon.range === "Melee" || weapon.type === "Melee") &&
-				weapon.range !== ""
-		)
-		.sort((a, b) => a.selectionName.localeCompare(b.selectionName));
-
-	const rangedWeapons = weapons
-		.filter(
-			(weapon) =>
-				weapon.range !== "Melee" && weapon.range !== "-" && weapon.range !== ""
-		)
-		.sort((a, b) => a.selectionName.localeCompare(b.selectionName));
+	const weapons = [...meleeWeapons, ...rangedWeapons];
 
 	const weaponDescriptions = weapons
 		.filter(
@@ -288,8 +274,6 @@ const Unit = ({ unit, index, catalog, onePerPage, forceRules }) => {
 						className="button print-display-none"
 						style={{
 							position: "absolute",
-							top: "0",
-							right: 0,
 							border: "1px solid #999",
 							top: 1,
 							right: 1,

src/10th/Weapons.jsx

@@ -54,12 +54,7 @@ export const Weapons = ({ title, weapons, modelStats, forceRules }) => {
 };
 
 export const hasDifferentProfiles = (selectionName, name) => {
-	return (
-		selectionName &&
-		selectionName.toLowerCase() !== name.toLowerCase() &&
-		!name.includes("(Shooting)") &&
-		!name.includes("(Melee)")
-	);
+	return selectionName && selectionName.toLowerCase() !== name.toLowerCase();
 };
 
 const Weapon = ({ weapon, previousWeapon, nextWeapon, isMelee, className }) => {
@@ -176,6 +171,11 @@ const getWeaponClassNames = (weapons, index) => {
 	let differentColor = false;
 	for (let i = 1; i <= index; i++) {
 		let { selectionName } = weapons[i];
+		if (!selectionName && !weapons[i - 1].selectionName) {
+			if (weapons[i].name !== weapons[i - 1].name) {
+				differentColor = !differentColor;
+			}
+		}
 		if (selectionName !== weapons[i - 1].selectionName) {
 			differentColor = !differentColor;
 		}