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

Second PlayerActionEvent Pass (#206)

Browse Source 
* fix crop stomp input scheduling bugs

* update space soccer to use PlayerActionEvent

* update spaceball to use PlayerActionEvent

make PlayerActionEvents clean themselves up on game switch

* update rhythm rally to use PlayerActionEvent

* update rhythm tweezers to use PlayerActionEvent

* update mahou tsukai to use PlayerActionEvent

* reduce logging level
This commit is contained in:
minenice55
2023-01-15 22:05:25 -05:00
committed by GitHub
parent 330c538947
commit dd0531f48f
13 changed files with 283 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Assets/Scripts/Games/RhythmRally/Paddlers.cs
View File

@ -27,38 +27,10 @@ namespace HeavenStudio.Games.Scripts_RhythmRally
{
if (!game.served || game.missed || !game.started) return;
var cond = Conductor.instance;
float stateBeat = cond.GetPositionFromMargin(game.targetBeat, 1f);
StateCheck(stateBeat);
if (PlayerInput.Pressed())
if (PlayerInput.Pressed() && !game.IsExpectingInputNow(InputType.STANDARD_DOWN))
{
if (state.perfect)
{
Ace();
}
else if (state.notPerfect())
{
Miss();
Jukebox.PlayOneShot("miss");
playerAnim.Play("Swing", 0, 0);
game.missCurve.KeyPoints[0].Position = game.ball.transform.position;
game.missCurve.transform.localScale = new Vector3(state.early ? 1f : -1f, 1f, 1f);
game.missBeat = cond.songPositionInBeats;
}
else
{
// Play "whoosh" sound here
playerAnim.Play("Swing", 0, 0);
}
}
if (stateBeat > Minigame.EndTime())
{
Miss();
game.ball.SetActive(false);
// Play "whoosh" sound here
playerAnim.Play("Swing", 0, 0);
}
}
@ -68,36 +40,49 @@ namespace HeavenStudio.Games.Scripts_RhythmRally
var hitBeat = cond.songPositionInBeats;
var bounceBeat = game.targetBeat + 1f;
var bounceBeat = game.serveBeat + game.targetBeat + 1f;
if (game.rallySpeed == RhythmRally.RallySpeed.Slow)
{
bounceBeat = game.targetBeat + 2f;
bounceBeat = game.serveBeat + game.targetBeat + 2f;
}
else if (game.rallySpeed == RhythmRally.RallySpeed.SuperFast)
{
bounceBeat = game.targetBeat + 0.5f;
bounceBeat = game.serveBeat + game.targetBeat + 0.5f;
}
playerAnim.Play("Swing", 0, 0);
MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("rhythmRally/Return", hitBeat), new MultiSound.Sound("rhythmRally/ReturnBounce", bounceBeat) });
BounceFX(bounceBeat);
game.ball.SetActive(true);
}
void Miss()
void NearMiss(float state)
{
MissBall();
Jukebox.PlayOneShot("miss");
playerAnim.Play("Swing", 0, 0);
game.missCurve.KeyPoints[0].Position = game.ball.transform.position;
game.missCurve.transform.localScale = new Vector3(-state, 1f, 1f);
game.missBeat = cond.songPositionInBeats;
game.ball.SetActive(true);
}
void MissBall()
{
game.served = false;
game.missed = true;
var whistleBeat = game.targetBeat + 1f;
var whistleBeat = game.serveBeat + game.targetBeat + 1f;
if (game.rallySpeed == RhythmRally.RallySpeed.Slow)
{
whistleBeat = game.targetBeat + 2f;
whistleBeat = game.serveBeat + game.targetBeat + 2f;
}
else if (game.rallySpeed == RhythmRally.RallySpeed.SuperFast)
{
whistleBeat = game.targetBeat + 0.5f;
whistleBeat = game.serveBeat + game.targetBeat + 0.5f;
}
MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("rhythmRally/Whistle", whistleBeat) });
@ -117,9 +102,20 @@ namespace HeavenStudio.Games.Scripts_RhythmRally
});
}
public override void OnAce()
public void Just(PlayerActionEvent caller, float state)
{
if (state >= 1f || state <= -1f) {
NearMiss(state);
return;
}
Ace();
}
public void Miss(PlayerActionEvent caller)
{
MissBall();
}
public void Out(PlayerActionEvent caller) {}
}
}