Compare commits

...
2 Commits
Author SHA1 Message Date
UnixNight 3794439d4e Record pair-contract package verification 2026-11-06 19:10:04 -05:00
UnixNight 924ad2f67b Recover ordered physical pair collision lifecycle 2026-11-06 19:07:09 -05:00
17 changed files with 850 additions and 1 deletions

No files matched your search

+9
View File
@@ -49,6 +49,15 @@ The broader priority remains Jimmy movement stabilization, with gadgets paused.
JN-Engine native/Godot movement. Use its original decompiler index only as leads, JN-Engine native/Godot movement. Use its original decompiler index only as leads,
verified with REA/authoritative originals. See docs/gameplay/jimmy-movement-stabilization.md. verified with REA/authoritative originals. See docs/gameplay/jimmy-movement-stabilization.md.
Pair continuation: docs/checkpoint/pair-lifecycle.md records28 complete original/
C# cases and20 VR04 class bindings. OriginalPairCollision is a bounded component,
not live scene admission. Next recover full physical registration/activation and
helpers, real actor responses and shared dynamic reclip before replacing existing
collision. Gated pairs retain contacts; sphere exclusions use the earlier actor.
Both packages identify clean924ad2f; standalone Linux Carl return passes with4
readbacks identical to ea04210. Current Windows is cross-published/resource-
verified; earlier Wine64 runtime evidence belongs to ea04210, native Windows open.
2026-11-06 continuation: the earlier292 original component cases plus50 derived- 2026-11-06 continuation: the earlier292 original component cases plus50 derived-
caller cases and body/visual-sync audit supply no extra reset. Startup diagnostics caller cases and body/visual-sync audit supply no extra reset. Startup diagnostics
now observe backgroundLevel1D/Jimmy allocation after an explicit OS repaint now observe backgroundLevel1D/Jimmy allocation after an explicit OS repaint
+6
View File
@@ -93,6 +93,12 @@ composes that static path for ordinary Jimmy flags/contacts and is used in VR04;
the live bridge supplies zero angular velocity, variable source radius60/100 and the live bridge supplies zero angular velocity, variable source radius60/100 and
separate published160 speed. Lab/outside retain the capsule. Special callbacks, separate published160 speed. Lab/outside retain the capsule. Special callbacks,
other original actor pair eligibility and shared dynamic reclipping remain gated. other original actor pair eligibility and shared dynamic reclipping remain gated.
`OriginalPairCollision` now expresses47A430's ordered physical-list pass and
47B3E0's sphere/exclusion query. It takes live actor callbacks and an explicit
mode2 solver, and preserves contacts when eligibility skips a pair.28 complete
original-component comparisons support it. It is not connected to the grouped
SceneInteractions loop: full registration/activation, real actor responses and
shared dynamic reclip state remain prerequisites. See checkpoint/pair-lifecycle.md.
Source root and modern feet/sole rendering are distinct adapters; F3 exit still Source root and modern feet/sole rendering are distinct adapters; F3 exit still
uses modern capsule occupancy. See checkpoint/collision-body-implementation.md. uses modern capsule occupancy. See checkpoint/collision-body-implementation.md.
The source-root upward ray is supplied separately from the camera debug query: The source-root upward ray is supplied separately from the camera debug query:
+7 -1
View File
@@ -61,13 +61,19 @@ payload ordering.100 new complete original comparisons and six callback-state
comparisons pass. Special callback mechanics, actor mode persistence and scene-wide comparisons pass. Special callback mechanics, actor mode persistence and scene-wide
dynamic/shared context remain separate gates; lab/outside capsule is preserved. dynamic/shared context remain separate gates; lab/outside capsule is preserved.
[Ordered pair lifecycle](pair-lifecycle.md) adds28 complete original/C# component
comparisons: physical-list pair order, one-sided sphere exclusions, gate retention,
callback-mutated roots/membership and enter/stay/leave. The component has explicit
mode2 injection and is not admitted to live scenes. VR04's6 inspected actor records
and20 bindings do not yet constitute the full physical/helper registration list.
| ID / system | Recovered contract / anchors | Port implementation | Evidence / remaining gap | Next bounded action | | ID / system | Recovered contract / anchors | Port implementation | Evidence / remaining gap | Next bounded action |
|---|---|---|---|---| |---|---|---|---|---|
| LOOP | Viewport47E4F0 physics before registry473740, including input44DF80; second sync473770; construction order and selective retained-character/new-game ordering. Separate engine morph clock. | Player now integrates prior body state, then fresh input/player/fire or retained player/fire/input. Uncontrolled body/fire now continue while movement/input are gated. Other systems remain grouped; fixed60Hz policy. | S/M/R. Controlled player partial order implemented; bounded raw-owner preparation implemented; full wrapper/registry/cadence open. | C3 continue other callbacks and morph/control phases; C4 support/response remains separate. | | LOOP | Viewport47E4F0 physics before registry473740, including input44DF80; second sync473770; construction order and selective retained-character/new-game ordering. Separate engine morph clock. | Player now integrates prior body state, then fresh input/player/fire or retained player/fire/input. Uncontrolled body/fire now continue while movement/input are gated. Other systems remain grouped; fixed60Hz policy. | S/M/R. Controlled player partial order implemented; bounded raw-owner preparation implemented; full wrapper/registry/cadence open. | C3 continue other callbacks and morph/control phases; C4 support/response remains separate. |
| INPUT | Game interface+8C slot3C4→44DF80→475A70 reads controlled5099E4 and calls3CC; Jimmy interface+C0→426030. | SDL arrows/jump aliases; control gate, modern debug override; mouse/controller incomplete. | S/M/R, user Windows route. Input occurs in object traversal after physics; device sampling/focus and latency open. | Trace event pump, key/mouse and focus gates alongside retained registry order. | | INPUT | Game interface+8C slot3C4→44DF80→475A70 reads controlled5099E4 and calls3CC; Jimmy interface+C0→426030. | SDL arrows/jump aliases; control gate, modern debug override; mouse/controller incomplete. | S/M/R, user Windows route. Input occurs in object traversal after physics; device sampling/focus and latency open. | Trace event pump, key/mouse and focus gates alongside retained registry order. |
| MOVE |437940/439900 ground/air;479D20 impulse→acceleration→gravity; authored114→26C body speed separate from controller608. | Body/fire continue without control; input/controller gated. VR04 uses ordinary source static body and variable radius; lab/outside capsule retained. Fresh/retained order and overhead wrapper explicit. | S/P/M/R. Source body references/phase checks and native VR04 flight pass; complete registry/base/transform/cadence open. | Continue dynamic/special C4 contracts and C3 base transforms; preserve published speed ownership across preparation/Init. | | MOVE |437940/439900 ground/air;479D20 impulse→acceleration→gravity; authored114→26C body speed separate from controller608. | Body/fire continue without control; input/controller gated. VR04 uses ordinary source static body and variable radius; lab/outside capsule retained. Fresh/retained order and overhead wrapper explicit. | S/P/M/R. Source body references/phase checks and native VR04 flight pass; complete registry/base/transform/cadence open. | Continue dynamic/special C4 contracts and C3 base transforms; preserve published speed ownership across preparation/Init. |
| JET |437F90 controller;421FB0 effect; fresh constructor order places fire after Jimmy, both after global physics. States0..5, hold>.4,8s, energy. | Explicit state table with post-collision effect ticking and VR immunity. | S/M/R. Fresh same-pass countdown recovered; retained child lifecycle, sound and expiry→animation open. | Trace retained Jimmy/fire resets and phase end events before scheduler integration. | | JET |437F90 controller;421FB0 effect; fresh constructor order places fire after Jimmy, both after global physics. States0..5, hold>.4,8s, energy. | Explicit state table with post-collision effect ticking and VR immunity. | S/M/R. Fresh same-pass countdown recovered; retained child lifecycle, sound and expiry→animation open. | Trace retained Jimmy/fire resets and phase end events before scheduler integration. |
| COLL |479D20/47BD80 body;47B4B0 FIFO grid/retries;370/374/37C; signed material IDs; separate160 friction; radius60/100 and support/suppression. | VR04 uses ordinary source static body/support/friction; lab/outside keep24-unit capsule. Root+150 wrapper live for route. Dynamic response remains provisional. | S/P/M/R. Ten original kernel, seven dispatcher, ten body references matched in managed composition;20 body groups and native/headless VR04 replay. Special/dynamic classes and visual transform open. | C4: recover original actor physical/pair eligibility and shared dynamic context; lab/outside need160/164/FENCE/LADDER before solver expansion. | | COLL |479D20/47BD80 body;47B4B0 FIFO grid/retries;370/374/37C; signed materials/friction; radius60/100;47A430 ordered pairs/47CA90 one-sided sphere exclusions. | VR04 uses ordinary source static body; lab/outside keep24-unit capsule.28-case pair component remains separate; live dynamic response provisional. | S/P/M/R. Prior kernel/dispatcher/body comparisons and native VR04 pass;28 complete pair observations now match. Real actor callbacks, full physical list and shared reclip remain open. | C4: complete VR04 physical registration/activation/helpers, then shared dynamic context; lab/outside need160/164/FENCE/LADDER before solver expansion. |
| ANIM | Engine morph10002DB0; linear interpolation10002F9A; game logical→OMT sync4624B0. | ASE sample timing, unconditional loop closure, pose/action aliases,1/60 advance. | S/P/M/R. Playback flags, rate, completion callbacks, transition order open. | Recover one-shot/loop/end notifications before more aliases. | | ANIM | Engine morph10002DB0; linear interpolation10002F9A; game logical→OMT sync4624B0. | ASE sample timing, unconditional loop closure, pose/action aliases,1/60 advance. | S/P/M/R. Playback flags, rate, completion callbacks, transition order open. | Recover one-shot/loop/end notifications before more aliases. |
| SCRIPT | Source AI/CAM/MCA dispatch and chains; task45F990 objective406F50 BEFORE records BEFORE per-entity424. | Pre-assignment objective selection and per-actor Carl override implemented; bounded synchronous director. | S/M/R. Script callbacks recovered for route; generic class coverage and reentrancy incomplete. | Continue other class-specific callbacks and reentrancy under the recovered owner/phase boundaries. | | SCRIPT | Source AI/CAM/MCA dispatch and chains; task45F990 objective406F50 BEFORE records BEFORE per-entity424. | Pre-assignment objective selection and per-actor Carl override implemented; bounded synchronous director. | S/M/R. Script callbacks recovered for route; generic class coverage and reentrancy incomplete. | Continue other class-specific callbacks and reentrancy under the recovered owner/phase boundaries. |
| CONTROL | Global5099E4 null during valid CAM/MCA; PlayerControlled completion target; DEFAULT447D..447F restores camera/UI/music. | Director raw ownership plus explicit debug effective override; eligible player body/fire continue; only input/controller tail is gated. | S/M/R. Raw/effective control and ordered preparation are implemented; full base/class wrappers and scheduler remain incomplete. | Continue full wrapper/base and collision contact phases around deferred LOAD. | | CONTROL | Global5099E4 null during valid CAM/MCA; PlayerControlled completion target; DEFAULT447D..447F restores camera/UI/music. | Director raw ownership plus explicit debug effective override; eligible player body/fire continue; only input/controller tail is gated. | S/M/R. Raw/effective control and ordered preparation are implemented; full base/class wrappers and scheduler remain incomplete. | Continue full wrapper/base and collision contact phases around deferred LOAD. |
+5
View File
@@ -23,6 +23,11 @@ Windows comparison remains a step5 obligation, not a completed claim. Step4's
derived-caller/body-transform investigation is also recorded, with broader derived-caller/body-transform investigation is also recorded, with broader
dynamic/special contacts and playback dependencies still open. dynamic/special contacts and playback dependencies still open.
Step4 continuation: [ordered pair lifecycle](pair-lifecycle.md) now has28 complete
original/C# comparisons,6 new REA pseudocode results and20 guarded VR04 class
bindings. The pair component is verified separately; scene admission remains
gated on full physical registration/activation, real callbacks and shared reclip.
## Objective ## Objective
Establish the original ownership and timing of player state across gameplay, Establish the original ownership and timing of player state across gameplay,
+172
View File
@@ -0,0 +1,172 @@
# Physical pair ordering and contact lifecycle
2026-11-06. Continues step4 of the movement plan after the Carl story-entry fix.
This closes a bounded pair-dispatch contract. It does not admit new live scene
physics, implement special Jimmy terrain callbacks or establish whole-game fidelity.
## Recovered source and structures
Canonical Neutron.exe SHA256:
`f5281076e1a2492f2d61f87aae3f4544b6d0f535ebe33f9fbb6f78710fe1aea8`.
`tools/binary/pair_lifecycle.py` guards8 complete source ranges and20 virtual
bindings, records PE file offsets and retains the matching original instruction
Evidence `ev_0d64cc58fa8f5573fc8e61e0f2c20e36288099212bd2257d3a3121361fd6c904`.
The generated probe relocates11 explicit absolute operands in private memory.
The supplied originals are read only; the executable entry point is not invoked.
New local REA/Ghidra pseudocode Evidence:
| Original VA / file offset | Role | Evidence ID suffix (all prefixed `ev_`) |
|---|---|---|
|479BC0 /79BC0|Physics scheduler; nonzero seconds, body pass then pair pass|56b7e074ec8509d1c5b3576d02361ff051963b777d7ccb8259ed9c65dc2db52f|
|47A430 /7A430|Ordered pair eligibility and notifications|8756a4c51d0c9215d3a36b86b673a2529bf74ed86bb9dcf630f66cbc398259b3|
|47B3E0 /7B3E0|Strict root-sphere overlap and callbacks|b98a1806c11507d5105d6fb22e259efafd141fe3c862eb4bb6602468a93a658d|
|47CA90 /7CA90|Earlier body's exclusion list|3f2613369c1259cba7aadfc00b7383dbf7bd37def7085f003daf81802dddbc4e|
|470B20 /70B20|Base leave, optional wake, contact removal|ae39adff84ac253cd370a2fd3f04ee7e9c00a6a6210d4f0222e938103a114d72|
|470BC0 /70BC0|Base stay/game callback cache|c3f377c29e0818cb43ed7bcc58d4db3871ab34d1b54c329421591438b79f0d00|
Complete replies/export and closed snapshot: `artifacts/pair-lifecycle/rea/`.
Ghidra did not recognize470A60/470BF0 as requested procedures; error replies are
retained. Its47B3E0 pseudocode misidentifies the first argument as a return-address
value. Calling convention, stack arguments and the omitted leaf bodies therefore
use guarded instructions plus actual copied-code execution, not that pseudocode.
No repeated query is presented as successful decompilation of those two leaves.
The physical list at695D3C is a circular sentinel list of12-byte nodes:
next+0, previous+4, game-interface pointer+8. This differs from the ordinary update
registry50999C. Re-registration and repeated Init are documented separately in
[body registration](body-root-registration.md).
Each actor owns contact-list sentinel pointer+260/count+264 and exclusion-list
sentinel pointer+254. These are interface-relative fields, not radius slot260.
Base contact game-callback result caches are+408 enter,+40C stay,+410 leave.
## State transitions and ordering
- Viewport47E554 calls479BC0 before ordinary registry updates. Nonzero delta and
global4F69E7 admit body integration479D20 followed by47A430. Pair global4F69E4
gates the latter independently; raw control5099E4 is not queried here.
- 47A430 traverses each earlier physical node against itself and subsequent nodes.
Identical actor pointers are skipped, with no reverse pair traversal. A duplicate
physical node can cause another test of the same actor pair; it is not deduplicated.
- Own220 is sampled once at the outer boundary; each inner actor's220 is read
again. Mutual3A0 permissions follow. Rejected flags/permissions skip the pair
**without removing stored contacts or emitting leave**. An outer actor disabled
by its first enter callback can still contact later actors in that traversal.
- First actor mode178=2 selects47A5E0(first,second); otherwise second mode2
selects47A5E0(second,first). Both mode2 preserves first-first selection. Other
modes use47B3E0(first,second). Box geometry is a distinct contract.
- Sphere query reads second root, first root, both radii and quick_magnitude.
Contact requires strict distance<radius sum. Tangency is separation.47CA90
checks **only the earlier actor's exclusion list**, after the distance test;
the later actor's exclusions are not consulted by this sphere query.
- Successful sphere query invokes first4C then second4C before notifications,
retaining the computed distance/result. A response may change a live root;
the current pair still notifies, while later pairs read the changed root.
- Each side independently queries membership3C. Positive overlap gives enter40
when absent, stay48 when present; separation gives leave44 only when present.
The first notification can alter the second side's membership before its query.
- Actual470A90 adds a contact unless already present or own deletion byte+6 is set.
Actual470B20 optionally restores live integration214 when own210 is false and
authoredB4 true, then removes matching nodes.470BC0 does not change membership.
These base routines can request current-game callbacks when their cache is−1.
- 470BF0 uses the **other** actor's1E0 inhibition flag. If clear, own integration210
permits414 response; a separate own1F8 branch may call60. Sleeping bodies can
still enter/stay contact. The probe leaves1F8 false; full response60 remains open.
## Original component execution and C# comparison
The native probe executes the complete pair pass, sphere/exclusion queries and
base membership/enter/stay/leave/overlap routines in a hash-verified generated
copy. Quick magnitude uses the copied OMT DLL export. Actors, vtables, permission
getters, response414 mutations, allocation/free and box query results are explicit
fixture adapters. No real Jimmy constructor, actor AI/contact consumer, static
world reclip, original renderer or scene loader executes.
All28 cases pass under isolated Wine32 with no network or Original-directory mount.
Cases cover enter/stay/tangency/leave/reentry, wake-on-leave, earlier/later/reordered
exclusions, gate retention, three-actor order, callback root/flag/membership changes,
duplicate identity, response inhibition, sleeping bodies and mode2 dispatch.
Initial12s capture expired during prefix creation; a reused scalar-only prefix
could not load OMT (error126, missing Wine DLLs). Both failures are retained.
The successful run uses a copied initialized OMT-capable prefix; it is component
evidence, not native Windows or whole-original gameplay verification.
`OriginalPairCollision` now translates the ordered pass and sphere query with
live actor callbacks and explicit mode2 injection. It is intentionally **not
wired into SceneInteractions or LabSimulation**. A stable physical list is required;
callback insertion/removal of list nodes is not yet reproduced by this component.
Base actor callback implementation remains the consumer's responsibility.
`GamePort.PairLifecycleTests` compares all28 native callback traces, contact masks,
integration/enabled flags and root-X snapshots. Fixed copies of those finite
expectations also run without generated artifacts. All28 complete comparisons pass.
The fixture's synthetic base-callback behavior is not a complete actor implementation.
The optional test rejects mode2 without an explicit solver instead of substituting
the provisional capsule. Existing lookup-table/x87 precision limitations remain;
these sphere fixtures use axis distances, not a proof of all boundary arithmetic.
Reproduce locally:
```sh
python3 tools/binary/pair_lifecycle.py ../Original \
--output artifacts/pair-lifecycle/native \
--rea artifacts/jimmy-movement-audit/rea-original-disassembly.json
i686-w64-mingw32-gcc -O0 -Wall -Wextra -Wno-unused-function \
-o artifacts/pair-lifecycle/native/probe.exe \
artifacts/pair-lifecycle/native/pair_lifecycle_probe.c
python3 tools/recon/reference_capture.py --asset-probe \
--probe-executable artifacts/pair-lifecycle/native/probe.exe \
--probe-success PAIR_LIFECYCLE_COMPLETE --seconds 12 \
--output artifacts/pair-lifecycle/probe
python3 tools/binary/pair_lifecycle.py ../Original \
--output artifacts/pair-lifecycle/native --capture artifacts/pair-lifecycle/probe
source scripts/env.sh
dotnet run --project tests/GamePort.PairLifecycleTests -- \
--native artifacts/pair-lifecycle/native/observations.json
```
Use an initialized OMT-capable generated Wine32 prefix for the12s capture.
`source.json` records identities/ranges/bindings; `observations.json` hashes the
capture, executable and generated source. The capture verifier checks EXE/DLL copy
hashes and observed probe identity. All generated evidence remains local.
## Integration and package verification
All338 Python tests pass, including2 new source/corpus checks. The28-case native
comparison and saved-reference replay pass; existing10 dynamic collision groups,
body-ownership and Director regressions pass. Debug build has zero warnings/errors.
Windows x64 cross-publish succeeds; its initial normal restore reports NU1900 for
unavailable vulnerability metadata. Clean packaging disables that metadata query.
Both packages identify clean source commit924ad2f67b5a2c3c90856366b0642c12da56d59e.
Each contains519 byte-identical original copies,4285 matching prepared scene files
and7 matching prepared audio files; DLLs match the corresponding publish outputs.
Standalone Linux from /tmp without SDK/development-library paths passes Carl first
neutral input/300 idle ticks/held-input return. All4 captures match the previous
ea04210 package exactly. This run disables optional Vulkan validation; prior
enabled-validation evidence remains separate. No new Windows runtime or whole-
original gameplay result is inferred. All539 originals remain unchanged.
Logs and hashes: artifacts/pair-lifecycle/validation.json, package-identity.json,
package-readbacks.json and package-control.log.
## VR04 eligibility coverage and next gate
Actual VR04 GAM contains Jimmy, Rocketship,3 YokianSoldiers and trophy among its
records. Their4 class game tables bind220→471A30, mode178→471720,
permission3A0→472F80 (unconditional true), overlap4C→470BF0 and210→4719F0.
The3 soldier records explicitly request HasCollision1. Guard output retains their
GAM offsets, tags, task/activation fields and20 common bindings. This removes any
basis for treating their class permission callback as a blanket exclusion.
It does **not** establish the complete physical list: other GAM classes, generated
children/helpers, task activation, constructors, exclusions, registration and live
flags still matter. Visibility and raw-control ownership cannot substitute for
that inventory. SceneInteractions currently groups selected player contacts after
player processing; its single contact set, active/control gates and immediate talk
dispatch are still approximations of these independent owners/phases.
Next: trace actual VR04 physical registration/activation and generated children,
then recover shared nearest/last-polygon dynamic reclip ownership. Recover real
Jimmy material160/164/FENCE/LADDER callbacks and persistent body/animation state
before enabling source physics in lab/outside. Keep ea04210 readbacks as the
comparison baseline; current clean924ad2f packages preserve that live route.
+16
View File
@@ -1,5 +1,21 @@
# Compatibility and validation # Compatibility and validation
2026-11-06 pair lifecycle checkpoint:28 copied-original pair/sphere/exclusion/
base-contact cases match the C# dispatch component's complete callbacks, contact
masks, integration/enabled flags and roots. Fixed reference tests also pass without
local traces. Actors, response hooks and box results are synthetic adapters;
mode2 geometry, whole original and native Windows behavior are not established.
The component is not admitted to live gameplay. All338 Python tests, targeted
dynamic/body-ownership/Director checks and Debug build pass; Windows cross-publish
succeeds with a NU1900 vulnerability-metadata warning.539 originals are unchanged.
See [pair contract](checkpoint/pair-lifecycle.md). Both packages identify clean
924ad2f, with519 exact original copies,4285 matching scene files and7 matching
prepared audio files each. Standalone Linux from /tmp without SDK/development
library paths passes the Carl control replay with4 readbacks identical to ea04210.
That run disables validation; no new enabled-validation claim is made. The current
Windows package is cross-published/resource-verified; the earlier Wine64 evidence
belongs to ea04210 and native Windows testing remains pending.
2026-11-06 TSK startup correction: the original menu creates backgroundLevel1D/ 2026-11-06 TSK startup correction: the original menu creates backgroundLevel1D/
Jimmy before successful TSK story entry, then retains that player ahead of the Jimmy before successful TSK story entry, then retains that player ahead of the
new level-game input callback. Program now models this on first story entry as new level-game input callback. Program now models this on first story entry as
+10
View File
@@ -384,3 +384,13 @@ assets and generated packages stay excluded.
republishes−10° bank; corrected startup order stays upright through300 idle republishes−10° bank; corrected startup order stays upright through300 idle
ticks. Original runtime/native Windows comparison remains distinct. See ticks. Original runtime/native Windows comparison remains distinct. See
gameplay/main-menu-player-lifetime.md. gameplay/main-menu-player-lifetime.md.
55. **Retain source pair ownership before admitting a replacement scene loop.**
47A430 uses physical registration order, live callbacks and eligibility gates
that preserve old contacts. Sphere47CA90 checks only the earlier actor's
exclusions; successful responses precede independent membership notifications.
The28-case original/C# component implements that bounded contract with an
explicit box solver. Keep it outside live gameplay until full registration,
real actor callbacks and shared reclip dependencies close. Render visibility
and raw-control flags are not substitutes for physical eligibility. See
checkpoint/pair-lifecycle.md.
+26
View File
@@ -7,6 +7,32 @@ Next-work plan: [recover interactions, then implement verified changes](checkpoi
It defines the Carl source/differential gate, the bounded implementation step, It defines the Carl source/differential gate, the bounded implementation step,
movement/contact/animation recovery and the end-to-end platform checkpoint. movement/contact/animation recovery and the end-to-end platform checkpoint.
## Ordered physical pair contract
[Pair lifecycle](checkpoint/pair-lifecycle.md) now records the original physical-
list order, asymmetric sphere exclusions, live callback mutations and independent
enter/stay/leave membership. Six new REA pseudocode results and guarded original
instructions support28 copied-code component cases. The C# pair dispatcher matches
all28 complete callback/contact/flag/root observations; saved expectations also
pass without generated traces. No new scene physics is enabled.
VR04's6 inspected Jimmy/Rocketship/soldier/trophy records share unconditional
class permission callbacks;20 virtual bindings are guarded. Complete physical
registration, other classes/helpers, actual response and dynamic reclip state
remain open. Keep lab/outside's playable capsule and VR04's bounded static body.
All338 Python tests, targeted dynamic/body-ownership/Director regressions and
Debug build pass; Windows cross-publish succeeds (NU1900 vulnerability-metadata
warning, no compilation error). All539 originals are unchanged. Local logs,
complete REA replies and component provenance are under artifacts/pair-lifecycle/.
Both packages now identify clean924ad2f:519 exact original copies,4285 matching
prepared scene files and7 matching prepared audio files each. Standalone Linux
from /tmp without SDK/development-library paths passes Carl first neutral input,
300 idle ticks and held-input resumption. All4 readbacks match the ea04210 package
baseline exactly. This package run disables optional Vulkan validation; the prior
enabled-validation route evidence is unchanged. Current Windows is cross-published
and resource-verified, not newly runtime-tested. All539 originals are reverified.
Package identities/readback hashes are under artifacts/pair-lifecycle/.
## Carl neutral return: TSK startup lifetime correction ## Carl neutral return: TSK startup lifetime correction
[Menu/player lifetime](gameplay/main-menu-player-lifetime.md) closes the missing [Menu/player lifetime](gameplay/main-menu-player-lifetime.md) closes the missing
+5
View File
@@ -5,6 +5,11 @@ offsets, virtual addresses, API symbols or observed behavior. Decompiled output
evidence, not original source. Original gameplay has not yet been observed successfully; isolated original DLL evidence, not original source. Original gameplay has not yet been observed successfully; isolated original DLL
probes and modern runtime checks are recorded separately. probes and modern runtime checks are recorded separately.
- [Ordered physical pairs](checkpoint/pair-lifecycle.md):6 REA pseudocode results,
8 guarded source ranges,20 VR04 class bindings and28 complete copied-code/C#
comparisons. One-sided exclusions, gate-retained contacts, callback-mutated
roots/membership and notification order are recovered. The reusable component
remains outside live scenes; physical registration and real callbacks are open.
- [Body root publication](checkpoint/body-root-publication.md) and - [Body root publication](checkpoint/body-root-publication.md) and
[body modes](checkpoint/body-modes.md):19 actual dispatcher/kernel contact-root [body modes](checkpoint/body-modes.md):19 actual dispatcher/kernel contact-root
observations plus87 body/support/friction flag/payload observations. Parent observations plus87 body/support/friction flag/payload observations. Parent
+9
View File
@@ -65,6 +65,15 @@ Execution order and acceptance criteria: [next work plan](checkpoint/next-work-p
replay. Native Windows and original-game comparisons remain separate. replay. Native Windows and original-game comparisons remain separate.
- [ ] Obtain native Windows/whole-original Carl feedback for that same scenario; - [ ] Obtain native Windows/whole-original Carl feedback for that same scenario;
local Wine allocation diagnostics remain visually unusable. local Wine allocation diagnostics remain visually unusable.
- [x] Recover physical pair order, eligibility gates, asymmetric exclusions and
callback-mutated enter/stay/leave state;28 complete original/C# comparisons
and20 VR04 class bindings. See checkpoint/pair-lifecycle.md. Component remains
outside the live scene loop until actor/scheduler dependencies close.
- [x] Refresh both clean924ad2f packages and verify resources; standalone Linux
Carl return passes with4 readbacks identical to the previous runtime checkpoint.
- [ ] Complete VR04 physical registration/activation and generated-helper inventory,
then dynamic nearest/last-polygon reclip ownership. Preserve existing scene
collision admission until real actor/special callbacks are verified.
- [x] Expand original lifecycle coverage:96 Carl contact,8 composed input/ - [x] Expand original lifecycle coverage:96 Carl contact,8 composed input/
controller/skip-prefix,48 task/objective and140 base/STOP cases; recover complete controller/skip-prefix,48 task/objective and140 base/STOP cases; recover complete
+1
View File
@@ -18,6 +18,7 @@ dotnet run --project tests/GamePort.SphereResponseTests
dotnet run --project tests/GamePort.StaticCollisionTests dotnet run --project tests/GamePort.StaticCollisionTests
dotnet run --project tests/GamePort.BodyPhysicsTests dotnet run --project tests/GamePort.BodyPhysicsTests
dotnet run --project tests/GamePort.BodyOwnershipTests dotnet run --project tests/GamePort.BodyOwnershipTests
dotnet run --project tests/GamePort.PairLifecycleTests
dotnet run --project tests/GamePort.GadgetTests dotnet run --project tests/GamePort.GadgetTests
dotnet run --project tests/GamePort.InvisibleTests dotnet run --project tests/GamePort.InvisibleTests
dotnet run --project tests/GamePort.BubbleMotionTests dotnet run --project tests/GamePort.BubbleMotionTests
@@ -0,0 +1,87 @@
using System.Numerics;
namespace GamePort.Game;
/// <summary>Live callbacks of an original physical-list member, not render visibility or raw control.</summary>
public interface IOriginalPairBody
{
bool PairCollisionEnabled { get; }
int CollisionMode { get; }
Vector3 Root { get; }
float Radius { get; }
bool AllowsPair(IOriginalPairBody other);
bool Excludes(IOriginalPairBody other);
bool HasContact(IOriginalPairBody other);
void SphereOverlap(IOriginalPairBody other, float distance);
void Enter(IOriginalPairBody other);
void Stay(IOriginalPairBody other);
void Leave(IOriginalPairBody other);
}
/// <summary>
/// EXE47A430/47B3E0/47CA90 ordered pair and notification contract. The caller
/// supplies physical registration order and real actor callbacks. Mode2 geometry
/// remains a separate injected solver. Not yet admitted to the live scene loop.
/// </summary>
public static class OriginalPairCollision
{
/// <remarks>
/// This bounded component requires a stable list during the pass. Source
/// linked-list insertion/deletion during callbacks is not reconstructed here.
/// Eligibility gates retain existing contacts; they do not synthesize leaves.
/// </remarks>
public static void Step(IReadOnlyList<IOriginalPairBody> bodies,
Func<IOriginalPairBody, IOriginalPairBody, bool>? boxContact = null, bool enabled = true)
{
ArgumentNullException.ThrowIfNull(bodies);
if (!enabled) return;
for (var i = 0; i < bodies.Count; i++)
{
var first = bodies[i];
//47A46E: sampled once for this outer traversal, before its callbacks.
if (!first.PairCollisionEnabled) continue;
for (var j = i; j < bodies.Count; j++)
{
var second = bodies[j];
if (!second.PairCollisionEnabled || ReferenceEquals(first, second)
|| !first.AllowsPair(second) || !second.AllowsPair(first)) continue;
bool contact;
if (first.CollisionMode == 2) contact = Box(first, second);
else if (second.CollisionMode == 2) contact = Box(second, first);
else contact = SphereContact(first, second);
Notify(first, second, contact);
//The first callback can alter the second actor's membership.
Notify(second, first, contact);
}
}
bool Box(IOriginalPairBody box, IOriginalPairBody other) =>
(boxContact ?? throw new InvalidOperationException("Mode2 requires an explicit source box solver"))(box, other);
}
public static bool SphereContact(IOriginalPairBody first, IOriginalPairBody second)
{
//Source queries second root first, then first root and both radii.
var secondRoot = second.Root;
var firstRoot = first.Root;
var firstRadius = first.Radius;
var radius = second.Radius + firstRadius;
var distance = OriginalBodySupport.QuickMagnitude(secondRoot - firstRoot);
//47CA90 checks only the earlier body's exclusions, after strict overlap.
if (!(distance < radius) || first.Excludes(second)) return false;
first.SphereOverlap(second, distance);
second.SphereOverlap(first, distance);
return true;
}
private static void Notify(IOriginalPairBody self, IOriginalPairBody other, bool contact)
{
if (!contact)
{
if (self.HasContact(other)) self.Leave(other);
}
else if (self.HasContact(other)) self.Stay(other);
else self.Enter(other);
}
}
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType><TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings><Nullable>enable</Nullable>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="../../src/GamePort/Game/OriginalPairCollision.cs" Link="OriginalPairCollision.cs" />
<Compile Include="../../src/GamePort/Game/OriginalBodySupport.cs" Link="OriginalBodySupport.cs" />
</ItemGroup>
</Project>
@@ -0,0 +1,190 @@
using System.Numerics;
using System.Text.Json;
using GamePort.Game;
var fixture = new Fixture();
var rows = new List<Observation>();
void Tick(string name) => rows.Add(fixture.Tick(name));
fixture.Reset(0,1);Tick("enter");Tick("stay");fixture.Actors[1].Position.X=20;Tick("tangent_leave");
fixture.Actors[0].Integration=false;fixture.Actors[0].Authored=true;fixture.Actors[1].Position.X=19;Tick("reenter_sleeping");
fixture.Actors[1].Position.X=21;Tick("leave_wakes_authored");
fixture.Reset(0,1);fixture.Actors[0].Exclusions.Add(fixture.Actors[1]);Tick("earlier_excludes");
fixture.Reset(0,1);fixture.Actors[1].Exclusions.Add(fixture.Actors[0]);Tick("later_excludes");
fixture.Order(1,0);Tick("reordered_exclusion_leaves");
fixture.Reset(0,1);Tick("before_disable");fixture.Actors[1].Enabled=false;Tick("disabled_retains_contact");
fixture.Actors[1].Enabled=true;fixture.Actors[0].Allowed=false;Tick("permission_retains_contact");
fixture.Actors[0].Allowed=true;fixture.Enabled=false;Tick("global_off_retains_contact");
fixture.Reset(0,1);fixture.Actors[1].Allowed=false;Tick("later_permission_rejects");
fixture.Reset(0,1);fixture.Actors[1].Position.X=19.999f;Tick("inside");
fixture.Reset(0,1);fixture.Actors[1].Position.X=20.001f;Tick("outside");
fixture.Reset(0,1,2);Tick("three_actor_order");
fixture.Reset(0,1,2);fixture.Mutation=1;Tick("response_moves_root");
fixture.Reset(0,1,2);fixture.Mutation=2;Tick("enter_disables_outer");
fixture.Reset(0,1,2);fixture.Mutation=3;Tick("enter_disables_later");
fixture.Reset(0,1);fixture.Mutation=4;Tick("enter_changes_counterpart_membership");
fixture.Reset(0,0,1);Tick("duplicate_body_identity");
fixture.Reset(0,1);fixture.Actors[1].Inhibit=true;Tick("other_inhibits_response");
fixture.Reset(0,1);fixture.Actors[0].Integration=false;Tick("sleeping_still_contacts");
fixture.Reset(0,1);fixture.Actors[0].Mode=2;Tick("box_first");
fixture.Reset(0,1);fixture.Actors[1].Mode=2;Tick("box_second");
fixture.Reset(0,1);fixture.Actors[0].Mode=fixture.Actors[1].Mode=2;Tick("both_box_keep_order");
fixture.BoxHit=false;Tick("box_separation");
fixture.Reset(0);Tick("single_actor");
if (args.Length == 2 && args[0] == "--native")
{
using var original=JsonDocument.Parse(File.ReadAllText(args[1]));
var references=original.RootElement.GetProperty("cases").EnumerateArray().ToArray();
if(references.Length!=rows.Count)throw new Exception("Original case count");
for(var i=0;i<rows.Count;i++)
{
var row=rows[i];var expected=references[i];
Check(row.Name==expected.GetProperty("name").GetString(),row.Name+" identity");
Check(row.Events==expected.GetProperty("events").GetString(),row.Name+" callback order");
foreach(var (field,actual) in new[]{("contacts",row.Contacts),("integration",row.Integration),("enabled",row.Enabled)})
Check(actual.SequenceEqual(expected.GetProperty(field).EnumerateArray().Select(v=>v.GetInt32())),row.Name+" "+field);
Check(row.RootX.SequenceEqual(expected.GetProperty("rootX").EnumerateArray().Select(v=>v.GetSingle())),row.Name+" roots");
}
Console.WriteLine($"Matched {rows.Count} complete original pair observations.");
}
else if(args.Length!=0)throw new ArgumentException("Use --native <observations.json>");
//Fixed reference expectations are checked even when generated traces are absent.
var events = new Dictionary<string,string>
{
["enter"]="R01;P01;R10;P10;E01;E10;",
["stay"]="R01;P01;R10;P10;S01;S10;",
["tangent_leave"]="L01;L10;",
["reenter_sleeping"]="R01;R10;P10;E01;E10;",
["leave_wakes_authored"]="L01;L10;",
["earlier_excludes"]="",
["later_excludes"]="R01;P01;R10;P10;E01;E10;",
["reordered_exclusion_leaves"]="L10;L01;",
["before_disable"]="R01;P01;R10;P10;E01;E10;",
["disabled_retains_contact"]="",
["permission_retains_contact"]="",
["global_off_retains_contact"]="",
["later_permission_rejects"]="",
["inside"]="R01;P01;R10;P10;E01;E10;",
["outside"]="",
["three_actor_order"]="R01;P01;R10;P10;E01;E10;R02;P02;R20;P20;E02;E20;R12;P12;R21;P21;E12;E21;",
["response_moves_root"]="R01;P01;R10;P10;E01;E10;R12;P12;R21;P21;E12;E21;",
["enter_disables_outer"]="R01;P01;R10;P10;E01;E10;R02;P02;R20;P20;E02;E20;R12;P12;R21;P21;E12;E21;",
["enter_disables_later"]="R01;P01;R10;P10;E01;E10;",
["enter_changes_counterpart_membership"]="R01;P01;R10;P10;E01;S10;",
["duplicate_body_identity"]="R01;P01;R10;P10;E01;E10;R01;P01;R10;P10;S01;S10;",
["other_inhibits_response"]="R01;R10;P10;E01;E10;",
["sleeping_still_contacts"]="R01;R10;P10;E01;E10;",
["box_first"]="B01;E01;E10;",
["box_second"]="B10;E01;E10;",
["both_box_keep_order"]="B01;E01;E10;",
["box_separation"]="B01;L01;L10;",
["single_actor"]="",
};
foreach(var row in rows)
{
if(events.TryGetValue(row.Name,out var expected))Check(row.Events==expected,row.Name+" reference order");
else throw new Exception("Missing saved reference: "+row.Name);
//Complete finite state observations, retained independently of the local capture.
int[] contacts=row.Name switch
{
"three_actor_order" or "enter_disables_outer"=>[6,5,3],
"response_moves_root"=>[2,5,2],
"tangent_leave" or "leave_wakes_authored" or "earlier_excludes" or
"reordered_exclusion_leaves" or "later_permission_rejects" or "outside" or
"box_separation" or "single_actor"=>[0,0,0],
_=>[2,1,0]
};
int[] integration=row.Name is "reenter_sleeping" or "sleeping_still_contacts" ? [0,1,1] : [1,1,1];
int[] enabled=row.Name switch
{
"disabled_retains_contact"=>[1,0,1],"enter_disables_outer"=>[0,1,1],
"enter_disables_later"=>[1,1,0],_=>[1,1,1]
};
float[] roots=row.Name switch
{
"tangent_leave"=>[0,20,0],"reenter_sleeping"=>[0,19,0],"leave_wakes_authored"=>[0,21,0],
"inside"=>[0,19.999f,0],"outside"=>[0,20.001f,0],"response_moves_root"=>[1000,0,0],_=>[0,0,0]
};
Check(row.Contacts.SequenceEqual(contacts)&&row.Integration.SequenceEqual(integration)
&&row.Enabled.SequenceEqual(enabled)&&row.RootX.SequenceEqual(roots),row.Name+" complete saved state");
}
Check(rows.Single(r=>r.Name=="disabled_retains_contact").Contacts.SequenceEqual(new[]{2,1,0}),"disabled contact retention");
Check(rows.Single(r=>r.Name=="global_off_retains_contact").Contacts.SequenceEqual(new[]{2,1,0}),"global contact retention");
Check(rows.Single(r=>r.Name=="leave_wakes_authored").Integration[0]==1,"leave wakes authored integration");
Check(rows.Single(r=>r.Name=="response_moves_root").RootX[0]==1000,"response publishes live root before next pair");
fixture.Reset(0,1);fixture.Actors[0].Mode=2;
try {OriginalPairCollision.Step(fixture.Bodies);throw new Exception("Missing box solver accepted");}
catch(InvalidOperationException) { }
Console.WriteLine("PASS:28 pair lifecycle cases, retained contacts, callback mutations and explicit box admission.");
static void Check(bool condition,string message){if(!condition)throw new Exception(message);}
sealed record Observation(string Name,string Events,int[] Contacts,int[] Integration,int[] Enabled,float[] RootX);
sealed class Fixture
{
public Actor[] Actors {get;}
public IOriginalPairBody[] Bodies {get;private set;}=[];
public string Events="";
public int Mutation;
public bool Enabled=true,BoxHit=true;
public Fixture()=>Actors=Enumerable.Range(0,3).Select(i=>new Actor(this,i)).ToArray();
public void Reset(params int[] order)
{
foreach(var actor in Actors)actor.Reset();
Mutation=0;Enabled=BoxHit=true;Order(order);
}
public void Order(params int[] order)=>Bodies=order.Select(i=>(IOriginalPairBody)Actors[i]).ToArray();
public Observation Tick(string name)
{
Events="";
OriginalPairCollision.Step(Bodies,(a,b)=>{Log('B',(Actor)a,(Actor)b);return BoxHit;},Enabled);
return new(name,Events,Actors.Select(a=>a.Contacts.Aggregate(0,(mask,b)=>mask|1<<b.Id)).ToArray(),
Actors.Select(a=>a.Integration?1:0).ToArray(),Actors.Select(a=>a.Enabled?1:0).ToArray(),Actors.Select(a=>a.Position.X).ToArray());
}
public void Log(char kind,Actor a,Actor b)=>Events+=$"{kind}{a.Id}{b.Id};";
}
sealed class Actor(Fixture fixture,int id):IOriginalPairBody
{
public int Id=>id;
public bool Enabled,Allowed,Integration,Authored,Inhibit;
public int Mode;
public Vector3 Position;
public HashSet<Actor> Contacts=[];
public HashSet<Actor> Exclusions=[];
public bool PairCollisionEnabled=>Enabled;
public int CollisionMode=>Mode;
public Vector3 Root=>Position;
public float Radius=>10;
public bool AllowsPair(IOriginalPairBody other)=>Allowed;
public bool Excludes(IOriginalPairBody other)=>Exclusions.Contains((Actor)other);
public bool HasContact(IOriginalPairBody other)=>Contacts.Contains((Actor)other);
public void Reset(){Enabled=Allowed=Integration=true;Authored=Inhibit=false;Mode=0;Position=default;Contacts.Clear();Exclusions.Clear();}
public void SphereOverlap(IOriginalPairBody other,float distance)
{
var b=(Actor)other;fixture.Log('R',this,b);
//Actual470BF0 invokes414 only if the other body's1E0 is false and own210 is true.
if(!b.Inhibit&&Integration)
{
fixture.Log('P',this,b);
if(fixture.Mutation==1&&id==0)Position.X=1000;
}
}
public void Enter(IOriginalPairBody other)
{
var b=(Actor)other;fixture.Log('E',this,b);Contacts.Add(b);
if(id==0&&b.Id==1)
switch(fixture.Mutation)
{
case 2: Enabled=false;break;
case 3: fixture.Actors[2].Enabled=false;break;
case 4: b.Contacts.Add(this);break;
}
}
public void Stay(IOriginalPairBody other)=>fixture.Log('S',this,(Actor)other);
public void Leave(IOriginalPairBody other)
{
var b=(Actor)other;fixture.Log('L',this,b);
if(!Integration&&Authored)Integration=true;
Contacts.Remove(b);
}
}
+31
View File
@@ -0,0 +1,31 @@
from pathlib import Path
import sys
import unittest
ROOT = Path(__file__).resolve().parents[1]
sys.path.insert(0, str(ROOT/'tools/binary'))
from pair_lifecycle import collect
class PairLifecycleTests(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.report = collect(ROOT.parent/'Original')
def test_complete_source_functions(self):
self.assertEqual(len(self.report['ranges']), 8)
self.assertEqual(len(self.report['relocations']), 11)
self.assertEqual(self.report['ranges'][0]['file_offset'], '0x7a430')
def test_vr04_candidates_and_common_permissions(self):
candidates = self.report['vr04_candidates']
self.assertEqual([row['kind'] for row in candidates], ['3JIM','3ROC','3SOL','3TRO','3SOL','3SOL'])
self.assertEqual([row['file_offset'] for row in candidates], ['0x8','0x1e5','0x4431','0x546a','0x582c','0x67c5'])
self.assertEqual(len(self.report['bindings']), 20)
permissions = [row['target'] for row in self.report['bindings'] if row['slot'] == '0x3a0']
self.assertEqual(permissions, ['0x472f80']*4)
self.assertTrue(all(row['has_collision'] == 1 for row in candidates if row['kind'] == '3SOL'))
if __name__ == '__main__':
unittest.main()
+138
View File
@@ -0,0 +1,138 @@
#!/usr/bin/env python3
"""Guard the original ordered pair pass; generate a copied-code contact probe."""
import argparse
import hashlib
import json
from pathlib import Path
import re
import struct
from checkpoint_script_state import EXE_SHA256, find_case, read_va
from pe_inspect import PE
import sys
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'levels'))
from gam import parse
REA_ID = 'ev_0d64cc58fa8f5573fc8e61e0f2c20e36288099212bd2257d3a3121361fd6c904'
RANGES = (
(0x47a430, 0x47a5de, '68ff890cd3f3526f8d4dd936b72748fdeb549cc97b56068ccc75c23df2c81ae6'),
(0x47b3e0, 0x47b4a1, '008cc7fa18ca1b59567f4388928045dcdfc9ac85d25dce277d2270378b18f5df'),
(0x47ca90, 0x47caba, '1d5618a99b80fec594c14a36b837e10456790bc44cac4306f8f7e66fd3a757b2'),
(0x470a60, 0x470a88, '6fd5f554e28bd9d733f561a1e755689f11d86997c2fda2ccefdbeab6946fe9f3'),
(0x470a90, 0x470b19, 'bfc56f226eb97077379bbb4f273ae47f0c0c1f97a1ec335996435a5c4f650038'),
(0x470b20, 0x470bb8, 'a84cc049930fd1301bb89a6a84255ebc4fe9515e26ce1d7be75c743574e31202'),
(0x470bc0, 0x470bea, '09bfd61be8128cdbf9c1f1aed7a416cd5ae3c735abf588106d17d744a233951a'),
(0x470bf0, 0x470c44, '5211f48735716c7a7426486f0b44ae9e93388546d825437edc6ef3f787e2aa8d'),
)
TARGETS = (0x4f69e4, 0x695d3c, 0x695d47, 0x4f6b08, 0x48d104, 0x509948)
TABLES = {'3JIM': 0x4a373c, '3ROC': 0x4b25ac, '3SOL': 0x4c19c4, '3TRO': 0x4be404}
COMMON = {0x178: 0x471720, 0x210: 0x4719f0, 0x220: 0x471a30,
0x3a0: 0x472f80, 0x4c: 0x470bf0}
def collect(original):
original = Path(original)
pe = PE(find_case(original, 'Neutron.exe'))
if hashlib.sha256(pe.data).hexdigest() != EXE_SHA256:
raise ValueError('Original identity mismatch')
ranges, relocations, bindings = [], [], []
for start, end, digest in RANGES:
code = read_va(pe, start, end-start)
if hashlib.sha256(code).hexdigest() != digest:
raise ValueError(f'Changed source body {start:#x}')
ranges.append(dict(va=hex(start), file_offset=hex(pe.offset(start-pe.base)),
length=end-start, sha256=digest))
for target in TARGETS:
encoded = struct.pack('<I', target)
for index in range(len(code)-3):
if code[index:index+4] == encoded:
relocations.append(dict(va=hex(start+index), target=hex(target)))
for kind, table in TABLES.items():
for slot, expected in COMMON.items():
if struct.unpack('<I', read_va(pe, table+slot, 4))[0] != expected:
raise ValueError('Changed actor binding')
bindings.append(dict(kind=kind, table=hex(table), slot=hex(slot), target=hex(expected),
file_offset=hex(pe.offset(table+slot-pe.base))))
gam_path = find_case(original, 'gam/VR04.gam')
candidates = []
for entity in parse(gam_path.read_bytes()).entities:
if entity.kind in TABLES:
values = entity.values()
candidates.append(dict(kind=entity.kind, tag=values['ObjectTag'], file_offset=hex(entity.offset),
has_collision=values['HasCollision'], can_move=values['CanMove'],
task=values['TaskName'], required_level=values['RequiredLevel'],
table=hex(TABLES[entity.kind])))
return dict(source_sha256=EXE_SHA256,
omt_sha256=hashlib.sha256(find_case(original, 'OMT2.dll').read_bytes()).hexdigest(),
ranges=ranges, relocations=relocations,
bindings=bindings, vr04_sha256=hashlib.sha256(gam_path.read_bytes()).hexdigest(),
vr04_candidates=candidates)
def generate(original, output, rea):
original, output = Path(original).resolve(), Path(output).resolve()
if output.is_relative_to(original) or original.is_relative_to(output):
raise ValueError('Separate generated directory required')
if output.exists() and any(p.is_symlink() for p in output.rglob('*')):
raise ValueError('Generated output contains symlinks')
report = collect(original)
record = next(r for r in json.loads(Path(rea).read_text())['records'] if r['evidence_id'] == REA_ID)
if record['subject']['digest']['sha256'] != EXE_SHA256:
raise ValueError('REA subject mismatch')
rows = []
for line in record['raw_result']['stdout'].splitlines():
match = re.match(r'\s*([0-9a-f]+):', line)
if match:
rows.append((int(match[1], 16), line))
for entry, (start, end, _) in zip(report['ranges'], RANGES):
excerpt = '\n'.join(line for va, line in rows if start <= va < end)
if not excerpt:
raise ValueError('Missing retained REA instructions')
entry['rea_extract'] = excerpt
output.mkdir(parents=True, exist_ok=True)
probe = Path(__file__).with_name('pair_lifecycle_probe.c').read_text()
probe = probe.replace('/* RELOCATIONS */', ','.join('{%s,%s}' % (row['va'], row['target']) for row in report['relocations']))
(output/'pair_lifecycle_probe.c').write_text(probe)
(output/'grappler_scalar_probe.c').write_text(Path(__file__).with_name('grappler_scalar_probe.c').read_text())
report.update(rea_evidence_id=REA_ID,
scope='Copied complete pair/sphere/exclusion/base-contact routines; synthetic actors/permissions/response and box adapters, not whole original gameplay.')
(output/'source.json').write_text(json.dumps(report, indent=2)+'\n')
return dict(source_sha256=EXE_SHA256, guarded_ranges=len(report['ranges']),
relocated_operands=len(report['relocations']), guarded_bindings=len(report['bindings']))
def capture(output, directory):
directory, output = Path(directory), Path(output)
metadata = json.loads((directory/'capture.json').read_text())
log = (directory/'wine.log').read_text()
if metadata['captures'][-1]['wineExit'] != 0 or 'PAIR_LIFECYCLE_COMPLETE' not in log:
raise ValueError('Incomplete probe')
cases = [json.loads(line[5:]) for line in log.splitlines() if line.startswith('PAIR ')]
if len(cases) != 28 or len({c['name'] for c in cases}) != 28:
raise ValueError('Missing or duplicate case')
source = json.loads((output/'source.json').read_text())
for filename, field in (('Neutron.exe', 'source_sha256'), ('OMT2.dll', 'omt_sha256')):
if hashlib.sha256(find_case(directory/'game', filename).read_bytes()).hexdigest() != source[field]:
raise ValueError('Copied original identity mismatch')
identity = json.loads((directory/'probe-identity.json').read_text())
if identity['sha256'] != hashlib.sha256((output/'probe.exe').read_bytes()).hexdigest():
raise ValueError('Observed probe binary identity mismatch')
files = [directory/'wine.log', directory/'capture.json', directory/'probe-identity.json',
output/'source.json', output/'pair_lifecycle_probe.c', output/'probe.exe']
report = dict(cases=cases, provenance={str(p): hashlib.sha256(p.read_bytes()).hexdigest() for p in files},
scope='Isolated original component execution under Wine32; no original entrypoint, constructor or real class callback.')
(output/'observations.json').write_text(json.dumps(report, indent=2)+'\n')
return dict(cases=len(cases), scope=report['scope'])
if __name__ == '__main__':
cli = argparse.ArgumentParser(description=__doc__)
cli.add_argument('original', type=Path)
cli.add_argument('--output', type=Path)
cli.add_argument('--rea', type=Path)
cli.add_argument('--capture', type=Path)
args = cli.parse_args()
if args.capture and not args.output or args.output and not (args.capture or args.rea):
cli.error('--output needs --rea for generation, or --capture for verification')
print(json.dumps(capture(args.output, args.capture) if args.capture else
generate(args.original, args.output, args.rea) if args.output else collect(args.original), indent=2))
+126
View File
@@ -0,0 +1,126 @@
/* Complete original pair pass, sphere query, exclusions and base contact list.
Synthetic actors/permission/response callbacks and box-result adapter. */
#define main unused_scalar_main
#include "grappler_scalar_probe.c"
#undef main
typedef struct {float x,y,z,w;} Vec;
typedef struct Node {struct Node *next,*previous;void *value;} Node;
typedef struct Actor {
unsigned char raw[0x500];uintptr_t table[0x440/4];
Node contacts,exclusions;Vec root;float radius;int id,enabled,mode,allowed,integration,authored,inhibit;
} Actor;
static Actor actors[3];static Node head,nodes[4];
static char events[4096];static unsigned used;static int mutation,box_hit=1;
typedef void (TC *Contact)(Actor*,Actor*);
static void event(char kind,Actor*a,Actor*b){
require(used+20<sizeof(events),"event buffer");
used+=(unsigned)snprintf(events+used,sizeof(events)-used,"%c%d%d;",kind,a->id,b->id);
}
static void list_init(Node*n){n->next=n->previous=n;n->value=NULL;}
static void append(Node*list,Actor*a){
Node*n=calloc(1,sizeof(*n));require(n!=NULL,"node");n->value=a;
n->next=list;n->previous=list->previous;list->previous->next=n;list->previous=n;
}
static void clear(Node*n){while(n->next!=n){Node*p=n->next;n->next=p->next;free(p);}list_init(n);}
static int TC enabled(Actor*a){return a->enabled;}
static int TC mode(Actor*a){return a->mode;}
static int TC allows(Actor*a,Actor*b){(void)b;return a->allowed;}
static float TC radius(Actor*a){return a->radius;}
static Vec*TC root(Actor*a,Vec*out){*out=a->root;return out;}
static int TC integration(Actor*a){return a->integration;}
static int TC authored(Actor*a){return a->authored;}
static void TC set_integration(Actor*a,int v){a->integration=v;}
static int TC inhibit(Actor*a){return a->inhibit;}
static int TC no(Actor*a){(void)a;return 0;}
static void TC response(Actor*a,Actor*b,float distance){
require(distance>=0,"distance");event('P',a,b);
if(mutation==1&&a->id==0)a->root.x=1000;
}
static void TC overlap(Actor*a,Actor*b,float distance){
event('R',a,b);((void(TC*)(Actor*,Actor*,float))AT(0x470bf0))(a,b,distance);
}
static void TC enter(Actor*a,Actor*b){
event('E',a,b);((Contact)AT(0x470a90))(a,b);
if(a->id==0&&b->id==1){
if(mutation==2)a->enabled=0;
if(mutation==3)actors[2].enabled=0;
if(mutation==4)append(&b->contacts,a);
}
}
static void TC leave(Actor*a,Actor*b){event('L',a,b);((Contact)AT(0x470b20))(a,b);}
static void TC stay(Actor*a,Actor*b){event('S',a,b);((Contact)AT(0x470bc0))(a,b);}
static int box(Actor*a,Actor*b){event('B',a,b);return box_hit;}
static void*allocate(size_t size){require(size==12,"source contact allocation");return malloc(size);}
static void release(void*p){free(p);}
static void reset(void){
for(int i=0;i<3;i++){
if(actors[i].contacts.next){clear(&actors[i].contacts);clear(&actors[i].exclusions);}
Actor*a=&actors[i];memset(a,0,sizeof(*a));a->id=i;a->enabled=a->allowed=a->integration=1;a->radius=10;
list_init(&a->contacts);list_init(&a->exclusions);
*(void**)a=a->table;*(void**)(a->raw+0x260)=&a->contacts;*(void**)(a->raw+0x254)=&a->exclusions;
#define SLOT(s,f) a->table[(s)/4]=(uintptr_t)(f)
SLOT(0x220,enabled);SLOT(0x178,mode);SLOT(0x3a0,allows);SLOT(0x260,radius);SLOT(0x310,root);
SLOT(0x3c,AT(0x470a60));SLOT(0x40,enter);SLOT(0x44,leave);SLOT(0x48,stay);SLOT(0x4c,overlap);
SLOT(0x210,integration);SLOT(0xb4,authored);SLOT(0x214,set_integration);SLOT(0x1e0,inhibit);
SLOT(0x1f8,no);SLOT(0x414,response);
#undef SLOT
}
list_init(&head);mutation=0;box_hit=1;*(unsigned char*)AT(0x4f69e4)=1;
}
static void order(int a,int b,int c){
list_init(&head);int ids[]={a,b,c};
for(int i=0;i<3&&ids[i]>=0;i++){
Node*n=&nodes[i];n->value=&actors[ids[i]];n->next=&head;n->previous=head.previous;
head.previous->next=n;head.previous=n;
}
*(void**)AT(0x695d3c)=&head;
}
static void tick(const char*name){
used=0;events[0]=0;((void(__cdecl*)(float))AT(0x47a430))(1.f/60);
printf("PAIR {\"name\":\"%s\",\"events\":\"%s\",\"contacts\":[",name,events);
for(int i=0;i<3;i++){
unsigned mask=0;for(Node*n=actors[i].contacts.next;n!=&actors[i].contacts;n=n->next)mask|=1u<<((Actor*)n->value)->id;
printf("%s%u",i?",":"",mask);
}
printf("],\"integration\":[%d,%d,%d],\"enabled\":[%d,%d,%d],\"rootX\":[%.9g,%.9g,%.9g]}\n",
actors[0].integration,actors[1].integration,actors[2].integration,
actors[0].enabled,actors[1].enabled,actors[2].enabled,actors[0].root.x,actors[1].root.x,actors[2].root.x);
}
int main(void){
setbuf(stdout,NULL);map_source();
static const struct{unsigned va,target;} relocations[]={/* RELOCATIONS */};
for(unsigned i=0;i<sizeof(relocations)/sizeof(*relocations);i++){
uint32_t value=(uintptr_t)AT(relocations[i].target);memcpy(AT(relocations[i].va),&value,4);
}
HMODULE omt=LoadLibraryA("Z:\\work\\game\\OMT2.dll");
if(!omt)fprintf(stderr,"OMT loader error=%lu\n",GetLastError());
require(omt!=NULL,"copied OMT");
FARPROC quick=GetProcAddress(omt,"?quick_magnitude@OMedia3DVector@@QBEMXZ");require(quick!=NULL,"quick magnitude");
*(void**)AT(0x48d104)=quick;jump(AT(0x478990),allocate);jump(AT(0x4789a0),release);jump(AT(0x47a5e0),box);
reset();order(0,1,-1);tick("enter");tick("stay");actors[1].root.x=20;tick("tangent_leave");
actors[0].integration=0;actors[0].authored=1;actors[1].root.x=19;tick("reenter_sleeping");
actors[1].root.x=21;tick("leave_wakes_authored");
reset();order(0,1,-1);append(&actors[0].exclusions,&actors[1]);tick("earlier_excludes");
reset();order(0,1,-1);append(&actors[1].exclusions,&actors[0]);tick("later_excludes");
order(1,0,-1);tick("reordered_exclusion_leaves");
reset();order(0,1,-1);tick("before_disable");actors[1].enabled=0;tick("disabled_retains_contact");
actors[1].enabled=1;actors[0].allowed=0;tick("permission_retains_contact");
actors[0].allowed=1;*(unsigned char*)AT(0x4f69e4)=0;tick("global_off_retains_contact");
reset();order(0,1,-1);actors[1].allowed=0;tick("later_permission_rejects");
reset();order(0,1,-1);actors[1].root.x=19.999f;tick("inside");
reset();order(0,1,-1);actors[1].root.x=20.001f;tick("outside");
reset();order(0,1,2);tick("three_actor_order");
reset();order(0,1,2);mutation=1;tick("response_moves_root");
reset();order(0,1,2);mutation=2;tick("enter_disables_outer");
reset();order(0,1,2);mutation=3;tick("enter_disables_later");
reset();order(0,1,-1);mutation=4;tick("enter_changes_counterpart_membership");
reset();order(0,0,1);tick("duplicate_body_identity");
reset();order(0,1,-1);actors[1].inhibit=1;tick("other_inhibits_response");
reset();order(0,1,-1);actors[0].integration=0;tick("sleeping_still_contacts");
reset();order(0,1,-1);actors[0].mode=2;tick("box_first");
reset();order(0,1,-1);actors[1].mode=2;tick("box_second");
reset();order(0,1,-1);actors[0].mode=actors[1].mode=2;tick("both_box_keep_order");
box_hit=0;tick("box_separation");
reset();order(0,-1,-1);tick("single_actor");
puts("PAIR_LIFECYCLE_COMPLETE");return 0;
}