@maka/maka-cli 5.229.0 → 5.231.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.229.0",
+  "version": "5.231.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",

package/bundle/typescript/src/commands/game/sideQuest/commands/pan.js

@@ -35,17 +35,36 @@ export class PanCommand extends Command {
         }
         return this.dashboard();
     }
-    /** One device on or off the network (p.233 -- slaving is a choice). */
-    switchDevice(name, on) {
+    /**
+     * Everything on this runner the switch can reach, held and worn gear
+     * INCLUDED. Equipping moves an item out of `inventory.getAllItems()`,
+     * so a list built from inventory alone loses the gun in your hand --
+     * which is the one device a player is most likely to mute. Both the
+     * lookup and the "switched off" list read this, so a device you can
+     * turn off is always a device you can see is off.
+     */
+    reachableDevices() {
         const a = this.actor;
-        if (!name)
-            return `${on ? 'Link' : 'Unlink'} what? Try "pan ${on ? 'on' : 'off'} <device>".`;
-        const candidates = [
+        const seen = new Set();
+        return [
             a.equipment.head?.commlink,
+            a.equipment.head?.eyes,
             a.equipment.rightHand?.weapon,
             a.equipment.leftHand?.weapon,
             ...a.inventory.getAllItems(),
-        ].filter((i) => i != null);
+        ].filter((i) => {
+            if (i == null || seen.has(i))
+                return false;
+            seen.add(i);
+            return true;
+        });
+    }
+    /** One device on or off the network (p.233 -- slaving is a choice). */
+    switchDevice(name, on) {
+        const a = this.actor;
+        if (!name)
+            return `${on ? 'Link' : 'Unlink'} what? Try "pan ${on ? 'on' : 'off'} <device>".`;
+        const candidates = this.reachableDevices();
         const needle = name.toLowerCase();
         const item = candidates.find(i => i.name.toLowerCase() === needle)
             ?? candidates.find(i => i.name.toLowerCase().includes(needle));
@@ -85,7 +104,7 @@ export class PanCommand extends Command {
         const a = this.actor;
         const master = a.getPanMaster();
         if (!master) {
-            const off = a.inventory.getAllItems().filter(i => !i.wirelessOn && Player.canJoinPan(i));
+            const off = this.reachableDevices().filter(i => !i.wirelessOn && Player.canJoinPan(i));
             if (off.length > 0) {
                 // The honest reason, because "no PAN" reads like a bug when you
                 // are holding a commlink you switched off yourself.
@@ -136,7 +155,7 @@ export class PanCommand extends Command {
         }
         // Anything deliberately switched off is listed too: a device you
         // cannot see on this screen is a device you will forget you muted.
-        const off = [...a.inventory.getAllItems()].filter(i => !i.wirelessOn && Player.canJoinPan(i));
+        const off = this.reachableDevices().filter(i => !i.wirelessOn && Player.canJoinPan(i));
         if (off.length > 0) {
             lines.push('');
             lines.push('Switched off:');

package/bundle/typescript/src/commands/game/sideQuest/models/player.js

@@ -997,10 +997,25 @@ export class Player extends AbstractPlayer {
      * not here and a smartgun is: the smartlink is the device.
      */
     panSlaves() {
+        // Over capacity is the master's problem, not a silent truncation --
+        // panOverflow() reports the excess so `pan` can say so out loud.
+        return this.panCandidates().slice(0, this.panCapacity());
+    }
+    /** Slaves that do not fit under the master's (DR x 3) ceiling. */
+    panOverflow() {
+        return Math.max(0, this.panCandidates().length - this.panCapacity());
+    }
+    /**
+     * Everything eligible to be a slave right now, master excluded. ONE
+     * assembly for both readers above -- they disagreed in the first cut
+     * (slaves counted worn gear, overflow counted only inventory), which
+     * would have reported "0 over capacity" while quietly dropping the gun
+     * in your hand off the end of the list.
+     */
+    panCandidates() {
         const master = this.getPanMaster();
         if (!master)
             return [];
-        const carried = this._inventory.getAllItems();
         const worn = [
             this._equipment.head?.commlink,
             this._equipment.rightHand?.weapon,
@@ -1008,7 +1023,7 @@ export class Player extends AbstractPlayer {
         ].filter((i) => i !== undefined && i !== null);
         const seen = new Set([master]);
         const out = [];
-        for (const item of [...worn, ...carried]) {
+        for (const item of [...worn, ...this._inventory.getAllItems()]) {
             if (seen.has(item) || !item.wirelessOn)
                 continue;
             if (!Player.canJoinPan(item))
@@ -1016,17 +1031,7 @@ export class Player extends AbstractPlayer {
             seen.add(item);
             out.push(item);
         }
-        // Over capacity is the master's problem, not a silent truncation --
-        // panOverflow() reports the excess so `pan` can say so out loud.
-        return out.slice(0, this.panCapacity());
-    }
-    /** Slaves that do not fit under the master's (DR x 3) ceiling. */
-    panOverflow() {
-        const master = this.getPanMaster();
-        if (!master)
-            return 0;
-        const wanted = this._inventory.getAllItems().filter(i => i !== master && i.wirelessOn && Player.canJoinPan(i)).length;
-        return Math.max(0, wanted - this.panCapacity());
+        return out;
     }
     /** Whether an item is the kind of thing a PAN can hold at all (p.233:
      *  "only devices can be slaves, masters, or part of a PAN"). */
@@ -1035,7 +1040,16 @@ export class Player extends AbstractPlayer {
             return true;
         if (item.isFirearm())
             return item.isSmartgun;
-        return item.category === Category.Drone || item.category === Category.Electronics;
+        if (item.category === Category.Drone)
+            return true;
+        // ELECTRONICS ONLY IF IT IS ACTUALLY A DEVICE. p.233 is narrow --
+        // "only devices can be slaves, masters, or part of a PAN" -- and
+        // Category.Electronics is not: it is also where the survival kit,
+        // the binoculars and a thermographic vision MOD live. A catalog row
+        // that declares a `device` block is the engine's own record of
+        // having a Device Rating, so that is the test. Without it the
+        // dashboard listed a first-aid tin as hackable gear.
+        return item.category === Category.Electronics && item.row?.device !== undefined;
     }
     /**
      * Defense against a PAN intrusion, itemised: the book's attribute plus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.229.0",
+  "version": "5.231.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 3.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 3.x applications using React.",