mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

Browse source
This commit is contained in:
Rapandrasmus 2023-01-16 09:22:31 +01:00
parent c7659bf544
commit 70b3373a49
2 changed files with 8 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs
View file

@ -11,40 +11,9 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
{
public float startBeat;
public bool isBig;
public enum Rating
{
Succesful = 0,
Barely = 1,
Miss = 2
}
public enum PlayerFlyingStage
{
EnteringUp = 0,
EnteringDown = 1,
ExitingUp = 2,
ExitingDown = 3,
}
public PlayerFlyingStage currentFlyingStage;
public Rating rating;
public bool goingDown = false;
[NonSerialized] public BezierCurve3D enterUpCurve;
[NonSerialized] public BezierCurve3D enterDownCurve;
[NonSerialized] public BezierCurve3D exitUpCurve;
[NonSerialized] public BezierCurve3D exitDownCurve;
private WorkingDough game;
private void Awake()
{
game = WorkingDough.instance;
}
private void Start()
{
game.ScheduleInput(startBeat, 1, isBig ? InputType.STANDARD_ALT_DOWN : InputType.STANDARD_DOWN, Barely, Miss, Nothing);
Debug.Log(rating.ToString());
}
private void Update()
{
@ -52,76 +21,20 @@ namespace HeavenStudio.Games.Scripts_WorkingDough
float flyPos = 0f;
switch (currentFlyingStage)
if (goingDown)
{
case PlayerFlyingStage.EnteringUp:
flyPos = cond.GetPositionFromBeat(startBeat, 0.5f);
transform.position = enterUpCurve.GetPoint(flyPos);
if (flyPos > 1f) currentFlyingStage = PlayerFlyingStage.EnteringDown;
break;
case PlayerFlyingStage.EnteringDown:
flyPos = cond.GetPositionFromBeat(startBeat + 0.5f, 0.5f);
flyPos = cond.GetPositionFromBeat(startBeat + 0.5f, 0.5f);
transform.position = enterDownCurve.GetPoint(flyPos);
if (flyPos > 1f)
{
Debug.Log(rating.ToString());
if (rating == Rating.Succesful || rating == Rating.Barely)
{
currentFlyingStage = PlayerFlyingStage.ExitingUp;
}
else
{
GameObject.Destroy(gameObject);
}
}
break;
case PlayerFlyingStage.ExitingUp:
flyPos = cond.GetPositionFromBeat(startBeat + 1f, 0.5f);
transform.position = exitUpCurve.GetPoint(flyPos);
if (flyPos > 1f) currentFlyingStage = PlayerFlyingStage.ExitingDown;
break;
case PlayerFlyingStage.ExitingDown:
flyPos = cond.GetPositionFromBeat(startBeat + 1.5f, 0.5f);
transform.position = exitDownCurve.GetPoint(flyPos);
if (flyPos > 1f) GameObject.Destroy(gameObject);
break;
}
}
private void Success()
{
rating = Rating.Succesful;
if (isBig)
{
game.doughDudesPlayer.GetComponent<Animator>().Play("BigDoughJump", 0, 0);
Jukebox.PlayOneShotGame("workingDough/rightBig");
transform.position = enterDownCurve.GetPoint(flyPos);
if (flyPos > 1f) GameObject.Destroy(gameObject);
}
else
{
game.doughDudesPlayer.GetComponent<Animator>().Play("SmallDoughJump", 0, 0);
Jukebox.PlayOneShotGame("workingDough/rightSmall");
flyPos = cond.GetPositionFromBeat(startBeat, 0.5f);
transform.position = enterUpCurve.GetPoint(flyPos);
if (flyPos > 1f) goingDown = true;
}
}
private void Barely(PlayerActionEvent caller, float state)
{
if (state >= 1f || state <= -1f)
{
rating = Rating.Barely;
return;
}
Success();
}
private void Miss(PlayerActionEvent caller)
{
rating = Rating.Miss;
}
private void Nothing(PlayerActionEvent caller) {}
}
}

2
Assets/Scripts/Games/WorkingDough/WorkingDough.cs
View file

@ -254,8 +254,6 @@ namespace HeavenStudio.Games
ballComponent.startBeat = beat;
ballComponent.enterUpCurve = playerEnterUpCurve;
ballComponent.enterDownCurve = playerEnterDownCurve;
ballComponent.exitUpCurve = playerExitUpCurve;
ballComponent.exitDownCurve = playerExitDownCurve;
spawnedBall.SetActive(true);