Creating horror events using observer pattern setup

Assets/Scenes/MainMenu.unity

@@ -123,7 +123,11 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+<<<<<<< HEAD
+--- !u!1001 &466576513
+=======
 --- !u!1001 &457845157
+>>>>>>> 160156fb4b631d530b8e2b29fa5e180dc6f4714d
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2

Assets/Scripts/Camera/CameraView.cs

@@ -14,13 +14,19 @@ public class CameraView : MonoBehaviour
     private void OnEnable()
     {
         EventService.Instance.OnLightsOffByGhostEvent.AddListener(Shake);
-        EventService.Instance.PlayerDeathEvent.AddListener(Shake);
+        EventService.Instance.OnPlayerDeathEvent.AddListener(Shake);
+        EventService.Instance.OnRatRush.AddListener(Shake);
+        EventService.Instance.OnSkullDrop.AddListener(Shake);
+
     }
 
     private void OnDisable()
     {
         EventService.Instance.OnLightsOffByGhostEvent.RemoveListener(Shake);
-        EventService.Instance.PlayerDeathEvent.RemoveListener(Shake);
+        EventService.Instance.OnPlayerDeathEvent.RemoveListener(Shake);
+        EventService.Instance.OnRatRush.RemoveListener(Shake);
+        EventService.Instance.OnSkullDrop.RemoveListener(Shake);
+
     }
 
     private void Start()
@@ -76,4 +82,4 @@ private void stopCoroutine(Coroutine coroutine)
         StopCoroutine(coroutine);
         coroutine = null;
     }
-}
+}

Assets/Scripts/Events/EventController.cs

@@ -1,18 +1,23 @@
 using System;
-
-public class EventController<T>
-{
-    public event Action<T> baseEvent;
-    public void InvokeEvent(T type) => baseEvent?.Invoke(type);
-    public void AddListener(Action<T> listener) => baseEvent += listener;
-    public void RemoveListener(Action<T> listener) => baseEvent -= listener;
-}
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
 
 public class EventController
 {
-    public event Action baseEvent;
+    public Action baseEvent;
+    public void AddListener(Action Listener) => baseEvent += Listener;
+
+    public void RemoveListener(Action Listener) => baseEvent -= Listener;
+
     public void InvokeEvent() => baseEvent?.Invoke();
-    public void AddListener(Action listener) => baseEvent += listener;
-    public void RemoveListener(Action listener) => baseEvent -= listener;
 
 }
+
+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);
+}

Assets/Scripts/Events/LightsOffByGhostEvent.cs

@@ -3,14 +3,13 @@
 public class LightsOffByGhostEvent : MonoBehaviour
 {
     [SerializeField] private int keysRequiredToTrigger;
-    [SerializeField] private SoundType soundToPlay;
-
+    [SerializeField] private SoundType soundType;
     private void OnTriggerEnter(Collider other)
     {
-        if (other.GetComponent<PlayerView>() != null && GameService.Instance.GetPlayerController().KeysEquipped == keysRequiredToTrigger)
+        if(other.GetComponent<PlayerView>() != null && keysRequiredToTrigger == GameService.Instance.GetPlayerController().KeysEquipped)
         {
             EventService.Instance.OnLightsOffByGhostEvent.InvokeEvent();
-            GameService.Instance.GetSoundView().PlaySoundEffects(soundToPlay);
+            GameService.Instance.GetSoundView().PlaySoundEffects(soundType);
             GetComponent<Collider>().enabled = false;
         }
     }

Assets/Scripts/Events/RatRushEvent.cs

@@ -14,6 +14,7 @@ private void OnTriggerEnter(Collider other)
         if (other.GetComponent<PlayerView>() != null)
         {
             onRatRush();
+            EventService.Instance.OnRatRush.InvokeEvent();
             GameService.Instance.GetSoundView().PlaySoundEffects(soundToPlay);
             GetComponent<Collider>().enabled = false;
         }

Assets/Scripts/Events/SkullDropEvent.cs

@@ -11,6 +11,7 @@ private void OnTriggerEnter(Collider other)
         if (other.GetComponent<PlayerView>() != null && GameService.Instance.GetPlayerController().KeysEquipped >= keysRequiredToTrigger)
         {
             OnSkullDrop();
+            EventService.Instance.OnSkullDrop.InvokeEvent();
             GameService.Instance.GetSoundView().PlaySoundEffects(soundToPlay);
             GetComponent<Collider>().enabled = false;
         }

Assets/Scripts/Interactables/KeyView.cs

@@ -11,4 +11,4 @@ public void Interact()
         EventService.Instance.OnKeyPickedUp.InvokeEvent(++currentKeys);
         gameObject.SetActive(false);
     }
