Implement timed Invisible gadget and shared energy warnings

This commit is contained in:
UnixNight committed 2026-11-02 09:21:56 -05:00
1 parent 3527d33810
commit 1897dd2b90
44 files changed
+2466 -39

No files matched your search

+25 -8
View File
@@ -17,14 +17,16 @@ public sealed class PlayerSceneBinding : IDisposable
this.director = director; this.player = player; this.inventory = inventory; this.tag = tag;
director.ActorPreparing += Prepare;
director.AuthoredTransformChanged += Transform;
director.GadgetReleaseRequested += Release;
inventory.GadgetSelected += Selected;
player.Invisible.EquippedChanged += InvisibleEquipped;
Selected(inventory.SelectedGadget);
}
public bool Step(PlayerInput input)
{
var acceptsInput = director.Controlled || player.Noclip;
player.Step(input, acceptsInput);
player.Step(input, acceptsInput, director.ControlledTag != null);
var rotation = director.FindActor(tag)?.Rotation ?? Vector3.Zero;
director.SyncActor(tag, player.ActorRoot, rotation with { Y = player.Yaw });
return acceptsInput;
@@ -35,17 +37,30 @@ public sealed class PlayerSceneBinding : IDisposable
if (!string.Equals(actor.Tag, tag, StringComparison.OrdinalIgnoreCase)) return;
if (action == ScriptPreparation.StopMotion) player.PrepareForScript();
else if (action == ScriptPreparation.ReleaseGadget)
{
//427FF0 has distinct cases. Only no-selection/jetpack cleanup is
//implemented; do not turn the other gadget cases into blanket resets.
if (inventory.SelectedGadget is -1 or 3)
{ inventory.SelectGadget(-1); player.GadgetMode = -1; }
else UnsupportedGadgetCleanups++;
}
Release(actor);
}
private void Release(DirectorActor actor)
{
if (!string.Equals(actor.Tag, tag, StringComparison.OrdinalIgnoreCase)) return;
//427FF0 switches raw mode, not display selection. A rejected Invisible
//equip can leave display2 with raw mode-1; cleanup does not equip it.
if (player.GadgetMode == 2 || inventory.SelectedGadget is -1 or 3)
{ inventory.SelectGadget(-1); player.GadgetMode = -1; }
else if (player.GadgetMode != -1) UnsupportedGadgetCleanups++;
}
private void Selected(int item) => player.GadgetMode = GadgetScreen.EquippedMode(item);
private void InvisibleEquipped(bool equipped)
{
if (director.FindActor("C3DGODDARD") is not { } companion) return;
//427FF0 requires Goddard complete9E8==false before showing/enabling.
//These six PostLoad levels set that flag (retained-companion.md).
if (!equipped && player.LevelCode is "LEV6" or "LEV7" or "LV1C" or "LV1D" or "LV4A" or "LV6A") return;
companion.Visible = companion.MovementEnabled = companion.BodyEnabled = !equipped;
}
private void Transform(DirectorActor actor)
{
if (string.Equals(actor.Tag, tag, StringComparison.OrdinalIgnoreCase))
@@ -56,6 +71,8 @@ public sealed class PlayerSceneBinding : IDisposable
{
director.ActorPreparing -= Prepare;
director.AuthoredTransformChanged -= Transform;
director.GadgetReleaseRequested -= Release;
inventory.GadgetSelected -= Selected;
player.Invisible.EquippedChanged -= InvisibleEquipped;
}
}