Restore original airborne steering for jumps and jetpack bursts
This commit is contained in:
1 parent
b58138d7ba
commit
976e677019
16 files changed
+357
-54
No files matched your search
+27
-11
@@ -76,7 +76,7 @@ internal static class Program
|
||||
--smoke-practice-prompt Headless original jet pack practice prompt
|
||||
--smoke-practice-transition Headless lab-to-VR04 practice transition
|
||||
--smoke-practice-window SDL practice pause/dismiss/resize check (12 frames)
|
||||
--smoke-jetpack Headless 300-step powered-jump/release check in VR04
|
||||
--smoke-jetpack 300-step powered steering/jump check in VR04
|
||||
--verify-assets Decode all original PNG/ASE files
|
||||
--smoke-window Test keyboard event/resize (requires --frames 6 or more)
|
||||
--no-validation Disable development validation
|
||||
@@ -325,8 +325,8 @@ internal static class Program
|
||||
if (!double.IsFinite(storyTime) || storyTime < 0 || storyTime > 3600 || storyTime > 0 && !headless)
|
||||
throw new ArgumentException("Story time must be0..3600 seconds in headless mode.");
|
||||
var frames = int.Parse(Option(args, "--frames") ?? (walkSmoke ? "240" : jetpackSmoke ? "300" : headless ? "1" : "0"));
|
||||
if (jetpackSmoke && (!headless || level?.Code != "VR04" || frames < 300))
|
||||
throw new ArgumentException("Jetpack smoke requires headless VR04 and at least300 frames");
|
||||
if (jetpackSmoke && (level?.Code != "VR04" || frames < 300))
|
||||
throw new ArgumentException("Jetpack smoke requires VR04 and at least300 frames");
|
||||
if (walkSmoke && frames < 240) throw new ArgumentException("Walk smoke requires at least 240 frames.");
|
||||
var smoke = args.Contains("--smoke-window");
|
||||
if (frames < 0 || (smoke && (headless || frames < 6)))
|
||||
@@ -413,6 +413,9 @@ internal static class Program
|
||||
double poseTime = initialPoseTime;
|
||||
var injectedInput = default(PlayerInput);
|
||||
var sawWalkKeys = 0;
|
||||
var sawJetpackKeys = 0;
|
||||
float poweredAirTravel = 0;
|
||||
var poweredAirTurn = false;
|
||||
var sawPracticeDismiss = false;
|
||||
var sawPracticePause = false;
|
||||
double last = clock.Elapsed.TotalSeconds;
|
||||
@@ -426,11 +429,13 @@ internal static class Program
|
||||
}
|
||||
while (running)
|
||||
{
|
||||
if (walkSmoke && !headless)
|
||||
if ((walkSmoke || jetpackSmoke) && !headless)
|
||||
{
|
||||
var requested = LabSimulation.SmokeInput(simulation!.Steps);
|
||||
var requested = jetpackSmoke ? LabSimulation.JetpackSmokeInput(simulation!.Steps)
|
||||
: LabSimulation.SmokeInput(simulation!.Steps);
|
||||
foreach (var (scancode, down, previous) in new[] {
|
||||
(82u, requested.Forward, injectedInput.Forward),
|
||||
(81u, requested.Backward, injectedInput.Backward), (80u, requested.Left, injectedInput.Left),
|
||||
(79u, requested.Right, injectedInput.Right), (225u, requested.Jump, injectedInput.Jump) })
|
||||
{
|
||||
if (down == previous) continue;
|
||||
@@ -461,6 +466,7 @@ internal static class Program
|
||||
{
|
||||
keys.Add(e.Scancode);
|
||||
if (walkSmoke) sawWalkKeys |= e.Scancode == 82 ? 1 : e.Scancode == 79 ? 2 : e.Scancode == 225 ? 4 : 0;
|
||||
if (jetpackSmoke) sawJetpackKeys |= e.Scancode == 82 ? 1 : e.Scancode == 81 ? 2 : e.Scancode == 80 ? 4 : e.Scancode == 225 ? 8 : 0;
|
||||
if (smoke && e.Scancode == 79) sawKey = true;
|
||||
if (e.Scancode is 41 or 44 && e.Repeat == 0 && director is { Controlled: false })
|
||||
{ sceneAudio?.StopSpeech(); director.Skip(); keys.Clear(); mouseJump = false; }
|
||||
@@ -504,18 +510,25 @@ internal static class Program
|
||||
var elapsed = now - last;
|
||||
var dt = (float)Math.Min(elapsed, 0.1);
|
||||
last = now;
|
||||
if (simulation != null && !inspecting && !practice.Active && (active || headless || walkSmoke))
|
||||
if (simulation != null && !inspecting && !practice.Active && (active || headless || walkSmoke || jetpackSmoke))
|
||||
{
|
||||
var steps = headless || walkSmoke || practiceWindowSmoke ? 1 : stepClock.Advance(elapsed);
|
||||
var steps = headless || walkSmoke || jetpackSmoke || practiceWindowSmoke ? 1 : stepClock.Advance(elapsed);
|
||||
for (var step = 0; step < steps; step++)
|
||||
{
|
||||
var input = jetpackSmoke ? new PlayerInput(false, false, false, false, simulation.Steps < 180)
|
||||
var input = jetpackSmoke && headless ? LabSimulation.JetpackSmokeInput(simulation.Steps)
|
||||
: walkSmoke && headless ? LabSimulation.SmokeInput(simulation.Steps) : new PlayerInput(
|
||||
keys.Contains(82), keys.Contains(81), keys.Contains(80), keys.Contains(79),
|
||||
mouseJump || keys.Contains(225) || keys.Contains(229) || keys.Contains(73) || keys.Contains(98));
|
||||
if (director?.Controlled != false)
|
||||
{
|
||||
var before = simulation.Position;
|
||||
var powered = simulation.JetpackEffectVisible && !simulation.Grounded;
|
||||
simulation.Step(input);
|
||||
if (jetpackSmoke && powered)
|
||||
{
|
||||
poweredAirTravel += Vector2.Distance(new(before.X, before.Z), new(simulation.Position.X, simulation.Position.Z));
|
||||
poweredAirTurn |= MathF.Abs(simulation.TurnRate) > 1;
|
||||
}
|
||||
interactions?.UpdateEnergy(simulation.Energy);
|
||||
director?.SyncActor(level!.Player!.Tag!, simulation.ActorRoot, new Vector3(0, simulation.Yaw, 0));
|
||||
director?.Touch(level!.Player!.Tag!, simulation.ActorRoot);
|
||||
@@ -590,7 +603,7 @@ internal static class Program
|
||||
if (!Sdl.SDL_PushEvent(ref key) || !Sdl.SDL_SetWindowSize(window, 800, 600))
|
||||
throw new InvalidOperationException(Sdl.Error);
|
||||
}
|
||||
if (walkSmoke && !headless && count == 1 && !Sdl.SDL_SetWindowSize(window, 800, 600))
|
||||
if ((walkSmoke || jetpackSmoke) && !headless && count == 1 && !Sdl.SDL_SetWindowSize(window, 800, 600))
|
||||
throw new InvalidOperationException(Sdl.Error);
|
||||
if (smoke && count == 1)
|
||||
{
|
||||
@@ -603,7 +616,7 @@ internal static class Program
|
||||
if (!Sdl.SDL_PushEvent(ref cycle)) throw new InvalidOperationException(Sdl.Error);
|
||||
}
|
||||
}
|
||||
if ((smoke || walkSmoke || practiceWindowSmoke) && renderer.Width == 800 && renderer.Height == 600) didResize = true;
|
||||
if ((smoke || walkSmoke || jetpackSmoke || practiceWindowSmoke) && renderer.Width == 800 && renderer.Height == 600) didResize = true;
|
||||
if (frames > 0 && count >= frames) break;
|
||||
if (transitionRequest != null) break;
|
||||
}
|
||||
@@ -621,7 +634,10 @@ internal static class Program
|
||||
if (jetpackSmoke)
|
||||
{
|
||||
Console.WriteLine($"Powered jump: bursts={simulation!.Bursts}, remaining={simulation.JetpackRemaining:F3}, energy={simulation.Energy:F3}, grounded={simulation.Grounded}.");
|
||||
if (simulation.Bursts == 0 || simulation.MaximumRise <= 137.62f || !simulation.Grounded) return 2;
|
||||
Console.WriteLine($"Powered air steering: travel={poweredAirTravel:F2}, turned={poweredAirTurn}.");
|
||||
if (!headless) Console.WriteLine($"Jetpack SDL keys received={sawJetpackKeys == 15}, resize800x600={didResize}.");
|
||||
if (simulation.Bursts == 0 || simulation.MaximumRise <= 137.62f || !simulation.Grounded
|
||||
|| poweredAirTravel <= 20 || !poweredAirTurn || !headless && (sawJetpackKeys != 15 || !didResize)) return 2;
|
||||
}
|
||||
if (director != null)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user