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

update mahou tsukai to use PlayerActionEvent

Browse source
This commit is contained in:
minenice55 2023-01-15 22:00:04 -05:00
parent e037473cab
commit 7cd9ef413d
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Assets/Scripts/Games/WizardsWaltz/Plant.cs
View file

@ -24,6 +24,10 @@ namespace HeavenStudio.Games.Scripts_WizardsWaltz
animator.Play("Appear", 0, 0); animator.Play("Appear", 0, 0);
} }
private void Start() {
game.ScheduleInput(createBeat, game.beatInterval, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, Just, Miss, Out);
}
private void Update() private void Update()
{ {
if (!passed && Conductor.instance.songPositionInBeats > createBeat + game.beatInterval) if (!passed && Conductor.instance.songPositionInBeats > createBeat + game.beatInterval)
@ -31,23 +35,6 @@ namespace HeavenStudio.Games.Scripts_WizardsWaltz
StartCoroutine(FadeOut()); StartCoroutine(FadeOut());
passed = true; passed = true;
} }
if (hit) return;
float stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.beatInterval, 1f);
StateCheck(stateBeat);
if (PlayerInput.Pressed(true))
{
if (state.perfect)
{
Ace();
} else if (state.notPerfect())
{
Miss();
}
}
} }
public void Bloom() public void Bloom()
@ -81,17 +68,28 @@ namespace HeavenStudio.Games.Scripts_WizardsWaltz
hit = true; hit = true;
} }
public void Miss() public void NearMiss()
{ {
game.wizard.Magic(this, false); game.wizard.Magic(this, false);
hit = true; hit = true;
} }
public override void OnAce() private void Just(PlayerActionEvent caller, float state)
{ {
if (state >= 1f || state <= -1f) {
NearMiss();
return;
}
Ace(); Ace();
} }
private void Miss(PlayerActionEvent caller)
{
// this is where perfect challenge breaks
}
private void Out(PlayerActionEvent caller) {}
public IEnumerator FadeOut() public IEnumerator FadeOut()
{ {
yield return new WaitForSeconds(Conductor.instance.secPerBeat * game.beatInterval / 2f); yield return new WaitForSeconds(Conductor.instance.secPerBeat * game.beatInterval / 2f);