etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-25 11:05:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bop Refactor + Tweaks/Fixes (#582)

Browse source 
* blue bear tweaks

* OnBeatPulse callback added

* Fixing humming bug in BM + Metronome fix + Some games conversion to onbeatpulse

* clappy trio to drumming practice

* rest of the games converted

* two minor changes
This commit is contained in:
Rapandrasmus 2023-11-23 17:19:39 +01:00 committed by GitHub
parent 4505018ec7
commit 43df22b463
35 changed files with 365 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Resources/Sfx/games/blueBear/whiff.wav.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2448776798073114dbaa07b1c4a83cd8 guid: b570a8e729c2e6c47bfe22048bcc0e8c
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: assetBundleName: ctrbear/common
assetBundleVariant: assetBundleVariant:

15
Assets/Scripts/Conductor.cs
View file

@ -76,12 +76,10 @@ namespace HeavenStudio
// Conductor is currently paused, but not fully stopped // Conductor is currently paused, but not fully stopped
public bool isPaused; public bool isPaused;
// Last reported beat based on song position
private double lastReportedBeat = 0f;
// Metronome tick sound enabled // Metronome tick sound enabled
public bool metronome = false; public bool metronome = false;
Util.Sound metronomeSound; Util.Sound metronomeSound;
private int _metronomeTally = 0;
// pitch values // pitch values
private float timelinePitch = 1f; private float timelinePitch = 1f;
@ -204,6 +202,7 @@ namespace HeavenStudio
songPosBeat = GetBeatFromSongPos(time); songPosBeat = GetBeatFromSongPos(time);
startBeat = songPosBeat; startBeat = songPosBeat;
_metronomeTally = 0;
startTime = DateTime.Now; startTime = DateTime.Now;
absTimeAdjust = 0; absTimeAdjust = 0;
@ -363,13 +362,10 @@ namespace HeavenStudio
{ {
if (metronome && isPlaying) if (metronome && isPlaying)
{ {
if (ReportBeat(ref lastReportedBeat)) if (songPositionInBeatsAsDouble >= Math.Ceiling(startBeat) + _metronomeTally)
{ {
metronomeSound = Util.SoundByte.PlayOneShot("metronome", lastReportedBeat); metronomeSound = Util.SoundByte.PlayOneShot("metronome", Math.Ceiling(startBeat) + _metronomeTally);
} _metronomeTally++;
else if (songPositionInBeats < lastReportedBeat)
{
lastReportedBeat = Mathf.Round(songPositionInBeats);
} }
} }
else else
@ -382,6 +378,7 @@ namespace HeavenStudio
} }
} }
[Obsolete("Conductor.ReportBeat is deprecated. Please use the OnBeatPulse callback instead.")]
public bool ReportBeat(ref double lastReportedBeat, double offset = 0, bool shiftBeatToOffset = true) public bool ReportBeat(ref double lastReportedBeat, double offset = 0, bool shiftBeatToOffset = true)
{ {
bool result = songPositionInBeats + (shiftBeatToOffset ? offset : 0f) >= (lastReportedBeat) + 1f; bool result = songPositionInBeats + (shiftBeatToOffset ? offset : 0f) >= (lastReportedBeat) + 1f;

18
Assets/Scripts/GameManager.cs
View file

@ -47,6 +47,7 @@ namespace HeavenStudio
[NonSerialized] public bool playOnStart; [NonSerialized] public bool playOnStart;
[NonSerialized] public double startBeat; [NonSerialized] public double startBeat;
[NonSerialized] public GameObject currentGameO; [NonSerialized] public GameObject currentGameO;
private Minigame _currentMinigame;
[NonSerialized] public bool autoplay; [NonSerialized] public bool autoplay;
[NonSerialized] public bool canInput = true; [NonSerialized] public bool canInput = true;
[NonSerialized] public RiqEntity currentSection, nextSection; [NonSerialized] public RiqEntity currentSection, nextSection;
@ -70,6 +71,7 @@ namespace HeavenStudio
public event Action<double> onBeatChanged; public event Action<double> onBeatChanged;
public event Action<RiqEntity> onSectionChange; public event Action<RiqEntity> onSectionChange;
public event Action<double> onBeatPulse;
public int BeatmapEntities() public int BeatmapEntities()
{ {
@ -493,6 +495,13 @@ namespace HeavenStudio
} }
} }
if (cond.songPositionInBeatsAsDouble >= Math.Ceiling(_playStartBeat) + _pulseTally)
{
if (_currentMinigame != null) _currentMinigame.OnBeatPulse(Math.Ceiling(_playStartBeat) + _pulseTally);
onBeatPulse?.Invoke(Math.Ceiling(_playStartBeat) + _pulseTally);
_pulseTally++;
}
float seekTime = 8f; float seekTime = 8f;
//seek ahead to preload games that have assetbundles //seek ahead to preload games that have assetbundles
SeekAheadAndPreload(cond.songPositionInBeatsAsDouble, seekTime); SeekAheadAndPreload(cond.songPositionInBeatsAsDouble, seekTime);
@ -580,10 +589,15 @@ namespace HeavenStudio
#region Play Events #region Play Events
private double _playStartBeat = 0;
private int _pulseTally = 0;
public void Play(double beat, float delay = 0f) public void Play(double beat, float delay = 0f)
{ {
bool paused = Conductor.instance.isPaused; bool paused = Conductor.instance.isPaused;
Debug.Log("Playing at " + beat); Debug.Log("Playing at " + beat);
_playStartBeat = beat;
_pulseTally = 0;
canInput = true; canInput = true;
if (!paused) if (!paused)
{ {
@ -951,6 +965,10 @@ namespace HeavenStudio
Destroy(currentGameO); Destroy(currentGameO);
currentGameO = Instantiate(GetGame(game)); currentGameO = Instantiate(GetGame(game));
if (currentGameO.TryGetComponent<Minigame>(out var minigame))
{
_currentMinigame = minigame;
}
currentGameO.transform.parent = eventCaller.GamesHolder.transform; currentGameO.transform.parent = eventCaller.GamesHolder.transform;
currentGameO.name = game; currentGameO.name = game;

26
Assets/Scripts/Games/BlueBear/BlueBear.cs
View file

@ -126,9 +126,9 @@ namespace HeavenStudio.Games
public GameObject individualBagHolder; public GameObject individualBagHolder;
[Header("Variables")] [Header("Variables")]
static int rightCrumbAppearThreshold = 15; private int rightCrumbAppearThreshold = 15;
static int leftCrumbAppearThreshold = 30; private int leftCrumbAppearThreshold = 30;
static int eatenTreats = 0; private int eatenTreats = 0;
bool crying; bool crying;
private List<RiqEntity> _allStoryEvents = new(); private List<RiqEntity> _allStoryEvents = new();
[SerializeField] private SuperCurveObject.Path[] _treatCurves; [SerializeField] private SuperCurveObject.Path[] _treatCurves;
@ -236,7 +236,6 @@ namespace HeavenStudio.Games
private void Awake() private void Awake()
{ {
instance = this; instance = this;
if (Conductor.instance.isPlaying || Conductor.instance.isPaused) EatTreat(true);
_allStoryEvents = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "story" }); _allStoryEvents = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "story" });
UpdateStory(); UpdateStory();
} }
@ -292,12 +291,12 @@ namespace HeavenStudio.Games
if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left.inputLockCategory)) if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left.inputLockCategory))
{ {
SoundByte.PlayOneShotGame("blueBear/whiff"); SoundByte.PlayOneShotGame("blueBear/whiff", -1, SoundByte.GetPitchFromSemiTones(UnityEngine.Random.Range(-1, 2), false));
Bite(true); Bite(true);
} }
else if (PlayerInput.GetIsAction(InputAction_Right) && !IsExpectingInputNow(InputAction_Right.inputLockCategory)) else if (PlayerInput.GetIsAction(InputAction_Right) && !IsExpectingInputNow(InputAction_Right.inputLockCategory))
{ {
SoundByte.PlayOneShotGame("blueBear/whiff"); SoundByte.PlayOneShotGame("blueBear/whiff", -1, SoundByte.GetPitchFromSemiTones(UnityEngine.Random.Range(-1, 2), false));
Bite(false); Bite(false);
} }
@ -373,12 +372,14 @@ namespace HeavenStudio.Games
{ {
HandleTreatsOnStart(beat); HandleTreatsOnStart(beat);
HandleEmotions(beat); HandleEmotions(beat);
HandleCrumbs(beat);
} }
public override void OnGameSwitch(double beat) public override void OnGameSwitch(double beat)
{ {
HandleTreatsOnStart(beat); HandleTreatsOnStart(beat);
HandleEmotions(beat); HandleEmotions(beat);
HandleCrumbs(beat);
} }
private void HandleTreatsOnStart(double gameswitchBeat) private void HandleTreatsOnStart(double gameswitchBeat)
@ -412,6 +413,15 @@ namespace HeavenStudio.Games
} }
} }
private void HandleCrumbs(double beat)
{
var allEventsBeforeBeat = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "crumb" }).FindAll(x => x.beat < beat);
if (allEventsBeforeBeat.Count == 0) return;
var lastCrumbEvent = allEventsBeforeBeat[^1];
SetCrumbThreshold(lastCrumbEvent["right"], lastCrumbEvent["left"], lastCrumbEvent["reset"]);
EatTreat(false);
}
public void SetCrumbThreshold(int rightThreshold, int leftThreshold, bool reset) public void SetCrumbThreshold(int rightThreshold, int leftThreshold, bool reset)
{ {
rightCrumbAppearThreshold = rightThreshold; rightCrumbAppearThreshold = rightThreshold;
@ -419,9 +429,9 @@ namespace HeavenStudio.Games
if (reset) eatenTreats = 0; if (reset) eatenTreats = 0;
} }
public void EatTreat(bool onlyCheck = false) public void EatTreat(bool appendTreats = true)
{ {
if (!onlyCheck) eatenTreats++; if (appendTreats) eatenTreats++;
if (eatenTreats >= leftCrumbAppearThreshold) if (eatenTreats >= leftCrumbAppearThreshold)
{ {
leftCrumb.SetActive(true); leftCrumb.SetActive(true);

10
Assets/Scripts/Games/BoardMeeting/BMExecutive.cs
View file

@ -22,6 +22,14 @@ namespace HeavenStudio.Games.Scripts_BoardMeeting
game = BoardMeeting.instance; game = BoardMeeting.instance;
} }
private void OnDestroy()
{
if (rollLoop != null)
{
rollLoop.Stop();
}
}
public void Prepare() public void Prepare()
{ {
if (spinning) return; if (spinning) return;
@ -78,7 +86,7 @@ namespace HeavenStudio.Games.Scripts_BoardMeeting
public void Bop() public void Bop()
{ {
if (!canBop || spinning || !anim.IsAnimationNotPlaying() || preparing) return; if (!canBop || spinning || preparing) return;
if (smileCounter > 0) if (smileCounter > 0)
{ {
anim.DoScaledAnimationAsync("SmileBop", 0.5f); anim.DoScaledAnimationAsync("SmileBop", 0.5f);

14
Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs
View file

@ -92,8 +92,8 @@ namespace HeavenStudio.Games
public BMExecutive firstSpinner; public BMExecutive firstSpinner;
[SerializeField] float shakeIntensity = 0.5f; [SerializeField] float shakeIntensity = 0.5f;
public bool shouldBop = true; public bool shouldBop = true;
bool assistantCanBop = true; private bool assistantCanBop = true;
bool executivesCanBop = true; private bool executivesCanBop = true;
public GameEvent bop = new GameEvent(); public GameEvent bop = new GameEvent();
[NonSerialized] public Sound chairLoopSound = null; [NonSerialized] public Sound chairLoopSound = null;
int missCounter = 0; int missCounter = 0;
@ -126,10 +126,6 @@ namespace HeavenStudio.Games
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && shouldBop)
{
SingleBop();
}
if (PlayerInput.GetIsAction(InputAction_BasicPressing) && !IsExpectingInputNow(InputAction_BasicPress.inputLockCategory)) if (PlayerInput.GetIsAction(InputAction_BasicPressing) && !IsExpectingInputNow(InputAction_BasicPress.inputLockCategory))
{ {
if (executives[executiveCount - 1].spinning) if (executives[executiveCount - 1].spinning)
@ -147,6 +143,12 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (!shouldBop) return;
SingleBop();
}
void SingleBop() void SingleBop()
{ {
if (assistantCanBop) if (assistantCanBop)

50
Assets/Scripts/Games/CatchyTune/CatchyTune.cs
View file

@ -208,13 +208,13 @@ namespace HeavenStudio.Games
// print("current beat: " + conductor.songPositionInBeatsAsDouble); // print("current beat: " + conductor.songPositionInBeatsAsDouble);
if (stopCatchLeft > 0 && stopCatchLeft <= cond.songPositionInBeatsAsDouble) if (stopCatchLeft > 0 && stopCatchLeft <= cond.songPositionInBeatsAsDouble)
{ {
plalinAnim.Play("idle", 0, 0); plalinAnim.DoScaledAnimationAsync("idle", 0.5f);
stopCatchLeft = 0; stopCatchLeft = 0;
} }
if (stopCatchRight > 0 && stopCatchRight <= cond.songPositionInBeatsAsDouble) if (stopCatchRight > 0 && stopCatchRight <= cond.songPositionInBeatsAsDouble)
{ {
alalinAnim.Play("idle", 0, 0); alalinAnim.DoScaledAnimationAsync("idle", 0.5f);
stopCatchRight = 0; stopCatchRight = 0;
} }
@ -236,19 +236,6 @@ namespace HeavenStudio.Games
heartMessage.SetActive(false); heartMessage.SetActive(false);
} }
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (bopLeft && stopCatchLeft == 0)
{
plalinAnim.Play("bop", 0, 0);
}
if (bopRight && stopCatchRight == 0)
{
alalinAnim.Play("bop", 0, 0);
}
}
if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left.inputLockCategory)) if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left.inputLockCategory))
{ {
catchWhiff(false); catchWhiff(false);
@ -260,6 +247,19 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (bopLeft && stopCatchLeft == 0)
{
plalinAnim.DoScaledAnimationAsync("bop", 0.5f);
}
if (bopRight && stopCatchRight == 0)
{
alalinAnim.DoScaledAnimationAsync("bop", 0.5f);
}
}
public void DropFruit(double beat, int side, bool smile, bool isPineapple, float endSmile) public void DropFruit(double beat, int side, bool smile, bool isPineapple, float endSmile)
{ {
var objectToSpawn = isPineapple ? pineappleBase : orangeBase; var objectToSpawn = isPineapple ? pineappleBase : orangeBase;
@ -344,23 +344,23 @@ namespace HeavenStudio.Games
case (int)WhoBops.Plalin: case (int)WhoBops.Plalin:
if (stopCatchLeft == 0) if (stopCatchLeft == 0)
{ {
plalinAnim.Play("bop", 0, 0); plalinAnim.DoScaledAnimationAsync("bop", 0.5f);
} }
break; break;
case (int)WhoBops.Alalin: case (int)WhoBops.Alalin:
if (stopCatchRight == 0) if (stopCatchRight == 0)
{ {
alalinAnim.Play("bop", 0, 0); alalinAnim.DoScaledAnimationAsync("bop", 0.5f);
} }
break; break;
case (int)WhoBops.Both: case (int)WhoBops.Both:
if (stopCatchRight == 0) if (stopCatchRight == 0)
{ {
alalinAnim.Play("bop", 0, 0); alalinAnim.DoScaledAnimationAsync("bop", 0.5f);
} }
if (stopCatchLeft == 0) if (stopCatchLeft == 0)
{ {
plalinAnim.Play("bop", 0, 0); plalinAnim.DoScaledAnimationAsync("bop", 0.5f);
} }
break; break;
default: default:
@ -374,12 +374,12 @@ namespace HeavenStudio.Games
if (side) if (side)
{ {
alalinAnim.Play(anim, 0, 0); alalinAnim.DoScaledAnimationAsync(anim, 0.5f);
stopCatchRight = beat + 0.9f; stopCatchRight = beat + 0.9f;
} }
else else
{ {
plalinAnim.Play(anim, 0, 0); plalinAnim.DoScaledAnimationAsync(anim, 0.5f);
stopCatchLeft = beat + 0.9f; stopCatchLeft = beat + 0.9f;
} }
@ -402,12 +402,12 @@ namespace HeavenStudio.Games
if (side) if (side)
{ {
alalinAnim.Play("miss" + fruitType, 0, 0); alalinAnim.DoScaledAnimationAsync("miss" + fruitType, 0.5f);
stopCatchRight = beat + 0.7f; stopCatchRight = beat + 0.7f;
} }
else else
{ {
plalinAnim.Play("miss" + fruitType, 0, 0); plalinAnim.DoScaledAnimationAsync("miss" + fruitType, 0.5f);
stopCatchLeft = beat + 0.7f; stopCatchLeft = beat + 0.7f;
} }
} }
@ -438,12 +438,12 @@ namespace HeavenStudio.Games
if (side) if (side)
{ {
alalinAnim.Play("whiff", 0, 0); alalinAnim.DoScaledAnimationAsync("whiff", 0.5f);
stopCatchRight = beat + 0.5f; stopCatchRight = beat + 0.5f;
} }
else else
{ {
plalinAnim.Play("whiff", 0, 0); plalinAnim.DoScaledAnimationAsync("whiff", 0.5f);
stopCatchLeft = beat + 0.5f; stopCatchLeft = beat + 0.5f;
} }
} }

10
Assets/Scripts/Games/CheerReaders/CheerReaders.cs
View file

@ -262,13 +262,15 @@ namespace HeavenStudio.Games
UpdateCameraZoom(); UpdateCameraZoom();
} }
public override void OnBeatPulse(double beat)
{
if (!shouldBop) return;
BopSingle();
}
void Update() void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && shouldBop)
{
BopSingle();
}
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {

9
Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
View file

@ -135,13 +135,14 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop) Bop(Conductor.instance.songPositionInBeatsAsDouble);
}
void Update() void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (shouldBop) Bop(cond.songPositionInBeatsAsDouble);
}
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
float normalizedBeat = cond.GetPositionFromBeat(signStartBeat, signLength); float normalizedBeat = cond.GetPositionFromBeat(signStartBeat, signLength);

