Update pinball event nodes.

Author: freezy

Editor/Widgets/CustomEventUnitWidget.cs Editor/Widgets/PinballEventUnitWidget.csEditor/Widgets/CustomEventUnitWidget.cs renamed to Editor/Widgets/PinballEventUnitWidget.cs

@@ -25,9 +25,9 @@
 namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[Widget(typeof(PinballEventUnit))]
-	public sealed class CustomEventUnitWidget : UnitWidget<PinballEventUnit>
+	public sealed class PinballEventUnitWidget : GleUnitWidget<PinballEventUnit>
 	{
-		public CustomEventUnitWidget(FlowCanvas canvas, PinballEventUnit unit) : base(canvas, unit)
+		public PinballEventUnitWidget(FlowCanvas canvas, PinballEventUnit unit) : base(canvas, unit)
 		{
 		}
 	}

…or/Widgets/CustomEventUnitWidget.cs.meta …r/Widgets/PinballEventUnitWidget.cs.metaEditor/Widgets/CustomEventUnitWidget.cs.meta renamed to Editor/Widgets/PinballEventUnitWidget.cs.meta Editor/Widgets/CustomEventUnitWidget.cs.meta renamed to Editor/Widgets/PinballEventUnitWidget.cs.meta

@@ -0,0 +1,30 @@
+// Visual Pinball Engine
+// Copyright (C) 2022 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/>.
+
+// ReSharper disable UnusedType.Global
+
+using Unity.VisualScripting;
+
+namespace VisualPinball.Unity.VisualScripting.Editor
+{
+	[Widget(typeof(TriggerPinballEventUnit))]
+	public sealed class TriggerPinballEventUnitWidget : GleUnitWidget<TriggerPinballEventUnit>
+	{
+		public TriggerPinballEventUnitWidget(FlowCanvas canvas, TriggerPinballEventUnit unit) : base(canvas, unit)
+		{
+		}
+	}
+}

Editor/Widgets/TriggerPinballEventUnitWidget.cs

@@ -28,14 +28,11 @@ namespace VisualPinball.Unity.VisualScripting
 	/// </summary>
 	[UnitTitle("On Pinball Event")]
 	[UnitCategory("Events/Visual Pinball")]
-	public class PinballEventUnit : GameObjectEventUnit<PinballEventArgs>
+	public class PinballEventUnit : GleEventUnit<PinballEventArgs>
 	{
 		[Serialize, Inspectable, UnitHeaderInspectable]
 		public EventDefinition Event { get; set; }
 
-		public override Type MessageListenerType => null;
-		protected override string hookName => VisualScriptingEventNames.PinballEvent;
-
 		[SerializeAs(nameof(argumentCount))]
 		private int _argumentCount;
 
@@ -50,6 +47,9 @@ public int argumentCount
 		[DoNotSerialize]
 		public List<ValueOutput> argumentPorts { get; } = new List<ValueOutput>();
 
+		protected override bool register => true;
+		public override EventHook GetHook(GraphReference reference) => new(VisualScriptingEventNames.PinballEvent);
+
 		protected override void Definition()
 		{
 			base.Definition();
@@ -71,9 +71,9 @@ protected override void AssignArguments(Flow flow, PinballEventArgs args)
 			}
 		}
 
-		public static void Trigger(GameObject target, string name, params object[] args)
+		public static void Trigger(GameObject target, string id, params object[] args)
 		{
-			EventBus.Trigger(VisualScriptingEventNames.PinballEvent, target, new PinballEventArgs(name, args));
+			EventBus.Trigger(VisualScriptingEventNames.PinballEvent, target, new PinballEventArgs(id, args));
 		}
 	}
 

Editor/Widgets/TriggerPinballEventUnitWidget.cs.meta

@@ -31,7 +31,7 @@ namespace VisualPinball.Unity.VisualScripting
 	[UnitShortTitle("Trigger")]
 	[TypeIcon(typeof(CustomEvent))]
 	[UnitCategory("Events/Visual Pinball")]
-	public sealed class TriggerPinballEventUnit : Unit
+	public sealed class TriggerPinballEventUnit : GleUnit
 	{
 		[Serialize, Inspectable, UnitHeaderInspectable]
 		public EventDefinition Event { get; set; }
@@ -57,39 +57,30 @@ public int argumentCount {
 		[PortLabelHidden]
 		public ControlOutput OutputTrigger { get; private set; }
 
-		/// <summary>
-		/// The target of the event.
-		/// </summary>
-		[DoNotSerialize]
-		[PortLabelHidden]
-		[NullMeansSelf]
-		public ValueInput target { get; private set; }
-
 		protected override void Definition()
 		{
 			InputTrigger = ControlInput(nameof(InputTrigger), Trigger);
 			OutputTrigger = ControlOutput(nameof(OutputTrigger));
 
-
-			target = ValueInput<GameObject>(nameof(target), null).NullMeansSelf();
 			Arguments = new List<ValueInput>();
-
 			for (var i = 0; i < argumentCount; i++) {
 				var argument = ValueInput<object>("argument_" + i);
 				Arguments.Add(argument);
 				Requirement(argument, InputTrigger);
 			}
 
-			Requirement(target, InputTrigger);
 			Succession(InputTrigger, OutputTrigger);
 		}
 
 		private ControlOutput Trigger(Flow flow)
 		{
-			var t = flow.GetValue<GameObject>(this.target);
-			var args = Arguments.Select(flow.GetConvertedValue).ToArray();
+			if (!AssertVsGle(flow)) {
+				Debug.LogError("Cannot find GLE.");
+				return OutputTrigger;
+			}
 
-			PinballEventUnit.Trigger(t, Event.Id, args);
+			var args = Arguments.Select(flow.GetConvertedValue).ToArray();
+			PinballEventUnit.Trigger(VsGle.gameObject, Event.Id, args);
 
 			return OutputTrigger;
 		}