t2-demo-parser 1.0.2 → 2.0.0

package/dist/GhostManager.js

@@ -433,17 +433,8 @@ function wheeledVehicleReadPacketData(bs, conn) {
     const result = vehicleReadPacketData(bs, conn);
     result.braking = bs.readFlag();
     // wheelCount × 3 F32 (avel, Dy, Dx per wheel)
-    // Use ghost wheel count cache (populated during ghost creates)
-    let wheelCount = 4;
-    const ghostIdx = conn.currentGhostIndex;
-    if (ghostIdx !== undefined) {
-        const cached = ghostWheelCountCache.get(ghostIdx);
-        if (cached !== undefined) {
-            wheelCount = cached;
-        }
-    }
     const wheels = [];
-    for (let i = 0; i < wheelCount; i++) {
+    for (let i = 0; i < WheeledVehicleWheelCount; i++) {
         wheels.push({
             avel: bs.readF32(),
             dy: bs.readF32(),
@@ -649,7 +640,11 @@ function bombProjectileUnpackUpdate(bs, _isInitial, _conn) {
     }
     if (bs.readFlag()) {
         result.explodePoint = { x: bs.readF32(), y: bs.readF32(), z: bs.readF32() };
-        result.explodeNormal = { x: bs.readF32(), y: bs.readF32(), z: bs.readF32() };
+        result.explodeNormal = {
+            x: bs.readF32(),
+            y: bs.readF32(),
+            z: bs.readF32(),
+        };
     }
     if (bs.readFlag()) {
         result.sourceObject = bs.readInt(11); // nextPow2(0x401) -> 11 bits
@@ -713,8 +708,16 @@ function seekerUnpackUpdate(bs, isInitial, conn) {
         const isExplosion = bs.readFlag();
         if (isExplosion) {
             // FUN_00639370: explode(position, normal) — SeekerProjectile detonation.
-            result.explodePosition = { x: bs.readF32(), y: bs.readF32(), z: bs.readF32() };
-            result.explodeNormal = { x: bs.readF32(), y: bs.readF32(), z: bs.readF32() };
+            result.explodePosition = {
+                x: bs.readF32(),
+                y: bs.readF32(),
+                z: bs.readF32(),
+            };
+            result.explodeNormal = {
+                x: bs.readF32(),
+                y: bs.readF32(),
+                z: bs.readF32(),
+            };
             return result;
         }
         result.position = { x: bs.readF32(), y: bs.readF32(), z: bs.readF32() };
@@ -1163,7 +1166,12 @@ function sunUnpackUpdate(bs, _isInitial, _conn) {
         }
         result.direction = { x: values[0], y: values[1], z: values[2] };
         result.color = { r: values[3], g: values[4], b: values[5], a: values[6] };
-        result.ambient = { r: values[7], g: values[8], b: values[9], a: values[10] };
+        result.ambient = {
+            r: values[7],
+            g: values[8],
+            b: values[9],
+            a: values[10],
+        };
         // Remaining 8 values are additional light properties in build 25034
         result.extraLightProps = values.slice(11);
     }
@@ -1189,7 +1197,11 @@ function skyUnpackUpdate(bs, _isInitial, _conn) {
         // bool fields are read via Stream::read(1) in the binary (byte-sized bool)
         result.useSkyTextures = bs.readBool();
         result.renderBottomTexture = bs.readBool();
-        result.skySolidColor = { r: bs.readF32(), g: bs.readF32(), b: bs.readF32() };
+        result.skySolidColor = {
+            r: bs.readF32(),
+            g: bs.readF32(),
+            b: bs.readF32(),
+        };
         result.windEffectPrecipitation = bs.readBool();
         const fogVolumes = [];
         for (let i = 0; i < fogVolumeCount; i++) {
@@ -1505,26 +1517,15 @@ function shockLanceProjectileUnpackUpdate(bs, isInitial, conn) {
 // WheeledVehicle ghost parser
 // ============================================================
 /**
- * Determine wheel count from a WheeledVehicleData shape name.
- * In standard Tribes 2, the only WheeledVehicle is the MPB/Jericho (6 wheels).
- * Wildcat and Beowulf are HoverVehicleData, NOT WheeledVehicleData.
- * wheelCount is computed at runtime from shape ground#/spring# node pairs.
- * Falls back to 6 (the only standard WheeledVehicle) if shape unknown.
+ * In standard Tribes 2, the only WheeledVehicleData is the MPB/Jericho
+ * (vehicle_land_mpbase.dts: Ground0-5 + Spring0-5), so the wheel section
+ * is always 6 entries. Wildcat and Beowulf are HoverVehicleData, NOT
+ * WheeledVehicleData. The engine computes the count at runtime from the
+ * shape's ground#/spring# node pairs; deriving it here from state
+ * accumulated in earlier packets (e.g. the create's dataBlockId) would
+ * desync parsers seeded mid-stream, which never parse the create.
  */
-function getWheelCountFromShape(shapeName) {
-    if (!shapeName)
-        return 6;
-    const lower = shapeName.toLowerCase();
-    // MPB (vehicle_land_mpbase.dts) has 6 wheels: Ground0-5 + Spring0-5
-    if (lower.includes("mpb") || lower.includes("mpbase"))
-        return 6;
-    // Default to 6 for unknown shapes (standard T2 only has the MPB)
-    return 6;
-}
-/** Cache of dataBlockId → wheelCount for WheeledVehicle ghosts. */
-const wheelCountCache = new Map();
-/** Cache of ghostIndex → wheelCount for WheeledVehicle updates (where dbId is absent). */
-const ghostWheelCountCache = new Map();
+const WheeledVehicleWheelCount = 6;
 function wheeledVehicleUnpackUpdate(bs, isInitial, conn) {
     const result = vehicleUnpackUpdate(bs, isInitial, conn);
     // Always read braking/wheels. Binary (FUN_00615a70) checks
@@ -1534,41 +1535,8 @@ function wheeledVehicleUnpackUpdate(bs, isInitial, conn) {
     {
         result.braking = bs.readFlag();
         if (bs.readFlag()) {
-            // Determine wheel count from the DataBlock's shape name.
-            // On creates, dataBlockId is available (DataBlockMask set).
-            // On updates, use ghost-index cache populated during create.
-            let wheelCount = 4;
-            const dbId = result.dataBlockId;
-            const ghostIdx = conn.currentGhostIndex;
-            if (dbId !== undefined) {
-                const cached = wheelCountCache.get(dbId);
-                if (cached !== undefined) {
-                    wheelCount = cached;
-                }
-                else if (conn.getDataBlockData) {
-                    const dbData = conn.getDataBlockData(dbId);
-                    if (dbData) {
-                        const shapeName = dbData.shapeName;
-                        if (typeof shapeName === "string") {
-                            wheelCount = getWheelCountFromShape(shapeName);
-                        }
-                        wheelCountCache.set(dbId, wheelCount);
-                    }
-                }
-                // Cache by ghost index for future updates
-                if (ghostIdx !== undefined) {
-                    ghostWheelCountCache.set(ghostIdx, wheelCount);
-                }
-            }
-            else if (ghostIdx !== undefined) {
-                // UPDATE: look up by ghost index
-                const cached = ghostWheelCountCache.get(ghostIdx);
-                if (cached !== undefined) {
-                    wheelCount = cached;
-                }
-            }
             const wheels = [];
-            for (let i = 0; i < wheelCount; i++) {
+            for (let i = 0; i < WheeledVehicleWheelCount; i++) {
                 wheels.push({
                     avel: bs.readF32(),
                     dy: bs.readF32(),