fix: Don't crash when internal lamp IDs don't match, and persist internal ID when setting a coil as lamp.

Author: freezy

VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Coil/CoilListViewItemRenderer.cs

@@ -117,6 +117,7 @@ private void RenderDestination(CoilListData coilListData, Rect cellRect, Action<
 					} else if (index == CoilDestination.Lamp) {
 						_tableComponent.MappingConfig.AddLamp(new LampMapping {
 							Id = coilListData.Id,
+							InternalId = coilListData.InternalId,
 							Source = LampSource.Lamp,
 							IsCoil = true,
 							Description = coilListData.Description

VisualPinball.Unity/VisualPinball.Unity.Editor/Managers/Lamp/LampListViewItemRenderer.cs

@@ -107,6 +107,9 @@ protected override void OnIconClick(LampListData data, bool pressedDown)
 
 		private void RenderCoilId(Dictionary<string, LampState> lampStatuses, LampListData lampListData, Rect cellRect)
 		{
+			cellRect.x += 5;
+			EditorGUI.LabelField(cellRect, lampListData.Id);
+
 			// add some padding
 			cellRect.x = cellRect.width - 45;
 			cellRect.width -= 4;
@@ -134,7 +137,7 @@ private void RenderCoilId(Dictionary<string, LampState> lampStatuses, LampListDa
 			cellRect.x += 20;
 			cellRect.width -= 20;
 
-			EditorGUI.LabelField(cellRect, lampListData.Id);
+			EditorGUI.LabelField(cellRect, lampListData.InternalId.ToString());
 		}
 
 		protected override void RenderDeviceElement(LampListData listData, Rect cellRect, Action<LampListData> updateAction)

VisualPinball.Unity/VisualPinball.Unity/Game/LampPlayer.cs

@@ -41,7 +41,7 @@ public class LampPlayer
 		/// <summary>
 		/// Links the GLE's IDs to the mappings.
 		/// </summary>
-		private readonly Dictionary<string,  Dictionary<int, Dictionary<ILampDeviceComponent, LampMapping>>> _lampMappings = new();
+		private readonly Dictionary<string, Dictionary<ILampDeviceComponent, Dictionary<int, LampMapping>>> _lampMappings = new();
 
 		private Player? _player;
 		private TableComponent? _tableComponent;
@@ -132,10 +132,11 @@ private void Apply(string id, int internalId, LampSource lampSource, bool isCoil
 		{
 			if (_lampAssignments.ContainsKey(id)) {
 				foreach (var component in _lampAssignments[id]) {
-					if (!_lampMappings[id].ContainsKey(internalId)) {
+
+					if (!_lampMappings[id][component].ContainsKey(internalId)) {
 						continue;
 					}
-					var mapping = _lampMappings[id][internalId][component];
+					var mapping = _lampMappings[id][component][internalId];
 					if (mapping.Source != lampSource || mapping.IsCoil != isCoil) {
 						// so, if we have a coil here that happens to have the same name as a lamp,
 						// or a GI light with the same name as an other lamp, skip.
@@ -230,13 +231,13 @@ private void AssignLampMapping(LampMapping lampMapping)
 				_lampAssignments[id] = new List<ILampDeviceComponent>();
 			}
 			if (!_lampMappings.ContainsKey(id)) {
-				_lampMappings[id] = new Dictionary<int, Dictionary<ILampDeviceComponent, LampMapping>>();
+				_lampMappings[id] = new Dictionary<ILampDeviceComponent, Dictionary<int, LampMapping>>();
 			}
 			_lampAssignments[id].Add(lampMapping.Device);
-			if (!_lampMappings[id].ContainsKey(lampMapping.InternalId)) {
-				_lampMappings[id][lampMapping.InternalId] = new Dictionary<ILampDeviceComponent, LampMapping>();
+			if (!_lampMappings[id].ContainsKey(lampMapping.Device)) {
+				_lampMappings[id][lampMapping.Device] = new Dictionary<int, LampMapping>();
 			}
-			_lampMappings[id][lampMapping.InternalId][lampMapping.Device] = lampMapping;
+			_lampMappings[id][lampMapping.Device][lampMapping.InternalId] = lampMapping;
 
 			if (!LampStates.ContainsKey(id)) {
 				LampStates[id] = new LampState(lampMapping.Device.LampStatus, lampMapping.Device.LampColor.ToEngineColor());