@maka/maka-cli 5.82.1 → 5.83.0

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

@@ -56,6 +56,7 @@ import { InventoryCommand } from './commands/inv.js';
 import { EquipmentCommand } from './commands/equipment.js';
 import { MapCommand } from './commands/map.js';
 import { SilentCommand } from './commands/silent.js';
+import { EnterHostCommand, ExitHostCommand } from './commands/enter-host.js';
 import { RestCommand } from './commands/rest.js';
 import { ReloadCommand } from './commands/reload.js';
 import { SubdueCommand } from './commands/subdue.js';
@@ -2125,6 +2126,20 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('map', MapCommand);
         CommandFactory.registerCommand('exits', MapCommand);
         CommandFactory.registerCommand('silent', SilentCommand);
+        // ENTER/EXIT HOST (p.239). The boundary between the grid and a host's
+        // own space -- see commands/enter-host.ts for why it did not exist
+        // until now.
+        //
+        // "exit" IS NOT REGISTERED HERE, ON PURPOSE. It is already the
+        // quit-the-game verb, and the quit branch in handleInput runs BEFORE
+        // CommandFactory dispatch -- so a command registered under 'exit'
+        // would never once execute. Tests calling the class directly would
+        // still pass, which is exactly the shape of defect kwR8SYTimMu2mgQq5
+        // (tests exercising code the game never runs). Instead the quit
+        // branch ROUTES a bare "exit" to this command while the persona is
+        // inside a host, and 'exit-host' is the always-reachable name.
+        CommandFactory.registerCommand('enter', EnterHostCommand);
+        CommandFactory.registerCommand('exit-host', ExitHostCommand);
         CommandFactory.registerCommand('rest', RestCommand);
         CommandFactory.registerCommand('reload', ReloadCommand);
         CommandFactory.registerCommand('subdue', SubdueCommand);
@@ -2172,6 +2187,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('surrender', SurrenderCommand);
         CommandFactory.registerCommand('jack', JackCommand);
         CommandFactory.registerCommand('project', ProjectCommand);
+        // 'astral' is what a player types when they mean project -- the
+        // word has to be CLAIMED or the parser calls it nonsense
+        // (LFmjA76izZ62NDjAv).
+        CommandFactory.registerCommand('astral', ProjectCommand);
         CommandFactory.registerCommand('return', ReturnCommand);
         CommandFactory.registerCommand('assense', AssenseCommand);
         CommandFactory.registerCommand('drone', DroneCommand);
@@ -3065,6 +3084,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // here would ride the cab home and the next jack-in would start
         // already trapped, with nothing on the grid holding it.
         this.player.linkLockedBy.clear();
+        // Same enumeration, same reason: insideHost is persona state and these
+        // paths end the persona without passing through planes.leaveMatrix.
+        this.player.insideHost = undefined;
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -3113,6 +3135,9 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // Same reason as settleTravelState: an exit that bypasses
         // leaveMatrix must drop the link-lock itself.
         this.player.linkLockedBy.clear();
+        // Same enumeration, same reason: insideHost is persona state and these
+        // paths end the persona without passing through planes.leaveMatrix.
+        this.player.insideHost = undefined;
         this.player.astralTicks = 0;
         this.player.activeDeck = undefined;
         this.player.riggedDrone = undefined;
@@ -4689,8 +4714,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // real session typed "jack-in" and bounced) -- normalize the hyphen.
         const normalized = input.replace(/^\s*jack-(in|out)\b/i, 'jack $1');
         const parts = normalized.trim().split(' ');
-        const verb = parts[0].toLowerCase();
-        const args = parts.slice(1);
+        // `let`, not const: the quit branch below re-points a bare "exit" at
+        // exit-host when the persona is inside one (p.239).
+        let verb = parts[0].toLowerCase();
+        let args = parts.slice(1);
         this.lastResolvedVerb = verb;
         const out = (text) => ({ text, verb: this.lastResolvedVerb });
         // Empty input is a nervous Enter, not a command (a real session's
@@ -4707,6 +4734,17 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             }
             // fall through -- the answer was a real command; play on.
         }
