feat(map,ui): add system icons to legend

MichaelMakesGames · Sep 10, 2024 · a33fa32 · a33fa32
1 parent 32959de
commit a33fa32
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/src/renderer/src/lib/map/Legend.svelte b/src/renderer/src/lib/map/Legend.svelte
@@ -93,6 +93,8 @@
 						y={0}
 						width={symbolSize}
 						height={symbolSize}
+						transform="scale({item.symbol.scale ?? 1})"
+						transform-origin="{symbolSize / 2} {symbolSize / 2}"
 						{...getFillColorAttributes({
 							mapSettings: $mapSettings,
 							colors,

diff --git a/src/renderer/src/lib/map/data/processLegend.ts b/src/renderer/src/lib/map/data/processLegend.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store';
 
-import { t } from '../../../intl';
+import { type MessageID, t } from '../../../intl';
 import type { GameState } from '../../GameState';
-import type { ColorSetting, MapSettings } from '../../settings';
+import type { ColorSetting, IconSetting, MapSettings } from '../../settings';
 import { localizeText } from './locUtils';
 import { mapModes, type MapModeSystemValue } from './mapModes';
 import type processBorders from './processBorders';
@@ -15,6 +15,7 @@ interface LegendItem {
 				type: 'icon';
 				icon: string;
 				color: ColorSetting;
+				scale?: number;
 		  }
 		| {
 				type: 'border';
@@ -41,6 +42,13 @@ export const processLegendDeps = [
 	'mapModePointOfView',
 	'legendFontSize',
 	'occupation',
+	'countryCapitalIcon',
+	'sectorCapitalIcon',
+	'populatedSystemIcon',
+	'wormholeIcon',
+	'gatewayIcon',
+	'lGateIcon',
+	'shroudTunnelIcon',
 ] satisfies (keyof MapSettings)[];
 
 export default async function processLegend(
@@ -112,10 +120,37 @@ export default async function processLegend(
 			]
 		: [];
 
+	const systemIconSettings: [MessageID, IconSetting][] = [
+		['setting.countryCapitalIcon', settings.countryCapitalIcon],
+		['setting.sectorCapitalIcon', settings.sectorCapitalIcon],
+		['setting.populatedSystemIcon', settings.populatedSystemIcon],
+		['setting.wormholeIcon', settings.wormholeIcon],
+		['setting.gatewayIcon', settings.gatewayIcon],
+		['setting.lGateIcon', settings.lGateIcon],
+		['setting.shroudTunnelIcon', settings.shroudTunnelIcon],
+	];
+	const largestIconSize = Math.max(
+		...systemIconSettings
+			.filter(([_messageId, setting]) => setting.enabled)
+			.map(([_messageId, setting]) => setting.size),
+	);
+	const systemIconItems: LegendItem[] = systemIconSettings
+		.filter(([_messageId, setting]) => setting.enabled)
+		.map(([messageId, setting]) => ({
+			label: get(t)(messageId),
+			symbol: {
+				type: 'icon',
+				icon: setting.icon,
+				color: setting.color,
+				scale: setting.size / largestIconSize,
+			},
+		}));
+
 	const items = insertHrBetweenGroups([
 		countryMapModeLegendItems,
 		systemMapModeLegendItems,
 		occupationLegendItems,
+		systemIconItems,
 	]);
 	return {
 		items,

diff --git a/src/renderer/src/lib/settings/mapSettingsConfig.ts b/src/renderer/src/lib/settings/mapSettingsConfig.ts
@@ -351,14 +351,17 @@ export const mapSettingsConfig: MapSettingConfigGroup[] = [
 			{
 				id: 'countryCapitalIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 			{
 				id: 'sectorCapitalIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 			{
 				id: 'populatedSystemIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 			{
 				id: 'unpopulatedSystemIcon',
@@ -367,18 +370,22 @@ export const mapSettingsConfig: MapSettingConfigGroup[] = [
 			{
 				id: 'wormholeIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 			{
 				id: 'gatewayIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 			{
 				id: 'lGateIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 			{
 				id: 'shroudTunnelIcon',
 				type: 'icon',
+				requiresReprocessing: true,
 			},
 		],
 	},