game: get aerial faith working again

wops

RunningLateGame/Assets/Scripts/AerialFaithDeathTrigger.cs

@@ -13,18 +13,28 @@
 public class AerialFaithDeathTrigger : MonoBehaviour
 {
     /// <summary>
-    ///     the trigger that detects if the player has jumped out of the play area
+    ///     the first trigger that detects if the player has jumped out of the play area
     /// </summary>
-    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger;
+    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger1;
 
     /// <summary>
-    ///     check if linkedLeapTrigger is set
+    ///     the second trigger that detects if the player has jumped out of the play area
+    /// </summary>
+    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger2;
+
+    /// <summary>
+    ///     the third trigger that detects if the player has jumped out of the play area
+    /// </summary>
+    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger3;
+
+    /// <summary>
+    ///     check if linkedLeapTrigger1 is set
     /// </summary>
     /// <exception cref="NullReferenceException">consequential exception</exception>
     private void Awake()
     {
-        if (linkedLeapTrigger == null)
+        if (linkedLeapTrigger1 == null)
-            throw new NullReferenceException("AerialFaithLandingTrigger: linkedLeapTrigger is not set");
+            throw new NullReferenceException("AerialFaithLandingTrigger: linkedLeapTrigger1 is not set");
     }
 
     /// <summary>
@@ -35,22 +45,19 @@ private void OnTriggerEnter(Collider other)
     {
         // Debug.Log($"AerialFaithDeathTrigger: was hit by object with tag {other.tag}");
 
-        if (!other.CompareTag("Player") || !linkedLeapTrigger.isPlayerInAir) return;
+        // proceed if:
-
+        //  - the colliding object is the player
-        // if (!other.CompareTag("Player"))
+        //  - any of the linked leap triggers are active, the 1st is always not null
-        // {
+        if (!other.CompareTag("Player")) return;
-        //     Debug.Log("AerialFaithDeathTrigger: player missed");
+        if (!(linkedLeapTrigger1.isPlayerInAir ||
-        //     return;
+              (linkedLeapTrigger2 != null && linkedLeapTrigger2.isPlayerInAir) ||
-        // }
+              (linkedLeapTrigger3 != null && linkedLeapTrigger3.isPlayerInAir)))
-        //
+            return;
-        // if (!linkedLeapTrigger.isPlayerInAir)
-        // {
-        //     Debug.Log("AerialFaithDeathTrigger: player is in an invalid state");
-        //     return;
-        // }
 
         Debug.Log("AerialFaithDeathTrigger: player missed, and will be baked");
-        linkedLeapTrigger.isPlayerInAir = false;
+        linkedLeapTrigger1.isPlayerInAir = false;
+        if (linkedLeapTrigger2 != null) linkedLeapTrigger2.isPlayerInAir = false;
+        if (linkedLeapTrigger3 != null) linkedLeapTrigger3.isPlayerInAir = false;
         // TODO: kill player
     }
 }

RunningLateGame/Assets/Scripts/AerialFaithLandingTrigger.cs

@@ -13,18 +13,28 @@
 public class AerialFaithLandingTrigger : MonoBehaviour
 {
     /// <summary>
-    ///     the trigger that detects if the player has jumped out of the play area
+    ///     the first trigger that detects if the player has jumped out of the play area
     /// </summary>
-    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger;
+    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger1;
 
     /// <summary>
-    ///     check if linkedLeapTrigger is set
+    ///     the second trigger that detects if the player has jumped out of the play area
+    /// </summary>
+    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger2;
+
+    /// <summary>
+    ///     the third trigger that detects if the player has jumped out of the play area
+    /// </summary>
+    [SerializeField] private AerialFaithLeapTrigger linkedLeapTrigger3;
+
+    /// <summary>
+    ///     check if linkedLeapTrigger1 is set
     /// </summary>
     /// <exception cref="NullReferenceException">consequential exception</exception>
     private void Awake()
     {
-        if (linkedLeapTrigger == null)
+        if (linkedLeapTrigger1 == null)
-            throw new NullReferenceException("AerialFaithLandingTrigger: linkedLeapTrigger is not set");
+            throw new NullReferenceException("AerialFaithLandingTrigger: linkedLeapTrigger1 is not set");
     }
 
     /// <summary>
@@ -34,8 +44,19 @@ private void Awake()
     private void OnTriggerEnter(Collider other)
     {
         // Debug.Log($"AerialFaithLandingTrigger: was hit by object with tag {other.tag}");
-        if (!other.CompareTag("Player") || !linkedLeapTrigger.isPlayerInAir) return;
+
+        // proceed if:
+        //  - the colliding object is the player
+        //  - any of the linked leap triggers are active, the 1st is always not null
+        if (!other.CompareTag("Player")) return;
+        if (!(linkedLeapTrigger1.isPlayerInAir ||
+              (linkedLeapTrigger2 != null && linkedLeapTrigger2.isPlayerInAir) ||
+              (linkedLeapTrigger3 != null && linkedLeapTrigger3.isPlayerInAir)))
+            return;
+
         Debug.Log("AerialFaithLandingTrigger: player landed");
-        linkedLeapTrigger.isPlayerInAir = false;
+        linkedLeapTrigger1.isPlayerInAir = false;
+        if (linkedLeapTrigger2 != null) linkedLeapTrigger2.isPlayerInAir = false;
+        if (linkedLeapTrigger3 != null) linkedLeapTrigger3.isPlayerInAir = false;
     }
 }

RunningLateGame/Assets/Scripts/MarkPlayer.cs

@@ -30,6 +30,6 @@ private void Start()
     public void OnPause()
     {
         Debug.Log("escape pressed");
-        _game.SetDisplayState(_game.Paused ? GameManager.DisplayState.Game : GameManager.DisplayState.ScreenPauseMenu);
+        _game.SetDisplayState(_game.Paused ? GameManager.DisplayState.Game : GameManager.DisplayState.OverlayPauseMenu);
     }
 }