Fix switch event unit.

Author: freezy

Editor/GleUnitAnalyzer.cs

@@ -1,13 +1,28 @@
-using System.Collections.Generic;
+// Visual Pinball Engine
+// Copyright (C) 2021 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System.Collections.Generic;
 using Unity.VisualScripting;
-using VisualPinball.Unity;
 using VisualPinball.Unity.VisualScripting;
 
 namespace Editor
 {
 
 	[Analyser(typeof(SwitchEventUnit))]
-	public class SwitchEventUnitAnalyzer : GleUnitAnalyser<SwitchEventArgs>
+	public class SwitchEventUnitAnalyzer : GleUnitAnalyser<VisualScriptingScriptEvent>
 	{
 		public SwitchEventUnitAnalyzer(GraphReference reference, SwitchEventUnit target) : base(reference, target)
 		{

Editor/Widgets/SetCoilUnitWidget.cs

@@ -34,7 +34,7 @@ public SetCoilUnitWidget(FlowCanvas canvas, SetCoilUnit unit) : base(canvas, uni
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (port == unit.id) {
+			if (port == unit.Id) {
 				InspectorProvider.instance.Renew(ref _coilIdInspector, meta, _setCoilInspectorConstructor);
 				return _coilIdInspector;
 			}

Editor/Widgets/SwitchEventUnitWidget.cs

@@ -34,7 +34,7 @@ public SwitchEventUnitWidget(FlowCanvas canvas, SwitchEventUnit unit) : base(can
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (port == unit.id) {
+			if (port == unit.Id) {
 				InspectorProvider.instance.Renew(ref _lampIdInspector, meta, _switchIdInspectorConstructor);
 
 				return _lampIdInspector;

Runtime/Events/Nodes/SetCoilUnit.cs

@@ -15,6 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using Unity.VisualScripting;
+using UnityEngine;
 
 namespace VisualPinball.Unity.VisualScripting
 {
@@ -24,27 +25,49 @@ public class SetCoilUnit : GleUnit
 	{
 		[DoNotSerialize]
 		[PortLabelHidden]
-		public ControlInput inputTrigger;
+		public ControlInput InputTrigger;
 
 		[DoNotSerialize]
 		[PortLabelHidden]
-		public ControlOutput outputTrigger;
+		public ControlOutput OutputTrigger;
 
 		[DoNotSerialize]
 		[PortLabel("Coil ID")]
-		public ValueInput id { get; private set; }
+		public ValueInput Id { get; private set; }
 
 		[DoNotSerialize]
 		[PortLabel("Value")]
-		public ValueInput enabled { get; private set; }
+		public ValueInput IsEnabled { get; private set; }
 
 		protected override void Definition()
 		{
-			inputTrigger = ControlInput(nameof(inputTrigger), _ => outputTrigger);
-			outputTrigger = ControlOutput(nameof(outputTrigger));
+			InputTrigger = ControlInput(nameof(InputTrigger), Process);
+			OutputTrigger = ControlOutput(nameof(OutputTrigger));
 
-			id = ValueInput<string>(nameof(id), string.Empty);
-			enabled = ValueInput<bool>(nameof(enabled), false);
+			Id = ValueInput<string>(nameof(Id), string.Empty);
+			IsEnabled = ValueInput<bool>(nameof(IsEnabled), false);
+
+			Requirement(Id, InputTrigger);
+			Succession(InputTrigger, OutputTrigger);
+		}
+		private ControlOutput Process(Flow flow)
+		{
+			var gle = flow.stack.gameObject.GetComponentInParent<VisualScriptingGamelogicEngine>();
+
+			if (gle != null) {
+
+				var id = flow.GetValue<string>(Id);
+				var isEnabled = flow.GetValue<bool>(IsEnabled);
+
+				gle.SetCoil(id, isEnabled);
+
+			} else {
+				Debug.LogError("Cannot find GLE.");
+			}
+
+			return OutputTrigger;
 		}
+
+
 	}
 }

Runtime/Events/Nodes/SwitchEventUnit.cs

@@ -20,15 +20,15 @@ namespace VisualPinball.Unity.VisualScripting
 {
 	[UnitTitle("On Switch Changed")]
 	[UnitCategory("Events\\Visual Pinball")]
-	public class SwitchEventUnit : GleEventUnit<SwitchEventArgs>
+	public class SwitchEventUnit : GleEventUnit<VisualScriptingScriptEvent>
 	{
 		[DoNotSerialize]
 		[PortLabel("Switch ID")]
-		public ValueInput id { get; private set; }
+		public ValueInput Id { get; private set; }
 
 		[DoNotSerialize]
 		[PortLabel("Is Enabled")]
-		public ValueOutput enabled { get; private set; }
+		public ValueOutput IsEnabled { get; private set; }
 
 		protected override bool register => true;
 
@@ -42,13 +42,18 @@ protected override void Definition()
 		{
 			base.Definition();
 
-			id = ValueInput(nameof(id), string.Empty);
-			enabled = ValueOutput<bool>(nameof(enabled));
+			Id = ValueInput(nameof(Id), string.Empty);
+			IsEnabled = ValueOutput<bool>(nameof(IsEnabled));
 		}
 
-		protected override void AssignArguments(Flow flow, SwitchEventArgs args)
+		protected override bool ShouldTrigger(Flow flow, VisualScriptingScriptEvent args)
 		{
-			flow.SetValue(enabled, args.IsEnabled);
+			return flow.GetValue<string>(Id) == args.Id;
+		}
+
+		protected override void AssignArguments(Flow flow, VisualScriptingScriptEvent args)
+		{
+			flow.SetValue(IsEnabled, args.IsEnabled);
 		}
 	}
 }

Runtime/Gamelogic/VisualScriptingEvents.cs

@@ -0,0 +1,30 @@
+// Visual Pinball Engine
+// Copyright (C) 2021 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+namespace VisualPinball.Unity.VisualScripting
+{
+	public readonly struct VisualScriptingScriptEvent
+	{
+		public readonly string Id;
+		public readonly bool IsEnabled;
+
+		public VisualScriptingScriptEvent(string id, bool isEnabled)
+		{
+			Id = id;
+			IsEnabled = isEnabled;
+		}
+	}
+}

Runtime/Gamelogic/VisualScriptingEvents.cs.meta

@@ -15,6 +15,8 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
+using System.Xml;
+using Unity.VisualScripting;
 using UnityEngine;
 using VisualPinball.Engine.Game.Engines;
 
@@ -49,9 +51,14 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 		{
 		}
 
-		public void Switch(string id, bool isClosed)
+		public void SetCoil(string id, bool isEnabled)
 		{
+			OnCoilChanged?.Invoke(this, new CoilEventArgs(id, isEnabled));
+		}
 
+		public void Switch(string id, bool isClosed)
+		{
+			EventBus.Trigger(EventNames.SwitchEvent, new VisualScriptingScriptEvent(id, isClosed));
 		}
 	}
 }