Restore tutorial return placement and source terrain collision eligibility
This commit is contained in:
1 parent
ca08c468ba
commit
8d60a68511
36 files changed
+991
-69
No files matched your search
@@ -113,7 +113,7 @@ public sealed class SceneDirector
|
||||
tasks.Assigned += OnTaskAssigned;
|
||||
}
|
||||
|
||||
public void Begin(GamEntity start)
|
||||
public void Begin(GamEntity start, bool activateStartTrigger = true)
|
||||
{
|
||||
if (start.Kind != "STRT") throw new ArgumentException("Expected original STRT entity", nameof(start));
|
||||
shot = null; pending.Clear(); activations.Clear();
|
||||
@@ -131,7 +131,9 @@ public sealed class SceneDirector
|
||||
actor.SpritePlaying = initial.SpritePlaying; actor.SpriteRevision++;
|
||||
ApplyTask(actor, tasks.Get(source.Text("TaskName")));
|
||||
}
|
||||
var trigger = start.Text("StartTrigger");
|
||||
// RETURN sets Jimmy+954; STRT4427F2..44282A consumes that flag and
|
||||
// suppresses its trigger once. Do not fast-forward the trigger's actions.
|
||||
var trigger = activateStartTrigger ? start.Text("StartTrigger") : null;
|
||||
ControlledTag = IsNone(trigger) ? level.Player?.Tag : null; // EXE4426B7.
|
||||
if (!IsNone(trigger)) Trigger(trigger!, start.Tag);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user