dredless 0.6.3 → 1.0.0

package/src/state/model/decoder.js

@@ -2,8 +2,7 @@ import {decoder} from "../../constants.js";
 import {
     LOADER_FILTER_MODE_NAMES,
     LOADER_POSITION_NAMES,
-    LOADER_PRIORITY_NAMES,
-    LoaderConfigTracker
+    LOADER_PRIORITY_NAMES
 } from "./loader-config.js";
 import {navigationDestinationFromEncodedValue, navigationZoneFromBaseId} from "../overworld.js";
 import {maybeSolveGeneratorMazeSeed} from "../generator-maze.js";
@@ -254,6 +253,7 @@ export const MODEL_TABLE_SPECS = new Map([
     }],
     [55, {
         name: "player",
+        defaults: {q20: 1, q60: 10, q64: 10, q68: 10},
         packedBeforeValues: true,
         fields: numericFields({
             256: 20, 512: 24, 1024: 28, 2048: 32, 4096: 36, 8192: 40,
@@ -274,8 +274,10 @@ export const MODEL_TABLE_SPECS = new Map([
         ]
     }],
     [56, {
-        name: "numeric_snapshot",
-        fields: numericFields({1: 20, 2: 24, 4: 28, 8: 32, 16: 36, 64: 40, 256: 44, 1024: 48})
+        name: "player_appearance",
+        // Official StateOutfit: four body colors, then four color/style pairs.
+        defaults: {q20: 0, q24: 0, q28: 0, q32: 0, q36: 0, q40: 0, q44: 0, q48: 0, q52: 0, q56: 0, q60: 0, q64: 0},
+        fields: numericFields({1: 20, 2: 24, 4: 28, 8: 32, 16: 36, 32: 40, 64: 44, 128: 48, 256: 52, 512: 56, 1024: 60, 2048: 64})
     }],
     [59, {name: "numeric_sparse", fields: numericFields({1: 20, 2: 24, 4: 28, 8: 32, 16: 36})}],
     [60, {name: "fluid_tank", packedBits: [{bit: 4, offset: 29}], ...TWO_FIELD_SPEC}],
@@ -284,7 +286,11 @@ export const MODEL_TABLE_SPECS = new Map([
     [63, {name: "numeric_pair", ...TWO_FIELD_SPEC}],
     [67, {name: "numeric_single", fields: numericFields({1: 20})}],
     [69, {
-        name: "rare_snapshot",
+        name: "loader_config",
+        // The official loader component starts with these values. Wire section
+        // 162 sends a packed absolute flag word before the five numeric deltas.
+        defaults: {q20: 3, q24: 4, q28: 1, q32: 16, q36: 20, q41: 0, q42: 0},
+        packedBeforeValues: true,
         packedBits: [{bit: 32, offset: 41}, {bit: 64, offset: 42}],
         fields: numericFields({1: 20, 2: 24, 4: 28, 8: 32, 16: 36})
     }],
@@ -407,7 +413,7 @@ export const WIRE_TAG_TABLES = new Map([
     [158, 75],
     [160, 76],
     [161, 77],
-    [162, 78],
+    [162, 69], // Loader configuration; distinct from navigation state (168).
     [163, 72],
     [164, 73],
     [165, 74],
@@ -574,32 +580,6 @@ export function firstRecord(records, predicate = null) {
     return null;
 }
 
-export const TABLE_78_FIELD_BITS = [
-    ["q20", 1],
-    ["q24", 2],
-    ["q28", 4],
-    ["q32", 8],
-    ["q36", 16],
-    ["q40", 32],
-    ["q44", 64]
-];
-
-export function table78DeltaRecord(changed) {
-    const record = {lastMask: changed.mask};
-    for (const [field, bit] of TABLE_78_FIELD_BITS) {
-        if (!(changed.mask & bit)) continue;
-        if (field === "q44" && ((changed.mask & 32) || changed.record?.q44 == null)) continue;
-        record[field] = (changed.record?.[field] ?? 0) - (changed.previous?.[field] ?? 0);
-    }
-    return record;
-}
-
-export function isSemanticLoaderDelta(changed, full) {
-    return !full &&
-        changed.previous != null &&
-        (changed.mask & 96) === 96;
-}
-
 export function decodeText(blob) {
     if (!(blob instanceof Uint8Array)) return null;
     try {
@@ -679,10 +659,18 @@ export function summarizeCargoEjector(entity, typeId, record) {
     };
 }
 
-export function summarizeCannon(entity, record, typeId = null) {
+export function summarizeCannon(entity, record, typeId = null, transformRecord = null) {
     if (!record || !CANNON_TYPE_IDS.has(typeId)) return null;
+    const relativeAngleRadians = numberOrNull(record.q32, 200);
+    const mountingAngleRadians = numberOrNull(transformRecord?.q28, 127.324);
+    const tau = 2 * Math.PI;
+    const absoluteAngleRadians = relativeAngleRadians == null || mountingAngleRadians == null
+        ? null
+        : (((mountingAngleRadians + relativeAngleRadians) % tau) + tau) % tau;
     const ammoItemId = record.q24 == null ? null : CANNON_AMMO_COLOR_ITEM_IDS.get(record.q24) ?? null;
-    const charge = record.q40 ?? null;
+    const indicatorValue = (record.q40 ?? 0) / 50;
+    const indicatorVisible = indicatorValue >= 1;
+    const indicatorBlinking = indicatorValue === 4;
     const recoil = record.q36 ?? null;
     const recoil2 = record.q48 ?? null;
     return {
@@ -692,18 +680,29 @@ export function summarizeCannon(entity, record, typeId = null) {
         ammoItemId,
         ammoName: entityNameFromType(ammoItemId),
         ammoCount: record.q28 ?? 0,
-        aim: record.q32 ?? null,
+        relativeAngleRadians,
+        absoluteAngleRadians,
         recoil,
         recoil2,
         recoils: [recoil, recoil2],
-        charge,
-        charged: charge == null ? null : charge >= 50,
+        indicatorValue,
+        indicatorVisible,
+        indicatorColor: !indicatorVisible ? null : indicatorBlinking ? 0xff0000 : cannonIndicatorColor(indicatorValue),
+        indicatorBlinking,
+        indicatorBlinkColor: indicatorBlinking ? 0xffff00 : null,
         spin: record.q52 ?? null,
-        coolingCellCount: record.q56 ?? 0,
+        resourceCount: record.q56 ?? 0,
         state: cloneRecord(record)
     };
 }
 
+function cannonIndicatorColor(value) {
+    // Match the official renderer's float32 arithmetic before truncating to a byte.
+    const distance = Math.abs(Math.fround(2 - Math.fround(value)));
+    const channel = Math.max(0, Math.min(255, Math.trunc(Math.fround(Math.fround(1 - distance) * 255))));
+    return value < 2 ? (channel << 16) | 0x00ff00 : 0xff0000 | (channel << 8);
+}
+
 export function summarizeThruster(entity, typeId, record) {
     if (!THRUSTER_TYPE_IDS.has(typeId)) return null;
     const facing = Number.isFinite(Number(record?.q20)) ? Number(record.q20) : 0;
@@ -1142,15 +1141,14 @@ export function summarizeHugeThruster(entity, markerRecord, sizeRecord = null) {
     };
 }
 
-export function summarizeLoader(entity, loaderRecord, loaderFilterRecord = null, filterSlotsRecord = null, tracker = null, includeDefaults = false, itemHolderRecord = null) {
+export function summarizeLoader(entity, loaderRecord, loaderFilterRecord = null, filterSlotsRecord = null, includeDefaults = false, itemHolderRecord = null) {
     if (!loaderRecord && !loaderFilterRecord && !includeDefaults) return null;
-    const config = tracker?.getConfig(null, entity, loaderRecord, loaderFilterRecord, filterSlotsRecord) ?? {};
-    const hasLoaderState = Boolean(loaderRecord);
-    const hasPositionConfig = Boolean(tracker?.hasPositionConfig(null, entity));
-    const pick = hasLoaderState && hasPositionConfig ? config.pick ?? null : null;
-    const place = hasLoaderState && hasPositionConfig ? config.place ?? null : null;
-    const priority = config.priority ?? 0;
-    const filterMode = config.filterMode ?? null;
+    // Match the official component defaults, then apply the already decoded state.
+    const loader = {...MODEL_TABLE_SPECS.get(69).defaults, ...loaderRecord};
+    const pick = loader.q20;
+    const place = loader.q24;
+    const priority = loader.q28 - 1;
+    const filterMode = loaderFilterRecord?.q20 ?? 0;
     const heldItem = itemSummary(itemHolderRecord?.q20, itemHolderRecord?.q24 ?? null);
     return {
         entity,
@@ -1160,13 +1158,15 @@ export function summarizeLoader(entity, loaderRecord, loaderFilterRecord = null,
         placeName: enumValueName(LOADER_POSITION_NAMES, place),
         priority,
         priorityName: enumValueName(LOADER_PRIORITY_NAMES, priority),
-        requireOutput: config.requireOutput ?? false,
-        waitForStack: config.waitForStack ?? false,
-        stack: config.stack ?? 16,
-        cycle: Math.max(1, config.cycle ?? 1),
+        requireOutput: Boolean(loader.q41),
+        waitForStack: Boolean(loader.q42),
+        stack: loader.q32,
+        cycle: loader.q36 / 20,
         filterMode,
         filterModeName: enumValueName(LOADER_FILTER_MODE_NAMES, filterMode),
-        filterSlots: config.filterSlots ?? null,
+        filterSlots: filterSlotsRecord
+            ? [filterSlotsRecord.q20, filterSlotsRecord.q24, filterSlotsRecord.q28].map(value => value || null)
+            : null,
         heldItemId: heldItem.itemId,
         heldItemName: heldItem.itemName,
         heldCount: heldItem.count,
@@ -1206,7 +1206,7 @@ export function summarizePusher(entity, pusherRecord, filterSlotsRecord = null)
         filteredModeName: enumValueName(PUSHER_MODE_NAMES, filteredMode),
         angle: numberOrNull(pusherRecord.q28, 10),
         speed: pusherRecord.q32 == null ? 20 : (pusherRecord.q32 / 100) + 20,
-        length: pusherRecord.q40 == null ? 1000 : ((pusherRecord.q40 + 50) / 10) + 995,
+        length: 1000 + (pusherRecord.q40 ?? 0) / 10,
         filterInventory: pusherRecord.q36 === 1,
         filterSlots: filterSlotsRecord ? [filterSlotsRecord.q20 ?? null, filterSlotsRecord.q24 ?? null, filterSlotsRecord.q28 ?? null] : null,
         state: cloneRecord(pusherRecord),
@@ -1372,7 +1372,37 @@ export function summarizePlayerPreview(entity, record, blueprintItems = []) {
     };
 }
 
-export function summarizePlayer(entity, record, previewRecord = null, blueprintItems = []) {
+function summarizePlayerAppearance(record, player) {
+    if (!record) return null;
+    const style = (colorOffset, styleOffset) => ({
+        color: record[qKey(colorOffset)] ?? 0,
+        styleId: record[qKey(styleOffset)] ?? 0
+    });
+    const override = (offset) => {
+        const id = player[qKey(offset)] ?? 0;
+        return id === 0 ? null : {itemId: id, itemName: entityNameFromType(id)};
+    };
+    return {
+        bodyColor: record.q20 ?? 0,
+        legsColor: record.q24 ?? 0,
+        skinColor: record.q28 ?? 0,
+        feetColor: record.q32 ?? 0,
+        hair: style(36, 40),
+        hat: style(44, 48),
+        face1: style(52, 56),
+        face2: style(60, 64),
+        itemOverrides: {
+            back: override(36),
+            hands: override(40),
+            feet: override(44),
+            head1: override(48),
+            head2: override(52)
+        },
+        state: cloneRecord(record)
+    };
+}
+
+export function summarizePlayer(entity, record, previewRecord = null, blueprintItems = [], appearanceRecord = null, localPlayerEntity = null) {
     if (!record) return null;
     const rawHeldItemId = record.q28 == null ? null : Number(record.q28);
     const heldItemId = Number.isFinite(rawHeldItemId) && rawHeldItemId !== 0 ? rawHeldItemId : null;
@@ -1383,14 +1413,29 @@ export function summarizePlayer(entity, record, previewRecord = null, blueprintI
         name: decodeText(record.blob92),
         heldItemId,
         heldItemName: entityNameFromType(heldItemId),
-        repairTargetDistance: record.q56 == null ? null : record.q56 / 10,
-        repairTargetAngle: record.q80 == null ? null : record.q80 / 100,
+        itemMode: record.q32 ?? null,
+        buildMultiplier: numberOrNull(record.q68, 10),
+        heldItemBeamDistance: numberOrNull(record.q56, 10),
+        heldItemAngle: numberOrNull(record.q80, 200),
         shipRank: PLAYER_SHIP_RANKS.get(teamRank) || null,
         patronTier: patronTierName(gameRank),
         isDeveloper: gameRank === 1,
         isPatron: gameRank >= 2 && gameRank <= 6,
-        piloting: Boolean(record.q107),
+        isLocal: entity === localPlayerEntity,
+        zoomedOut: Boolean(record.q107),
         muted: Boolean(record.q112),
+        invisible: Boolean(record.q106),
+        cheats: {
+            noclip: Boolean(record.q105),
+            sandboxBuild: Boolean(record.q108)
+        },
+        itemEffectActive: Boolean(record.q111),
+        animation: {
+            facing: record.q20 ?? 1,
+            orientation: record.q24 ?? 0,
+            walking: Boolean(record.q109)
+        },
+        appearance: summarizePlayerAppearance(appearanceRecord, record),
         actionPreview: summarizePlayerPreview(entity, previewRecord, blueprintItems),
         state: cloneRecord(record)
     };

package/src/state/model/index.d.ts

@@ -25,6 +25,10 @@ export {
     type ShieldGeneratorSummary,
     type HelmSummary,
     type PlayerSummary,
+    type PlayerAnimationSummary,
+    type PlayerAppearanceSummary,
+    type PlayerAppearanceStyleSummary,
+    type PlayerAppearanceItemSummary,
     type ShipControlSummary,
     type ShipWorldMetadataSummary,
     type ShipShieldSummary,