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

DJ School: Cue elegibility tweaks (autoplay should work correctly now)

Browse Source
This commit is contained in:
Jenny Crowe
2022-02-21 07:56:10 -07:00
parent 41ca962595
commit d1eff4a20d
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Assets/Scripts/Games/DJSchool/DJSchool.cs
View File

@ -113,17 +113,13 @@ namespace RhythmHeavenMania.Games.DJSchool
BeatAction.New(djYellow, new List<BeatAction.Action>() BeatAction.New(djYellow, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { djYellow.GetComponent<Animator>().Play("BreakCmon", 0, 0); }), new BeatAction.Action(beat, delegate { djYellow.GetComponent<Animator>().Play("BreakCmon", 0, 0); }),
new BeatAction.Action(beat + 1f, delegate { djYellow.GetComponent<Animator>().Play("BreakCmon", 0, 0); }), new BeatAction.Action(beat + 1f, delegate { djYellow.GetComponent<Animator>().Play("BreakCmon", 0, 0); SetupCue(beat, false); }),
new BeatAction.Action(beat + 2f, delegate new BeatAction.Action(beat + 2f, delegate
{ {
djYellow.GetComponent<Animator>().Play("Hold", 0, 0); djYellow.GetComponent<Animator>().Play("Hold", 0, 0);
djYellowHolding = true; djYellowHolding = true;
}), }),
}); });
student.holdBeat = beat;
student.eligible = true;
student.ResetState();
} }
public void AndStop(float beat) public void AndStop(float beat)
@ -139,17 +135,13 @@ namespace RhythmHeavenMania.Games.DJSchool
BeatAction.New(djYellow, new List<BeatAction.Action>() BeatAction.New(djYellow, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat + 0.5f, delegate { djYellow.GetComponent<Animator>().Play("BreakCmon", 0, 0); }), new BeatAction.Action(beat + 0.5f, delegate { djYellow.GetComponent<Animator>().Play("BreakCmon", 0, 0); SetupCue(beat - 0.5f, false); }),
new BeatAction.Action(beat + 1.5f, delegate new BeatAction.Action(beat + 1.5f, delegate
{ {
djYellow.GetComponent<Animator>().Play("Hold", 0, 0); djYellow.GetComponent<Animator>().Play("Hold", 0, 0);
djYellowHolding = true; djYellowHolding = true;
}), }),
}); });
student.holdBeat = beat - 0.5f;
student.eligible = true;
student.ResetState();
} }
public void ScratchoHey(float beat, int type) public void ScratchoHey(float beat, int type)
@ -181,15 +173,22 @@ namespace RhythmHeavenMania.Games.DJSchool
BeatAction.New(djYellow, new List<BeatAction.Action>() BeatAction.New(djYellow, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { djYellow.GetComponent<Animator>().Play("Scratcho", 0, 0); }), new BeatAction.Action(beat, delegate { djYellow.GetComponent<Animator>().Play("Scratcho", 0, 0); }),
new BeatAction.Action(beat + 1f, delegate { djYellow.GetComponent<Animator>().Play("Scratcho2", 0, 0); }), new BeatAction.Action(beat + 1f, delegate { djYellow.GetComponent<Animator>().Play("Scratcho2", 0, 0); SetupCue(beat, true); }),
new BeatAction.Action(beat + 2.05f, delegate new BeatAction.Action(beat + 2.05f, delegate
{ {
djYellow.GetComponent<Animator>().Play("Hey", 0, 0); djYellow.GetComponent<Animator>().Play("Hey", 0, 0);
djYellowHolding = false; djYellowHolding = false;
}), }),
}); });
}
student.swipeBeat = beat; void SetupCue(float beat, bool swipe)
{
if (swipe)
student.swipeBeat = beat;
else
student.holdBeat = beat;
student.eligible = true; student.eligible = true;
student.ResetState(); student.ResetState();
} }