Merge branch 'release_1'

This commit is contained in:
minenice55 2024-01-02 10:53:30 -05:00
commit d7aac5f1c7
2 changed files with 45 additions and 28 deletions

View file

@ -98,7 +98,7 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 0.5f defaultLength = 0.5f
} }
}, },
new List<string>() { "ntr", "keep" }, new List<string>() { "rvl", "keep" },
"rvlseal", "en", "rvlseal", "en",
new List<string>() { "en" } new List<string>() { "en" }
); );

View file

@ -122,12 +122,14 @@ namespace HeavenStudio
selectedDisplayAnim.DoNormalizedAnimation("Idle", GetPositionFromBeat(0, 2)); selectedDisplayAnim.DoNormalizedAnimation("Idle", GetPositionFromBeat(0, 2));
} }
if (logoRevealed && !menuMode) if (!menuMode && songPosBeat >= 0.5)
{ {
var controllers = PlayerInput.GetInputControllers(); var controllers = PlayerInput.GetInputControllers();
foreach (var newController in controllers) foreach (var newController in controllers)
{ {
if (newController.GetLastButtonDown(true) > 0) if (newController.GetLastButtonDown(true) > 0)
{
if (logoRevealed)
{ {
menuMode = true; menuMode = true;
firstPress = true; firstPress = true;
@ -162,6 +164,11 @@ namespace HeavenStudio
} }
} }
} }
else
{
SkipToBeat(5);
}
}
} }
} }
@ -418,6 +425,16 @@ namespace HeavenStudio
return a; return a;
} }
public void SkipToBeat(double beat)
{
if (songPosBeat >= beat) return;
double seconds = BeatsToSecs(beat, bpm);
time = seconds;
songPos = time + offset;
songPosBeat = SecsToBeats(songPos);
musicSource.time = (float)time;
}
public void CreatePressed() public void CreatePressed()
{ {
if (exiting) return; if (exiting) return;