etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fan Club: fix forcing idol anims during responses

This commit is contained in:
minenice55 2022-03-21 11:29:24 -04:00
parent d768f48eae
commit 04535747f7
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/Scripts/Games/FanClub/FanClub.cs
View File

@ -49,6 +49,7 @@ namespace HeavenStudio.Games
public GameEvent bop = new GameEvent(); public GameEvent bop = new GameEvent();
public GameEvent specBop = new GameEvent(); public GameEvent specBop = new GameEvent();
public GameEvent noBop = new GameEvent(); public GameEvent noBop = new GameEvent();
public GameEvent noResponse = new GameEvent();
public GameEvent noSpecBop = new GameEvent(); public GameEvent noSpecBop = new GameEvent();
private bool responseToggle = false; private bool responseToggle = false;
@ -176,6 +177,12 @@ namespace HeavenStudio.Games
noBop.startBeat = beat; noBop.startBeat = beat;
} }
private void DisableResponse(float beat, float length)
{
noResponse.length = length;
noResponse.startBeat = beat;
}
private void DisableSpecBop(float beat, float length) private void DisableSpecBop(float beat, float length)
{ {
float bt = Conductor.instance.songPositionInBeats; float bt = Conductor.instance.songPositionInBeats;
@ -193,8 +200,8 @@ namespace HeavenStudio.Games
public void PlayAnim(float beat, float length, int type) public void PlayAnim(float beat, float length, int type)
{ {
noBop.length = length; DisableResponse(beat, length);
noBop.startBeat = beat; DisableBop(beat, length);
switch (type) switch (type)
{ {
@ -240,8 +247,11 @@ namespace HeavenStudio.Games
{ {
if (!responseToggle) if (!responseToggle)
{ {
idolAnimator.Play("IdolCrap", -1, 0); if (!(Conductor.instance.songPositionInBeats >= noResponse.startBeat && Conductor.instance.songPositionInBeats < noResponse.startBeat + noResponse.length))
idolClapEffect.Play(); {
idolAnimator.Play("IdolCrap", -1, 0);
idolClapEffect.Play();
}
} }
} }
@ -249,7 +259,8 @@ namespace HeavenStudio.Games
{ {
if (responseToggle) if (responseToggle)
{ {
idolAnimator.Play("IdolResponse", -1, 0); if (!(Conductor.instance.songPositionInBeats >= noResponse.startBeat && Conductor.instance.songPositionInBeats < noResponse.startBeat + noResponse.length))
idolAnimator.Play("IdolResponse", -1, 0);
} }
} }