@maka/maka-cli 5.129.0 → 5.131.0

package/bundle/typescript/src/commands/game/sideQuest/utilities/room-view.js

@@ -2,6 +2,7 @@ import { capitalCase } from 'change-case';
 import { Direction } from '../types/shared/direction-enum.js';
 import { OPEN_FLOOR, spotOf, visibleActorsIn, exitSpot, seatingIn, theSpot } from './spots.js';
 import { placeName } from './log-style.js';
+import { DRONE_COLOUR, DRONE_ICON } from './drone-prose.js';
 import { key, levelFootprint, dimsForSize, tallestRoomRows, METERS_PER_LEVEL, } from './room-grid.js';
 /**
  * THE ROOM LAYOUT (spatial-viz follow-up, 2026-08-25): an ASCII top-down
@@ -83,6 +84,24 @@ const HOSTILE_GLYPH = '⚔';
  *  A star reads as "yours" without pretending to be a person you can
  *  hand the controls to. */
 const CREW_GLYPH = '★';
+/**
+ * YOU, JUMPED INTO A DRONE (player ruling 2026-09-06: "when jumped into
+ * the drone, I'd like the player icon to change to amber to match the
+ * color scheme. Also, the player's neutral color icon (meat body)
+ * should remain").
+ *
+ * While rigged, the viewer's presence is the FRAME, and it drew as the
+ * same uncoloured 👤 as their body would -- and the body, slumped in
+ * bodyRoom, did not draw at all (seatingIn seats an actor once, at the
+ * frame). So a rigger looking at a room holding both saw one figure and
+ * could not say which. Now the frame is the drone icon the feed and the
+ * HUD already speak (✈, drone-prose.ts), in the rigger's amber -- a
+ * BMP dingbat, so unlike the emoji it really takes the colour -- and
+ * the body keeps the plain 👤 at the cell it was left in. Shape AND
+ * colour differ, as this panel's rulings require. An autopilot frame
+ * (a companion shell) is still the crew's ★: it is yours, not you.
+ */
+const RIGGED_GLYPH = DRONE_ICON;
 /** A CORPSE -- a body left where it fell, lootable (Room.bodies). */
 const DEAD_GLYPH = '💀';
 /**
@@ -203,7 +222,13 @@ function buildRenderMaps(grid, room, viewer) {
     const corpses = new Map();
     for (const b of room.bodies)
         corpses.set(key(b.cell), b.name);
-    return { cellToSpot, cellToExit, verticalAt, cellTerrain, occupants, corpses };
+    // The rigger's body, where it slumped (see RIGGED_GLYPH): seatingIn
+    // seats the viewer once, at the FRAME, so the body has to be placed
+    // from the cell enterDrone set aside.
+    const slumpedBody = viewer.plane !== 'meat' && viewer.bodyRoom === room && viewer.bodyCell
+        ? key(viewer.bodyCell)
+        : undefined;
+    return { cellToSpot, cellToExit, verticalAt, cellTerrain, occupants, corpses, slumpedBody };
 }
 function paint(g) {
     const body = g.inverse ? `{inverse}${g.ch}{/inverse}` : g.ch;
@@ -258,8 +283,13 @@ function actorGlyph(a, viewer, isOtherPlayer, isTableAlly) {
         return { ch: DOWNED_GLYPH, color: 'yellow' };
     // YOU keep the emoji; a fellow runner is the one who changes. Both
     // branches existed already and returned the identical icon.
-    if (a === viewer)
-        return { ch: PLAYER_GLYPH, wide: true };
+    // ...unless you are riding a frame: then this cell is the DRONE, in
+    // the rigger's amber, and the emoji is your body (see RIGGED_GLYPH).
+    if (a === viewer) {
+        return viewer.plane === 'drone'
+            ? { ch: RIGGED_GLYPH, color: DRONE_COLOUR }
+            : { ch: PLAYER_GLYPH, wide: true };
+    }
     if (isOtherPlayer?.(a))
         return { ch: OTHER_PLAYER_GLYPH, color: OTHER_PLAYER_COLOR };
     // Your own people read as yours even mid-fight -- knowing which of
@@ -311,7 +341,10 @@ function glyphAt(c, maps, viewer, isOtherPlayer, isTableAlly) {
             ?? glyphs.find(g => g.ch === NEUTRAL_GLYPH)
             ?? glyphs[0];
     }
-    // Nobody standing here -- but something may be lying here.
+    // Nobody standing here -- but something may be lying here: your own
+    // slumped body first (it is what you are looking for), then the dead.
+    if (maps.slumpedBody === k)
+        return { ch: PLAYER_GLYPH, wide: true };
     if (maps.corpses.has(k))
         return { ch: DEAD_GLYPH, wide: true };
     const terrain = maps.cellTerrain.get(k);
@@ -465,6 +498,13 @@ export function renderRoomLayout(room, viewer, isOtherPlayer, isTableAlly) {
         present.has(PLAYER_GLYPH)
             ? `${PLAYER_GLYPH} you (${NARROW_SUBSTITUTE[PLAYER_GLYPH]} in the side panel, where cells are one column)`
             : '',
+        // Jumped in: the amber frame is you, the plain figure is your body.
+        present.has(RIGGED_GLYPH)
+            ? `{${DRONE_COLOUR}-fg}${RIGGED_GLYPH}{/${DRONE_COLOUR}-fg} you, jumped in (${viewer.riggedDrone?.name ?? 'drone'})`
+            : '',
+        maps.slumpedBody !== undefined
+            ? `${PLAYER_GLYPH} your body, slumped (${NARROW_SUBSTITUTE[PLAYER_GLYPH]} in the side panel)`
+            : '',
         present.has(OTHER_PLAYER_GLYPH) ? `{${OTHER_PLAYER_COLOR}-fg}${OTHER_PLAYER_GLYPH}{/${OTHER_PLAYER_COLOR}-fg} runner` : '',
         present.has(CREW_GLYPH) ? `{green-fg}${CREW_GLYPH}{/green-fg} yours` : '',
         present.has(NEUTRAL_GLYPH) ? `{white-fg}${NEUTRAL_GLYPH}{/white-fg} local` : '',

package/package.json

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