Restore tutorial return placement and source terrain collision eligibility

This commit is contained in:
UnixNight committed 2026-10-25 01:30:09 -04:00
1 parent ca08c468ba
commit 8d60a68511
36 files changed
+991 -69

No files matched your search

+15 -1
View File
@@ -42,6 +42,20 @@ Check(skipMusicPlaying,"Skipping must restore selected gameplay music");
Check(skip.FindActor("C3DGODDARD")!.Position==endGoddard,"Skip must preserve AI/toggle actions");
Console.WriteLine("PASS original intro skip preserves action sequence");
var returnDirector = new SceneDirector(level, new TaskStates(save.Tasks), (_, _) => 10);
var returnCues = 0;
returnDirector.Speech += (_, _) => returnCues++;
var sourceGoddard = returnDirector.FindActor("C3DGODDARD")!.Position;
returnDirector.Begin(level.FindStart()!, activateStartTrigger: false);
Check(returnDirector.Controlled && !returnDirector.Playing && returnCues == 0,
"RETURN suppresses the start trigger rather than replaying/skipping its dialogue");
Check(returnDirector.FindActor("C3DGODDARD")!.Position == sourceGoddard,
"Suppressing LABEXP must not execute its teleport/patrol actions");
returnDirector.Begin(level.FindStart()!);
Check(!returnDirector.Controlled && returnDirector.CurrentTag == "LABEXP1" && returnCues == 1,
"Return suppression does not persist into a later normal start");
Console.WriteLine("PASS RETURN suppresses STRT actions once and preserves normal start behavior");
foreach (var finishBySkip in new[] { false, true })
{
var carlScene = new SceneDirector(level, new TaskStates(save.Tasks), (_, _) => .1);
@@ -191,7 +205,7 @@ var restoredDirector=new SceneDirector(vr,new TaskStates(save.Tasks),(_,_)=>1);v
Check(restoredDirector.Actors.Where(a=>a.Kind=="3PIC").All(a=>!a.Visible && !a.Active),"Loaded acquired stars must hide before contact");
var transitions=0;LevelTransition? returned=null;interactions.Transition += request=>{transitions++;returned=request;};
var returnGate=vr.Entities.First(e=>e.Kind=="LOAD");interactions.Update(returnGate.Position);interactions.Update(returnGate.Position);
Check(transitions==1 && returned!.LevelFile==save.ReturnLevel && returned.StartPoint==save.ReturnStart,"RETURN uses stored destination and contact-enter gating");
Check(transitions==1 && returned!.Returning && returned.LevelFile==save.ReturnLevel && returned.StartPoint==save.ReturnStart,"RETURN uses stored destination, restore flag and contact-enter gating");
Console.WriteLine("PASS original VR01 star/trophy score, strict contact entry, acquired-state save/reload and RETURN request");
static GamEntity Entity(string kind,string tag,params (string Name,object Value)[] values)