mark/sota
Archived
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: mark:5f8b0f167073082ef501379fefbf16ace275f5a1
Branches Tags
mark:main
mark:vfinal
...
compare: mark:fc9307d5d0895c2fd67b6750681b05f21fc50ae3
Branches Tags
mark:main
mark:vfinal

2 commits
5f8b0f1670 ... fc9307d5d0

Author SHA1 Message Date
Mark Joshwel fc9307d5d0 game: get aerial faith working again 2024-08-11 03:00:59 +08:00
Mark Joshwel 2d13cb0bc6 game(scripts): rename state in MarkPlayer 
wops
 2024-08-11 03:00:33 +08:00
4 changed files with 1020 additions and 4497 deletions
Show stats Expand all files Collapse all files

5435
RunningLateGame/Assets/Scenes/Playgrounds/Playground.unity
View file

File diff suppressed because one or more lines are too long

45
RunningLateGame/Assets/Scripts/AerialFaithDeathTrigger.cs
View file

@ -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)
throw new NullReferenceException("AerialFaithLandingTrigger: linkedLeapTrigger is not set");
if (linkedLeapTrigger1 == null)
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;
// if (!other.CompareTag("Player"))
// {
// Debug.Log("AerialFaithDeathTrigger: player missed");
// return;
// }
//
// if (!linkedLeapTrigger.isPlayerInAir)
// {
// Debug.Log("AerialFaithDeathTrigger: player is in an invalid state");
// 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("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
}
}

35
RunningLateGame/Assets/Scripts/AerialFaithLandingTrigger.cs
View file

@ -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)
throw new NullReferenceException("AerialFaithLandingTrigger: linkedLeapTrigger is not set");
if (linkedLeapTrigger1 == null)
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;
}
}

2
RunningLateGame/Assets/Scripts/MarkPlayer.cs
View file

@ -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);
}
}