dredless 0.7.0 → 1.0.0

package/src/state/model/decoder.js

@@ -253,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,
@@ -273,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}],
@@ -665,7 +668,9 @@ export function summarizeCannon(entity, record, typeId = null, transformRecord =
         ? 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 {
@@ -680,14 +685,24 @@ export function summarizeCannon(entity, record, typeId = null, transformRecord =
         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;
@@ -1357,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;
@@ -1368,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,

package/src/state/model/state.js

@@ -122,6 +122,7 @@ const {
 } = modelDecoder;
 
 export class ModelState {
+    #localPlayerEntity = null;
     #blueprintItems = null;
     #helmOccupied = new Map();
     #commsStationOccupied = new Map();
@@ -147,6 +148,18 @@ export class ModelState {
         this.#invalidateDerived();
     }
 
+    get localPlayerEntity() {
+        return this.#localPlayerEntity;
+    }
+
+    setLocalPlayerEntity(entity) {
+        const next = entity == null ? null : Number(entity);
+        if (next !== null && (!Number.isInteger(next) || next < 0)) throw new RangeError("local player entity must be a non-negative integer or null");
+        if (this.#localPlayerEntity === next) return;
+        this.#localPlayerEntity = next;
+        this.#invalidateDerived();
+    }
+
     table(id) {
         // Shared empty map: #summarizeEntity performs ~32 record() lookups per
         // entity, most against absent tables, and each miss used to allocate.
@@ -435,28 +448,30 @@ export class ModelState {
         const table7 = update.sections.find((section) => section.table === 7);
         if (!table7) return;
 
-        const changedPilotState = new Map();
+        // Zoom state is a hint for helm occupancy when paired with helm updates;
+        // the player flag itself does not identify a pilot or an operated machine.
+        const changedZoomState = new Map();
         for (const section of update.sections) {
             if (section.table !== 55) continue;
             for (const changed of section.records) {
                 if (!(changed.mask & 16)) continue;
                 const player = this.record(55, changed.entity);
-                changedPilotState.set(changed.entity, Boolean(player?.q107));
+                changedZoomState.set(changed.entity, Boolean(player?.q107));
             }
         }
 
-        const activePilotCount = [...this.table(55).values()].filter((record) => record?.q107).length;
+        const zoomedOutPlayerCount = [...this.table(55).values()].filter((record) => record?.q107).length;
         for (const changed of table7.records) {
             const record = this.record(7, changed.entity);
             const typeId = entityTypeIdFromRecord(record);
             if (!HELM_TYPE_IDS.has(typeId)) continue;
 
-            if (activePilotCount > 0 && record?.q20 === 0 && HELM_TYPE_IDS.has(Number(record?.q32))) {
+            if (zoomedOutPlayerCount > 0 && record?.q20 === 0 && HELM_TYPE_IDS.has(Number(record?.q32))) {
                 this.#helmOccupied.set(changed.entity, true);
             }
 
-            if (!(changed.mask & 8) || changedPilotState.size === 0) continue;
-            this.#helmOccupied.set(changed.entity, [...changedPilotState.values()].some(Boolean));
+            if (!(changed.mask & 8) || changedZoomState.size === 0) continue;
+            this.#helmOccupied.set(changed.entity, [...changedZoomState.values()].some(Boolean));
         }
     }
 
@@ -822,7 +837,7 @@ export class ModelState {
         const shieldGenerator = typeId === 256 ? summarizeShieldGenerator(entityId, shieldRecord, itemHolderRecord, shieldGeneratorBoostRecord) : null;
         const shieldProjector = typeId === 257 ? summarizeShieldProjector(entityId, shieldProjectorRecord) : null;
         const blueprintPreview = summarizeBlueprintPreview(entityId, blueprintPreviewRecord, transformRecord);
-        const player = summarizePlayer(entityId, playerRecord, rec(14), this.#blueprintPreviewItems());
+        const player = summarizePlayer(entityId, playerRecord, rec(14), this.#blueprintPreviewItems(), rec(56), this.#localPlayerEntity);
         const shipControl = summarizeShipControl(entityId, shipControlRecord);
         const helm = summarizeHelm(entityId, typeId, this.#helmOccupied.get(entityId));
         const commsStation = summarizeCommsStation(entityId, typeId, commsStationRecord, this.#commsStationOccupied.get(entityId));

package/src/state/world/index.js

@@ -28,6 +28,7 @@ function pushBounded(target, value, limit) {
 export class WorldStore {
     #overworldId = null;
     #shipWorldId = null;
+    #cameraFocus = null;
 
     constructor(limits = {}) {
         this.currentWorldId = null;
@@ -47,6 +48,17 @@ export class WorldStore {
 
     apply(packet) {
         if (!packet || packet.world == null) return null;
+        if (packet.type === 21) {
+            if (this.#cameraFocus && this.#cameraFocus.world !== packet.world) {
+                this.worlds.get(Number(this.#cameraFocus.world))?.model.setLocalPlayerEntity(null);
+            }
+            this.#cameraFocus = packet;
+            this.currentWorldId = Number(packet.world);
+            const world = this.get(packet.world);
+            world.model.setLocalPlayerEntity(null);
+            this.#resolveLocalPlayer(world);
+            return {type: "camera-focus", world, packet};
+        }
         if (packet.type === 22) return this.#applyMeta(packet);
         if (packet.type === 23) return this.#applyTiles(packet);
         if (packet.type === 20) return this.#applyModel(packet);
@@ -98,16 +110,27 @@ export class WorldStore {
         return this.worlds.get(Number(shipWorld.parentWorld))?.entity(shipWorld.parentEntity) || null;
     }
 
+    #resolveLocalPlayer(world) {
+        if (!this.#cameraFocus || Number(this.#cameraFocus.world) !== world.id || world.seed == null) return;
+        const focus = world.decodeEncrypted(this.#cameraFocus.data);
+        // Official camera message is [player_ent, zero], encrypted with the world seed.
+        if (Array.isArray(focus) && focus.length === 2 && Number.isInteger(focus[0]) && focus[0] >= 0 && focus[1] === 0) {
+            world.model.setLocalPlayerEntity(focus[0]);
+        }
+    }
+
     #applyMeta(packet) {
         if (packet.removed) {
             const world = this.worlds.get(Number(packet.world));
             if (world) world.readMeta(packet);
             this.worlds.delete(Number(packet.world));
+            if (Number(this.#cameraFocus?.world) === Number(packet.world)) this.#cameraFocus = null;
             if (this.currentWorldId === Number(packet.world)) this.currentWorldId = null;
             return {type: "world-removed", world: world || null, packet};
         }
         const world = this.get(packet.world);
         world.readMeta(packet);
+        this.#resolveLocalPlayer(world);
         if (this.currentWorldId == null && !world.isOverworld) this.currentWorldId = world.id;
         return {type: "world", world};
     }
@@ -157,7 +180,10 @@ export class WorldStore {
         if (packet.model_data && world.seed != null) {
             const previousModel = world.model;
             try {
-                if (packet.full) world.model = new ModelState({isOverworld: world.isOverworld});
+                if (packet.full) {
+                    world.model = new ModelState({isOverworld: world.isOverworld});
+                    world.model.setLocalPlayerEntity(previousModel.localPlayerEntity);
+                }
                 result.decoded = decodeModelPayload(packet.model_data, packet.world, world.seed);
                 result.model = world.model.apply(result.decoded, {full: Boolean(packet.full)});
                 if (result.model?.error && packet.full && previousModel) world.model = previousModel;