Restore Goddard leveling and Scooter positional pitch processing

This commit is contained in:
UnixNight committed 2026-11-04 18:27:56 -05:00
1 parent 74be19eb15
commit fccc0b9d1b
24 files changed
+967 -8

No files matched your search

+24
View File
@@ -0,0 +1,24 @@
#!/usr/bin/env python3
"""Original Goddard facing guards and isolated copied-code probe preparation."""
import argparse
import hashlib
import json
from pathlib import Path
from checkpoint_script_state import EXE_SHA256,find_case,read_va
from pe_inspect import PE
RANGES=((0x4096e0,0x40988d),(0x4093bd,0x4093d8),(0x41c8db,0x41c90c),(0x472480,0x472570))
def collect(original):
pe=PE(find_case(Path(original),'Neutron.exe'))
if hashlib.sha256(pe.data).hexdigest()!=EXE_SHA256:raise ValueError('Unexpected original EXE')
return dict(source_sha256=EXE_SHA256,ranges=[dict(va=hex(a),file_offset=hex(pe.offset(a-pe.base)),length=b-a,
sha256=hashlib.sha256(read_va(pe,a,b-a)).hexdigest()) for a,b in RANGES])
def generate(original,output):
original=Path(original).resolve();output=Path(output).resolve()
if output.is_relative_to(original) or original.is_relative_to(output):raise ValueError('Separate output required')
report=collect(original);output.mkdir(parents=True,exist_ok=True)
(output/'source.json').write_text(json.dumps(report,indent=2)+'\n')
(output/'goddard_leveling_probe.c').write_text(Path(__file__).with_name('goddard_leveling_probe.c').read_text())
return report
if __name__=='__main__':
p=argparse.ArgumentParser();p.add_argument('original',type=Path);p.add_argument('--generate-probe',type=Path);a=p.parse_args()
print(json.dumps(generate(a.original,a.generate_probe) if a.generate_probe else collect(a.original),indent=2))
+38
View File
@@ -0,0 +1,38 @@
/* Copied4096E0/472480, source Goddard axis factors, synthetic enabled/dirty actor.
No original game entrypoint, AI target selection, body or rendering. */
#define main unused_grappler_main
#include "grappler_scalar_probe.c"
#undef main
static uintptr_t table[0x340/4];
#define OF(o) (*(float*)(object+(o)))
static void fix(uint32_t start,uint32_t end){
const uint32_t targets[]={0x48d914,0x48e5b0,0x48e5c0,0x48e5c4};
for(uint32_t at=start;at+4<=end;at++){
uint32_t v;memcpy(&v,AT(at),4);
for(unsigned i=0;i<4;i++)if(v==targets[i]){v=(uintptr_t)AT(v);memcpy(AT(at),&v,4);at+=3;break;}
}
}
static void run(const char*name,float x,float y,float z,float targetYaw,float dt,int ticks,int enabled,int dirty){
memset(object,0,sizeof(object));*(void**)object=table;object[5]=enabled;object[10]=dirty;
OF(0x224)=x;OF(0x228)=y;OF(0x22c)=z;OF(0x278)=targetYaw;
OF(0x810)=.3f;OF(0x814)=3.2f;OF(0x818)=.3f;
for(int i=0;i<ticks;i++)((void(TC*)(void*,float))AT(0x4096e0))(object,dt);
printf("LEVEL %s in=%.9g,%.9g,%.9g,%.9g,%.9g,%d,%d,%d out=%.9g,%.9g,%.9g\n",name,x,y,z,targetYaw,dt,ticks,enabled,dirty,OF(0x224),OF(0x228),OF(0x22c));
}
int main(void){
map_source();fix(0x4096e0,0x40988d);fix(0x472480,0x472570);
const unsigned char ready[]={0xb0,1,0xc3};memcpy(AT(0x475ca0),ready,3);
table[0x334/4]=(uintptr_t)AT(0x472480);
run("tilted",20,90,30,90,.1f,1,1,1);
run("opposite",340,90,330,90,.1f,1,1,1);
run("seam",350,359,350,1,.1f,1,1,1);
run("negative",-20,-10,-30,20,.1f,1,1,1);
run("equal180",180,180,180,0,.1f,1,1,1);
run("over180",181,181,181,0,.1f,1,1,1);
run("tick",20,90,30,90,1.f/60,1,1,1);
run("five_seconds",20,90,30,90,1.f/60,300,1,1);
run("upright",0,90,0,90,.1f,1,1,1);
run("disabled",20,90,30,90,.1f,1,0,1);
run("clean",20,90,30,90,.1f,1,1,0);
puts("GODDARD_LEVELING_COMPLETE");return 0;
}
+88
View File
@@ -0,0 +1,88 @@
#!/usr/bin/env python3
"""Guard Scooter frequency ownership and prepare copied positional sound probe."""
import argparse
import hashlib
import json
from pathlib import Path
import re
import struct
import subprocess
from checkpoint_script_state import find_case, read_va
from checkpoint_camera_audio_ui import EXE_SHA256, DLL_SHA256
from pe_inspect import PE
RANGES=(('engine',0x412ed0,0x412f89),('channel_start',0x47d561,0x47d5f6),
('position',0x47d9d0,0x47dc1e))
DLL_RANGE=(0x1003bba0,0x1003bbfa)
def collect(original):
original=Path(original);exe=PE(find_case(original,'Neutron.exe'));dll=PE(find_case(original,'OMT2.dll'))
if hashlib.sha256(exe.data).hexdigest()!=EXE_SHA256 or hashlib.sha256(dll.data).hexdigest()!=DLL_SHA256:
raise ValueError('Unexpected source identity')
ranges=[dict(kind=k,va=hex(a),file_offset=hex(exe.offset(a-exe.base)),length=b-a,
sha256=hashlib.sha256(read_va(exe,a,b-a)).hexdigest()) for k,a,b in RANGES]
a,b=DLL_RANGE;ranges.append(dict(kind='dx_frequency',va=hex(a),file_offset=hex(dll.offset(a-dll.base)),length=b-a,
sha256=hashlib.sha256(read_va(dll,a,b-a)).hexdigest()))
constants={hex(va):struct.unpack('<'+fmt,read_va(exe,va,struct.calcsize(fmt)))[0]
for va,fmt in ((0x495310,'d'),(0x495308,'d'),(0x49d5ac,'f'))}
if constants!={'0x495310':1/1.9,'0x495308':51.,'0x49d5ac':.75}:raise ValueError('Changed pitch constants')
return dict(exe_sha256=EXE_SHA256,dll_sha256=DLL_SHA256,ranges=ranges,constants=constants)
TEMPLATE=r'''
#define main unused_grappler_main
#include "grappler_scalar_probe.c"
#undef main
typedef struct{float x,y,z,w;}Vec;
static unsigned char engine[0x80],channel[0x80],actor[0x100],camera[0x80];
static uintptr_t channels[1],vtable[0x320/4],cvtable[0x30/4];
static int frequency,calls;
static Vec TC*root(void*self,Vec*out){(void)self;*out=(Vec){0,0,0,1};return out;}
static void TC volume(void*self,int value){(void)self;(void)value;}
static void TC pan(void*self,int value){(void)self;(void)value;}
static void TC pitch(void*self,unsigned value){(void)self;frequency=value;calls++;}
int main(void){
map_source();
const struct{uint32_t va,target;} reloc[]={/* RELOCATIONS */};
for(unsigned i=0;i<sizeof(reloc)/sizeof(reloc[0]);i++){
uint32_t value;memcpy(&value,AT(reloc[i].va),4);require(value==reloc[i].target,"absolute operand");
value=(uintptr_t)AT(value);memcpy(AT(reloc[i].va),&value,4);
}
HMODULE dll=LoadLibraryA("Z:\\work\\game\\OMT2.dll");require(dll!=NULL,"copied OMT");
*(void**)AT(0x48d104)=GetProcAddress(dll,"?quick_magnitude@OMedia3DVector@@QBEMXZ");
*(void**)AT(0x48d10c)=GetProcAddress(dll,"?global@OMediaCosSinTable@@2V1@A");
require(*(void**)AT(0x48d104)&&*(void**)AT(0x48d10c),"OMT exports");
*(void**)AT(0x69600c)=engine;*(void**)(engine+0x40)=channels;channels[0]=(uintptr_t)channel;
*(void**)channel=cvtable;cvtable[0x18/4]=(uintptr_t)volume;cvtable[0x1c/4]=(uintptr_t)pitch;cvtable[0x20/4]=(uintptr_t)pan;
*(void**)actor=vtable;vtable[0x310/4]=(uintptr_t)root;*(void**)AT(0x695d9c)=actor;
*(void**)AT(0x509a50)=camera;*AT(0x695e1c)=1;*(int*)AT(0x4f6b38)=255;
const struct{int nominal;float distance,history;} cases[]={
{11025,200,200},{11025,200,0},{11025,200,150},{11025,200,37},
{50885,800,0},{50885,800,600},{11025,100,200},{7000,500,0},
{11025,0,200},{11025,123.75f,100},{11025,100,123.75f}};
for(unsigned i=0;i<sizeof(cases)/sizeof(cases[0]);i++){
*(int*)AT(0x695e3c)=cases[i].nominal;F(0x695f84)=cases[i].history;
*(float*)(camera+0x4c)=cases[i].distance;frequency=cases[i].nominal;calls=0;
((void(*)(int))AT(0x47d9d0))(0);
printf("POSITION in=%d,%.9g,%.9g out=%d,%.9g,%d\n",cases[i].nominal,cases[i].distance,cases[i].history,frequency,F(0x695f84),calls);
}
puts("SCOOTER_PITCH_COMPLETE");return 0;
}
'''
def generate(original,output):
original=Path(original).resolve();output=Path(output).resolve()
if output.is_relative_to(original) or original.is_relative_to(output):raise ValueError('Separate output required')
report=collect(original);exe=PE(find_case(original,'Neutron.exe'))
asm=subprocess.run(['objdump','-d','-Mintel','--start-address=0x47d9d0','--stop-address=0x47dc1e',str(exe.path)],capture_output=True,text=True,check=True).stdout
targets={int(s,16) for s in re.findall(r'ds:0x([a-f0-9]+)',asm)}
targets.update((0x695d9c,0x695e1c,0x695f84,0x695e3c))
data=read_va(exe,0x47d9d0,0x24e);reloc=[]
for t in sorted(targets):
reloc.extend((0x47d9d0+m.start(),t) for m in re.finditer(re.escape(struct.pack('<I',t)),data))
output.mkdir(parents=True,exist_ok=True)
(output/'scooter_pitch_probe.c').write_text(TEMPLATE.replace('/* RELOCATIONS */',','.join('{0x%x,0x%x}'%r for r in reloc)))
(output/'source.json').write_text(json.dumps(report,indent=2)+'\n')
return report
if __name__=='__main__':
p=argparse.ArgumentParser();p.add_argument('original',type=Path);p.add_argument('--generate-probe',type=Path);a=p.parse_args()
print(json.dumps(generate(a.original,a.generate_probe) if a.generate_probe else collect(a.original),indent=2))