127
Assets/Scripts/Games/DJSchool/DJSchool.cs
View file

@ -165,95 +165,48 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (!goBop) return;
if (student.isHolding)
{
student.anim.DoScaledAnimationAsync("HoldBop", 0.5f);
}
else if (!student.swiping && student.anim.IsAnimationNotPlaying())
{
student.anim.DoScaledAnimationAsync("IdleBop", 0.5f);
}
var yellowState = djYellowAnim.GetCurrentAnimatorStateInfo(0);
if (yellowState.IsName("Hey"))
{
//PostScratchoFace();
}
if (!andStop && !djYellowHolding)
{
float normalizedSmileBeat = Conductor.instance.GetPositionFromBeat(smileBeat, 3f);
if (normalizedSmileBeat >= 0 && normalizedSmileBeat <= 1f) djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.Happy);
else if (!djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.CrossEyed)) djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.NeutralLeft);
djYellowScript.Reverse(djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.CrossEyed));
if (djYellowBopLeft)
{
djYellowAnim.DoScaledAnimationAsync("IdleBop2", 0.5f);
}
else
{
djYellowAnim.DoScaledAnimationAsync("IdleBop", 0.5f);
}
djYellowBopLeft = !djYellowBopLeft;
}
else if (djYellowHolding)
{
djYellowAnim.DoScaledAnimationAsync("HoldBop", 0.5f);
}
}
private void Update() private void Update()
{ {
#region old script
//var cond = Conductor.instance;
//if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
//{
// if (cond.songPositionInBeatsAsDouble >= bop.startBeat && cond.songPositionInBeatsAsDouble < bop.startBeat + bop.length)
// {
// if (student.anim.IsAnimationNotPlaying())
// {
// if (student.isHolding)
// {
// student.anim.Play("HoldBop", 0, 0);
// }
// else
// {
// student.anim.Play("IdleBop", 0, 0);
// }
// }
// if (djYellowAnim.IsAnimationNotPlaying())
// {
// var yellowState = djYellowAnim.GetCurrentAnimatorStateInfo(0);
// if (yellowState.IsName("Hey"))
// {
// PostScratchoFace();
// }
// if (djYellowHolding)
// {
// djYellowAnim.Play("HoldBop", 0, 0);
// }
// else
// {
// // todo: split between left and right bop based on beat
// djYellowAnim.Play("IdleBop", 0, 0);
// }
// }
// }
//}
#endregion
if (Conductor.instance.ReportBeat(ref lastReportedBeat))
{
if (goBop)
{
if (student.isHolding)
{
student.anim.DoScaledAnimationAsync("HoldBop", 0.5f);
}
else if (!student.swiping && student.anim.IsAnimationNotPlaying())
{
student.anim.DoScaledAnimationAsync("IdleBop", 0.5f);
}
var yellowState = djYellowAnim.GetCurrentAnimatorStateInfo(0);
if (yellowState.IsName("Hey"))
{
//PostScratchoFace();
}
if (!andStop && !djYellowHolding)
{
float normalizedSmileBeat = Conductor.instance.GetPositionFromBeat(smileBeat, 3f);
if (normalizedSmileBeat >= 0 && normalizedSmileBeat <= 1f) djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.Happy);
else if (!djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.CrossEyed)) djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.NeutralLeft);
djYellowScript.Reverse(djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.CrossEyed));
if (djYellowBopLeft)
{
djYellowAnim.DoScaledAnimationAsync("IdleBop2", 0.5f);
}
else
{
djYellowAnim.DoScaledAnimationAsync("IdleBop", 0.5f);
}
djYellowBopLeft = !djYellowBopLeft;
}
else if (djYellowHolding)
{
djYellowAnim.DoScaledAnimationAsync("HoldBop", 0.5f);
}
}
}
else if (Conductor.instance.songPositionInBeatsAsDouble < lastReportedBeat)
{
lastReportedBeat = Math.Round(Conductor.instance.songPositionInBeatsAsDouble);
}
if(PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress) && !student.isHolding) //Start hold miss if(PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress) && !student.isHolding) //Start hold miss
{ {
student.OnMissHoldForPlayerInput(); student.OnMissHoldForPlayerInput();

34
Assets/Scripts/Games/DogNinja/DogNinja.cs
View file

@ -17,11 +17,12 @@ namespace HeavenStudio.Games.Loaders
{ {
new GameAction("Bop", "Bop") new GameAction("Bop", "Bop")
{ {
function = delegate { DogNinja.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity["toggle"]); }, function = delegate { DogNinja.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["auto"], eventCaller.currentEntity["toggle"]); },
defaultLength = 0.5f, resizable = true,
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("toggle", false, "Enable Bopping", "Whether to bop to the beat or not"), new Param("toggle", true, "Enable Bopping", "Whether to bop to the beat or not"),
new Param("auto", false, "Enable Bopping (Auto)", "Whether to bop to the beat or not automatically"),
} }
}, },
new GameAction("Prepare", "Prepare") new GameAction("Prepare", "Prepare")
@ -141,7 +142,7 @@ namespace HeavenStudio.Games
private double lastReportedBeat = 0f; private double lastReportedBeat = 0f;
private bool birdOnScreen = false; private bool birdOnScreen = false;
static bool dontBop = false; bool dontBop = false;
private const string sfxNum = "dogNinja/"; private const string sfxNum = "dogNinja/";
public static DogNinja instance; public static DogNinja instance;
@ -213,6 +214,12 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (dontBop) return;
DogAnim.DoScaledAnimationAsync("Bop", 0.5f);
}
private void Update() private void Update()
{ {
if (DogAnim.GetBool("needPrepare") && DogAnim.IsAnimationNotPlaying()) if (DogAnim.GetBool("needPrepare") && DogAnim.IsAnimationNotPlaying())
@ -258,17 +265,18 @@ namespace HeavenStudio.Games
} }
} }
private void LateUpdate() public void Bop(double beat, float length, bool auto, bool bop)
{ {
if (Conductor.instance.ReportBeat(ref lastReportedBeat) && DogAnim.IsAnimationNotPlaying() && !dontBop) dontBop = !auto;
{ if (!bop) return;
DogAnim.DoScaledAnimationAsync("Bop", 0.5f); List<BeatAction.Action> actions = new();
}
}
public void Bop(double beat, bool bop) for (int i = 0; i < length; i++)
{ {
dontBop = !bop; actions.Add(new(beat + i, delegate { DogAnim.DoScaledAnimationAsync("Bop", 0.5f); }));
}
if (actions.Count > 0) BeatAction.New(this, actions);
} }
public static void QueueObject(double beat, int direction, int typeL, int typeR, bool prepare, bool muteThrow) public static void QueueObject(double beat, int direction, int typeL, int typeR, bool prepare, bool muteThrow)

