@maka/maka-cli 5.147.0 → 5.148.0

package/bundle/typescript/package.json

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

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