+        else if (verb === 'exit' && actor.insideHost) {
+            // INSIDE A HOST, "exit" MEANS THE HOST (p.239 Enter/Exit Host), not
+            // the game. A persona who just crossed into a host's architecture
+            // and types the obvious word to come back out should not be asked
+            // whether they want to stop playing. "quit" still quits, and is
+            // never ambiguous; this only ever fires while there is an
+            // enclosure nearer than the game itself to leave.
+            verb = 'exit-host';
+            args = [];
+            this.lastResolvedVerb = verb;
+        }
         else if (verb === 'quit' || verb === 'exit') {
             this._quitArmed = true;
             return out(`Really quit? ("y" to confirm -- anything else keeps playing.)`);
@@ -4852,24 +4890,42 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
      * drill into the real descriptions. Verbs registered but missing from
      * this table surface in an "other" bucket rather than vanishing -- a
      * future command can't silently fall out of help.
+     *
+     * AN ALIAS MEANS THE SAME COMMAND -- not "a related word"
+     * (ZJjWMKww2kstbkJCW: "'descend' is not in the list of moving
+     * commands"). Both readers of this table take the group's HEAD as the
+     * command: the overview prints e[0] and nothing else, and "help
+     * <word>" looks up the primary's class to describe it. So a distinct
+     * command parked at index 1 is invisible in the overview AND answers
+     * questions about it with another command's description -- `descend`
+     * was reported missing, but `help descend` was also quietly printing
+     * how to climb UP.
+     *
+     * Five groups had it: descend under climb, run and sprint under move,
+     * unfollow under follow, decompile under compile, kill under attack.
+     * Every one of them is its own class with its own description that no
+     * player could reach. They are split out here rather than taught to
+     * the renderer, because "a group is one command" is the assumption
+     * the renderer is ENTITLED to make -- the table was what lied.
+     * help-taxonomy.test.ts now holds that line for the whole table.
      */
     static HELP_CATEGORIES = [
-        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach', 'run', 'sprint'], ['climb', 'descend', 'mantle', 'scale', 'clamber'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow', 'unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
+        { title: 'moving', entries: [['look'], ['go'], ['move', 'walk', 'approach'], ['run'], ['sprint'], ['climb', 'mantle', 'scale', 'clamber'], ['descend'], ['sit', 'kneel'], ['lie', 'prone'], ['stand'], ['follow'], ['unfollow'], ['map', 'exits'], ['search'], ['sneak']] },
         { title: 'gear', entries: [['inv', 'inventory'], ['equipment', 'eq'], ['take'], ['loot'], ['drop'], ['give'], ['store'], ['equip'], ['unequip'], ['brandish', 'draw'], ['holster', 'stow'], ['reload'], ['use'], ['read']] },
-        { title: 'combat', entries: [['attack', 'kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest']] },
+        { title: 'combat', entries: [['attack'], ['kill'], ['subdue'], ['grapple', 'restrain', 'clinch'], ['struggle'], ['release'], ['cover'], ['stance'], ['surrender'], ['edge'], ['rest']] },
         // The party layer: everyone who walks (or flies, or manifests) at
         // your side answers to these.
         // "players" folded back under crew after playtesting ("crew
         // players" / "crew street"); the bare verb still answers quietly.
         { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall']] },
-        { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project'], ['return'], ['assense']] },
-        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project', 'astral'], ['return'], ['assense']] },
+        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['enter'], ['exit-host'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
         // The Emerged get their own shelf (player request: "there MUST be
         // resonance" -- matrix is the place, Resonance is the talent).
         // `sustain` shelves here and not under magic: the command is
         // technomancer-gated (a sprite task, SR5 p.256) and refuses anyone
         // else, so the Emerged shelf is where its audience looks.
-        { title: 'resonance', entries: [['compile', 'decompile'], ['thread'], ['unravel'], ['register'], ['standby'], ['sustain'], ['sprites']] },
+        { title: 'resonance', entries: [['compile'], ['decompile'], ['thread'], ['unravel'], ['register'], ['standby'], ['sustain'], ['sprites']] },
         { title: 'social', entries: [['say'], ['emote', 'me'], ['talk-to'], ['call'], ['end-call', 'end', 'hangup'], ['accept'], ['decline', 'deny', 'refuse'], ['haggle', 'negotiate'], ['persuade', 'convince'], ['ask'], ['contacts']] },
         { title: 'street', entries: [['abandon'], ['browse', 'buy'], ['sell'], ['catalog'], ['source', 'procure'], ['work', 'gig'], ['jobs'], ['journal'], ['perform'], ['palm'], ['docwagon'], ['treat'], ['eat'], ['drink'], ['lifestyle'], ['pay']] },
         { title: 'barriers', entries: [['pick'], ['breach'], ['dispel', 'dispell'], ['bluff'], ['unlock'], ['lock']] },