9
Assets/Scripts/Games/DoubleDate/DoubleDate.cs
View file

@ -138,6 +138,11 @@ namespace HeavenStudio.Games
clouds.transform.position = Vector3.left * ((Time.realtimeSinceStartup * cloudSpeed) % cloudDistance); clouds.transform.position = Vector3.left * ((Time.realtimeSinceStartup * cloudSpeed) % cloudDistance);
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop) SingleBop();
}
void Update() void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
@ -162,10 +167,6 @@ namespace HeavenStudio.Games
} }
queuedBalls.Clear(); queuedBalls.Clear();
} }
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && shouldBop)
{
SingleBop();
}
} }
else else
{ {

15
Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs
View file

@ -144,16 +144,17 @@ namespace HeavenStudio.Games
PersistColor(beat); PersistColor(beat);
} }
public override void OnBeatPulse(double beat)
{
if (goBop)
{
Bop();
}
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (goBop)
{
Bop();
}
}
if (isMoving && cond.isPlaying && !cond.isPaused) if (isMoving && cond.isPlaying && !cond.isPaused)
{ {

42
Assets/Scripts/Games/FanClub/FanClub.cs
View file

@ -204,8 +204,6 @@ namespace HeavenStudio.Games
private List<GameObject> Spectators; private List<GameObject> Spectators;
//bop-type animations //bop-type animations
private GameEvent bop = new GameEvent();
private GameEvent specBop = new GameEvent();
private GameEvent noBop = new GameEvent(); private GameEvent noBop = new GameEvent();
private GameEvent noResponse = new GameEvent(); private GameEvent noResponse = new GameEvent();
private GameEvent noCall = new GameEvent(); private GameEvent noCall = new GameEvent();
@ -356,30 +354,28 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
var cond = Conductor.instance;
if (goBopIdol)
{
if (!(cond.songPositionInBeatsAsDouble >= noBop.startBeat && cond.songPositionInBeatsAsDouble < noBop.startBeat + noBop.length))
{
idolAnimator.Play("IdolBeat" + GetPerformanceSuffix(), 0, 0);
Blue.PlayAnimState("Beat");
Orange.PlayAnimState("Beat");
}
}
if (goBopSpec)
{
if (!(cond.songPositionInBeatsAsDouble >= noSpecBop.startBeat && cond.songPositionInBeatsAsDouble < noSpecBop.startBeat + noSpecBop.length))
BopAll();
}
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (goBopIdol)
{
if (!(cond.songPositionInBeatsAsDouble >= noBop.startBeat && cond.songPositionInBeatsAsDouble < noBop.startBeat + noBop.length))
{
idolAnimator.Play("IdolBeat" + GetPerformanceSuffix(), 0, 0);
Blue.PlayAnimState("Beat");
Orange.PlayAnimState("Beat");
}
}
}
if (cond.ReportBeat(ref specBop.lastReportedBeat, specBop.startBeat % 1))
{
if (goBopSpec)
{
if (!(cond.songPositionInBeatsAsDouble >= noSpecBop.startBeat && cond.songPositionInBeatsAsDouble < noSpecBop.startBeat + noSpecBop.length))
BopAll();
}
}
//idol jumping physics //idol jumping physics
float jumpPos = cond.GetPositionFromBeat(idolJumpStartTime, 1f); float jumpPos = cond.GetPositionFromBeat(idolJumpStartTime, 1f);

11
Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs
View file

@ -230,16 +230,17 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (goBopFlip) SingleBop((int)WhoBops.Flippers);
if (goBopTuck) SingleBop((int)WhoBops.CaptainTuck);
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (goBopFlip) SingleBop((int)WhoBops.Flippers);
if (goBopTuck) SingleBop((int)WhoBops.CaptainTuck);
}
if (isWalking) if (isWalking)
{ {
float normalizedBeat = cond.GetPositionFromBeat(walkStartBeat, walkLength); float normalizedBeat = cond.GetPositionFromBeat(walkStartBeat, walkLength);

10
Assets/Scripts/Games/ForkLifter/ForkLifter.cs
View file

@ -69,16 +69,6 @@ namespace HeavenStudio.Games.Loaders
}, },
resizable = true resizable = true
}, },
new GameAction("bop", "Bop")
{
function = delegate { var e = eventCaller.currentEntity; ForkLifter.instance.Bop(e.beat, e.length, e["bop"], e["autoBop"]); },
parameters = new List<Param>()
{
new Param("bop", true, "Keep Bopping", "Should Fork bop for the duration of the block?"),
new Param("autoBop", false, "Keep Bopping (Auto)", "Should Fork bop indefinitely?"),
},
resizable = true,
},
}, },
new List<string>() {"rvl", "normal"}, new List<string>() {"rvl", "normal"},
"rvlfork", "en", "rvlfork", "en",

