Fix original cutscene music lifecycle and verify walking lab route

This commit is contained in:
UnixNight committed 2026-10-24 20:42:21 -04:00
1 parent c929f942e1
commit b58138d7ba
16 files changed
+282 -18

No files matched your search

+30
View File
@@ -69,6 +69,7 @@ internal static class Program
--audio PATH Play recovered WAV; --loop-audio repeats it
--audio-smoke PATH Verify audio-stream consumption
--scene-audio-smoke PATH Verify music/speech streams from entities.json
--cutscene-audio-smoke PATH Verify original cutscene music stop/restart
--effects-audio-smoke PATH Verify default effect bank and loop lifetime
--smoke-transition Headless VR01 RETURN / renderer-recreation check
--smoke-lab-route Headless source lab contact route / next-scene rebuild
@@ -98,6 +99,33 @@ internal static class Program
if (parent.Exists && parent.LinkTarget != null) throw new ArgumentException("Save output directory must not redirect through a symbolic link");
}
if (args.Contains("--verify-assets")) return VerifyAssets(root);
if (Option(args, "--cutscene-audio-smoke") is { } cutsceneManifest)
{
var bank = new PreparedEntityResources(cutsceneManifest);
var cutsceneLevel = GamLevel.Load(AssetPath.Resolve(root, "gam/level1b.gam"));
var cutsceneSave = OriginalSave.Load(AssetPath.Resolve(root, "NewGame.tsk"));
var cutscene = new SceneDirector(cutsceneLevel, new TaskStates(cutsceneSave.Tasks), bank.Duration);
using var mixer = new SceneAudio(bank);
cutscene.Speech += mixer.Speech;
cutscene.MusicStopped += mixer.StopMusic;
cutscene.MusicRestarted += mixer.RestartMusic;
mixer.Music("musicsecretlab.omt", 0);
if (mixer.QueuedMusicBytes <= 0) throw new InvalidOperationException("No gameplay music before cutscene test");
cutscene.Begin(cutsceneLevel.FindStart()!);
var silentDuring = mixer.QueuedMusicBytes == 0 && mixer.QueuedSpeechBytes > 0;
for (var tick = 0; tick < 18000 && !cutscene.Controlled; tick++)
{
cutscene.Step(FixedStepClock.Step);
if (!cutscene.Controlled && mixer.QueuedMusicBytes != 0) silentDuring = false;
}
var naturalRestart = cutscene.Controlled && mixer.QueuedMusicBytes > 0;
cutscene.Begin(cutsceneLevel.FindStart()!);
var resetSilent = mixer.QueuedMusicBytes == 0;
mixer.StopSpeech(); cutscene.Skip();
var skipRestart = cutscene.Controlled && mixer.QueuedMusicBytes > 0;
Console.WriteLine($"Cutscene audio: music silent through intro={silentDuring}, natural restart={naturalRestart}, reset silent={resetSilent}, skip restart={skipRestart}.");
return silentDuring && naturalRestart && resetSilent && skipRestart ? 0 : 2;
}
if (Option(args, "--effects-audio-smoke") is { } effectsManifest)
{
using var mixer = new SceneAudio(new PreparedEntityResources(effectsManifest));
@@ -325,6 +353,8 @@ internal static class Program
if (sceneAudio != null)
{
director.Speech += sceneAudio.Speech;
director.MusicStopped += sceneAudio.StopMusic;
director.MusicRestarted += sceneAudio.RestartMusic;
interactions!.SoundEffect += id => sceneAudio.Effect(id);
mechanisms!.Sound += (actor, id, loop) => sceneAudio.Effect(id, loop ? actor.Tag : null);
mechanisms.StopSound += actor => sceneAudio.StopLoop(actor.Tag);