Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:57:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rhythm Rally: Added "toss ball" action. Paddler now also tosses ball when you miss.

Browse Source
This commit is contained in:
Jenny Crowe
2022-02-21 23:43:24 -07:00
parent 081c08e47f
commit 12c70d4311
3 changed files with 286 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Assets/Scripts/Games/RhythmRally/RhythmRally.cs
View File

@ -19,8 +19,10 @@ namespace RhythmHeavenMania.Games.RhythmRally
[Header("Ball and curve info")]
public GameObject ball;
public GameObject ballShadow;
public TrailRenderer ballTrail;
public BezierCurve3D serveCurve;
public BezierCurve3D returnCurve;
public BezierCurve3D tossCurve;
public GameObject ballHitFX;
@ -33,8 +35,11 @@ namespace RhythmHeavenMania.Games.RhythmRally
public bool started;
public bool missed;
public bool served;
public bool tossing;
public float serveBeat;
public float targetBeat;
public float tossBeat;
public float tossLength;
private bool inPose;
public Paddlers paddlers;
@ -152,6 +157,13 @@ namespace RhythmHeavenMania.Games.RhythmRally
curveToUse.transform.localScale = new Vector3(1f, curveHeight, 1f);
ball.transform.position = curveToUse.GetPoint(Mathf.Clamp(curvePosition, 0, 1));
}
else
{
if (tossing)
{
TossUpdate(tossBeat, tossLength);
}
}
// TODO: Make conditional so ball shadow only appears when over table.
ballShadow.transform.position = new Vector3(ball.transform.position.x, -0.399f, ball.transform.position.z);
@ -195,7 +207,20 @@ namespace RhythmHeavenMania.Games.RhythmRally
{
opponentPrepping = true;
if ((opponentState.IsName("Swing") && opponentAnim.IsAnimationNotPlaying()) || (!opponentState.IsName("Swing") && !opponentState.IsName("Ready1")))
{
opponentAnim.Play("Ready1");
// Toss ball if it fell off the table.
if (missed && !tossing)
{
float tossHeight = 3f;
if (rallySpeed == RallySpeed.Slow || rallySpeed == RallySpeed.Fast)
tossHeight = 6f;
Toss(hitBeat + beatDur1, beatDur2, tossHeight);
}
}
// If player never swung and is still in ready state, snap them out of it.
if (missed && playerState.IsName("Ready1"))
@ -203,6 +228,13 @@ namespace RhythmHeavenMania.Games.RhythmRally
}
}
}
else
{
if (tossing)
{
TossUpdate(tossBeat, tossLength);
}
}
// Paddler bop animation.
@ -213,7 +245,7 @@ namespace RhythmHeavenMania.Games.RhythmRally
if (!playerPrepping && (playerAnim.IsAnimationNotPlaying() || playerState.IsName("Idle") || playerState.IsName("Beat")))
playerAnim.Play("Beat", 0, 0);
if (!opponentPrepping && !opponentServing && (opponentAnim.IsAnimationNotPlaying() || opponentState.IsName("Idle") || opponentState.IsName("Beat")))
if (!opponentPrepping && !opponentServing && !tossing && (opponentAnim.IsAnimationNotPlaying() || opponentState.IsName("Idle") || opponentState.IsName("Beat")))
opponentAnim.Play("Beat", 0, 0);
}
}
@ -233,6 +265,7 @@ namespace RhythmHeavenMania.Games.RhythmRally
missed = false;
started = true;
opponentServing = true;
tossing = false;
serveBeat = beat;
rallySpeed = speed;
@ -263,6 +296,39 @@ namespace RhythmHeavenMania.Games.RhythmRally
paddlers.ResetState();
}
public void Toss(float beat, float length, float height, bool firstToss = false)
{
tossCurve.transform.localScale = new Vector3(1f, height, 1f);
tossBeat = beat;
tossLength = length;
tossing = true;
if (firstToss)
{
opponentAnim.Play("Ready1");
Jukebox.PlayOneShotGame("rhythmRally/Whistle");
}
StartCoroutine(TossTrailCo());
}
// Hide the trail for one frame to avoid shenanigans when teleporting the ball.
IEnumerator TossTrailCo()
{
ballTrail.emitting = false;
TossUpdate(tossBeat, tossLength);
yield return null;
ballTrail.emitting = true;
}
private void TossUpdate(float beat, float duration)
{
var tossPosition = Conductor.instance.GetPositionFromBeat(beat, duration);
ball.transform.position = tossCurve.GetPoint(Mathf.Clamp(tossPosition, 0, 1));
}
public void Pose()
{
playerAnim.Play("Pose", 0, 0);