From 34bf449184bdcebf6a149beed9eb8be70535c6ae Mon Sep 17 00:00:00 2001
From: NilsUeter <nils.ueter@gmail.com>
Date: Wed, 7 Jun 2023 23:34:50 +0200
Subject: [PATCH] fix font loading and different profiles

---
 src/Roster.jsx  | 37 ++++++++++++++++++++++++-------------
 src/Weapons.jsx | 33 ++++++++++++++++++++++++++++-----
 src/index.css   |  6 +++---
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/Roster.jsx b/src/Roster.jsx
index 3f616b4..df7380c 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -3,7 +3,7 @@ import factionBackground from "./assets/factionBackground.png";
 import adeptusAstartesIcon from "./assets/adeptusAstartesIcon.png";
 import rangedIcon from "./assets/rangedIcon.png";
 import { Arrow, wavyLine } from "./assets/icons";
-import { Weapons } from "./Weapons";
+import { Weapons, hasDifferentProfiles } from "./Weapons";
 
 export const Roster = ({ roster, onePerPage }) => {
 	if (!roster) {
@@ -111,12 +111,23 @@ const Unit = ({ unit, index, catalog, onePerPage, forceRules }) => {
 				(weapon.range === "-" || weapon.range === "") && weapon.abilities
 		)
 		.sort((a, b) => a.selectionName.localeCompare(b.selectionName));
-	const modelsWithDifferentProfiles = weapons.filter(
-		(weapon) =>
-			weapon.selectionName !== weapon.name &&
-			!weapon.name.includes("(Shooting)") &&
-			!weapon.name.includes("(Melee)")
-	);
+	const modelsWithDifferentProfiles = weapons.filter((weapon, index) => {
+		const { selectionName, name } = weapon;
+		const previousWeapon = weapons[index - 1];
+		const nextWeapon = weapons[index + 1];
+		return (
+			hasDifferentProfiles(selectionName, name) &&
+			((previousWeapon &&
+				hasDifferentProfiles(
+					previousWeapon.selectionName,
+					previousWeapon.name
+				) &&
+				selectionName === previousWeapon.selectionName) ||
+				(nextWeapon &&
+					hasDifferentProfiles(nextWeapon.selectionName, nextWeapon.name) &&
+					selectionName === nextWeapon.selectionName))
+		);
+	});
 
 	const overridePrimary = getOverridePrimary(factions, keywords);
 
@@ -223,7 +234,7 @@ const Unit = ({ unit, index, catalog, onePerPage, forceRules }) => {
 						style={{
 							fontFamily: "ConduitITCStd",
 							fontSize: "2.5em",
-							letterSpacing: "1px",
+							letterSpacing: ".1px",
 							lineHeight: "1",
 							fontWeight: 800,
 							textTransform: "uppercase",
@@ -340,7 +351,7 @@ const Unit = ({ unit, index, catalog, onePerPage, forceRules }) => {
 				>
 					<Spells title="PSYCHIC" spells={spells} />
 					<table
-						cellspacing="0"
+						cellSpacing="0"
 						className="weapons-table"
 						style={{ width: "100%" }}
 					>
@@ -359,7 +370,7 @@ const Unit = ({ unit, index, catalog, onePerPage, forceRules }) => {
 					</table>
 					<div style={{ flex: "1" }}></div>
 					<table
-						cellspacing="0"
+						cellSpacing="0"
 						className="weapons-table"
 						style={{ width: "100%" }}
 					>
@@ -679,7 +690,7 @@ const FancyBox = ({ children }) => {
 const Psykers = ({ title, psykers }) => {
 	return (
 		<table
-			cellspacing="0"
+			cellSpacing="0"
 			className="weapons-table"
 			style={{ width: "100%", margin: "4px 2px" }}
 		>
@@ -751,7 +762,7 @@ const WoundTracker = ({ woundTracker }) => {
 				}}
 			>
 				<table
-					cellspacing="0"
+					cellSpacing="0"
 					className="weapons-table"
 					style={{ width: "100%", margin: "4px 2px", marginBottom: -16 }}
 				>
@@ -787,7 +798,7 @@ const WoundTracker = ({ woundTracker }) => {
 const Spells = ({ title, spells }) => {
 	return (
 		<table
-			cellspacing="0"
+			cellSpacing="0"
 			className="weapons-table"
 			style={{ width: "100%", marginTop: "var(--size-20)" }}
 		>
diff --git a/src/Weapons.jsx b/src/Weapons.jsx
index a84d25c..1022764 100644
--- a/src/Weapons.jsx
+++ b/src/Weapons.jsx
@@ -34,6 +34,8 @@ export const Weapons = ({ title, weapons, modelStats, forceRules }) => {
 					<Weapon
 						key={weapon.name}
 						weapon={weapon}
+						previousWeapon={weapons[index - 1]}
+						nextWeapon={weapons[index + 1]}
 						modelStats={modelStats}
 						isMelee={isMelee}
 						className={getWeaponClassNames(weapons, index)}
@@ -51,7 +53,24 @@ export const Weapons = ({ title, weapons, modelStats, forceRules }) => {
 	);
 };
 
-const Weapon = ({ weapon, modelStats, isMelee, className, forceRules }) => {
+export const hasDifferentProfiles = (selectionName, name) => {
+	return (
+		selectionName &&
+		selectionName.toLowerCase() !== name.toLowerCase() &&
+		!name.includes("(Shooting)") &&
+		!name.includes("(Melee)")
+	);
+};
+
+const Weapon = ({
+	weapon,
+	previousWeapon,
+	nextWeapon,
+	modelStats,
+	isMelee,
+	className,
+	forceRules,
+}) => {
 	let { name, selectionName, range, type, str, ap, damage, abilities } = weapon;
 	var lastWhiteSpace = type.lastIndexOf(" ");
 	const attacks = type.substring(lastWhiteSpace + 1);
@@ -65,11 +84,15 @@ const Weapon = ({ weapon, modelStats, isMelee, className, forceRules }) => {
 	if (name === "Krak grenades") {
 		name = "Krak grenade";
 	}
+
 	const differentProfiles =
-		selectionName &&
-		selectionName.toLowerCase() !== name.toLowerCase() &&
-		!name.includes("(Shooting)") &&
-		!name.includes("(Melee)");
+		hasDifferentProfiles(selectionName, name) &&
+		((previousWeapon &&
+			hasDifferentProfiles(previousWeapon.selectionName, previousWeapon.name) &&
+			selectionName === previousWeapon.selectionName) ||
+			(nextWeapon &&
+				hasDifferentProfiles(nextWeapon.selectionName, nextWeapon.name) &&
+				selectionName === nextWeapon.selectionName));
 
 	if (differentProfiles && name.endsWith(" grenades")) {
 		name = name.replace(" grenades", "");
diff --git a/src/index.css b/src/index.css
index 12761c2..1772c75 100644
--- a/src/index.css
+++ b/src/index.css
@@ -22,17 +22,17 @@
 
 @font-face {
 	font-family: "ConduitITCStd";
-	src: url("fonts/ConduitITCStd ExtraBold.woff2") format("woff2");
+	src: url("/fonts/ConduitITCStd ExtraBold.woff2") format("woff2");
 	font-weight: 800;
 }
 @font-face {
 	font-family: "ConduitITCStd";
-	src: url("fonts/ConduitITCStd Bold.woff2") format("woff2");
+	src: url("/fonts/ConduitITCStd Bold.woff2") format("woff2");
 	font-weight: 700;
 }
 @font-face {
 	font-family: "ConduitITCStd";
-	src: url("fonts/ConduitITCStd-Regular.woff2") format("woff2");
+	src: url("/fonts/ConduitITCStd-Regular.woff2") format("woff2");
 	font-weight: 400;
 }