clibuddy 1.0.0 → 1.2.0

package/dist/adventure/adventureUI.d.ts

@@ -19,6 +19,6 @@ export declare function changeQuestChain(menu: AdventureMenuState, delta: number
 export declare function changeExpeditionBiome(menu: AdventureMenuState, delta: number): AdventureMenuState;
 export declare function getSelectedBiomeId(menu: AdventureMenuState): string;
 export declare function renderAdventureMenu(menu: AdventureMenuState, state: BuddyState): string[];
-export declare function renderRoom(advState: AdventureState, adventure: AdventureDef, buddyName: string): string;
-export declare function renderResult(advState: AdventureState, adventure: AdventureDef, buddyName: string): string;
+export declare function renderRoom(advState: AdventureState, adventure: AdventureDef, state: BuddyState): string;
+export declare function renderResult(advState: AdventureState, adventure: AdventureDef, state: BuddyState): string;
 //# sourceMappingURL=adventureUI.d.ts.map

package/dist/adventure/adventureUI.js

@@ -10,11 +10,14 @@ exports.getSelectedBiomeId = getSelectedBiomeId;
 exports.renderAdventureMenu = renderAdventureMenu;
 exports.renderRoom = renderRoom;
 exports.renderResult = renderResult;
-const types_1 = require("./types");
+const types_1 = require("../buddy/types");
+const species_1 = require("../buddy/species");
+const types_2 = require("./types");
 const biomes_1 = require("./generation/biomes");
-const types_2 = require("../story/types");
+const types_3 = require("../story/types");
 const npcs_1 = require("../story/npcs");
 const listUtils_1 = require("../rendering/listUtils");
+const scene_1 = require("../rendering/scene");
 const screen_1 = require("../rendering/screen");
 function createAdventureMenu() {
     return { active: false, tab: "story", selectedIndex: 0, expeditionDifficulty: 1, expeditionBiomeIndex: 0, questChains: [], selectedChainIndex: 0 };
@@ -72,13 +75,13 @@ const DIFF_LABELS = {
 };
 function renderAdventureMenu(menu, state) {
     const lines = [];
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(48)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
     // Tab bar
     const storyTab = menu.tab === "story" ? `${screen_1.ansi.bold}${screen_1.ansi.colors.yellow}[Story]${screen_1.ansi.reset}` : `${screen_1.ansi.dim}[Story]${screen_1.ansi.reset}`;
     const expTab = menu.tab === "expedition" ? `${screen_1.ansi.bold}${screen_1.ansi.colors.cyan}[Expedition]${screen_1.ansi.reset}` : `${screen_1.ansi.dim}[Expedition]${screen_1.ansi.reset}`;
     const endTab = menu.tab === "endless" ? `${screen_1.ansi.bold}${screen_1.ansi.colors.magenta}[Endless]${screen_1.ansi.reset}` : `${screen_1.ansi.dim}[Endless]${screen_1.ansi.reset}`;
     lines.push(`  ${storyTab}  ${expTab}  ${endTab}  ${screen_1.ansi.dim}Tab${screen_1.ansi.reset}`);
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(48)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
     if (menu.tab === "story") {
         renderQuestsTab(lines, menu, state);
     }
@@ -88,7 +91,7 @@ function renderAdventureMenu(menu, state) {
     else {
         renderEndlessTab(lines, state);
     }
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(48)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
     return lines;
 }
 function renderQuestsTab(lines, menu, state) {
@@ -109,8 +112,8 @@ function renderQuestsTab(lines, menu, state) {
     // Chapter list
     for (let i = 0; i < chain.chapters.length; i++) {
         const chapter = chain.chapters[i];
-        const completed = (0, types_2.isChapterComplete)(chapter.id, progress);
-        const blockReason = (0, types_2.canStartChapter)(chapter, progress, state.level);
+        const completed = (0, types_3.isChapterComplete)(chapter.id, progress);
+        const blockReason = (0, types_3.canStartChapter)(chapter, progress, state.level);
         const selected = i === menu.selectedIndex;
         const pointer = selected ? `${screen_1.ansi.colors.cyan}▸${screen_1.ansi.reset}` : " ";
         if (completed) {
@@ -148,16 +151,20 @@ function renderExpeditionTab(lines, menu, state) {
     lines.push("");
     lines.push(`  ${screen_1.ansi.bold}Biome:${screen_1.ansi.reset} ${biome?.name ?? biomeId}  ${screen_1.ansi.dim}←→ to change${screen_1.ansi.reset}`);
     lines.push("");
+    const requiredLevel = Math.max(1, (diff - 1) * 2);
     const energyCost = 10 + diff * 3;
     const hungerCost = 5 + diff * 2;
-    lines.push(`  ${screen_1.ansi.dim}Cost: ${energyCost} energy, ${hungerCost} hunger${screen_1.ansi.reset}`);
-    const canGo = state.level >= Math.max(1, (diff - 1) * 2) && state.stats.energy >= energyCost && state.stats.hunger >= hungerCost;
+    const levelOk = state.level >= requiredLevel;
+    const energyOk = state.stats.energy >= energyCost;
+    const hungerOk = state.stats.hunger >= hungerCost;
+    const canGo = levelOk && energyOk && hungerOk;
+    const check = (ok) => ok ? `${screen_1.ansi.colors.green}✓${screen_1.ansi.reset}` : `${screen_1.ansi.colors.red}✗${screen_1.ansi.reset}`;
+    lines.push(`  ${check(levelOk)} Level: ${state.level} ${screen_1.ansi.dim}(need ${requiredLevel}+)${screen_1.ansi.reset}`);
+    lines.push(`  ${check(energyOk)} Energy: ${Math.round(state.stats.energy)} ${screen_1.ansi.dim}(costs ${energyCost})${screen_1.ansi.reset}`);
+    lines.push(`  ${check(hungerOk)} Hunger: ${Math.round(state.stats.hunger)} ${screen_1.ansi.dim}(costs ${hungerCost})${screen_1.ansi.reset}`);
     if (canGo) {
         lines.push(`  ${screen_1.ansi.colors.green}Ready to embark!${screen_1.ansi.reset}`);
     }
-    else {
-        lines.push(`  ${screen_1.ansi.colors.red}Not ready — check level/energy/hunger${screen_1.ansi.reset}`);
-    }
     lines.push(`  ${screen_1.ansi.dim}Enter to generate & start, Esc to close${screen_1.ansi.reset}`);
 }
 function renderEndlessTab(lines, state) {
@@ -170,65 +177,90 @@ function renderEndlessTab(lines, state) {
     lines.push(`  ${screen_1.ansi.dim}• Biome rotates each room${screen_1.ansi.reset}`);
     lines.push(`  ${screen_1.ansi.dim}• Defeat = run over${screen_1.ansi.reset}`);
     lines.push("");
-    lines.push(`  ${screen_1.ansi.dim}Requires: Level 5+, 20 energy, 15 hunger${screen_1.ansi.reset}`);
-    const canGo = state.level >= 5 && state.stats.energy >= 20 && state.stats.hunger >= 15;
+    const levelOk = state.level >= 5;
+    const energyOk = state.stats.energy >= 20;
+    const hungerOk = state.stats.hunger >= 15;
+    const canGo = levelOk && energyOk && hungerOk;
+    const check = (ok) => ok ? `${screen_1.ansi.colors.green}✓${screen_1.ansi.reset}` : `${screen_1.ansi.colors.red}✗${screen_1.ansi.reset}`;
+    lines.push(`  ${check(levelOk)} Level: ${state.level} ${screen_1.ansi.dim}(need 5+)${screen_1.ansi.reset}`);
+    lines.push(`  ${check(energyOk)} Energy: ${Math.round(state.stats.energy)} ${screen_1.ansi.dim}(costs 20)${screen_1.ansi.reset}`);
+    lines.push(`  ${check(hungerOk)} Hunger: ${Math.round(state.stats.hunger)} ${screen_1.ansi.dim}(costs 15)${screen_1.ansi.reset}`);
     if (canGo) {
         lines.push(`  ${screen_1.ansi.colors.green}Ready to descend!${screen_1.ansi.reset}`);
     }
-    else {
-        lines.push(`  ${screen_1.ansi.colors.red}Not ready — check level/energy/hunger${screen_1.ansi.reset}`);
-    }
     lines.push(`  ${screen_1.ansi.dim}Enter to begin your descent${screen_1.ansi.reset}`);
 }
 // ─── Adventure Room Rendering ────────────────────────────────
-function renderRoom(advState, adventure, buddyName) {
-    const room = (0, types_1.getRoom)(adventure, advState.currentRoomId);
+function renderRoom(advState, adventure, state) {
+    const room = (0, types_2.getRoom)(adventure, advState.currentRoomId);
     if (!room)
         return "  Room not found!";
-    const progress = (0, types_1.getRoomProgress)(advState);
+    const progress = (0, types_2.getRoomProgress)(advState);
     const lines = [];
+    // ── Header with box-drawn frame ──
     lines.push("");
     if (adventure.isScene || adventure.hideRoomCounter) {
-        lines.push(`  ${screen_1.ansi.bold}${adventure.name}${screen_1.ansi.reset}`);
+        lines.push(`  ${screen_1.ansi.bold}╔══ ${adventure.name} ${"═".repeat(Math.max(1, screen_1.UI_WIDTH - adventure.name.length - 6))}╗${screen_1.ansi.reset}`);
     }
     else {
-        lines.push(`  ${screen_1.ansi.bold}${adventure.name}${screen_1.ansi.reset}  ${screen_1.ansi.dim}Room ${progress}/${adventure.rooms.length}${screen_1.ansi.reset}  ${screen_1.ansi.dim}Morale: ${advState.morale}%${screen_1.ansi.reset}`);
+        const roomInfo = `Room ${progress}/${adventure.rooms.length}`;
+        const fillLen = Math.max(1, screen_1.UI_WIDTH - adventure.name.length - roomInfo.length - 8);
+        lines.push(`  ${screen_1.ansi.bold}╔══ ${adventure.name} ${"═".repeat(fillLen)} ${roomInfo} ═╗${screen_1.ansi.reset}`);
+    }
+    if (!adventure.isScene && !adventure.hideRoomCounter) {
+        lines.push(`  ${screen_1.ansi.dim}Morale: ${advState.morale}%${screen_1.ansi.reset}`);
     }
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(44)}${screen_1.ansi.reset}`);
     lines.push("");
     lines.push(`  ${screen_1.ansi.bold}${room.title}${screen_1.ansi.reset}`);
     lines.push("");
-    // Show NPC ASCII art if present
+    // ── Side-by-side buddy + NPC art (or just buddy art) ──
+    const species = (0, species_1.getSpecies)(state.speciesId);
+    const buddyColor = species ? types_1.RARITY_COLORS[species.rarity] : "";
+    const buddyArtLines = species ? species.animations.idle[0].split("\n") : [];
     if (room.npcsPresent && room.npcsPresent.length > 0) {
-        for (const npcId of room.npcsPresent) {
-            const npc = (0, npcs_1.getNPC)(npcId);
-            if (npc) {
-                lines.push(`  ${screen_1.ansi.dim}${npc.name} the ${npc.title}${screen_1.ansi.reset}`);
-                for (const artLine of npc.art) {
-                    lines.push(`    ${screen_1.ansi.colors.cyan}${artLine}${screen_1.ansi.reset}`);
-                }
-                lines.push("");
+        const npc = (0, npcs_1.getNPC)(room.npcsPresent[0]);
+        if (npc && species) {
+            // Side-by-side: buddy (left) + NPC (right)
+            const artLines = (0, scene_1.composeDualArt)(buddyArtLines, npc.art, buddyColor, screen_1.ansi.colors.cyan);
+            for (const line of artLines) {
+                lines.push(`    ${line}`);
             }
+            // Labels below the art pair
+            const buddyLabel = `${buddyColor}${state.name}${screen_1.ansi.reset}`;
+            const npcLabel = `${screen_1.ansi.colors.cyan}${npc.name}${screen_1.ansi.reset} ${screen_1.ansi.dim}${npc.title}${screen_1.ansi.reset}`;
+            lines.push(`    ${buddyLabel}          ${npcLabel}`);
+            lines.push("");
         }
     }
-    // Paged text display — show LINES_PER_PAGE lines per page
+    else if (species) {
+        // No NPC — show buddy art centered, dimmed slightly
+        for (const artLine of buddyArtLines) {
+            lines.push(`    ${buddyColor}${artLine}${screen_1.ansi.reset}`);
+        }
+        lines.push("");
+    }
+    // ── Sliding window text — show only current page ──
     const LINES_PER_PAGE = 3;
     const totalPages = Math.ceil(room.text.length / LINES_PER_PAGE);
     const currentPage = advState.textPage;
     const textFullyShown = advState.textFullyShown || currentPage >= totalPages - 1;
-    // Show text up to current page
-    const linesToShow = Math.min(room.text.length, (currentPage + 1) * LINES_PER_PAGE);
-    for (let i = 0; i < linesToShow; i++) {
+    // Scroll indicator: prior text exists
+    if (currentPage > 0) {
+        lines.push(`  ${screen_1.ansi.dim}  ▲${screen_1.ansi.reset}`);
+    }
+    // Show only current page's lines (sliding window)
+    const startLine = currentPage * LINES_PER_PAGE;
+    const endLine = Math.min(room.text.length, startLine + LINES_PER_PAGE);
+    for (let i = startLine; i < endLine; i++) {
         lines.push(`  ${room.text[i]}`);
     }
     lines.push("");
     if (!textFullyShown) {
-        // More text to show — prompt to continue reading
-        lines.push(`  ${screen_1.ansi.dim}▼ Press Enter to continue reading... (${currentPage + 1}/${totalPages})${screen_1.ansi.reset}`);
+        lines.push(`  ${screen_1.ansi.dim}▼ Enter to continue... (${currentPage + 1}/${totalPages})${screen_1.ansi.reset}`);
     }
     else {
-        // All text shown — show buddy line + choices
-        lines.push(`  ${buddyName}: "${advState.buddyReaction}"`);
+        // All text shown — buddy reaction + choices
+        lines.push(`  ${buddyColor}${state.name}:${screen_1.ansi.reset} "${advState.buddyReaction}"`);
         lines.push("");
         if (room.type === "narrative" && room.choices) {
             for (let i = 0; i < room.choices.length; i++) {
@@ -236,7 +268,6 @@ function renderRoom(advState, adventure, buddyName) {
             }
         }
         else if (room.type === "event" && room.eventChoices) {
-            // Check if event was already resolved
             const alreadyResolved = room.eventChoices.some((c) => c.outcome === advState.buddyReaction);
             if (alreadyResolved) {
                 lines.push(`  ${screen_1.ansi.dim}Press Enter to continue...${screen_1.ansi.reset}`);
@@ -262,26 +293,37 @@ function renderRoom(advState, adventure, buddyName) {
     return lines.join("\n");
 }
 // ─── Result Screen ───────────────────────────────────────────
-function renderResult(advState, adventure, buddyName) {
+function renderResult(advState, adventure, state) {
     const lines = [];
+    const w = screen_1.UI_WIDTH;
     lines.push("");
-    lines.push(`  ${screen_1.ansi.bold}${screen_1.ansi.colors.green}Adventure Complete!${screen_1.ansi.reset}`);
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(44)}${screen_1.ansi.reset}`);
-    lines.push("");
-    lines.push(`  ${screen_1.ansi.bold}${adventure.name}${screen_1.ansi.reset} — Cleared!`);
-    lines.push("");
-    lines.push(`  Battles: ${advState.battlesWon} won, ${advState.battlesLost} lost, ${advState.battlesFled} fled`);
+    lines.push(`  ${screen_1.ansi.colors.green}╔${"═".repeat(w)}╗${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.colors.green}║${screen_1.ansi.reset}  ${screen_1.ansi.bold}★ ADVENTURE COMPLETE ★${screen_1.ansi.reset}${" ".repeat(Math.max(0, w - 24))}${screen_1.ansi.colors.green}║${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.colors.green}╠${"═".repeat(w)}╣${screen_1.ansi.reset}`);
+    const padLine = (text, visLen) => {
+        return `  ${screen_1.ansi.colors.green}║${screen_1.ansi.reset}  ${text}${" ".repeat(Math.max(0, w - visLen - 2))}${screen_1.ansi.colors.green}║${screen_1.ansi.reset}`;
+    };
+    lines.push(padLine(`${screen_1.ansi.bold}${adventure.name}${screen_1.ansi.reset}`, adventure.name.length));
+    lines.push(padLine("", 0));
+    const battleText = `Battles: ${advState.battlesWon} won, ${advState.battlesLost} lost, ${advState.battlesFled} fled`;
+    lines.push(padLine(battleText, battleText.length));
     if (advState.lootCollected.length > 0) {
         const lootNames = advState.lootCollected.map((id) => id.replace(/_/g, " "));
-        lines.push(`  Loot: ${lootNames.join(", ")}`);
+        const lootText = `Loot: ${lootNames.join(", ")}`;
+        lines.push(padLine(lootText, lootText.length));
     }
-    lines.push(`  XP earned: ${screen_1.ansi.bold}${advState.xpEarned}${screen_1.ansi.reset}`);
-    lines.push(`  Final morale: ${advState.morale}%`);
+    const xpText = `XP earned: ${advState.xpEarned}`;
+    lines.push(padLine(`${screen_1.ansi.bold}${xpText}${screen_1.ansi.reset}`, xpText.length));
+    lines.push(padLine(`Final morale: ${advState.morale}%`, `Final morale: ${advState.morale}%`.length));
     if (advState.damageTaken === 0 && advState.battlesWon > 0) {
-        lines.push(`  ${screen_1.ansi.colors.yellow}★ PERFECT — No damage taken!${screen_1.ansi.reset}`);
+        const perfText = "★ PERFECT — No damage taken!";
+        lines.push(padLine(`${screen_1.ansi.colors.yellow}${perfText}${screen_1.ansi.reset}`, perfText.length));
     }
+    lines.push(`  ${screen_1.ansi.colors.green}╚${"═".repeat(w)}╝${screen_1.ansi.reset}`);
     lines.push("");
-    lines.push(`  ${buddyName}: "${advState.buddyReaction}"`);
+    const species = (0, species_1.getSpecies)(state.speciesId);
+    const buddyColor = species ? types_1.RARITY_COLORS[species.rarity] : "";
+    lines.push(`  ${buddyColor}${state.name}:${screen_1.ansi.reset} "${advState.buddyReaction}"`);
     lines.push("");
     lines.push(`  ${screen_1.ansi.dim}Press Enter to return...${screen_1.ansi.reset}`);
     lines.push("");

package/dist/adventure/combat/combatUI.d.ts

@@ -1,5 +1,14 @@
-import { BuddyState } from "../../buddy/types";
+import { BuddyState, InventorySlot } from "../../buddy/types";
 import { CombatState } from "../types";
+import { ItemRarity } from "../../inventory/items";
 export declare function renderCombat(combat: CombatState, state: BuddyState, adventureName: string): string;
 export declare function renderSkillMenu(combat: CombatState, state: BuddyState): string;
+/** Get inventory slots usable in combat (medicine items with health effect) */
+export declare function getCombatItems(inventory: InventorySlot[]): {
+    slot: InventorySlot;
+    name: string;
+    healAmount: number;
+    rarity: ItemRarity;
+}[];
+export declare function renderItemMenu(combat: CombatState, inventory: InventorySlot[], selectedIndex: number): string;
 //# sourceMappingURL=combatUI.d.ts.map

package/dist/adventure/combat/combatUI.js

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderCombat = renderCombat;
 exports.renderSkillMenu = renderSkillMenu;
+exports.getCombatItems = getCombatItems;
+exports.renderItemMenu = renderItemMenu;
 const types_1 = require("../../buddy/types");
 const species_1 = require("../../buddy/species");
 const types_2 = require("../types");
 const lines_1 = require("../../dialogue/lines");
 const skills_1 = require("./skills");
+const items_1 = require("../../inventory/items");
 const screen_1 = require("../../rendering/screen");
+const scene_1 = require("../../rendering/scene");
 const CONDITION_ICONS = {
     burn: "🔥", poison: "☠", freeze: "❄", stun: "⚡", charm: "💕",
     blind: "👁", regen: "💚", shield: "🛡", buff: "↑", debuff: "↓",
@@ -34,41 +38,76 @@ function hpBar(current, max, width = 15) {
 function renderCombat(combat, state, adventureName) {
     const species = (0, species_1.getSpecies)(state.speciesId);
     const lines = [];
-    lines.push("");
-    lines.push(`  ${screen_1.ansi.bold}${adventureName}${screen_1.ansi.reset}  ${screen_1.ansi.dim}Combat${screen_1.ansi.reset}`);
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(44)}${screen_1.ansi.reset}`);
-    lines.push("");
-    // Enemy
+    const termWidth = process.stdout.columns || 80;
+    const speciesColor = species ? types_1.RARITY_COLORS[species.rarity] : "";
+    const playerElemIcon = types_2.ELEMENT_ICONS[combat.playerElement] ?? "";
     const enemyElemIcon = types_2.ELEMENT_ICONS[combat.enemyElement] ?? "";
-    lines.push(`  ${screen_1.ansi.colors.red}${screen_1.ansi.bold}${combat.enemy.name}${screen_1.ansi.reset} ${enemyElemIcon}`);
-    lines.push(`  HP: ${hpBar(combat.enemyStats.hp, combat.enemyStats.maxHp)}  ${screen_1.ansi.dim}ATK:${combat.enemyStats.atk} DEF:${combat.enemyStats.def}${screen_1.ansi.reset}${formatConditions(combat.enemyConditions)}`);
-    for (const artLine of combat.enemy.art) {
-        lines.push(`    ${screen_1.ansi.colors.red}${artLine}${screen_1.ansi.reset}`);
-    }
+    const buddyArtLines = species ? species.animations.idle[0].split("\n") : [];
+    const enemyArtLines = combat.enemy.art;
+    // Pre-calculate content width for the frame
+    const buddyHPpreview = `HP: ${hpBar(combat.playerStats.hp, combat.playerStats.maxHp)}`;
+    const enemyHPpreview = `HP: ${hpBar(combat.enemyStats.hp, combat.enemyStats.maxHp)}`;
+    const leftColWidth = (0, screen_1.stripAnsi)(buddyHPpreview).length + 2;
+    const contentWidth = leftColWidth + (0, screen_1.stripAnsi)(enemyHPpreview).length;
+    // ── Header with box frame matched to content ──
+    const frameWidth = Math.max(screen_1.UI_WIDTH, contentWidth + 4); // +4 for "    " indent
     lines.push("");
-    lines.push(`  ${screen_1.ansi.dim}        vs${screen_1.ansi.reset}`);
+    const battleLabel = "⚔ BATTLE";
+    const fillLen = Math.max(1, frameWidth - adventureName.length - battleLabel.length - 8);
+    lines.push(`  ${screen_1.ansi.bold}╔══ ${adventureName} ${"═".repeat(fillLen)} ${battleLabel} ═╗${screen_1.ansi.reset}`);
     lines.push("");
-    // Player buddy
-    const speciesColor = species ? types_1.RARITY_COLORS[species.rarity] : "";
-    const playerElemIcon = types_2.ELEMENT_ICONS[combat.playerElement] ?? "";
-    lines.push(`  ${speciesColor}${screen_1.ansi.bold}${state.name}${screen_1.ansi.reset} ${playerElemIcon}`);
-    lines.push(`  HP: ${hpBar(combat.playerStats.hp, combat.playerStats.maxHp)}  ${screen_1.ansi.dim}ATK:${combat.playerStats.atk} DEF:${combat.playerStats.def}${screen_1.ansi.reset}${formatConditions(combat.playerConditions)}`);
-    if (species) {
-        const frame = species.animations.idle[0].split("\n");
-        for (const artLine of frame) {
-            lines.push(`    ${speciesColor}${artLine}${screen_1.ansi.reset}`);
+    // ── Side-by-side layout (buddy left, enemy right) ──
+    if (termWidth >= 60 && species) {
+        const leftArtWidth = Math.max(...buddyArtLines.map(l => (0, screen_1.stripAnsi)(l).length));
+        // Art gap calculated so enemy art starts at same column as enemy HP
+        const artGap = Math.max(4, leftColWidth - leftArtWidth);
+        const artLines = (0, scene_1.composeDualArt)(buddyArtLines, enemyArtLines, speciesColor, screen_1.ansi.colors.red, artGap);
+        // Name labels above art, aligned to same columns
+        const buddyLabel = `${speciesColor}${screen_1.ansi.bold}${state.name}${screen_1.ansi.reset} ${playerElemIcon}`;
+        const enemyLabel = `${screen_1.ansi.colors.red}${screen_1.ansi.bold}${combat.enemy.name}${screen_1.ansi.reset} ${enemyElemIcon}`;
+        lines.push(`    ${(0, screen_1.visPad)(buddyLabel, leftColWidth)}${screen_1.ansi.dim}VS${screen_1.ansi.reset}  ${enemyLabel}`);
+        lines.push("");
+        // Art side by side
+        for (const line of artLines) {
+            lines.push(`    ${line}`);
+        }
+        lines.push("");
+        // HP bars side-by-side — aligned to same columns as art
+        const buddyHPstr = `HP: ${hpBar(combat.playerStats.hp, combat.playerStats.maxHp)}`;
+        const enemyHPstr = `HP: ${hpBar(combat.enemyStats.hp, combat.enemyStats.maxHp)}`;
+        const buddyStats = `${screen_1.ansi.dim}ATK:${combat.playerStats.atk} DEF:${combat.playerStats.def}${screen_1.ansi.reset}${formatConditions(combat.playerConditions)}`;
+        const enemyStats = `${screen_1.ansi.dim}ATK:${combat.enemyStats.atk} DEF:${combat.enemyStats.def}${screen_1.ansi.reset}${formatConditions(combat.enemyConditions)}`;
+        lines.push(`    ${(0, screen_1.visPad)(buddyHPstr, leftColWidth)}${enemyHPstr}`);
+        lines.push(`    ${(0, screen_1.visPad)(buddyStats, leftColWidth)}${enemyStats}`);
+    }
+    else {
+        // ── Narrow fallback: vertical stack (original layout) ──
+        lines.push(`  ${screen_1.ansi.colors.red}${screen_1.ansi.bold}${combat.enemy.name}${screen_1.ansi.reset} ${enemyElemIcon}`);
+        lines.push(`  HP: ${hpBar(combat.enemyStats.hp, combat.enemyStats.maxHp)}  ${screen_1.ansi.dim}ATK:${combat.enemyStats.atk} DEF:${combat.enemyStats.def}${screen_1.ansi.reset}${formatConditions(combat.enemyConditions)}`);
+        for (const artLine of enemyArtLines) {
+            lines.push(`    ${screen_1.ansi.colors.red}${artLine}${screen_1.ansi.reset}`);
+        }
+        lines.push("");
+        lines.push(`  ${screen_1.ansi.dim}        vs${screen_1.ansi.reset}`);
+        lines.push("");
+        lines.push(`  ${speciesColor}${screen_1.ansi.bold}${state.name}${screen_1.ansi.reset} ${playerElemIcon}`);
+        lines.push(`  HP: ${hpBar(combat.playerStats.hp, combat.playerStats.maxHp)}  ${screen_1.ansi.dim}ATK:${combat.playerStats.atk} DEF:${combat.playerStats.def}${screen_1.ansi.reset}${formatConditions(combat.playerConditions)}`);
+        if (species) {
+            for (const artLine of buddyArtLines) {
+                lines.push(`    ${speciesColor}${artLine}${screen_1.ansi.reset}`);
+            }
         }
     }
     lines.push("");
-    // Combat log (last 2 messages)
+    // ── Combat log (last 2 messages) ──
     const recentLog = combat.log.slice(-2);
     for (const msg of recentLog) {
         lines.push(`  ${screen_1.ansi.dim}${msg}${screen_1.ansi.reset}`);
     }
     lines.push("");
-    // Action menu (only during player turn)
+    // ── Action menu / result ──
     if (combat.phase === "player_turn") {
-        lines.push(`  ${screen_1.ansi.dim}${"─".repeat(44)}${screen_1.ansi.reset}`);
+        lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
         lines.push(`  [1] Attack    [2] Skill    [3] Item`);
         lines.push(`  [4] Defend    [5] Flee`);
         lines.push(`  ${screen_1.ansi.dim}Energy: ${"◆".repeat(combat.combatEnergy)}${"◇".repeat(combat.maxCombatEnergy - combat.combatEnergy)}${screen_1.ansi.reset}`);
@@ -76,15 +115,15 @@ function renderCombat(combat, state, adventureName) {
     else if (combat.phase === "victory") {
         const victoryLines = lines_1.COMBAT_VICTORY_LINES[state.speciesId];
         const victoryLine = victoryLines ? victoryLines[Math.floor(Math.random() * victoryLines.length)] : "We did it!";
-        lines.push(`  ${screen_1.ansi.colors.green}${screen_1.ansi.bold}Victory!${screen_1.ansi.reset}  ${screen_1.ansi.dim}+${combat.enemy.xpReward} XP${screen_1.ansi.reset}`);
-        lines.push(`  ${state.name}: "${victoryLine}"`);
+        lines.push(`  ${screen_1.ansi.colors.green}${screen_1.ansi.bold}★ Victory!${screen_1.ansi.reset}  ${screen_1.ansi.dim}+${combat.enemy.xpReward} XP${screen_1.ansi.reset}`);
+        lines.push(`  ${speciesColor}${state.name}:${screen_1.ansi.reset} "${victoryLine}"`);
         lines.push(`  ${screen_1.ansi.dim}Press Enter to continue...${screen_1.ansi.reset}`);
     }
     else if (combat.phase === "defeat") {
         const defeatLines = lines_1.COMBAT_DEFEAT_LINES[state.speciesId];
         const defeatLine = defeatLines ? defeatLines[Math.floor(Math.random() * defeatLines.length)] : "We'll get them next time...";
         lines.push(`  ${screen_1.ansi.colors.red}${screen_1.ansi.bold}Defeated!${screen_1.ansi.reset}`);
-        lines.push(`  ${state.name}: "${defeatLine}"`);
+        lines.push(`  ${speciesColor}${state.name}:${screen_1.ansi.reset} "${defeatLine}"`);
         lines.push(`  ${screen_1.ansi.dim}Press Enter to retreat...${screen_1.ansi.reset}`);
     }
     else if (combat.phase === "fled") {
@@ -92,7 +131,6 @@ function renderCombat(combat, state, adventureName) {
         lines.push(`  ${screen_1.ansi.dim}Press Enter to continue...${screen_1.ansi.reset}`);
     }
     else {
-        // Animating
         lines.push(`  ${screen_1.ansi.dim}...${screen_1.ansi.reset}`);
     }
     lines.push("");
@@ -101,7 +139,7 @@ function renderCombat(combat, state, adventureName) {
 function renderSkillMenu(combat, state) {
     const skills = (0, skills_1.getAvailableSkills)(state.speciesId, state.level);
     const lines = [];
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(44)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
     lines.push(`  ${screen_1.ansi.bold}Skills${screen_1.ansi.reset}  ${screen_1.ansi.dim}Energy: ${"◆".repeat(combat.combatEnergy)}${"◇".repeat(combat.maxCombatEnergy - combat.combatEnergy)}${screen_1.ansi.reset}`);
     for (let i = 0; i < skills.length; i++) {
         const s = skills[i];
@@ -110,7 +148,50 @@ function renderSkillMenu(combat, state) {
         lines.push(`  ${color}[${i + 1}] ${s.name} (${s.energyCost}◆) — ${s.description}${screen_1.ansi.reset}`);
     }
     lines.push(`  ${screen_1.ansi.dim}[0] Back${screen_1.ansi.reset}`);
-    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(44)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
+    return lines.join("\n");
+}
+/** Get inventory slots usable in combat (medicine items with health effect) */
+function getCombatItems(inventory) {
+    const results = [];
+    for (const slot of inventory) {
+        if (slot.count <= 0)
+            continue;
+        const item = (0, items_1.getItem)(slot.itemId);
+        if (!item || item.type !== "medicine")
+            continue;
+        const healAmount = item.statEffect.health ?? 0;
+        if (healAmount > 0) {
+            results.push({ slot, name: item.name, healAmount, rarity: item.rarity });
+        }
+    }
+    return results;
+}
+function renderItemMenu(combat, inventory, selectedIndex) {
+    const items = getCombatItems(inventory);
+    const lines = [];
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.bold}Items${screen_1.ansi.reset}  ${screen_1.ansi.dim}HP: ${combat.playerStats.hp}/${combat.playerStats.maxHp}${screen_1.ansi.reset}`);
+    if (items.length === 0) {
+        lines.push(`  ${screen_1.ansi.dim}  No medicine in inventory${screen_1.ansi.reset}`);
+    }
+    else {
+        for (let i = 0; i < items.length; i++) {
+            const { name, healAmount, slot, rarity } = items[i];
+            const rarityColor = items_1.ITEM_RARITY_COLORS[rarity] ?? "";
+            const hpAfter = Math.min(combat.playerStats.maxHp, combat.playerStats.hp + healAmount);
+            const selected = i === selectedIndex;
+            const pointer = selected ? `${screen_1.ansi.colors.cyan}▸${screen_1.ansi.reset}` : " ";
+            if (selected) {
+                lines.push(`  ${pointer} ${rarityColor}${screen_1.ansi.bold}${name}${screen_1.ansi.reset} x${slot.count}  ${screen_1.ansi.colors.green}+${healAmount} HP${screen_1.ansi.reset} ${screen_1.ansi.dim}(→${hpAfter})${screen_1.ansi.reset}`);
+            }
+            else {
+                lines.push(`  ${pointer} ${screen_1.ansi.dim}${name} x${slot.count}${screen_1.ansi.reset}`);
+            }
+        }
+    }
+    lines.push(`  ${screen_1.ansi.dim}${"─".repeat(screen_1.UI_WIDTH)}${screen_1.ansi.reset}`);
+    lines.push(`  ${screen_1.ansi.dim}Enter to use, Esc to close${screen_1.ansi.reset}`);
     return lines.join("\n");
 }
 //# sourceMappingURL=combatUI.js.map

package/dist/buddy/roll.js

@@ -36,7 +36,7 @@ function createBuddyState(species, name) {
         name,
         speciesId: species.id,
         stats: {
-            hunger: 80,
+            hunger: 75,
             happiness: 80,
             health: 100,
             energy: 100,

package/dist/buddy/types.d.ts

@@ -83,6 +83,7 @@ export interface BuddyState {
     notifications: Notification[];
     adventureStats: AdventureStats;
     questProgress: import("../story/types").QuestProgress;
+    tutorialStep?: number;
 }
 export declare const RARITY_COLORS: Record<Rarity, string>;
 export declare const RARITY_LABELS: Record<Rarity, string>;

package/dist/commands/actions.js

@@ -38,12 +38,12 @@ function registerActivityCommand(name, description, activityType, countKey, mess
         },
     });
 }
-registerActivityCommand("feed", "Feed your buddy to restore hunger", "eating", "feeds", (name) => `${name} starts eating! Nom nom...`);
-registerActivityCommand("play", "Play with your buddy to boost happiness", "playing", "plays", (name) => `${name} starts playing!`, (state) => state.stats.energy < 10 ? `${state.name} is too tired to play. Let them /sleep first.` : null);
-registerActivityCommand("sleep", "Let your buddy rest to restore energy", "sleeping", "sleeps", (name) => `${name} curls up and falls asleep... Zzz`);
+registerActivityCommand("feed", "Feed — Hunger +25 (10s)", "eating", "feeds", (name) => `${name} starts eating! Nom nom...`);
+registerActivityCommand("play", "Play — Happiness +20, Energy -15 (15s)", "playing", "plays", (name) => `${name} starts playing!`, (state) => state.stats.energy < 10 ? `${state.name} is too tired to play. Let them /sleep first.` : null);
+registerActivityCommand("sleep", "Sleep — Energy +30 (2m, skippable)", "sleeping", "sleeps", (name) => `${name} curls up and falls asleep... Zzz`);
 (0, registry_1.registerCommand)({
     name: "heal",
-    description: "Heal your buddy to restore health (instant)",
+    description: "Heal — Health +20, +3 XP (instant)",
     execute: (state) => {
         if (!state.alive) {
             return { state: null, message: `${state.name} is no longer with us... Use /revive first.`, rerender: false };
@@ -66,21 +66,7 @@ registerActivityCommand("sleep", "Let your buddy rest to restore energy", "sleep
         if (state.alive) {
             return { state: null, message: `${state.name} is alive and well!`, rerender: false };
         }
-        const counts = { ...state.actionCounts, revives: state.actionCounts.revives + 1 };
-        const newState = {
-            ...state,
-            alive: true,
-            xp: Math.floor(state.xp / 2),
-            stats: { hunger: 50, happiness: 50, health: 50, energy: 50 },
-            lastUpdated: Date.now(),
-            activity: undefined,
-            actionCounts: counts,
-        };
-        return {
-            state: newState,
-            message: `${state.name} stirs back to life! They lost half their XP but they're back.`,
-            rerender: true,
-        };
+        return { state: null, message: "__CONFIRM_REVIVE__", rerender: false };
     },
 });
 (0, registry_1.registerCommand)({
@@ -100,7 +86,7 @@ registerActivityCommand("sleep", "Let your buddy rest to restore energy", "sleep
     name: "help",
     description: "Show all available commands",
     execute: () => {
-        return { state: null, message: "Press / to open the command palette!", rerender: false };
+        return { state: null, message: "Quick: [f]eed [p]lay [s]leep — or press / for all commands", rerender: false };
     },
 });
 (0, registry_1.registerCommand)({