feat(map,data): add union border color settings, separate from sector…

… border color
MichaelMakesGames · May 10, 2024 · 3447f22 · 3447f22
1 parent a2e69e6
commit 3447f22
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/src/renderer/src/intl/en-US.ts b/src/renderer/src/intl/en-US.ts
@@ -253,6 +253,7 @@ export default {
 		sectorBorderStroke: 'Sector Borders',
 		sectorBorderColor: 'Sector Border Color',
 		unionBorderStroke: 'Union Borders',
+		unionBorderColor: 'Union Border Color',
 		unionMode: 'Union Mode',
 		unionSubjects: 'Subjects',
 		unionFederations: 'Federations',

diff --git a/src/renderer/src/lib/map/CountryBorders.svelte b/src/renderer/src/lib/map/CountryBorders.svelte
@@ -18,6 +18,10 @@
 			return $mapSettings.sectorBorderStroke.enabled;
 		}
 	}
+
+	function sortSectorBorders(a: { isUnionBorder: boolean }, b: { isUnionBorder: boolean }) {
+		return (a.isUnionBorder ? 1 : -1) - (b.isUnionBorder ? 1 : -1);
+	}
 </script>
 
 {#if $mapSettings.borderStroke.enabled}
@@ -56,7 +60,7 @@
 				})}
 			/>
 		{/if}
-		{#each border.sectorBorders.filter(filterSectorBorders) as sectorBorder}
+		{#each border.sectorBorders.filter(filterSectorBorders).sort(sortSectorBorders) as sectorBorder}
 			<Glow
 				enabled={sectorBorder.isUnionBorder && $mapSettings.unionBorderStroke.enabled
 					? $mapSettings.unionBorderStroke.glow
@@ -76,7 +80,12 @@
 						mapSettings: $mapSettings,
 						colors,
 						countryColors: border,
-						colorStack: [$mapSettings.sectorBorderColor, $mapSettings.borderFillColor],
+						colorStack: [
+							sectorBorder.isUnionBorder && $mapSettings.unionBorderStroke.enabled
+								? $mapSettings.unionBorderColor
+								: $mapSettings.sectorBorderColor,
+							$mapSettings.borderFillColor,
+						],
 					})}
 					fill="none"
 				/>

diff --git a/src/renderer/src/lib/settings/mapSettings.ts b/src/renderer/src/lib/settings/mapSettings.ts
@@ -57,6 +57,7 @@ export type ColorMapSettings =
 	| 'hyperlaneColor'
 	| 'hyperRelayColor'
 	| 'sectorBorderColor'
+	| 'unionBorderColor'
 	| 'unownedHyperlaneColor'
 	| 'unownedHyperRelayColor'
 	| 'wormholeStrokeColor'
@@ -258,6 +259,10 @@ export const defaultMapSettings: MapSettings = {
 		dashed: false,
 		dashArray: '3 3',
 	},
+	unionBorderColor: {
+		color: 'border',
+		colorAdjustments: [{ type: 'MIN_CONTRAST', value: 0.25 }],
+	},
 	terraIncognita: true,
 	terraIncognitaPerspectiveCountry: 'player',
 	terraIncognitaStyle: 'striped',

diff --git a/src/renderer/src/lib/settings/mapSettingsConfig.ts b/src/renderer/src/lib/settings/mapSettingsConfig.ts
@@ -54,6 +54,14 @@ export const mapSettingsConfig: MapSettingConfigGroup[] = [
 					!settings.unionMode ||
 					(settings.unionFederations === 'off' && settings.unionSubjects === 'off'),
 			},
+			{
+				id: 'unionBorderColor',
+				type: 'color',
+				hideIf: (settings) =>
+					!settings.unionBorderStroke.enabled ||
+					!settings.unionMode ||
+					(settings.unionFederations === 'off' && settings.unionSubjects === 'off'),
+			},
 		],
 	},
 	{