-}
+}

Assets/Scripts/Interactables/LightSwitchView.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -6,28 +7,29 @@ public class LightSwitchView : MonoBehaviour, IInteractable
     [SerializeField] private List<Light> lightsources = new List<Light>();
     [SerializeField] private SoundType soundType;
     private SwitchState currentState;
+    public static event Action OnLightSwitchToggled;
 
     private void OnEnable()
     {
-        EventService.Instance.OnLightSwitchToggled.AddListener(onLightsToggled);
-        EventService.Instance.OnLightsOffByGhostEvent.AddListener(onLightsOffByGhostEvent);
+        EventService.Instance.OnLightSwitchToggled.AddListener(onLightSwitch);
+        EventService.Instance.OnLightsOffByGhostEvent.AddListener(onLightsTurnedOffByGhost);
     }
-
     private void OnDisable()
     {
         EventService.Instance.OnLightSwitchToggled.RemoveListener(onLightsToggled);
-        EventService.Instance.OnLightsOffByGhostEvent.RemoveListener(onLightsOffByGhostEvent);
+        EventService.Instance.OnLightsOffByGhostEvent.RemoveListener(onLightsTurnedOffByGhost);
     }
 
-    private void Start()
-    {
-        currentState = SwitchState.Off;
-    }
+
+    private void Start() => currentState = SwitchState.Off;
+
+
     public void Interact()
     {
         GameService.Instance.GetInstructionView().HideInstruction();
         EventService.Instance.OnLightSwitchToggled.InvokeEvent();
     }
