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

Merge pull request #668 from RHeavenStudio/cherry-pick-release_1_patches-a071b45d2387a9cf28b2acc1adf99c7ef6c901c7 

just two bug fixes
This commit is contained in:
minenice55 2024-01-31 05:01:41 +00:00 committed by GitHub
parent 1b0d4664f1 28cc8ab426
commit 1270005c90
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
View File

@ -266,7 +266,7 @@ namespace HeavenStudio.Games
private void ScheduleStep(double beat)
{
PlayerActionEvent input = ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Nothing);
input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly();
// input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly();
}
private void RecursiveStepping(double beat)

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

@ -286,16 +286,6 @@ namespace HeavenStudio.Games
if (dumplings.Count != 0) InputFunctions(3);
}
// blushes when done eating but not when staring
if (needBlush
&& !MonkAnim.IsPlayingAnimationNames("Eat", "Stare", "Barely", "Miss")
&& !isStaring
&& !noBlush)
{
MonkAnim.DoScaledAnimationAsync("Blush", 0.5f);
needBlush = false;
}
// sets hair stuff active when it needs to be
if (growLevel > 0) {
StacheHolder.SetActive(true);
@ -346,6 +336,19 @@ namespace HeavenStudio.Games
}
}
private void LateUpdate()
{
// blushes when done eating but not when staring
if (needBlush
&& !MonkAnim.IsPlayingAnimationNames("Eat", "Stare", "Barely", "Miss")
&& !isStaring
&& !noBlush)
{
MonkAnim.DoScaledAnimationAsync("Blush", 0.5f);
needBlush = false;
}
}
public override void OnBeatPulse(double beat)
{
if ((MonkAnim.IsAnimationNotPlaying() || MonkAnim.IsPlayingAnimationNames("Bop", "Idle"))