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

Multiple space kickers, minor issues (#250)

Browse Source 
* Almost done

* Bezier curves are silly

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
This commit is contained in:
Rapandrasmus
2023-01-31 17:15:51 +01:00
committed by GitHub
parent d4185441c4
commit 3d3575301f
15 changed files with 6355 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Assets/Scripts/Games/SpaceSoccer/Kicker.cs
View File

@ -18,6 +18,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
public float dispenserBeat; //unused
public int kickTimes = 0;
public bool player;
public float zValue;
[Header("Components")]
private Animator anim;
@ -38,6 +39,12 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
{
nextHit = game.ScheduleInput(beat, ball.GetAnimLength(Ball.State.Dispensing), InputType.STANDARD_DOWN, KickJust, Miss, Out);
}
else
{
BeatAction.New(this.gameObject, new List<BeatAction.Action>(){
new BeatAction.Action(beat + ball.GetAnimLength(Ball.State.Dispensing), delegate { KickCheck(true, false, beat + ball.GetAnimLength(Ball.State.Dispensing)); }),
});
}
}
public void Kick(bool hit, bool highKick = false)
@ -45,7 +52,9 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
aceTimes = 0;
if (player)
{
Jukebox.PlayOneShotGame("spaceSoccer/kick");
}
if (highKick)
{
@ -200,20 +209,45 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
}
}
private void KickCheck(bool hit, bool overrideState = false)
private void KickCheck(bool hit, bool overrideState = false, float beat = 0f)
{
if (canHighKick)
{
HighKick(hit);
if (!player)
{
BeatAction.New(this.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + ball.GetAnimLength(Ball.State.Kicked), delegate { Kick(true, true); }),
new BeatAction.Action(beat + ball.GetAnimLength(Ball.State.Toe), delegate { Toe(true); }),
new BeatAction.Action(beat + ball.GetAnimLength(Ball.State.Toe) + 1.5f, delegate { KickCheck(true, false, beat + ball.GetAnimLength(Ball.State.Toe) + 1.5f); }),
});
}
}
else if (canKick)
{
Kick(hit);
if (!player)
{
BeatAction.New(this.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + ball.GetAnimLength(Ball.State.Kicked), delegate { KickCheck(true, false, beat + ball.GetAnimLength(Ball.State.Kicked)); }),
});
}
}
else if (!canKick && !canHighKick && overrideState)
{
Kick(hit);
if (!player)
{
BeatAction.New(this.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + ball.GetAnimLength(Ball.State.Kicked), delegate { KickCheck(true, false, beat + ball.GetAnimLength(Ball.State.Kicked)); }),
});
}
}
}
void MissBall(float targetBeat)