dredless 1.0.1 → 1.1.0

package/dist/browser/dredless.global.js

@@ -4068,7 +4068,6 @@
     firstRecord: () => firstRecord,
     isAquaShielderBotState: () => isAquaShielderBotState,
     isBlueRusherBotState: () => isBlueRusherBotState,
-    isBoulderBotExclusion: () => isBoulderBotExclusion,
     isCowardBossState: () => isCowardBossState,
     isLazerEnthusiastBotState: () => isLazerEnthusiastBotState,
     isNavigationDestination: () => isNavigationDestination,
@@ -4095,11 +4094,13 @@
     pushCapped: () => pushCapped,
     qKey: () => qKey,
     scaledSizeSummary: () => scaledSizeSummary,
+    summarizeBall: () => summarizeBall,
     summarizeBlueprintPreview: () => summarizeBlueprintPreview,
     summarizeBot: () => summarizeBot,
     summarizeCannon: () => summarizeCannon,
     summarizeCargoEjector: () => summarizeCargoEjector,
     summarizeCargoHatch: () => summarizeCargoHatch,
+    summarizeCombatBeams: () => summarizeCombatBeams,
     summarizeCommsStation: () => summarizeCommsStation,
     summarizeDockingSpring: () => summarizeDockingSpring,
     summarizeDoor: () => summarizeDoor,
@@ -4117,8 +4118,11 @@
     summarizeNavigationUnit: () => summarizeNavigationUnit,
     summarizePlayer: () => summarizePlayer,
     summarizePlayerPreview: () => summarizePlayerPreview,
+    summarizeProjectile: () => summarizeProjectile,
     summarizePusher: () => summarizePusher,
     summarizePusherBeam: () => summarizePusherBeam,
+    summarizeRcd: () => summarizeRcd,
+    summarizeRecycler: () => summarizeRecycler,
     summarizeShieldGenerator: () => summarizeShieldGenerator,
     summarizeShieldProjector: () => summarizeShieldProjector,
     summarizeShipControl: () => summarizeShipControl,
@@ -4662,6 +4666,10 @@
     [11, { name: "numeric_sparse", fields: numericFields({ 1: 20, 2: 24, 4: 28, 8: 32, 16: 36 }) }],
     [12, { name: "numeric_sparse", fields: numericFields({ 1: 20, 2: 24, 4: 28, 8: 32 }) }],
     [14, { name: "size_state", fields: numericFields({ 1: 20, 2: 24, 4: 28, 8: 32, 16: 36, 32: 40, 64: 44 }) }],
+    [15, {
+      name: "combat_beams",
+      fields: numericFields({ 1: 20, 2: 24, 4: 28, 8: 32, 16: 36, 32: 40, 64: 44, 128: 48, 256: 52 })
+    }],
     [16, {
       name: "label_numeric_state",
       read(reader, record, mask) {
@@ -4679,29 +4687,48 @@
         if (mask & 16) record.q36 = (record.q36 || 0) + reader.readFieldDelta();
       }
     }],
-    [17, { name: "numeric_sparse", fields: numericFields({ 1: 20, 2: 24, 4: 28, 8: 32, 16: 36 }) }],
+    [17, {
+      name: "ball",
+      packedBeforeValues: true,
+      packedBits: [{ bit: 1, offset: 21 }, { bit: 2, offset: 22 }]
+    }],
     [18, {
       name: "mob_combat_state",
+      // Official reader packs flags 64/2048 before numeric deltas. Raw offsets
+      // follow that reader's layout, rather than treating flag bits as values.
+      packedBeforeValues: true,
+      packedBits: [{ bit: 64, offset: 77 }, { bit: 2048, offset: 78 }],
+      defaults: {
+        q20: -1,
+        q24: 0,
+        q28: 0,
+        q32: 0,
+        q36: 0,
+        q40: -9417217,
+        q44: 0,
+        q48: -100,
+        q52: 0,
+        q56: 10,
+        q60: 10,
+        q64: 1,
+        q68: 1,
+        q72: 100
+      },
       fields: numericFields({
         2: 20,
         4: 24,
         8: 28,
         16: 32,
         32: 36,
-        64: 40,
-        128: 44,
-        256: 48,
-        512: 52,
-        1024: 56,
-        2048: 60,
-        4096: 64,
-        8192: 68,
-        16384: 72,
-        32768: 76,
-        65536: 80,
-        131072: 84,
-        524288: 88,
-        4194304: 92
+        128: 40,
+        256: 44,
+        512: 48,
+        1024: 52,
+        4096: 56,
+        8192: 60,
+        16384: 64,
+        32768: 68,
+        65536: 72
       })
     }],
     [19, { name: "motion_state", packedBits: [{ bit: 4, offset: 29 }], ...TWO_FIELD_SPEC }],
