Implement source-backed Scooter vehicle in tutorial and outside
This commit is contained in:
1 parent
8df5e81070
commit
62c07a3d59
44 files changed
+3135
-174
No files matched your search
@@ -133,3 +133,12 @@ range, timing, energy and interruption policy. The selection3 naming overlap is
|
||||
an explicit reason to implement the combined shrink/jetpack controls coherently.
|
||||
Other gadget assets are candidates for later behavior recovery, not evidence that
|
||||
all eight gadget behaviors are currently implemented.
|
||||
|
||||
2026-11-04 Scooter continuation: export_scooter now prepares exact OMT shape0/1,
|
||||
Canv0/1 pixels and HISCOOT/HISCOOTSTOP rider morphs, with source aliases and PE
|
||||
spans in its manifest. Runtime body/wheels/rider preserve source pivots/unit scale;
|
||||
null-material wheel faces remain undrawn. The Goddard HISCOOT alias is separately
|
||||
recovered and is not substituted for the active Jeep mesh. Eight resource groups
|
||||
check exact geometry/UVs/normals/materials/radii/pixels, morph samples/topology,
|
||||
binding instructions, determinism, identity and output isolation. Live status and
|
||||
remaining render/lifetime limits: [scooter-live.md](scooter-live.md).
|
||||
@@ -0,0 +1,169 @@
|
||||
# Live Scooter: VR05 and outside LEV1
|
||||
|
||||
2026-11-04. Supersedes the deferred status in [scooter.md](scooter.md).
|
||||
The user requested normal outside use after the vehicle implementation. Item4
|
||||
now summons an independent C3DJEEP at Goddard; walking into it mounts Jimmy.
|
||||
An owned tile in the normal Tab/Space gadget panel works in both scenes. F1 →
|
||||
Player → Give/Select Scooter supplies the same selection path. Up/primary fire
|
||||
accelerates, Left/Right steers, Down brakes then reverses, jump queues a supported
|
||||
jump, and Tab/Space unequips. There is no invented equip-energy requirement.
|
||||
Other scenes retain the tile/Practice flow without enabling an unsupported body.
|
||||
|
||||
## Source and evidence
|
||||
|
||||
Authoritative EXE SHA256:
|
||||
`f5281076e1a2492f2d61f87aae3f4544b6d0f535ebe33f9fbb6f78710fe1aea8`.
|
||||
Original files remain untouched. The friend's source supplied leads; binary and
|
||||
resource checks against this project's originals determine the contracts.
|
||||
`scooter.py` retains17 spans/13 virtual bindings/10 constants; `scooter_motion.py`
|
||||
adds20 bounded ranges, PE offsets, hashes and relocation operands. The committed
|
||||
`tests/GamePort.ScooterTests/original-motion-reference.json` identifies source,
|
||||
probe generator, generated executable and Wine log, with53 observations. Code
|
||||
addresses below have file offset VA−400000, independently checked by PE mapping.
|
||||
|
||||
| Original VA / file offset | Caller, owner and recovered contract |
|
||||
|---|---|
|
||||
|4211A0 /211A0;464B90 /64B90|Jimmy Init423CE8 lazily constructs6AC-byte Jeep, stored Jimmy+A30. Complete vtable4A2F8C, game+C0 vtable4A2AEC. Radius150, support factor.2, friction.9, suppression1. Explicit464C75 sets prevent-lowering true;464C7D disables bounce.|
|
||||
|4290B7 /290B7|Selection requires enabled Goddard, copies his root/Euler into vehicle, enables/shows vehicle, disables/hides companion. Selecting alone does not mount.|
|
||||
|47B3E0 /7B3E0;47A430 /7A430;422F13 /22F13|Strict quick-magnitude sphere contact invokes Jimmy's interaction dispatcher422D30, identifies C3DJEEP, calls complete1E0→425120, transfers raw owner5099E4, sets rider69C, selects SCOOT.425120 only cancels mode1 jump/effect when eligible.|
|
||||
|412A90 /12A90;468020 /68020|Construct four wheel children, first4 of6 pointer slots578..58C. Local positions (−3,1,73),(3,1,73),(−3,1,−30),(3,1,−30). Mutual wheel/vehicle/passenger exclusions. Wheels have no independent integration/gravity; support queries are manual.|
|
||||
|465830 /65830;421C10 /21C10|Keyboard steering±200dt, cap45, Left precedence; return-to-zero latch. Rear support required for throttle/reverse. Accel700, brake1200, maximum1485, reverse−594. Down's first edge brakes; held reverse additionally waits through the source one-second timer branch. No sprint predicate.|
|
||||
|465220 /65220|Counts prior child supports, applies yaw only with front contacts/horizontal motion, coasting/steer/slope terms, then full-velocity/forward mixing only with parent support and≥2 child supports. Direction sum is intentionally not renormalized. Scalar, velocity and pending impulse are distinct state.|
|
||||
|421910 /21910;467000 /67000;4669F0 /669F0|Head-on contact with horizontal quick speed>20 and abs(forward·normal)≥.9 starts impact: speed/acceleration0. No bounce reflection. Four-second enabled-body state damps horizontal velocity/angular velocity, then clears them. Glancing positive-speed throttle applies source minimum230, even if it raises a slow scalar.|
|
||||
|473770 /73770;412F90 /12F90;467080 /67080|Post-normal registry phase sets roll=−steering/2, manually queries each wheel's real support, clamps local suspension±15, spins from horizontal travel/radius, then synchronizes visuals. Radius23.769514 from OMT shape1 header. Wheels do not fabricate support from the parent.|
|
||||
|476FF0 /76FF0;466AF0 /66AF0;473320 /73320|Stored support normal→signed14-bit angle components→yaw-rotated pitch/roll. The target yaw is overwritten with live yaw. Source full AddEuler normalizes all axes during drive. Facing uses shortest delta, rate*dt and strict small-step snap. No contacts selects pitch340/rate2; unmounted sets rate10.|
|
||||
|421580 /21580|Mounted jump latch queues Y700; float pose clock strictly exceeds double.3 before selecting SCOOTSTOP for signed speed<10, otherwise SCOOT. Jimmy copies root/Euler before the later wheel/lean phase.|
|
||||
|4130A0 /130A0|Default mode1 eye uses rotated(−30,0,−200)+worldY50, quick-distance gains1/1.7/2.8, smoothing before clipping, new-eye quantized aim toward rotated(0,50,100). Impact retains eyeY, approaches rootXZ at.3dt and aims at root.413870 explicitly passes edges=false.|
|
||||
|413852 /13852;47B4B0 /7B4B0|Camera resets nearest face distance130000 only, inherits edge/contact state, clips from vehicle root with cube75's sphere radius64.9519043. Ordinary body initializes its own sphere context; no invented camera sweep.|
|
||||
|412ED0 /12ED0|Enabled/visible vehicle starts loop SFX46 and retains base sample frequency. Pitch=max(7000,trunc(base+signedSpeed*(1/1.9)*51)). Parked vehicle also sounds; cleanup stops it.|
|
||||
|4281B3 /281B3;457FF7 /57FF7|Selected cleanup restores eligible Goddard at vehicle root/Euler, disables/hides vehicle, stops engine. Mounted branch restores Jimmy raw control, raises root40, clears acceleration/live velocity, preserves movement mode/pending impulse. RETURN explicitly invokes cleanup before requesting transition.|
|
||||
|
||||
Vehicle complete offsets:600/602/604 front/rear/total support WORDs;610/618/620/
|
||||
628 acceleration/brake/base/current maximum;61C prior scalar;63C angle;640 yaw
|
||||
rate;648 brake timer;64C impact timer;650/654 camera modes;658/659 throttle/brake;
|
||||
65C impact;65D/65F keyboard/reverse latch;690/694 engine channel/base frequency;
|
||||
698 jump latch;69C rider;6A0 pose clock. Full source structures remain partial.
|
||||
|
||||
REA/Ghidra12.1.4 evidence is retained under artifacts/scooter-{wheels,assets,
|
||||
lifecycle,motion}-live, including complete replies, exports and closed snapshots.
|
||||
Important Evidence IDs:
|
||||
|
||||
-465220 `ev_09ecf350c8705d5f9c1da5b444eb8cd027f64f4859713b29c9d04bc4c55c2bc8`;
|
||||
465830 `ev_dbb6ac283387e14f08d527a750c14af44c52ed80c612c40393a5434a16589916`.
|
||||
-467080 `ev_3e6bc2c29886888f3d70087b38b7a8b933d70394908f0328e1a3032a39cd9077`;
|
||||
468020 `ev_2bbed17bcf63926b0ed8202ebf6d7320bf49ddb5bc4427a541c2bff4e448e84b`;
|
||||
4682A0 `ev_f083ee63317f9d4d999b16da31c770e0f5c0517caebf73ba53e8769bc4ee7699`.
|
||||
-4213F0 `ev_4ef0cec31d2f339f8e10213acabaa71f0fee3f7c6c96f278f691947616dbaa22`;
|
||||
422AC0 `ev_a689f8970de2072f0e2b18babfa9f20c9aa9824a37acdb76c158218d4b85d992`;
|
||||
477550 `ev_d44b004b6fe8045d4f9592712cda51bcb3cfb331d58980493bd7ced707d68150`.
|
||||
-476FF0 `ev_9d38be2acca1063e7d91783adc0e928f9f9128cfb9031e258eaa51e94f0adfa1`;
|
||||
467990 `ev_c4db605fd549572edcee03e01e5c0026ba856ad5ad0016678fd1ca2902e5610b`.
|
||||
|
||||
Some selectors, including4130A0/422D30/466AF0, were not recognized as complete
|
||||
procedures. Saved instructions and callers fill those bounded gaps; no successful
|
||||
decompilation is attributed to them. x87 aliases in465220/476FF0 are unreliable;
|
||||
assembly plus copied-original numeric execution resolves arithmetic. No unchanged
|
||||
failed selector was retried. Profile identity and exact metadata remain in the
|
||||
saved REA bundles.
|
||||
|
||||
## Implementation and ownership
|
||||
|
||||
`Scooter` owns vehicle body, previous wheel contacts, input latches, impact/pose
|
||||
clocks and shared-camera history. `ScooterMotion`, `ScooterWheels` and
|
||||
`ScooterCamera` isolate the recovered formulas. `PlayerSceneBinding` steps body
|
||||
before input, tests contact after Jimmy's independent physics, transfers ownership,
|
||||
steps vehicle frame, copies passenger transform, then steps wheel phase. Fresh/
|
||||
retained input order follows the existing player registration-order switch.
|
||||
Raw control loss alone does not teardown; named-Jimmy CAM/MCA/RETURN cleanup does.
|
||||
`SceneInteractions` accepts vehicle-owned pickups and coincident Jimmy LOAD, with
|
||||
separate radii150/60. Excluded wheel/passenger pair callbacks are not dispatched.
|
||||
General dynamic pair discovery remains unimplemented. Provisional moving-door
|
||||
response is an explicitly inherited modern adapter.
|
||||
|
||||
Source PostLoad41E0F9 places active-follow Goddard250 behind Jimmy when a ray is
|
||||
clear; retained STRT placement4239EC and RETURN423AE3 remain separate source paths.
|
||||
The port creates the owned companion in VR05/LEV1 before runtime bindings and uses
|
||||
behind250 or STRT fallback. Its opt-in state4 follow subset uses408E40/408BC0
|
||||
velocity/arrival hysteresis and41E303 speed450/600 plus far warp1500→behind800.
|
||||
It retains the existing provisional NPC body and heading/animation bridge; this
|
||||
is not full Goddard AI. Lab patrol behavior is unchanged. Modern R reset releases
|
||||
selection, clears vehicle state and restores the companion near the start. F3
|
||||
releases it before noclip. Modern scene teardown disposes the engine before audio.
|
||||
Vehicle/wheel allocation is scene-local; arbitrary non-RETURN persistence and
|
||||
full retained-source reconstruction are unresolved, not silently claimed exact.
|
||||
|
||||
`ScooterVisuals` uses source-pivot, unit-scale scooter.omt shape0 and four shape1
|
||||
wheels. Null-material faces remain undrawn (DLL1003756C), rather than invented
|
||||
white caps. Exact original canvases are exported. HISCOOT and HISCOOTSTOP bind
|
||||
jimscooter/Jimscooterstop morphs, with jimstop topology and original opaque Jimmy
|
||||
atlas; the rider uses the Euler copied before wheel lean. godscooter.ASE is a
|
||||
separate Goddard transformation resource, not the active vehicle shape.421535→
|
||||
477550 makes the source shape unlit; there is no impact scale change.
|
||||
|
||||
## Verification and unresolved questions
|
||||
|
||||
-53 copied-original Wine32 component observations match managed formulas:22 drive,
|
||||
9 input,8 normal→Euler (unused output yaw excluded),3 facing,7 wall and4 impact.
|
||||
Harness supplies synthetic base actor/camera/audio/wheel support and original
|
||||
OMT vector/trig. It never runs the original game entrypoint. Source quarter-turn
|
||||
table sin=1/cos=0 is observed, explaining exact cardinal terrain endpoints.
|
||||
-11 managed integration groups use real VR05/LEV1 data: ordinary outside tile,
|
||||
summon/contact mount, body/wheels, drive/steer/brake/jump/no energy debit,
|
||||
actual front-door wall and four-second recovery, default/impact camera math,
|
||||
dismount40/companion/audio, named cleanup/noclip/reset, actual RETURN and visual
|
||||
repeat/hide, plus follow/freeze/warp/reset of the companion. Front-door +Z driving hits the house steps, correctly entering impact.
|
||||
-The original OMT cube probe observed75→bounds±37.5/radius64.9519043 with false
|
||||
flag before a later unrelated true-flag call faulted. That diagnostic run was
|
||||
not a clean complete camera probe; full camera execution is not claimed.
|
||||
-Source guards and exact-resource exporter checks run through scripts/test.sh.
|
||||
Runtime replay/build/package results are recorded below after verification.
|
||||
|
||||
Remaining: original whole-game comparison and native Windows play; mouse/analog
|
||||
input and camera modes2..20; special cutscene camera helpers; scene-wide shared
|
||||
collision globals including Jimmy/vehicle/other body ordering; general dynamic
|
||||
pairs, mission/hazard callbacks and other levels; exact Goddard body/animation;
|
||||
full retained vehicle/wheel/helper lifetime and save/load; render/cadence/pivot
|
||||
parity. Jimmy's lab/outside capsule remains parked; Scooter uses its independent
|
||||
source static body and does not bypass special Jimmy policies. Fixed60Hz and
|
||||
modern wide UI are explicit port policies. Dummy audio verifies transport and
|
||||
lifecycle, not speakers or audible pitch quality.
|
||||
|
||||
## Port replay evidence
|
||||
|
||||
Headless llvmpipe1280×720 and native Linux GTX1070/private Xvfb1920×1080
|
||||
pass10 render phases in both VR05 and LEV1: summon, contact mount, drive, steer,
|
||||
brake/jump, dismount, remount, named cleanup, noclip and reset. All seven injected
|
||||
SDL keys are received; Vulkan validation is enabled with zero errors. The outside
|
||||
replay explicitly uses authored school1 and turns away from obstacles; front-door
|
||||
head-on behavior is covered separately by the actual-geometry managed test.
|
||||
248 extra player/vehicle/interactions/director ticks reuse received input, without
|
||||
root/speed/timer seeding. Companion/patrol and HUD clocks are not included in those
|
||||
extra fixture ticks; this is not a source cadence or manual tutorial-completion
|
||||
claim. Final native R exercises the real reset command; the headless fixture calls
|
||||
the bounded reset helpers directly. Logs: artifacts/scooter-{vr05,outside}{,-window}.log;
|
||||
stage captures share those prefixes. Images were inspected, including source
|
||||
rider/body/wheels and the full32-row2560×1080 Player page.
|
||||
|
||||
From GamePort, `source scripts/env.sh`, then:
|
||||
|
||||
```
|
||||
dotnet run --project tests/GamePort.ScooterTests
|
||||
dotnet run -- --scene artifacts/extracted/VR05/scene.json --level gam/VR05.gam \
|
||||
--smoke-scooter --headless --screenshot artifacts/scooter-check.ppm
|
||||
dotnet run --no-build -- --scene artifacts/extracted/level1/scene.json \
|
||||
--level gam/level1.gam --start school1 --smoke-scooter --headless
|
||||
```
|
||||
|
||||
For native SDL replay omit --headless and add `--width 1920 --height 1080`. Set SDL_AUDIODRIVER=dummy only when hardware output is
|
||||
unavailable. The audio replay executes SDL frequency-ratio calls and cleanup;
|
||||
audible behavior and native Windows playback remain unverified.
|
||||
|
||||
Final regression: scripts/test.sh exits0 (artifacts/scooter-final-tests.log):303
|
||||
Python tests plus2 separate HUD checks, all managed suites,36 main GPU completions
|
||||
with zero enabled Vulkan validation errors,17 material readback checks, route/
|
||||
checkpoint/transition/animation and SDL dummy audio checks. All539 originals
|
||||
verify unchanged. The later companion-active guard and first-engine-frame frequency
|
||||
ordering were verified by the final11-group Scooter and10-group Patrol runs;
|
||||
source guards and final .NET10 build pass. The build retains the existing NU1900
|
||||
unavailable vulnerability-metadata warning; there are no compilation errors.
|
||||
Native Windows runtime and original whole-game comparison are still pending.
|
||||
@@ -1,4 +1,7 @@
|
||||
# Scooter: separate vehicle and deferred implementation
|
||||
# Scooter: original static checkpoint (historical)
|
||||
|
||||
Current implementation and corrected contracts: [scooter-live.md](scooter-live.md).
|
||||
The following records the earlier evidence boundary.
|
||||
|
||||
2026-11-02. Static source recovery only; **no live Scooter implementation or
|
||||
original gameplay verification**. User parked broad collision. Scooter cannot
|
||||
|
||||
Reference in new issue
Block a user