Add persistent force-control toggle to F1 debug menu

This commit is contained in:
UnixNight committed 2026-10-25 02:00:55 -04:00
1 parent 3078b8afd0
commit 20aa1bc2b9
13 files changed
+96 -12

No files matched your search

+5 -3
View File
@@ -5,17 +5,17 @@ using GamePort.Assets;
namespace GamePort.Application;
public sealed record DebugScene(string LevelFile, string Code, string[] Starts);
public enum DebugAction { None, Resume, Camera, SkipCutscene, RefillEnergy, GiveJetpack, ApplySceneTask, LoadScene, Reset }
public enum DebugAction { None, Resume, Camera, SkipCutscene, RefillEnergy, GiveJetpack, ApplySceneTask, LoadScene, Reset, ForceControl }
public sealed record DebugMenuView(string[] Lines, int SelectedLine);
public sealed record DebugStatus(string Level, string Start, Vector3 Root, float Yaw, float Speed,
bool Grounded, float Energy, int Score, int SceneTask, string Cutscene, bool Controlled,
int Issues, float FarPlane, bool Inspecting);
int Issues, float FarPlane, bool Inspecting, bool ForcedControl = false);
/// <summary>Modern investigation tools, deliberately separate from recovered game UI.</summary>
public sealed class DebugMenu
{
public const uint ToggleKey = 58; // SDL scancode F1; F11 remains fullscreen.
public const int ItemCount = 10;
public const int ItemCount = 11;
public bool Open { get; private set; }
public int Selected { get; private set; }
public int SceneTask { get; private set; }
@@ -65,6 +65,7 @@ public sealed class DebugMenu
0 => DebugAction.Resume, 1 => DebugAction.Camera, 2 => DebugAction.SkipCutscene,
3 => DebugAction.RefillEnergy, 4 => DebugAction.GiveJetpack, 5 => DebugAction.ApplySceneTask,
8 => Scene == null ? DebugAction.None : DebugAction.LoadScene, 9 => DebugAction.Reset,
10 => DebugAction.ForceControl,
_ => DebugAction.None
};
return DebugAction.None;
@@ -95,6 +96,7 @@ public sealed class DebugMenu
$"START: {Start ?? "UNAVAILABLE"}",
"LOAD SELECTED LEVEL / START",
"RESET CURRENT START",
$"FORCE CONTROL: {status.ForcedControl} (ENTER TOGGLE)",
"",
"UP/DOWN SELECT LEFT/RIGHT CHANGE ENTER APPLY",
"SCENE TASK: PAGE UP/DOWN CHANGES BY 10",
+12 -2
View File
@@ -70,8 +70,15 @@ public sealed class SceneDirector
public List<DirectorActor> Actors { get; } = [];
public IReadOnlyList<DirectorIssue> Issues => issues;
private string? controlledTag;
/// <summary>Modern debug override; leaves authored control/camera transitions intact.</summary>
public bool DebugForceControl { get; set; }
public bool Controlled => Equal(ControlledTag, level.Player?.Tag);
public string? ControlledTag { get; private set; }
public string? ControlledTag
{
get => DebugForceControl ? level.Player?.Tag : controlledTag;
private set => controlledTag = value;
}
public bool InventoryEnabled { get; private set; } = true;
public bool Blocked { get; private set; }
public bool Playing => shot is not null;
@@ -116,6 +123,7 @@ public sealed class SceneDirector
public void Begin(GamEntity start, bool activateStartTrigger = true)
{
if (start.Kind != "STRT") throw new ArgumentException("Expected original STRT entity", nameof(start));
DebugForceControl = false;
shot = null; pending.Clear(); activations.Clear();
Blocked = skipping = false; blockedNext = blockedCaller = null;
CameraEye = CameraTarget = null;
@@ -492,7 +500,9 @@ public sealed class SceneDirector
private void RestoreControl()
{
var wasControlled = Controlled;
// Authored music handoff must use authored ownership even if debug input
// is forced during the cutscene. The override does not grant source control.
var wasControlled = Equal(controlledTag, level.Player?.Tag);
shot = null;
ControlledTag = level.Player?.Tag;
InventoryEnabled = true;
+18 -4
View File
@@ -513,6 +513,8 @@ internal static class Program
var debugActionsObserved = false;
var debugEscapeObserved = false;
var debugResumeObserved = false;
var debugForceObserved = false;
float debugForceTravel = 0;
var debugPausedRoot = simulation?.ActorRoot ?? Vector3.Zero;
var debugPausedSteps = simulation?.Steps ?? 0;
void ResetScene()
@@ -545,7 +547,8 @@ internal static class Program
case DebugAction.Resume: debugMenu.Close(); break;
case DebugAction.Camera: ToggleCamera(); debugMenu.Close(); break;
case DebugAction.SkipCutscene:
if (director is { Controlled: false }) { sceneAudio?.StopSpeech(); director.Skip(); debugMenu.Message = "CUTSCENE SKIPPED"; }
if (director is { Playing: true } or { Blocked: true } or { Controlled: false })
{ sceneAudio?.StopSpeech(); director.Skip(); debugMenu.Message = "CUTSCENE SKIPPED"; }
else debugMenu.Message = "NO ACTIVE CUTSCENE";
break;
case DebugAction.RefillEnergy when simulation != null:
@@ -564,6 +567,9 @@ internal static class Program
{ debugMenu.Message = "SELECTED START HAS NO SUPPORTED FLOOR"; break; }
RequestTransition(new(selected.LevelFile, debugMenu.Start!, 0, -1)); debugMenu.Close(); break;
case DebugAction.Reset: ResetScene(); debugMenu.Close(); break;
case DebugAction.ForceControl when director != null:
director.DebugForceControl = !director.DebugForceControl;
debugMenu.Message = $"FORCE CONTROL {director.DebugForceControl}; CLOSE MENU TO RESUME"; break;
case DebugAction.None: break;
default: debugMenu.Message = "ACTION REQUIRES PLAY MODE"; break;
}
@@ -750,7 +756,7 @@ internal static class Program
simulation?.ActorRoot ?? Vector3.Zero, simulation?.Yaw ?? 0, simulation?.Speed ?? 0,
simulation?.Grounded ?? false, simulation?.Energy ?? 0, interactions?.Score ?? 0,
storyTasks?.Get("SCENE") ?? 0, director?.CurrentTag ?? "NONE", director?.Controlled ?? false,
director?.Issues.Count ?? 0, SceneProjection.FarPlane(level?.Code), inspecting));
director?.Issues.Count ?? 0, SceneProjection.FarPlane(level?.Code), inspecting, director?.DebugForceControl ?? false));
debugOverlay.Update(mesh, debugView.Lines, debugView.SelectedLine);
var projection = originalCamera || simulation != null && !inspecting
? SceneProjection.CreateGameplay(level?.Code, (float)renderer.Width / renderer.Height)
@@ -813,7 +819,15 @@ internal static class Program
{
debugResumeObserved = simulation!.Steps > debugPausedSteps && simulation.Travel > 1;
Push(82, false);
director!.Trigger("neutron1a");
Tap(DebugMenu.ToggleKey);
for (var row = 5; row < 10; row++) Tap(81);
Tap(40); // Enable force control while the new MCA remains active.
}
if (count == 13) { debugForceTravel = simulation!.Travel; Tap(41); Push(82); }
if (count == 16)
debugForceObserved = director is { DebugForceControl: true, Controlled: true, Playing: true }
&& simulation!.Travel > debugForceTravel + .1f;
}
if (objectiveWindowSmoke)
{
@@ -865,8 +879,8 @@ internal static class Program
if (simulation != null) Console.WriteLine(simulation.Report);
if (debugSmoke)
{
Console.WriteLine($"Debug SDL check: paused={debugPauseObserved}, actions={debugActionsObserved}, Escape/input capture={debugEscapeObserved}, resumed={debugResumeObserved}, resize800x600={didResize}.");
if (!debugPauseObserved || !debugActionsObserved || !debugEscapeObserved || !debugResumeObserved || !didResize) return 2;
Console.WriteLine($"Debug SDL check: paused={debugPauseObserved}, actions={debugActionsObserved}, Escape/input capture={debugEscapeObserved}, resumed={debugResumeObserved}, forced movement during MCA={debugForceObserved}, resize800x600={didResize}.");
if (!debugPauseObserved || !debugActionsObserved || !debugEscapeObserved || !debugResumeObserved || !debugForceObserved || !didResize) return 2;
}
if (carlSmoke)
{