+
     private void toggleLights()
     {
         bool lights = false;
@@ -53,21 +55,33 @@ private void toggleLights()
 
     private void setLights(bool lights)
     {
+        foreach (Light lightSource in lightsources)
+        {
+            lightSource.enabled = lights;
+        }
         if (lights)
+        {
             currentState = SwitchState.On;
+        }
         else
-            currentState = SwitchState.Off;
-
-        foreach (Light lightSource in lightsources)
         {
-            lightSource.enabled = lights;
+            currentState = SwitchState.Off;
         }
     }
-    private void onLightsOffByGhostEvent()
+
+    private void onLightSwitch()
+    {
+        toggleLights();
+        GameService.Instance.GetSoundView().PlaySoundEffects(SoundType.SwitchSound);
+        GameService.Instance.GetInstructionView().HideInstruction();
+    }
+    private void onLightsTurnedOffByGhost()
     {
-        GameService.Instance.GetSoundView().PlaySoundEffects(soundType);
         setLights(false);
+        GameService.Instance.GetSoundView().PlaySoundEffects(SoundType.SwitchSound);
+        GameService.Instance.GetInstructionView().ShowInstruction(InstructionType.LightsOff);
     }
+
     private void onLightsToggled()
     {
         toggleLights();

Assets/Scripts/Interactables/PotionView.cs

@@ -2,13 +2,16 @@
 
 public class PotionView : MonoBehaviour, IInteractable
 {
+
     [SerializeField] SoundType soundType;
     private int potionEffect = 20;
 
     public void Interact()
     {
+
         GameService.Instance.GetInstructionView().HideInstruction();
         GameService.Instance.GetSoundView().PlaySoundEffects(soundType);
+        EventService.Instance.OnPotionDrink.InvokeEvent(potionEffect);
         gameObject.SetActive(false);
     }
 }

Assets/Scripts/Player/PlayerController.cs

@@ -1,6 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
+
 public class PlayerController
 {
+    public bool IsInteracted;
+
     private PlayerView playerView;
     private PlayerScriptableObject playerScriptableObject;
     private float velocity;
@@ -9,30 +14,32 @@ public class PlayerController
     private float mouseX;
     private PlayerState playerState;
 
-    public bool IsInteracted;
     public int KeysEquipped { get => playerScriptableObject.KeysEquipped; set => playerScriptableObject.KeysEquipped = value; }
     public PlayerState PlayerState { get => playerState; private set => playerState = value; }
 
+
     public PlayerController(PlayerView playerView, PlayerScriptableObject playerScriptableObject)
     {
         this.playerView = playerView;
         this.playerView.SetController(this);
         this.playerScriptableObject = playerScriptableObject;
         this.playerScriptableObject.KeysEquipped = 0;
+
+
         playerState = PlayerState.InDark;
 
-        EventService.Instance.OnLightsOffByGhostEvent.AddListener(onLightsOffByGhost);
-        EventService.Instance.OnLightSwitchToggled.AddListener(onLightsToggled);
-        EventService.Instance.OnKeyPickedUp.AddListener(OnKeyPickedUp);
-        EventService.Instance.PlayerEscapedEvent.AddListener(DisableControls);
+        EventService.Instance.OnLightSwitchToggled.AddListener(LightSwitchToggled);
+        EventService.Instance.OnKeyPickedUp.AddListener(onKeysPickedUp);
+        EventService.Instance.OnLightsOffByGhostEvent.AddListener(onLightsTurnedOffByGhost);
     }
+
     ~PlayerController()
     {
-        EventService.Instance.OnLightsOffByGhostEvent.RemoveListener(onLightsOffByGhost);
-        EventService.Instance.OnLightSwitchToggled.RemoveListener(onLightsToggled);
-        EventService.Instance.OnKeyPickedUp.RemoveListener(OnKeyPickedUp);
-        EventService.Instance.PlayerEscapedEvent.RemoveListener(DisableControls);
+        EventService.Instance.OnLightSwitchToggled.RemoveListener(LightSwitchToggled);
+        EventService.Instance.OnKeyPickedUp.RemoveListener(onKeysPickedUp);
+        EventService.Instance.OnLightsOffByGhostEvent.RemoveListener(onLightsTurnedOffByGhost);
     }
+
     public void Interact() => IsInteracted = Input.GetKeyDown(KeyCode.E) ? true : (Input.GetKeyUp(KeyCode.E) ? false : IsInteracted);
 
     public void Jump(Rigidbody playerRigidbody, Transform transform)
@@ -47,7 +54,7 @@ public void Jump(Rigidbody playerRigidbody, Transform transform)
 
     public void Move(Rigidbody playerRigidbody, Transform transform)
     {
-        getInput();
+        GetInput();
 
         Quaternion rotation;
         Vector3 position;
@@ -60,14 +67,9 @@ public void Move(Rigidbody playerRigidbody, Transform transform)
     public void KillPlayer()
     {
         PlayerState = PlayerState.Dead;
-        EventService.Instance.PlayerDeathEvent.InvokeEvent();
     }
 
-    private void onLightsOffByGhost() => PlayerState = PlayerState.InDark;
-    private void OnKeyPickedUp(int keys) => KeysEquipped = keys;
-    private void DisableControls() => playerView.enabled = false;
-
-    private void getInput()
+    private void GetInput()
     {
         horizontalAxis = Input.GetAxis("Horizontal");
         verticalAxis = Input.GetAxis("Vertical");
@@ -82,11 +84,23 @@ private void calculatePositionRotation(Rigidbody playerRigidbody, Transform tran
         rotation = playerRigidbody.rotation * Quaternion.Euler(lookRotation);
         position = (transform.position) + (velocity * movement) * Time.fixedDeltaTime;
     }
-    private void onLightsToggled()
+    private void LightSwitchToggled()
     {
         if (PlayerState == PlayerState.InDark)
+        {
             PlayerState = PlayerState.None;
+        }
         else
+        {
             PlayerState = PlayerState.InDark;
+        }
+    }
+
+    private void onLightsTurnedOffByGhost() => PlayerState = PlayerState.InDark;
+
+
+    private void onKeysPickedUp(int keys)
+    {
+        KeysEquipped = keys;
     }
-}
+}