11
Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs
View file

@ -27,7 +27,6 @@ namespace HeavenStudio.Games.Scripts_ForkLifter
public int currentEarlyPeasOnFork; public int currentEarlyPeasOnFork;
public int currentPerfectPeasOnFork; public int currentPerfectPeasOnFork;
public int currentLatePeasOnFork; public int currentLatePeasOnFork;
private double lastReportedBeat;
private bool isEating = false; private bool isEating = false;
@ -49,16 +48,6 @@ namespace HeavenStudio.Games.Scripts_ForkLifter
{ {
Stab(null); Stab(null);
} }
if (Conductor.instance.ReportBeat(ref lastReportedBeat) && anim.IsAnimationNotPlaying() && shouldBop)
{
SingleBop();
}
}
public void SingleBop()
{
anim.DoScaledAnimationAsync("Player_Bop", 0.5f);
} }
public void Eat() public void Eat()

5
Assets/Scripts/Games/KarateMan/KarateMan.cs
View file

@ -1166,6 +1166,11 @@ namespace HeavenStudio.Games
Wind.windMain = windStrength; Wind.windMain = windStrength;
} }
public override void OnBeatPulse(double beat)
{
Joe.RequestBop();
}
public void ToggleBop(double beat, float length, bool toggle, bool autoBop) public void ToggleBop(double beat, float length, bool toggle, bool autoBop)
{ {
Joe.bop.length = autoBop ? float.MaxValue : 0; Joe.bop.length = autoBop ? float.MaxValue : 0;

11
Assets/Scripts/Games/KarateMan/KarateManJoe.cs
View file

@ -51,6 +51,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan
} }
public bool inNuriLock { get { return (Conductor.instance.songPositionInBeatsAsDouble >= noNuriJabTime && Conductor.instance.songPositionInBeatsAsDouble < noNuriJabTime + 1f); } } public bool inNuriLock { get { return (Conductor.instance.songPositionInBeatsAsDouble >= noNuriJabTime && Conductor.instance.songPositionInBeatsAsDouble < noNuriJabTime + 1f); } }
public void RequestBop()
{
var cond = Conductor.instance;
if (cond.songPositionInBeatsAsDouble > bop.startBeat && cond.songPositionInBeatsAsDouble < bop.startBeat + bop.length && cond.songPositionInBeatsAsDouble >= unPrepareTime && !inCombo) Bop();
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
@ -95,11 +101,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan
anim.Play("Beat", -1, 0); anim.Play("Beat", -1, 0);
} }
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1, false) && cond.songPositionInBeatsAsDouble > bop.startBeat && cond.songPositionInBeatsAsDouble < bop.startBeat + bop.length && cond.songPositionInBeatsAsDouble >= unPrepareTime && !inCombo)
{
Bop();
}
if (inCombo && shouldComboId == -2) if (inCombo && shouldComboId == -2)
{ {
float missProg = cond.GetPositionFromBeat(lastComboMissTime, 3f); float missProg = cond.GetPositionFromBeat(lastComboMissTime, 3f);

15
Assets/Scripts/Games/Lockstep/Lockstep.cs
View file

@ -336,18 +336,19 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (goBop)
{
PlayStepperAnim("Bop", true, 0.5f);
}
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (goBop)
{
PlayStepperAnim("Bop", true, 0.5f);
}
}
if (queuedInputs.Count > 0) if (queuedInputs.Count > 0)
{ {
foreach (var input in queuedInputs) foreach (var input in queuedInputs)

5
Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
View file

@ -157,10 +157,9 @@ namespace HeavenStudio.Games
} }
} }
private void LateUpdate() public override void OnBeatPulse(double beat)
{ {
if (Conductor.instance.ReportBeat(ref lastReportedBeat) if (!BossAnim.IsPlayingAnimationName("BossCall")
&& !BossAnim.IsPlayingAnimationName("BossCall")
&& !BossAnim.IsPlayingAnimationName("BossSignal") && !BossAnim.IsPlayingAnimationName("BossSignal")
&& bossBop) && bossBop)
{ {

6
Assets/Scripts/Games/Minigame.cs
View file

@ -412,6 +412,12 @@ namespace HeavenStudio.Games
} }
} }
// mainly for bopping logic
public virtual void OnBeatPulse(double beat)
{
}
public static MultiSound PlaySoundSequence(string game, string name, double startBeat, params SoundSequence.SequenceParams[] args) public static MultiSound PlaySoundSequence(string game, string name, double startBeat, params SoundSequence.SequenceParams[] args)
{ {
Minigames.Minigame gameInfo = GameManager.instance.GetGameInfo(game); Minigames.Minigame gameInfo = GameManager.instance.GetGameInfo(game);

28
Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs
View file

@ -349,24 +349,24 @@ namespace HeavenStudio.Games
} }
} }
private void LateUpdate() public override void OnBeatPulse(double beat)
{ {
if (Conductor.instance.ReportBeat(ref lastReportedBeat)) { if ((MonkAnim.IsAnimationNotPlaying() || MonkAnim.IsPlayingAnimationName("Bop") || MonkAnim.IsPlayingAnimationName("Idle"))
if ((MonkAnim.IsAnimationNotPlaying() || MonkAnim.IsPlayingAnimationName("Bop") || MonkAnim.IsPlayingAnimationName("Idle"))
&& monkBop && monkBop
&& !isStaring) && !isStaring)
{ {
MonkAnim.DoScaledAnimationAsync("Bop", 0.5f); MonkAnim.DoScaledAnimationAsync("Bop", 0.5f);
} }
if (!MonkAnim.IsPlayingAnimationName("Blush") || !MonkAnim.IsPlayingAnimationName("Stare")) { if (!MonkAnim.IsPlayingAnimationName("Blush") || !MonkAnim.IsPlayingAnimationName("Stare"))
if (growLevel == 4) BrowAnim.DoScaledAnimationAsync("Bop", 0.5f); {
if (growLevel > 0) StacheAnim.DoScaledAnimationAsync($"Bop{growLevel}", 0.5f); if (growLevel == 4) BrowAnim.DoScaledAnimationAsync("Bop", 0.5f);
} if (growLevel > 0) StacheAnim.DoScaledAnimationAsync($"Bop{growLevel}", 0.5f);
}
if (CloudMonkey.activeInHierarchy) { if (CloudMonkey.activeInHierarchy) //Why activeInHierarchy? - Rasmus
CloudMonkey.GetComponent<Animator>().DoScaledAnimationAsync("Bop", 0.5f); {
} CloudMonkey.GetComponent<Animator>().DoScaledAnimationAsync("Bop", 0.5f); //DONT DO THIS!!! GetComponent is a really expensive operation - Rasmus
} }
} }