@@ -4755,7 +4782,13 @@
       fields: numericFields({ 1: 20, 2: 24 }),
       blobs: [{ bit: 4, offset: 28 }, { bit: 8, offset: 40 }]
     }],
-    [24, { name: "projectile_state", packedBits: [{ bit: 8, offset: 33 }], fields: numericFields({ 1: 20, 2: 24, 4: 28 }) }],
+    [24, {
+      name: "projectile_state",
+      defaults: { q20: 16777215, q24: 1, q28: 1 },
+      packedBeforeValues: true,
+      packedBits: [{ bit: 2, offset: 33 }],
+      fields: numericFields({ 1: 20, 4: 24, 8: 28 })
+    }],
     [25, {
       name: "zone_label",
       orderedValues: true,
@@ -4834,7 +4867,7 @@
       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 }) }],
+    [59, { name: "rcd", fields: numericFields({ 1: 20, 2: 24, 4: 28, 8: 32 }) }],
     [60, { name: "fluid_tank", packedBits: [{ bit: 4, offset: 29 }], ...TWO_FIELD_SPEC }],
     [61, { name: "shield_charge", ...TWO_FIELD_SPEC }],
     [62, { name: "flag_state", packedBits: [{ bit: 1, offset: 21 }], fields: [] }],
@@ -4906,7 +4939,7 @@
     [48, 12],
     [49, 13],
     [50, 14],
-    [51, 51],
+    [51, 15],
     [52, 16],
     [74, 17],
     [80, 17],
@@ -5327,38 +5360,113 @@
     combatRecord,
     motionRecord,
     table10Record,
-    table51Record,
+    beamRecord,
     itemCrate,
     player,
     shipControl
   }) {
-    if (!health || itemCrate || player || shipControl || isBoulderBotExclusion(health, table2Record, combatRecord)) return null;
+    if (!health || itemCrate || player || shipControl) return null;
     const className = botClassFromState({
       health,
       table2Record,
       smallRecord,
       combatRecord,
       table10Record,
-      table51Record
+      beamRecord
     });
+    if (className === "bot") return null;
     return {
       entity,
       className,
+      classificationSource: "heuristic",
+      health,
+      beams: summarizeCombatBeams(entity, beamRecord),
+      combat: combatRecord ? {
+        bodyColorRgba: (combatRecord.q20 ?? -1) >>> 0,
+        weaponColorRgba: (combatRecord.q40 ?? -9417217) >>> 0,
+        aimAngle: combatRecord.q44 === -70 ? null : numberOrNull(combatRecord.q44, 10),
+        thrusterMask: combatRecord.q60 ?? 10,
+        alternateSprite: Boolean(combatRecord.q77),
+        beamEffectEnabled: Boolean(combatRecord.q78),
+        state: cloneRecord(combatRecord)
+      } : null,
       identifier: botIdentifierFromState({ combatRecord, motionRecord, smallRecord }),
       typeA: health.state?.q28 ?? null,
       typeB: health.state?.q32 ?? null
     };
   }
