Added Generic Actions

Assets/Scripts/Events/EventController.cs

@@ -1,10 +1,28 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventController<T>
+{
+    public Action<T> baseEvent;
+
+    public void AddListener(Action<T> Listener) => baseEvent += Listener;
+
+    public void RemoveListener(Action<T> Listener) => baseEvent -= Listener;
+
+    public void InvokeEvent(T type) => baseEvent?.Invoke(type);
+
+}
 
 public class EventController
 {
     public Action baseEvent;
-    public void AddListener(Action listener) => baseEvent += listener;
-    public void RemoveListener(Action listener) => baseEvent -= listener;
+
+    public void AddListener(Action Listener) => baseEvent += Listener;
+
+    public void RemoveListener(Action Listener) => baseEvent -= Listener;
+
     public void InvokeEvent() => baseEvent?.Invoke();
-}
 
+}

Assets/Scripts/Interactables/KeyView.cs

@@ -5,11 +5,11 @@ public class KeyView : MonoBehaviour, IInteractable
     [SerializeField] GameUIView gameUIView;
     public void Interact()
     {
+        int currentKey = GameService.Instance.GetPlayerController().KeysEquipped;
         GameService.Instance.GetInstructionView().HideInstruction();
         GameService.Instance.GetSoundView().PlaySoundEffects(SoundType.KeyPickUp);
-        GameService.Instance.GetPlayerController().KeysEquipped++;
-        gameUIView.UpdateKeyText();
-
+        currentKey++;
+        EventService.Instance.OnKeyPickedUp.InvokeEvent(currentKey);
         gameObject.SetActive(false);
     }
 }

Assets/Scripts/Interactables/LightSwitchView.cs

@@ -1,21 +1,21 @@
 using System;
 using System.Collections.Generic;
-using UnityEditor.MPE;
 using UnityEngine;
 using static LightSwitchView;
 
 public class LightSwitchView : MonoBehaviour, IInteractable
 {
     [SerializeField] private List<Light> lightsources = new List<Light>();
     private SwitchState currentState;
+    public static event Action lightToggledAction;
 
-    private void OnEnable() => EventService.Instance.OnLightSwitchToggled.AddListener(onLightSwitch);
+    private void OnEnable() => EventService.Instance.lightToggledAction.AddListener(onLightSwitch);
 
-    private void OnDisable() => EventService.Instance.OnLightSwitchToggled.RemoveListener(onLightSwitch);
+    private void OnDisable() => EventService.Instance.lightToggledAction.RemoveListener(onLightSwitch);
 
     private void Start() => currentState = SwitchState.Off;
 
-    public void Interact() => EventService.Instance.OnLightSwitchToggled.InvokeEvent();
+    public void Interact() => EventService.Instance.lightToggledAction.InvokeEvent();
 
     private void toggleLights()
     {

Assets/Scripts/Player/PlayerController.cs

@@ -24,15 +24,19 @@ public PlayerController(PlayerView playerView, PlayerScriptableObject playerScri
         this.playerView.SetController(this);
         this.playerScriptableObject = playerScriptableObject;
         this.playerScriptableObject.KeysEquipped = 0;
-        playerState = PlayerState.InDark;
 
-        EventService.Instance.OnLightSwitchToggled.AddListener(onLightSwitch);
+
+        playerState = PlayerState.InDark;
+        EventService.Instance.lightToggledAction.AddListener(LightSwitchToggled);
+        EventService.Instance.OnKeyPickedUp.AddListener(onKeysPickedUp);
     }
 
-    ~PlayerController()
-    {
-        EventService.Instance.OnLightSwitchToggled.RemoveListener(onLightSwitch);
+    ~PlayerController() {
+        EventService.Instance.lightToggledAction.RemoveListener(LightSwitchToggled);
+        EventService.Instance.OnKeyPickedUp.RemoveListener(onKeysPickedUp);
     }
+
+
     public void Interact() => IsInteracted = Input.GetKeyDown(KeyCode.E) ? true : (Input.GetKeyUp(KeyCode.E) ? false : IsInteracted);
 
     public void Jump(Rigidbody playerRigidbody, Transform transform)
@@ -77,12 +81,20 @@ private void calculatePositionRotation(Rigidbody playerRigidbody, Transform tran
         rotation = playerRigidbody.rotation * Quaternion.Euler(lookRotation);
         position = (transform.position) + (velocity * movement) * Time.fixedDeltaTime;
     }
-
-    private void onLightSwitch()
+    private void LightSwitchToggled()
     {
         if (PlayerState == PlayerState.InDark)
+        {
             PlayerState = PlayerState.None;
+        }
         else
+        {
             PlayerState = PlayerState.InDark;
+        }
+    }
+
+    private void onKeysPickedUp(int keys)
+    {
+        KeysEquipped = keys;
     }
 }

Assets/Scripts/Service/EventService.cs

@@ -1,4 +1,9 @@
 
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
 public class EventService
 {
     private static EventService instance;
@@ -14,10 +19,13 @@ public static EventService Instance
         }
     }
 
-    public EventController OnLightSwitchToggled { get; private set; }
+    public EventController lightToggledAction { get; private set; }
+    public EventController<int> OnKeyPickedUp { get; private set; }
 
     public EventService()
     {
-        OnLightSwitchToggled = new EventController();
+        lightToggledAction = new EventController();
+        OnKeyPickedUp = new EventController<int>();
     }
 }
+

Assets/Scripts/UI/GameUIView.cs

@@ -21,13 +21,16 @@ public class GameUIView : MonoBehaviour
 
     private void OnEnable()
     {
-        tryAgainButton.onClick.AddListener(OnTryAgainButtonClicked);
-        quitButton.onClick.AddListener(OnQuitButtonClicked);
+        tryAgainButton.onClick.AddListener(onTryAgainButtonClicked);
+        quitButton.onClick.AddListener(onQuitButtonClicked);
+        EventService.Instance.OnKeyPickedUp.AddListener(updateKeyText);
     }
+
+    private void OnDisable() => EventService.Instance.OnKeyPickedUp.RemoveListener(updateKeyText);
     public void UpdateInsanity(float playerSanity) => insanityImage.rectTransform.localScale = new Vector3(1, playerSanity, 1);
-    public void UpdateKeyText() => keysFoundText.SetText($"Keys Found: {GameService.Instance.GetPlayerController().KeysEquipped}/3");
+    private void updateKeyText(int keys) => keysFoundText.SetText($"Keys Found: {keys}/3");
 
-    private void OnQuitButtonClicked() => Application.Quit();
-    private void OnTryAgainButtonClicked() => SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
+    private void onQuitButtonClicked() => Application.Quit();
+    private void onTryAgainButtonClicked() => SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
 }