6
Assets/Scripts/Games/OctopusMachine/Octopus.cs
View file

@ -17,7 +17,6 @@ namespace HeavenStudio.Games.Scripts_OctopusMachine
public bool isSqueezed; public bool isSqueezed;
public bool isPreparing; public bool isPreparing;
public double queuePrepare; public double queuePrepare;
public double lastReportedBeat = 0f;
double lastSqueezeBeat; double lastSqueezeBeat;
bool isActive = true; bool isActive = true;
@ -65,10 +64,9 @@ namespace HeavenStudio.Games.Scripts_OctopusMachine
} }
} }
void LateUpdate() public void RequestBop()
{ {
if (Conductor.instance.ReportBeat(ref lastReportedBeat) if (!anim.IsPlayingAnimationName("Bop")
&& !anim.IsPlayingAnimationName("Bop")
&& !anim.IsPlayingAnimationName("Happy") && !anim.IsPlayingAnimationName("Happy")
&& !anim.IsPlayingAnimationName("Angry") && !anim.IsPlayingAnimationName("Angry")
&& !anim.IsPlayingAnimationName("Oops") && !anim.IsPlayingAnimationName("Oops")

29
Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs
View file

@ -206,7 +206,6 @@ namespace HeavenStudio.Games
bool autoAction; bool autoAction;
double intervalStartBeat; double intervalStartBeat;
float beatInterval = 1f; float beatInterval = 1f;
double lastReportedBeat;
static List<double> queuedSqueezes = new(); static List<double> queuedSqueezes = new();
static List<double> queuedReleases = new(); static List<double> queuedReleases = new();
@ -253,6 +252,23 @@ namespace HeavenStudio.Games
} }
} }
public override void OnBeatPulse(double beat)
{
if (bopIterate >= 3)
{
bopStatus =
bopIterate = 0;
autoAction = false;
}
if (autoAction) bopIterate++;
foreach (var octo in octopodes)
{
octo.RequestBop();
}
}
private void Update() private void Update()
{ {
BackgroundColorUpdate(); BackgroundColorUpdate();
@ -261,17 +277,6 @@ namespace HeavenStudio.Games
if (Text.text is "Wrong! Try Again!" or "Good!") Text.text = ""; if (Text.text is "Wrong! Try Again!" or "Good!") Text.text = "";
queuePrepare = double.MaxValue; queuePrepare = double.MaxValue;
} }
if (Conductor.instance.ReportBeat(ref lastReportedBeat))
{
if (bopIterate >= 3) {
bopStatus =
bopIterate = 0;
autoAction = false;
}
if (autoAction) bopIterate++;
}
} }
public void ChangeText(string text, string youText) public void ChangeText(string text, string youText)

