@maka/maka-cli 5.146.0 → 5.148.0

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.146.0",
+  "version": "5.148.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/advance.js

@@ -73,6 +73,14 @@ export class AdvanceCommand extends Command {
         this.actor.performAction('trains', skill);
         this.logger.write(`${actor.name} advanced ${skill} to ${next} (spent ${cost} karma, ${actor.karma} left).`);
         this.scene.updateStatus();
+        // A DURABLE CHANGE (fDswPCSf8tGhMPMZ6, same shape as vR8ajvm3wXdexxdF2:
+        // buy/sell learned this, advance never did). Karma spent and a skill
+        // raised is exactly the kind of change equip.ts already asks for a
+        // save over -- without it, a player who trains and quits before the
+        // next autosave beat reloads to a lower skill AND the karma still
+        // gone, and the web character sheet (reading the last saved doc)
+        // shows the stale rating.
+        this.game?.requestSave('advance');
         return `You drill ${skill} until it sticks: ${current} -> ${next}. (${cost} karma spent, ${actor.karma} left.)`;
     }
     trainAttribute(attr) {
@@ -111,6 +119,7 @@ export class AdvanceCommand extends Command {
             this.actor.performAction('trains', attr);
             this.logger.write(`${actor.name} advanced ${attr} to base ${attr === 'magic' ? actor.baseMagic : actor.baseResonance} (effective ${effective}; spent ${cost} karma, ${actor.karma} left).`);
             this.scene.updateStatus();
+            this.game?.requestSave('advance');
             return `The talent deepens: ${attr} ${base} -> ${base + 1}${actor.essenceBurn > 0 ? ` (effective ${effective} after the chrome's toll)` : ''}. (${cost} karma spent, ${actor.karma} left.)`;
         }
         const current = actor[attr];
@@ -136,6 +145,7 @@ export class AdvanceCommand extends Command {
         this.actor.performAction('trains', attr);
         this.logger.write(`${actor.name} advanced ${attr} to ${next} (spent ${cost} karma, ${actor.karma} left).`);
         this.scene.updateStatus();
+        this.game?.requestSave('advance');
         const trackNote = attr === 'body' ? ` Your physical track grows with it.` : attr === 'reaction' ? ` Your stun track grows with it.` : '';
         return `Weeks of drills compressed into downtime: ${attr} ${current} -> ${next}. (${cost} karma spent, ${actor.karma} left.)${trackNote}`;
     }

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

@@ -6,7 +6,7 @@ import { fuzzyPickName } from '../utilities/fuzzy-match.js';
 import { describeFledTarget } from '../utilities/pursuit.js';
 import { shellsInRoom, resolveBodyAttack, crossPlaneRefusal } from '../utilities/planes.js';
 import { heldBy, holding } from '../utilities/grapple.js';
-import { spotOf, ensureAtSpot, ensureAtExit, canReach, spotDistanceMeters } from '../utilities/spots.js';
+import { spotOf, ensureAtSpot, ensureAtExit, canReach, spotDistanceMeters, OPEN_FLOOR } from '../utilities/spots.js';
 import { resolveBarrierStrike } from '../utilities/barrier-combat.js';
 import { billAction, notYourPhase, phaseHint } from '../utilities/action-cost.js';
 import { spendMovementMeters } from '../utilities/movement-cost.js';
@@ -369,6 +369,18 @@ export class AttackCommand extends Command {
         // MELEE REACH: ground costs (p.161-162).
         if (isMelee) {
             const targetSpot = spotOf(target);
+            // An attacker with no spot of their own reads to canReach as
+            // "reaches everything" (the same compat rule that lets an unbound
+            // exit be worked from anywhere) -- fine for a location query, but
+            // for the ATTACKER in a reach check it skips ground-closing
+            // billing entirely: a hostile spawned mid-room, never having
+            // moved, could swing on a target the player had just paced away
+            // from in a fully gridded room (MotczCjebFNdHAWq7). Resolving
+            // an unset spot to the open floor first -- move.ts's own default
+            // -- gives canReach and spotDistanceMeters a real position to
+            // measure the reach/cost from instead of "unknown = anywhere".
+            if (spotOf(actor) === undefined)
+                actor.atSpot = OPEN_FLOOR;
             const mine = spotOf(actor);
             if (targetSpot !== undefined && !canReach(actor, targetSpot)) {
                 const meters = mine !== undefined && room.ensureGrid() ? spotDistanceMeters(room, mine, targetSpot) : 0;

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

@@ -0,0 +1,54 @@
+import { Command } from './command.js';
+/**
+ * "there should be a command for counterspelling" (3vCH5uQvpKZdjzWYQ).
+ *
+ * There already is counterspelling -- it just isn't a command. RAW
+ * (p.294) is a STANDING PARRY: a Counterspelling-skilled defender's
+ * dice roll straight into the defense test the instant a hostile spell
+ * targets them, and a co-located party caster can extend theirs over a
+ * teammate the same way ("one source, no stacking" -- the better rating
+ * covers, they don't add). combat-exchange.ts already does exactly
+ * this, automatically, on every spell strike, and narrates it on the
+ * Defense line ("+N counterspell -- Name's cover") when it bites.
+ *
+ * So the report's actual gap is not mechanics, it's that typing
+ * "counterspell" got "I don't understand the command" -- a player
+ * reaching for a verb that (correctly, per RAW) does not exist. This
+ * command answers that reach with the truth instead of a parser error:
+ * what protection they're already carrying and why nothing needs to be
+ * typed to use it.
+ *
+ * ONE HONEST GAP: canon also lets a defender who has already spent
+ * their Free Action declare protection reactively as an Interrupt
+ * Action at Initiative -5 (p.294). This engine's Action Phase economy
+ * (utilities/action-cost.ts) has no off-phase Free Action today --
+ * `IBillOptions.anyPhase` is declared and reserved for exactly this,
+ * unused by anything yet -- so the reactive-declare half of spell
+ * defense isn't modeled. What's implemented (the standing parry, which
+ * is what actually answers "I have counterspelling, why didn't it
+ * help") works with no action spent at all, which is the more common
+ * case by far.
+ */
+export class CounterspellCommand extends Command {
+    static verb = 'counterspell';
+    static description = 'Check your counterspelling cover. Nothing to spend: your Counterspelling skill (or a co-located party caster\'s, if theirs is better) automatically rolls into the defense the instant a hostile spell targets you or an ally.';
+    async execute(_args = []) {
+        const actor = this.actor;
+        if (actor.isAspected && !actor.canWorkSorcery()) {
+            return `Counterspelling is Sorcery, and your gift is aspected elsewhere -- you can see the weave, not turn it.`;
+        }
+        if (typeof actor.isCaster !== 'function' || !actor.isCaster()) {
+            return `Counterspelling takes the Art or a spell formula, grimoire, or focus on you -- you have none.`;
+        }
+        const rating = actor.skillRating('counterspelling');
+        if (rating <= 0) {
+            return `You have no Counterspelling trained -- "qualities" or "advance" at home if you want to pick it up.`;
+        }
+        return `Counterspelling isn't something you trigger -- it's a standing parry (SR5 p.294).`
+            + `\nEvery hostile spell that targets you, or a party member you're co-located with, automatically`
+            + `\nrolls your counterspelling ${rating} into their defense test -- no action spent. If more than one`
+            + `\ncaster in the room could cover the same target, the best single rating applies (it doesn't stack).`
+            + `\nWatch the Defense line for "+${rating} counterspell" when it bites.`;
+    }
+}
+//# sourceMappingURL=counterspell.js.map

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

@@ -57,7 +57,10 @@ export class DocwagonCommand extends Command {
         const surcharge = Math.ceil(def.price * check.surchargePct);
         const total = def.price + surcharge;
         if (this.actor.currency < total) {
-            return `${reachable.name} taps the rate card: ${total} nuyen a year for ${tier}${surcharge > 0 ? ` (papers with a smell run extra)` : ''}. You're carrying ${this.actor.currency}.`;
+            return [
+                ...(check.lines[0] ? [check.lines[0]] : []),
+                `${reachable.name} taps the rate card: ${total} nuyen a year for ${tier}${surcharge > 0 ? ` (papers with a smell run extra)` : ''}. You're carrying ${this.actor.currency}.`,
+            ].join('\n');
         }
         const renewal = this.game.docwagon?.tier === tier;
         this.actor.adjustCurrency(-total);

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

@@ -161,7 +161,10 @@ export class InstallCommand extends Command {
             paymentLine = `You put the ${part.name} on the tray. The doc turns it over once, nods. "Part's good. Installation's on the house story-rate."`;
         }
         else if (actor.currency < aug.cost) {
-            return `${aug.name} runs ${aug.cost} nuyen -- you're carrying ${actor.currency}. The doc doesn't do tabs on surgery.`;
+            return [
+                ...(identityLine ? [identityLine] : []),
+                `${aug.name} runs ${aug.cost} nuyen -- you're carrying ${actor.currency}. The doc doesn't do tabs on surgery.`,
+            ].join('\n');
         }
         else {
             actor.adjustCurrency(-aug.cost);

package/bundle/typescript/src/commands/game/sideQuest/factories/repro-scene.js

@@ -162,6 +162,24 @@ export function buildReproScene(fixture) {
         throw new ReproFixtureError(`"${misplacedIce.name}" is ice, so it cannot also stand in a doorway, guard, circulate or carry a gun. `
             + `Ice lives in the host, not on the floor -- drop the meat-side flags, or drop "ice".`);
     }
+    // A SEED HAS ONE PLANE. astral maps to 'astral' the same way ice maps
+    // to 'matrix' (npc-seed.ts) -- asking for both is asking the builder
+    // to pick a lie.
+    const bothPlanes = npcs.find(n => n.ice && n.astral);
+    if (bothPlanes) {
+        throw new ReproFixtureError(`"${bothPlanes.name}" is asked to be both ice and astral -- an actor has one plane, pick one.`);
+    }
+    // AN ASTRAL FORM CANNOT HOLD A DOOR SHUT OR CARRY A GUN. "guarding"
+    // means blocking meat movement, and "an astral presence has no body
+    // to block with" IS the fix this flag exists to bench -- a fixture
+    // asking for both would prove the opposite of what it claims. armed
+    // hands out a pistol and a commlink, and an astral form carries no
+    // physical object (SR5 p.301-302, Spirit Basics).
+    const contradictoryAstral = npcs.find(n => n.astral && (n.guarding || n.armed));
+    if (contradictoryAstral) {
+        throw new ReproFixtureError(`"${contradictoryAstral.name}" is astral, so it cannot guard a door or carry a gun -- `
+            + `an astral form has no body to block or hold anything with. Drop the flag, or drop "astral".`);
+    }
     const barrier = fixture.barrier;
     const direction = barrier?.sealsExit ?? Direction.NORTH;
     const startSide = fixture.start ?? 'barrier';
@@ -339,6 +357,12 @@ export function buildReproScene(fixture) {
             };
         }
         return {
+            // UNLIKE ice, astral does not move the NPC anywhere -- it keeps
+            // the ordinary placement below. The whole point of the fix this
+            // flag benches is that an astral actor stands right where a meat
+            // one would and still does not block (seatingIn is unchanged by
+            // the fix; only WHETHER it blocks changed, never WHERE it sits).
+            ...(npc.astral ? { plane: 'astral' } : {}),
             description: npc.concept,
             dialogue: [],
             player: {

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

@@ -170,6 +170,7 @@ import { SneakCommand } from './commands/sneak.js';
 import { PersuadeCommand } from './commands/persuade.js';
 import { BluffCommand } from './commands/bluff.js';
 import { DispelCommand } from './commands/dispel.js';
+import { CounterspellCommand } from './commands/counterspell.js';
 import { BreachCommand } from './commands/breach.js';
 import { EmoteCommand } from './commands/emote.js';
 import { OverwatchCommand } from './commands/overwatch.js';
@@ -2648,6 +2649,10 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('dispel', DispelCommand);
         CommandFactory.registerCommand('dispell', DispelCommand);
         CommandFactory.registerCommand('breach', BreachCommand);
+        // "counterspell" is not an action to spend -- it explains the
+        // standing parry combat-exchange.ts already applies automatically
+        // (3vCH5uQvpKZdjzWYQ).
+        CommandFactory.registerCommand('counterspell', CounterspellCommand);
         // Free-form roleplay ("me" is the classic MUD spelling).
         CommandFactory.registerCommand('emote', EmoteCommand);
         CommandFactory.registerCommand('me', EmoteCommand);
@@ -6051,7 +6056,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // "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'], ['stow']] },
-        { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project', 'astral'], ['return'], ['assense']] },
+        { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project', 'astral'], ['return'], ['assense'], ['counterspell']] },
         { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['download'], ['enter'], ['exit-host'], ['hop'], ['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).

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

@@ -1840,8 +1840,9 @@ ${worldEventsSummary}
 ${wares.map(i => `- "${i.name}" (${priceOf(i)} nuyen)`).join('\n')}
 When a customer orders or agrees to buy, SERVE it in the same response: [COMMAND] give <item name> to <customer name>
 Serve EXACTLY the stock item whose name best matches what the customer asked for (they say "noodles", you have a "Noodle Bowl" -- that's the one). Substitute a different dish ONLY if the match is out of stock, and say so out loud when you do. The stock list above is the truth about what you have -- never claim a listed item is gone.
-The till settles automatically on handoff (they're charged street price, or what they can cover). Quote the price when they order. Never serve someone who hasn't asked.`
-            : '';
+The till settles automatically on handoff (they're charged street price, or what they can cover). Quote the price when they order. Never serve someone who hasn't asked.
+NEVER claim a sale is complete from dialogue alone -- no "here you go," no till chirping, no describing them pocketing anything, unless this SAME response also issues the [COMMAND] give line above. A sale without that command simply never happened, and the customer is left owning nothing while believing they bought something.`
+            : `YOUR SHOP STOCK: you have NOTHING owner-tagged to you on the shelf/counter right now -- the list above is empty. If a customer asks to buy something, you do not have it to sell: say so honestly (out of stock, don't carry it, check back later), or point them at where they might actually find it. NEVER narrate handing over an item, taking payment, or a till settling for anything that isn't real stock -- there is nothing here to [COMMAND] give, so nothing changes hands no matter how the conversation reads.`;
         // SWAG OVER THE LINE (source.ts; the shop-stock lesson's remote
         // twin): a contact with a TRADE can order anything in their domain
         // through the network -- but only the order system closes a deal.

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

@@ -20,8 +20,11 @@
  * would themselves have been a MINOR bump had a version already
  * existed. Read it as "schema, second edition", not "second edition
  * broke something".
+ *
+ * 2.4.0 adds IReproNpc.astral -- purely additive, older drafts still
+ * valid.
  */
-export const REPRO_SCHEMA_VERSION = '2.3.0';
+export const REPRO_SCHEMA_VERSION = '2.4.0';
 /** THE LIVE REASON, from the field or the card's own words.
  *
  *  `repro.live` is authoritative -- but the server's validator must

package/package.json

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