@maka/maka-cli 5.179.0 → 5.180.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.179.0",
+  "version": "5.180.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/unlock.js

@@ -1,6 +1,7 @@
 import { Door } from '../models/door.js';
 import { Command } from './command.js';
 import { ensureAtExit, lockedRouteHint } from '../utilities/spots.js';
+import { applyDeviceOpened } from '../utilities/devices.js';
 export class UnlockCommand extends Command {
     static verb = 'unlock';
     static description = 'Unlock a door.';
@@ -51,6 +52,34 @@ export class UnlockCommand extends Command {
         if (reach.refusal)
             return reach.refusal;
         const crossNote = reach.line ? `${reach.line}\n` : '';
+        // A DOOR HELD BY A DEVICE IN THIS ROOM (8XDR2BCZoSmpqdkXG). The
+        // Door itself knows no key -- scene-factory seals it through the
+        // device (heldByDevice), and the KEY lives on the device as its
+        // keyItem. This verb only ever read the Door, so on a keyed maglock
+        // it answered "you don't have the key" to the player holding it --
+        // while the device's own wrong-verb line promised exactly this:
+        // "The right key opens it clean: 'unlock' with Corvid's Fob in
+        // hand." Same offer `use` makes, so the same code path and the same
+        // aftermath (applyDeviceOpened), never a second copy of "what opens
+        // this".
+        const holder = room.deviceOpening(direction);
+        if (holder) {
+            if (holder.keyItem && this.actor.inventory.hasItem(holder.keyItem.name)) {
+                const result = holder.offer('', this.actor.inventory);
+                this.logger.write(`UnlockCommand: ${this.actor.name} turned ${holder.keyItem.name} in ${holder.name}: ${result.success}`);
+                this.actor.performAction('unlocked', result.message);
+                if (!result.success)
+                    return crossNote + result.message;
+                const lines = applyDeviceOpened(this.scene, this.actor, room, holder, 'unlock');
+                return crossNote + [result.message, ...lines].join('\n');
+            }
+            const ways = holder.verbs().map(v => `"${v} ${holder.name}"`).join(' or ');
+            const takes = holder.keyItem
+                ? `It takes ${holder.keyItem.name}, which you don't have.`
+                : `No key you could carry fits it.`;
+            this.logger.write(`UnlockCommand: ${this.actor.name} has no key for ${holder.name} on "${target}".`);
+            return crossNote + `${holder.name} holds it. ${takes} Or force it: ${ways}.`;
+        }
         const requiredKeyOrSolution = door.unlockItemOrSolution?.toLowerCase();
         if (requiredKeyOrSolution && this.actor.inventory.hasItem(requiredKeyOrSolution)) {
             const key = this.actor.inventory.getItem(requiredKeyOrSolution);

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

@@ -147,6 +147,20 @@ export class UseCommand extends Command {
             return resolved.error ?? `You don't have the ${itemName} to use.`;
         }
         const itemToUse = resolved.item;
+        // A KEY, USED ON ITS OWN, GOES INTO THE LOCK IT OPENS
+        // (8XDR2BCZoSmpqdkXG). "use Corvid's Fob" is the most natural thing
+        // to type at a maglock that says it takes the fob, and it used to
+        // fall all the way down this ladder to "You can't use the fob in
+        // this way" -- the Key category has no use() of its own. When
+        // exactly one shut device in the room answers to this item, the
+        // item IS the offer, the same one "use <item> on <device>" makes.
+        const opensHere = devices.filter(d => d.keyItem?.name === itemToUse.name);
+        if (opensHere.length === 1) {
+            return this.useDevice(opensHere[0], itemToUse.name);
+        }
+        if (opensHere.length > 1) {
+            return `${itemToUse.name} opens more than one thing here -- say which: ${opensHere.map(d => d.name).join(', ')}.`;
+        }
         if (itemToUse.category === Category.Medical) {
             return this.applyFirstAid(itemToUse);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.179.0",
+  "version": "5.180.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.",