19
Assets/Scripts/Games/RhythmRally/RhythmRally.cs
View file

@ -152,7 +152,6 @@ namespace HeavenStudio.Games
public Paddlers paddlers; public Paddlers paddlers;
public GameEvent bop = new GameEvent();
private bool goBop = true; private bool goBop = true;
public static RhythmRally instance; public static RhythmRally instance;
@ -357,16 +356,6 @@ namespace HeavenStudio.Games
} }
} }
// Paddler bop animation.
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (goBop && !inPose)
{
BopSingle();
}
}
opponentServing = false; opponentServing = false;
//update camera //update camera
@ -375,6 +364,14 @@ namespace HeavenStudio.Games
GameCamera.AdditionalFoV = cameraFOV; GameCamera.AdditionalFoV = cameraFOV;
} }
public override void OnBeatPulse(double beat)
{
if (goBop && !inPose)
{
BopSingle();
}
}
public void Bop(double beat, float length, bool bop, bool bopAuto) public void Bop(double beat, float length, bool bop, bool bopAuto)
{ {
goBop = bopAuto; goBop = bopAuto;

64
Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs
View file

@ -84,22 +84,20 @@ namespace HeavenStudio.Games
instance = this; instance = this;
} }
// Update is called once per frame public override void OnBeatPulse(double beat)
{
if (shouldBop) SomenPlayer.DoScaledAnimationAsync("HeadBob", 0.5f);
}
void Update() void Update()
{ {
var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && shouldBop)
{
SomenPlayer.Play("HeadBob", -1, 0);
}
if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress))
{ {
SoundByte.PlayOneShotGame("rhythmSomen/somen_mistake"); SoundByte.PlayOneShotGame("rhythmSomen/somen_mistake");
FrontArm.Play("ArmPluck", -1, 0); FrontArm.DoScaledAnimationAsync("ArmPluck", 0.5f);
backArm.Play("BackArmNothing", 0, 0); backArm.DoScaledAnimationAsync("BackArmNothing", 0.5f);
hasSlurped = false; hasSlurped = false;
EffectSweat.Play("BlobSweating", -1, 0); EffectSweat.DoScaledAnimationAsync("BlobSweating", 0.5f);
ScoreMiss(); ScoreMiss();
} }
} }
@ -108,7 +106,7 @@ namespace HeavenStudio.Games
{ {
if (!missed) if (!missed)
{ {
backArm.Play("BackArmLift", 0, 0); backArm.DoScaledAnimationAsync("BackArmLift", 0.5f);
FrontArm.DoScaledAnimationAsync("ArmSlurp", 0.5f); FrontArm.DoScaledAnimationAsync("ArmSlurp", 0.5f);
hasSlurped = true; hasSlurped = true;
BeatAction.New(instance, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
@ -117,8 +115,8 @@ namespace HeavenStudio.Games
{ {
if (hasSlurped) if (hasSlurped)
{ {
backArm.Play("BackArmNothing", 0, 0); backArm.DoScaledAnimationAsync("BackArmNothing", 0.5f);
FrontArm.Play("ArmNothing", 0, 0); FrontArm.DoScaledAnimationAsync("ArmNothing", 0.5f);
} }
}) })
}); });
@ -136,7 +134,7 @@ namespace HeavenStudio.Games
{ {
new BeatAction.Action(beat + i, delegate new BeatAction.Action(beat + i, delegate
{ {
SomenPlayer.Play("HeadBob", -1, 0); SomenPlayer.DoScaledAnimationAsync("HeadBob", 0.5f);
}) })
}); });
} }
@ -155,9 +153,9 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { FarCrane.Play("Drop", -1, 0);}), new BeatAction.Action(beat, delegate { FarCrane.DoScaledAnimationAsync("Drop", 0.5f);}),
new BeatAction.Action(beat + 1.0f, delegate { FarCrane.Play("Open", -1, 0);}), new BeatAction.Action(beat + 1.0f, delegate { FarCrane.DoScaledAnimationAsync("Open", 0.5f);}),
new BeatAction.Action(beat + 1.5f, delegate { FarCrane.Play("Lift", -1, 0);}), new BeatAction.Action(beat + 1.5f, delegate { FarCrane.DoScaledAnimationAsync("Lift", 0.5f);}),
}); });
} }
@ -174,9 +172,9 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { CloseCrane.Play("DropClose", -1, 0);}), new BeatAction.Action(beat, delegate { CloseCrane.DoScaledAnimationAsync("DropClose", 0.5f);}),
new BeatAction.Action(beat + 1.0f, delegate { CloseCrane.Play("OpenClose", -1, 0);}), new BeatAction.Action(beat + 1.0f, delegate { CloseCrane.DoScaledAnimationAsync("OpenClose", 0.5f);}),
new BeatAction.Action(beat + 1.5f, delegate { CloseCrane.Play("LiftClose", -1, 0);}), new BeatAction.Action(beat + 1.5f, delegate { CloseCrane.DoScaledAnimationAsync("LiftClose", 0.5f);}),
}); });
} }
@ -195,12 +193,12 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { CloseCrane.Play("DropClose", -1, 0);}), new BeatAction.Action(beat, delegate { CloseCrane.DoScaledAnimationAsync("DropClose", 0.5f);}),
new BeatAction.Action(beat, delegate { FarCrane.Play("Drop", -1, 0);}), new BeatAction.Action(beat, delegate { FarCrane.DoScaledAnimationAsync("Drop", 0.5f);}),
new BeatAction.Action(beat + 1.0f, delegate { CloseCrane.Play("OpenClose", -1, 0);}), new BeatAction.Action(beat + 1.0f, delegate { CloseCrane.DoScaledAnimationAsync("OpenClose", 0.5f);}),
new BeatAction.Action(beat + 1.0f, delegate { FarCrane.Play("Open", -1, 0);}), new BeatAction.Action(beat + 1.0f, delegate { FarCrane.DoScaledAnimationAsync("Open", 0.5f);}),
new BeatAction.Action(beat + 1.5f, delegate { CloseCrane.Play("LiftClose", -1, 0);}), new BeatAction.Action(beat + 1.5f, delegate { CloseCrane.DoScaledAnimationAsync("LiftClose", 0.5f);}),
new BeatAction.Action(beat + 1.5f, delegate { FarCrane.Play("Lift", -1, 0);}), new BeatAction.Action(beat + 1.5f, delegate { FarCrane.DoScaledAnimationAsync("Lift", 0.5f);}),
}); });
} }
@ -212,35 +210,35 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { EffectExclam.Play("ExclamAppear", -1, 0);}), new BeatAction.Action(beat, delegate { EffectExclam.DoScaledAnimationAsync("ExclamAppear", 0.5f);}),
}); });
} }
public void CatchSuccess(PlayerActionEvent caller, float state) public void CatchSuccess(PlayerActionEvent caller, float state)
{ {
backArm.Play("BackArmNothing", 0, 0); backArm.DoScaledAnimationAsync("BackArmNothing", 0, 0);
hasSlurped = false; hasSlurped = false;
splashEffect.Play(); splashEffect.Play();
if (state >= 1f || state <= -1f) if (state >= 1f || state <= -1f)
{ {
SoundByte.PlayOneShotGame("rhythmSomen/somen_splash"); SoundByte.PlayOneShotGame("rhythmSomen/somen_splash");
FrontArm.Play("ArmPluckNG", -1, 0); FrontArm.DoScaledAnimationAsync("ArmPluckNG", 0.5f);
EffectSweat.Play("BlobSweating", -1, 0); EffectSweat.DoScaledAnimationAsync("BlobSweating", 0.5f);
missed = true; missed = true;
return; return;
} }
SoundByte.PlayOneShotGame("rhythmSomen/somen_catch"); SoundByte.PlayOneShotGame("rhythmSomen/somen_catch");
SoundByte.PlayOneShotGame("rhythmSomen/somen_catch_old", volume: 0.25f); SoundByte.PlayOneShotGame("rhythmSomen/somen_catch_old", volume: 0.25f);
FrontArm.Play("ArmPluckOK", -1, 0); FrontArm.DoScaledAnimationAsync("ArmPluckOK", 0.5f);
EffectHit.Play("HitAppear", -1, 0); EffectHit.DoScaledAnimationAsync("HitAppear", 0.5f);
missed = false; missed = false;
} }
public void CatchMiss(PlayerActionEvent caller) public void CatchMiss(PlayerActionEvent caller)
{ {
missed = true; missed = true;
EffectShock.Play("ShockAppear", -1, 0); EffectShock.DoScaledAnimationAsync("ShockAppear", 0.5f);
} }
public void CatchEmpty(PlayerActionEvent caller) public void CatchEmpty(PlayerActionEvent caller)

