misc: Added new GLE OnStarted event handler. Replaced PlayerStartedEvent with GleStartedEvent

Author: jsm174

Runtime/Gamelogic/VisualScriptingEventNames.cs

@@ -18,7 +18,7 @@ namespace VisualPinball.Unity
 {
 	public static class VisualScriptingEventNames
 	{
-		public const string PlayerStartedEvent = "PlayerStartedEvent";
+		public const string GleStartedEvent = "GleStartedEvent";
 		public const string LampEvent = "LampEvent";
 		public const string SwitchEvent = "SwitchEvent";
 		public const string CoilEvent = "CoilEvent";

Runtime/Gamelogic/VisualScriptingGamelogicBridge.cs

@@ -23,37 +23,54 @@ namespace VisualPinball.Unity.VisualScripting
 	[DisallowMultipleComponent]
 	[RequireComponent(typeof(IGamelogicEngine))]
 	[RequireComponent(typeof(Player))]
-	[AddComponentMenu("Visual Pinball/Game Logic Engine/Visual Scripting Bridge")]
+	[AddComponentMenu("Visual Pinball/Gamelogic Engine/Visual Scripting Bridge")]
 	public class VisualScriptingGamelogicBridge : MonoBehaviour
 	{
-		private IGamelogicEngine _gle;
 		private Player _player;
+		private IGamelogicEngine _gle;
+
+		private bool _init;
 
 		private void Awake()
 		{
-			_gle = GetComponent<IGamelogicEngine>();
+			_init = false;
+
 			_player = GetComponent<Player>();
-			if (_gle == null) {
-				Debug.LogWarning("Cannot find gamelogic engine.");
-				return;
-			}
 			if (_player == null) {
 				Debug.LogWarning("Cannot find player.");
-				return;
 			}
 
-			_player.OnPlayerStarted += OnPlayerStarted; 
+			_gle = GetComponent<IGamelogicEngine>();
+			if (_gle != null) {
+				_gle.OnStarted += OnStarted;
+			}
+			else { 
+				Debug.LogWarning("Cannot find gamelogic engine.");
+			}
 		}
 
-		private void OnDestroy()
-		{
-			if (_player != null) {
-				_player.OnPlayerStarted -= OnPlayerStarted;
+		private void OnDestroy() { 
+			if (_gle != null) {
+				_gle.OnStarted -= OnStarted;
+
+				if (_init) {
+					_gle.OnSwitchChanged -= OnSwitchChanged;
+					_gle.OnCoilChanged -= OnCoilChanged;
+					_gle.OnLampChanged -= OnLampChanged;
+				}
 			}
+		}
+
+		private void OnStarted(object sender, EventArgs e) 
+		{
 			if (_gle != null) {
-				_gle.OnSwitchChanged -= OnSwitchChanged;
-				_gle.OnCoilChanged -= OnCoilChanged;
-				_gle.OnLampChanged -= OnLampChanged;
+				_gle.OnSwitchChanged += OnSwitchChanged;
+				_gle.OnCoilChanged += OnCoilChanged;
+				_gle.OnLampChanged += OnLampChanged;
+
+				_init = true;
+
+				EventBus.Trigger(VisualScriptingEventNames.GleStartedEvent, e);
 			}
 		}
 
@@ -67,21 +84,9 @@ private static void OnCoilChanged(object sender, CoilEventArgs e)
 			EventBus.Trigger(VisualScriptingEventNames.CoilEvent, e);
 		}
 
-		private void OnPlayerStarted(object sender, EventArgs e)
-		{
-			if (_gle != null) {
-				_gle.OnSwitchChanged += OnSwitchChanged;
-				_gle.OnCoilChanged += OnCoilChanged;
-				_gle.OnLampChanged += OnLampChanged;
-			}
-
-			EventBus.Trigger(VisualScriptingEventNames.PlayerStartedEvent, EventArgs.Empty);
-		}
-
 		private static void OnLampChanged(object sender, LampEventArgs e)
 		{
 			EventBus.Trigger(VisualScriptingEventNames.LampEvent, e);
 		}
-
 	}
 }

Runtime/Gamelogic/VisualScriptingGamelogicEngine.cs

@@ -25,7 +25,7 @@
 namespace VisualPinball.Unity.VisualScripting
 {
 	[DisallowMultipleComponent]
-	[AddComponentMenu("Visual Pinball/Game Logic Engine/Visual Scripting Game Logic")]
+	[AddComponentMenu("Visual Pinball/Gamelogic Engine/Visual Scripting Game Logic")]
 	public class VisualScriptingGamelogicEngine : MonoBehaviour, IGamelogicEngine
 	{
 		public string Name => "Visual Scripting Gamelogic Engine";
@@ -51,6 +51,7 @@ public class VisualScriptingGamelogicEngine : MonoBehaviour, IGamelogicEngine
 		public event EventHandler<LampColorEventArgs> OnLampColorChanged;
 		public event EventHandler<CoilEventArgs> OnCoilChanged;
 		public event EventHandler<SwitchEventArgs2> OnSwitchChanged;
+		public event EventHandler<EventArgs> OnStarted;
 
 		[NonSerialized] public BallManager BallManager;
 		[NonSerialized] private Player _player;
@@ -59,7 +60,8 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
 		{
 			_player = player;
 			BallManager = ballManager;
-			EventBus.Trigger(VisualScriptingEventNames.PlayerStartedEvent, EventArgs.Empty);
+
+			OnStarted?.Invoke(this, EventArgs.Empty);
 		}
 
 		public void Switch(string id, bool isClosed)

Runtime/Nodes/PlayerStartedEventUnit.cs Runtime/Nodes/GleStartedEventUnit.csRuntime/Nodes/PlayerStartedEventUnit.cs renamed to Runtime/Nodes/GleStartedEventUnit.cs

@@ -19,20 +19,15 @@
 
 namespace VisualPinball.Unity.VisualScripting
 {
-	[UnitTitle("On Player Started Event")]
+	[UnitTitle("On Gamelogic Engine Started Event")]
 	[UnitCategory("Events\\Visual Pinball")]
-	public sealed class PlayerStartedEventUnit : EventUnit<EventArgs>
+	public sealed class GleStartedEventUnit : EventUnit<EventArgs>
 	{
 		protected override bool register => true;
 
 		public override EventHook GetHook(GraphReference reference)
 		{
-			return new EventHook(VisualScriptingEventNames.PlayerStartedEvent);
-		}
-
-		protected override void Definition()
-		{
-			base.Definition();
+			return new EventHook(VisualScriptingEventNames.GleStartedEvent);
 		}
 	}
 }