-  function isBoulderBotExclusion(health, table2Record, combatRecord) {
-    return Boolean(
-      health?.maxHp === 2e3 && health?.state?.q28 === 30 && health?.state?.q32 != null && table2Record?.q20 != null && table2Record?.q24 == null && !combatRecord
-    );
+  function summarizeProjectile(entity, record) {
+    if (!record) return null;
+    const color = record.q20 ?? 16777215;
+    const itemId = record.q28 ?? 1;
+    return {
+      entity,
+      color,
+      colorCss: colorToCss(color),
+      botStyle: Boolean(record.q33),
+      indicatorCount: record.q24 ?? 1,
+      spriteItemId: itemId === 0 ? null : itemId,
+      spriteItemName: itemId === 0 ? null : entityNameFromType(itemId),
+      state: cloneRecord(record)
+    };
+  }
+  function summarizeCombatBeams(entity, record) {
+    if (!record) return null;
+    return {
+      entity,
+      beams: [0, 1, 2].map((index) => {
+        const length = (record[qKey(32 + index * 4)] ?? 0) / 10;
+        return {
+          angle: (record[qKey(20 + index * 4)] ?? 0) / 1e3,
+          length,
+          active: length > 0,
+          colorRgba: (record[qKey(44 + index * 4)] ?? 0) >>> 0
+        };
+      }),
+      state: cloneRecord(record)
+    };
+  }
+  function summarizeBall(entity, record, health = null, sizeRecord = null) {
+    if (!record) return null;
+    return {
+      entity,
+      health,
+      radius: numberOrNull(sizeRecord?.q20, 20),
+      rubber: Boolean(record.q21),
+      isEgg: Boolean(record.q22),
+      state: cloneRecord(record)
+    };
+  }
+  function summarizeRcd(entity, record, itemHolderRecord) {
+    if (!record) return null;
+    const variant = (record.q20 ?? 0) === 0 ? "sandbox" : "flux";
+    const item = itemSummary(itemHolderRecord?.q20, itemHolderRecord?.q24);
+    return {
+      entity,
+      variant,
+      variantCode: record.q20 ?? 0,
+      itemId: variant === "sandbox" ? 121 : 122,
+      storedItemId: item.itemId,
+      storedItemName: item.itemName,
+      storedItemCount: item.count,
+      beam: {
+        offsetX: (record.q28 ?? 0) / 5,
+        offsetY: (record.q32 ?? 0) / 5,
+        active: Boolean(record.q28 || record.q32)
+      },
+      state: cloneRecord(record)
+    };
+  }
+  function summarizeRecycler(entity, marker, itemHolderRecord) {
+    if (!marker) return null;
+    const item = itemSummary(itemHolderRecord?.q20, itemHolderRecord?.q24);
+    return { entity, storedItemId: item.itemId, storedItemName: item.itemName, storedItemCount: item.count };
   }
-  function botClassFromState({ health, table2Record, smallRecord, combatRecord, table10Record, table51Record }) {
+  function botClassFromState({ health, table2Record, smallRecord, combatRecord, table10Record, beamRecord }) {
     if (isYellowMineGuardBotState({ health, smallRecord, combatRecord, table2Record })) return "yellow-mine-guard";
     if (isShieldHelperBotState({ health, table2Record })) return "shield-helper";
     if (isShieldMasterBotState({ health, table2Record })) return "shield-master";
-    if (isLazerEnthusiastBotState({ health, table2Record, table10Record, table51Record })) return "lazer-enthusiast";
+    if (isLazerEnthusiastBotState({ health, table2Record, table10Record, beamRecord })) return "lazer-enthusiast";
     if (isCowardBossState({ health })) return "the-coward";
     if (isOrangeFoolBotState({ combatRecord })) return "orange-fool";
     if (isZombieBossBotState({ health, table2Record, combatRecord })) return "zombie-boss";
@@ -5372,6 +5480,7 @@
     if (isAquaShielderBotState({ health, table2Record, combatRecord })) return "aqua-shielder";
     if (table2Record) return "table2-bot";
     if (combatRecord) return "combat-bot";
+    if (beamRecord) return "beam-bot";
     return "bot";
   }
   function isCowardBossState({ health }) {
@@ -5398,8 +5507,8 @@
   function isAquaShielderBotState({ health, table2Record, combatRecord }) {
     return combatRecord?.q20 === 13697024 && combatRecord?.q24 === 1 || health?.state?.q28 === 50 && health?.state?.q32 === 122 && table2Record?.q20 === 240 && table2Record?.q24 === -900;
   }
-  function isLazerEnthusiastBotState({ health, table2Record, table10Record, table51Record }) {
-    return health?.state?.q28 === 140 && health?.state?.q32 === 155 && table2Record?.q20 === 300 && table2Record?.q24 === -900 && Boolean(table10Record) && Boolean(table51Record);
+  function isLazerEnthusiastBotState({ health, table2Record, table10Record, beamRecord }) {
+    return health?.state?.q28 === 140 && health?.state?.q32 === 155 && table2Record?.q20 === 300 && table2Record?.q24 === -900 && Boolean(table10Record) && Boolean(beamRecord);
   }
   function isYellowMineGuardBotState({ health, smallRecord, combatRecord, table2Record }) {
     return health?.state?.q28 === 30 && health?.state?.q32 === 33 && smallRecord?.q20 === 78 && smallRecord?.q24 === 78 && combatRecord?.q24 === -995542016 && !table2Record;
@@ -5952,6 +6061,10 @@
     return { width: 1, height: 1, source: "default" };
   }
   function entityLabel(entity) {
+    if (entity?.projectile) return "Projectile";
+    if (entity?.ball) return entity.ball.isEgg ? "Egg" : "Ball";
+    if (entity?.rcd) return entity.rcd.variant === "sandbox" ? "Sandbox RCD" : "Flux RCD";
+    if (entity?.recycler) return "Recycler";
     if (entity?.category === "metadata" && entity?.typeName) return `Metadata ${entity.typeName}`;
     if (entity?.blueprintPreview) return `Blueprint Preview (${entity.blueprintPreview.itemName ?? entity.blueprintPreview.itemId ?? "item"})`;
     if (entity?.category === "loose_item" && entity?.itemHolder?.itemName) return `Loose ${entity.itemHolder.itemName}`;
@@ -5982,6 +6095,10 @@
     return entity?.typeId != null ? `Entity ${entity.typeId}` : "Entity";
   }
   function entityCategory(entity) {
+    if (entity?.projectile) return "projectile";
+    if (entity?.ball) return "ball";
+    if (entity?.rcd) return "rcd";
+    if (entity?.recycler) return "placed_entity";
     if (entity?.player) return "player";
     if (entity?.blueprintPreview) return "blueprint_preview";
     if (entity?.shipControl) return "ship_control";
@@ -6084,7 +6201,11 @@
     summarizeCommsStation: summarizeCommsStation2,
     summarizeHealth: summarizeHealth2,
     summarizeBot: summarizeBot2,
-    isBoulderBotExclusion: isBoulderBotExclusion2,
+    summarizeProjectile: summarizeProjectile2,
+    summarizeCombatBeams: summarizeCombatBeams2,
+    summarizeBall: summarizeBall2,
+    summarizeRcd: summarizeRcd2,
+    summarizeRecycler: summarizeRecycler2,
     botClassFromState: botClassFromState2,
     isCowardBossState: isCowardBossState2,
     isOrangeFoolBotState: isOrangeFoolBotState2,
@@ -6265,6 +6386,11 @@
         blocks: includeBlocks ? this.#derivedBlocks().slice() : void 0,
         transforms: derived.transforms.slice(),
         players: derived.players.slice(),
+        projectiles: derived.specialEntities.projectiles.slice(),
+        bots: derived.specialEntities.bots.slice(),
+        rcds: derived.specialEntities.rcds.slice(),
+        balls: derived.specialEntities.balls.slice(),
+        recyclers: derived.specialEntities.recyclers.slice(),
         shipControls: derived.shipControls.slice(),
         machines: this.#machinesSnapshot(derived.machines),
         tables: includeTables ? this.tablesSnapshot() : derived.tableSummaries.slice()
@@ -6289,6 +6415,21 @@
     players() {
       return this.#derivedState().players.slice();
     }
+    projectiles() {
+      return this.#derivedState().specialEntities.projectiles.slice();
+    }
+    bots() {
+      return this.#derivedState().specialEntities.bots.slice();
+    }
+    rcds() {
+      return this.#derivedState().specialEntities.rcds.slice();
+    }
+    balls() {
+      return this.#derivedState().specialEntities.balls.slice();
+    }
+    recyclers() {
+      return this.#derivedState().specialEntities.recyclers.slice();
+    }
     shipControls() {
       return this.#derivedState().shipControls.slice();
     }
@@ -6633,6 +6774,7 @@
         doors: [],
         expandoBoxes: []
       };
+      const specialEntities = { projectiles: [], bots: [], rcds: [], balls: [], recyclers: [] };
       const players = [];
       const shipControls = [];
       const transforms = [];
@@ -6661,12 +6803,18 @@
         if (contents.spawnPoint) machines.spawnPoints.push(contents.spawnPoint);
         if (contents.door) machines.doors.push(contents.door);
         if (contents.expandoBox) machines.expandoBoxes.push(contents.expandoBox);
+        if (contents.projectile) specialEntities.projectiles.push(contents.projectile);
+        if (contents.bot) specialEntities.bots.push(contents.bot);
+        if (contents.rcd) specialEntities.rcds.push(contents.rcd);
+        if (contents.ball) specialEntities.balls.push(contents.ball);
+        if (contents.recycler) specialEntities.recyclers.push(contents.recycler);
         if (contents.player) players.push(contents.player);
         if (contents.shipControl) shipControls.push(contents.shipControl);
       }
       derived.entities = entities;
       derived.transforms = transforms;
       derived.players = players;
+      derived.specialEntities = specialEntities;
       derived.shipControls = shipControls;
       derived.machines = machines;
       derived.summariesDirty = false;
@@ -6743,6 +6891,11 @@
       const itemHolder = summarizeItemHolder2(entityId, itemHolderRecord);
       const isExpandoBox = typeId === EXPANDO_BOX_TYPE_ID2 || markerTypeId === EXPANDO_BOX_TYPE_ID2;
       const health = summarizeHealth2(entityId, healthRecord);
+      const projectile = summarizeProjectile2(entityId, rec(24));
+      const combatBeams = summarizeCombatBeams2(entityId, rec(15));
+      const ball = summarizeBall2(entityId, rec(17), health, rec(2));
+      const rcd = summarizeRcd2(entityId, rec(59), itemHolderRecord);
+      const recycler = this.isOverworld === false ? summarizeRecycler2(entityId, rec(23), itemHolderRecord) : null;
       const fabricator = summarizeFabricator2(entityId, fabricatorRecord, itemHolderRecord, typeRecord);
       const cargoEjector = summarizeCargoEjector2(entityId, typeId, cargoEjectorRecord);
       const cannon = summarizeCannon2(entityId, cannonRecord, typeId, transformRecord);
@@ -6774,15 +6927,15 @@
       const mapMarker = this.isOverworld ? summarizeMapMarker2(entityId, labelRecord, zoneLabelRecord, crateSizeRecord) : null;
       const dockingSpring = this.isOverworld ? summarizeDockingSpring2(entityId, dockingSpringRecord, bodyStateRecord, crateSizeRecord) : null;
       const hugeThruster = this.isOverworld ? summarizeHugeThruster2(entityId, hugeThrusterRecord, crateSizeRecord) : null;
-      const itemCrate = this.isOverworld && !rec(2) && !rec(18) && health && crateSizeRecord ? summarizeItemCrate2(entityId, crateSizeRecord, crateItemRecord, healthRecord) : null;
-      const bot = this.isOverworld ? summarizeBot2(entityId, {
+      const itemCrate = this.isOverworld && !rec(2) && !rec(18) && !combatBeams && !projectile && !ball && !rcd && health && crateSizeRecord ? summarizeItemCrate2(entityId, crateSizeRecord, crateItemRecord, healthRecord) : null;
+      const bot = (this.isOverworld || rec(18) || combatBeams) && !projectile && !ball && !rcd ? summarizeBot2(entityId, {
         health,
         table2Record: rec(2),
         smallRecord: crateSizeRecord,
         combatRecord: rec(18),
         motionRecord: crateItemRecord,
         table10Record: rec(10),
-        table51Record: rec(51),
+        beamRecord: rec(15),
         itemCrate,
         player,
         shipControl
@@ -6795,6 +6948,11 @@
         flags: [transformRecord.q33, transformRecord.q34, transformRecord.q35].filter((value) => value != null)
       } : null;
       const contents = mergeContents2({
+        projectile,
+        combatBeams,
+        ball,
+        rcd,
+        recycler,
         itemHolder,
         expandoBox,
         hoverOutline,
@@ -6855,6 +7013,10 @@
       });
       const typeName = entityNameFromType2(typeId);
       const category = entityCategory2({
+        projectile,
+        ball,
+        rcd,
+        recycler,
         typeId,
         markerTypeId,
         looseItemMarker,
@@ -6890,6 +7052,10 @@
         markerTypeId,
         markerTypeName,
         label: entityLabel2({
+          projectile,
+          ball,
+          rcd,
+          recycler,
           category,
           typeId,
           typeName,
@@ -6923,6 +7089,11 @@
           isOverworld: this.isOverworld
         }),
         kind: [
+          projectile ? "projectile" : null,
+          combatBeams ? "combat_beams" : null,
+          ball ? "ball" : null,
+          rcd ? "rcd" : null,
+          recycler ? "recycler" : null,
           transform ? "transform" : null,
           dynamicBody ? "dynamic_body" : null,
           itemHolder ? "item_holder" : null,
@@ -7529,6 +7700,11 @@
         transforms: model.transforms,
         machines: model.machines,
         players: model.players,
+        projectiles: model.projectiles,
+        bots: model.bots,
+        rcds: model.rcds,
+        balls: model.balls,
+        recyclers: model.recyclers,
         shipControls: model.shipControls,
         commsBubbles: this.commsBubbles.slice(),
         tiles: includeTiles ? [...this.tiles.values()] : void 0
@@ -8941,6 +9117,11 @@
       this.entities = new EntityCollection(client, scope);
       this.machines = new MachineCollection(client, scope);
       this.players = new PlayerCollection(client, scope);
+      this.projectiles = new EntitySummaryCollection(client, scope, "projectiles");
+      this.bots = new EntitySummaryCollection(client, scope, "bots");
+      this.rcds = new EntitySummaryCollection(client, scope, "rcds");
+      this.balls = new EntitySummaryCollection(client, scope, "balls");
+      this.recyclers = new EntitySummaryCollection(client, scope, "recyclers");
       this.blocks = new BlockCollection(client, scope);
       this.materials = new MaterialCollection(client, scope);
     }
@@ -9058,6 +9239,21 @@
       return currentPlayerSummary(this.client, this.scope);
     }
   };
+  var EntitySummaryCollection = class {
+    constructor(client, scope, method) {
+      this.client = client;
+      this.scope = scope;
+      this.method = method;
+      this.component = { projectiles: "projectile", bots: "bot", rcds: "rcd", balls: "ball", recyclers: "recycler" }[method];
+    }
+    all() {
+      return worldStateFor(this.client, this.scope)?.model[this.method]() || [];
+    }
+    get(entity) {
+      const id = entityIdOf(entity);
+      return worldStateFor(this.client, this.scope)?.model.entity(id)?.contents?.[this.component] || null;
+    }
+  };
   var BlockCollection = class {
     constructor(client, scope) {
       this.client = client;
@@ -9709,6 +9905,7 @@
     }
   };
   var ENTITY_COMPONENT_ALIASES = /* @__PURE__ */ new Map([
+    ["combatbeams", "combatBeams"],
     ["hoveroutline", "hoverOutline"],
     ["outline", "hoverOutline"],
     ["itemholder", "itemHolder"],
@@ -9759,6 +9956,12 @@
     "expandoBox"
   ];
   var ENTITY_FEATURES = [
+    "combatBeams",
+    "projectile",
+    "bot",
+    "rcd",
+    "ball",
+    "recycler",
     "health",
     "position",
     "outline",
@@ -9817,6 +10020,10 @@
     return null;
   }
   function entityPublicType(summary, contents) {
+    if (contents?.projectile) return "projectile";
+    if (contents?.rcd) return "rcd";
+    if (contents?.ball) return contents.ball.isEgg ? "egg" : "ball";
+    if (contents?.recycler) return "recycler";
     const machine = entityMachineType(contents);
     if (machine) return machine;
     if (contents?.player || summary?.category === "player") return "player";