29
Assets/Scripts/Games/Ringside/Ringside.cs
View file

@ -218,26 +218,27 @@ namespace HeavenStudio.Games
ReporterBlink(); ReporterBlink();
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop && canBop)
{
if (UnityEngine.Random.Range(1, 18) == 1)
{
wrestlerAnim.DoScaledAnimationAsync("BopPec");
}
else
{
wrestlerAnim.DoScaledAnimationAsync("Bop");
}
}
}
void Update() void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (shouldBop && canBop)
{
if (UnityEngine.Random.Range(1, 18) == 1)
{
wrestlerAnim.DoScaledAnimationAsync("BopPec");
}
else
{
wrestlerAnim.DoScaledAnimationAsync("Bop");
}
}
}
if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress) && !shouldNotInput) if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress) && !shouldNotInput)
{ {
if ((PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch) if ((PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)

14
Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
View file

@ -169,16 +169,14 @@ namespace HeavenStudio.Games
instance = this; instance = this;
} }
// Update is called once per frame public override void OnBeatPulse(double beat)
{
if (goBopSamurai) player.Bop();
if (goBopChild) childParent.GetComponent<NtrSamuraiChild>().Bop();
}
void Update() void Update()
{ {
var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (goBopSamurai) player.Bop();
if (goBopChild) childParent.GetComponent<NtrSamuraiChild>().Bop();
}
if (PlayerInput.GetIsAction(InputAction_AltDown)) if (PlayerInput.GetIsAction(InputAction_AltDown))
DoStep(); DoStep();
if (PlayerInput.GetIsAction(InputAction_AltUp) && player.isStepping()) if (PlayerInput.GetIsAction(InputAction_AltUp) && player.isStepping())

23
Assets/Scripts/Games/SpaceDance/SpaceDance.cs
View file

@ -228,6 +228,18 @@ namespace HeavenStudio.Games
colorEnd = defaultBGColor; colorEnd = defaultBGColor;
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop)
{
Bop();
}
if (spaceGrampsShouldBop)
{
GrampsBop();
}
}
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
@ -237,17 +249,6 @@ namespace HeavenStudio.Games
{ {
scroll.NormalizedX -= xBaseSpeed * xScrollMultiplier * Time.deltaTime; scroll.NormalizedX -= xBaseSpeed * xScrollMultiplier * Time.deltaTime;
scroll.NormalizedY -= yBaseSpeed * yScrollMultiplier * Time.deltaTime; scroll.NormalizedY -= yBaseSpeed * yScrollMultiplier * Time.deltaTime;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (shouldBop)
{
Bop();
}
if (spaceGrampsShouldBop)
{
GrampsBop();
}
}
if (isShootingStar) if (isShootingStar)
{ {
float normalizedBeat = cond.GetPositionFromBeat(shootingStarStartBeat, shootingStarLength); float normalizedBeat = cond.GetPositionFromBeat(shootingStarStartBeat, shootingStarLength);

9
Assets/Scripts/Games/TapTrial/TapTrial.cs
View file

@ -123,15 +123,16 @@ namespace HeavenStudio.Games
instance = this; instance = this;
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop) SingleBop();
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (shouldBop && cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
SingleBop();
}
GiraffeUpdate(cond); GiraffeUpdate(cond);
JumpUpdate(cond); JumpUpdate(cond);
ScrollUpdate(cond); ScrollUpdate(cond);

23
Assets/Scripts/Games/TheDazzles/TheDazzles.cs
View file

@ -257,23 +257,24 @@ namespace HeavenStudio.Games
instance = this; instance = this;
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop)
{
foreach (var girl in npcGirls)
{
girl.Bop();
}
player.Bop();
}
}
void Update() void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (shouldBop)
{
foreach (var girl in npcGirls)
{
girl.Bop();
}
player.Bop();
}
}
if (queuedPoses.Count > 0) if (queuedPoses.Count > 0)
{ {
foreach (var pose in queuedPoses) foreach (var pose in queuedPoses)

16
Assets/Scripts/Games/TossBoys/TossBoys.cs
View file

@ -262,20 +262,20 @@ namespace HeavenStudio.Games
return default(SuperCurveObject.Path); return default(SuperCurveObject.Path);
} }
public override void OnBeatPulse(double beat)
{
if (shouldBop)
{
SingleBop();
}
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
BackgroundColorUpdate(); BackgroundColorUpdate();
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (shouldBop)
{
SingleBop();
}
}
if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch) if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch)
{ {
TossKid next = GetCurrentReceiver(); TossKid next = GetCurrentReceiver();

2
Assets/Scripts/Games/TossBoys/TossKid.cs
View file

@ -41,7 +41,7 @@ namespace HeavenStudio.Games.Scripts_TossBoys
public void Bop() public void Bop()
{ {
if (!anim.IsAnimationNotPlaying() || crouch || preparing) return; if (crouch || preparing) return;
DoAnimationScaledAsync("Bop", 0.5f); DoAnimationScaledAsync("Bop", 0.5f);
} }

20
Assets/Scripts/Games/TrickClass/TrickClass.cs
View file

@ -116,18 +116,20 @@ namespace HeavenStudio.Games
instance = this; instance = this;
} }
public override void OnBeatPulse(double beat)
{
var cond = Conductor.instance;
if (!goBop) return;
if ((!playerReady) && cond.songPositionInBeatsAsDouble > playerBopStart)
playerAnim.DoScaledAnimationAsync("Bop");
if (cond.songPositionInBeatsAsDouble > girlBopStart)
girlAnim.DoScaledAnimationAsync("Bop");
}
private void Update() private void Update()
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && goBop)
{
if ((!playerReady) && cond.songPositionInBeatsAsDouble > playerBopStart)
playerAnim.DoScaledAnimationAsync("Bop");
if (cond.songPositionInBeatsAsDouble > girlBopStart)
girlAnim.DoScaledAnimationAsync("Bop");
}
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (queuedInputs.Count > 0) if (queuedInputs.Count > 0)