@maka/maka-cli 5.1.31 → 5.1.32

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

@@ -1,7 +1,7 @@
 import blessed from 'blessed';
 import { capitalCase } from 'change-case';
 import Game from './game.js';
-import { Player, Room } from './models/_index.js';
+import { Player, Room, } from './models/_index.js';
 import { Logger } from './utilities/logger.js';
 export async function main(playerName, sceneSeed, options) {
     // Create a screen object
@@ -9,156 +9,12 @@ export async function main(playerName, sceneSeed, options) {
         smartCSR: true,
         title: 'Side Quest Adventure Game',
     });
+    screen.key(['C-c'], async () => {
+        process.exit(0);
+    });
     // Initialize Logger
     const gameLog = Logger.getInstance(options.logFilePath, screen);
     try {
-        const inventoryBox = blessed.box({
-            top: '0%',
-            left: '75%',
-            width: '25%',
-            height: '45%',
-            border: {
-                type: 'line'
-            },
-            label: ' Inventory ',
-            content: 'Your items will be listed here...',
-            tags: true, // Enable formatting tags in content
-            scrollable: true, // Enable scrolling if the content overflows
-            scrollbar: {
-                ch: ' ',
-                track: {
-                    bg: 'yellow'
-                },
-                style: {
-                    inverse: true
-                }
-            },
-            keys: true,
-            mouse: true,
-        });
-        // Function to update the inventory
-        const updateInventory = (playerInventory, currencyName = 'currency') => {
-            const items = playerInventory.getAllItems();
-            let currencyTotal = 0;
-            const itemLines = [];
-            for (const item of items) {
-                let line = item.name;
-                if (item.isCurrencyCarrier?.() && item.currencyAmount > 0) {
-                    line += ` [${item.currencyAmount}]`;
-                    currencyTotal += item.currencyAmount;
-                }
-                itemLines.push(line);
-            }
-            itemLines.unshift(`{bold}Total ${currencyName}:{/bold} ${currencyTotal}\n`);
-            inventoryBox.setContent(itemLines.join('\n'));
-            screen.render();
-        };
-        // Append the inventory box to the screen
-        screen.append(inventoryBox);
-        const equipmentBox = blessed.box({
-            top: '45%',
-            left: '75%',
-            width: '25%',
-            height: '25%',
-            border: {
-                type: 'line'
-            },
-            label: ' Equipment ',
-            content: 'Your equipped items will be listed here...',
-            tags: true,
-            scrollable: true,
-            scrollbar: {
-                ch: ' ',
-                track: {
-                    bg: 'yellow'
-                },
-                style: {
-                    inverse: true
-                }
-            },
-            keys: true,
-            mouse: true,
-        });
-        // Append the equipment box to the screen
-        screen.append(equipmentBox);
-        const updateEquipment = (playerEquipment) => {
-            const sections = [];
-            const renderSlotGroup = (label, group) => {
-                if (!group) {
-                    sections.push(`{bold}${label}:{/bold} None`);
-                    return;
-                }
-                const equipped = Object.entries(group)
-                    .filter(([_, item]) => item !== null)
-                    .map(([slot, item]) => `  ${slot}: ${item.name}`);
-                if (equipped.length > 0) {
-                    sections.push(`{bold}${label}:{/bold}`);
-                    sections.push(...equipped);
-                }
-                else {
-                    sections.push(`{bold}${label}:{/bold} None`);
-                }
-            };
-            renderSlotGroup("Head", playerEquipment.head);
-            renderSlotGroup("Torso", playerEquipment.torso);
-            renderSlotGroup("Legs", playerEquipment.legs);
-            renderSlotGroup("Feet", playerEquipment.feet);
-            renderSlotGroup("Arms", playerEquipment.arms);
-            renderSlotGroup("Gloves", playerEquipment.gloves);
-            renderSlotGroup("Left Hand", playerEquipment.leftHand);
-            renderSlotGroup("Right Hand", playerEquipment.rightHand);
-            equipmentBox.setContent(sections.join('\n'));
-            screen.render();
-        };
-        // Create a log box to display game output
-        const logBox = blessed.box({
-            id: 'logBox',
-            top: '0%',
-            left: '0%',
-            width: '75%',
-            height: '90%',
-            border: {
-                type: 'line'
-            },
-            label: ' Game Log ',
-            scrollable: true, // Enable scrolling
-            alwaysScroll: true,
-            scrollbar: {
-                ch: ' ',
-                track: {
-                    bg: 'yellow'
-                },
-                style: {
-                    inverse: true
-                }
-            },
-            keys: true, // Enable keyboard input
-            mouse: true, // Enable mouse input
-            tags: true // Intercept tags
-        });
-        logBox.removeAllListeners('mousemove');
-        screen.append(logBox);
-        // Create an input box for user commands
-        const inputBox = blessed.textbox({
-            bottom: 0,
-            left: 0,
-            width: '100%',
-            height: '10%',
-            tags: true,
-            border: { type: 'line' },
-            style: { fg: 'white', border: { fg: 'cyan' } },
-            keys: true, // Enable keyboard input
-            mouse: true, // Enable mouse input
-            inputOnFocus: true, // Focus the text input when clicked,
-            vi: true
-        });
-        screen.append(inputBox);
-        // Key bindings
-        screen.key(['escape', 'C-c'], () => process.exit(0));
-        // Focus on the input box by default
-        inputBox.focus();
-        // Render the screen
-        screen.render();
         gameLog.write(`----->>>>>> Initializing Game`);
         const nexus = new Room({
             name: 'Nexus',
@@ -170,25 +26,25 @@ export async function main(playerName, sceneSeed, options) {
         const game = await Game.getInstance(player, sceneSeed);
         const ready = await game.init(options, screen);
         // Print welcome message or initial room description
-        logBox.setContent(ready); // getWelcomeMessage should return the initial game introduction or room description
-        updateEquipment(game.player.equipment);
-        updateInventory(game.player.inventory, capitalCase(game.scene.getCurrencyType()));
+        game.logBox.setContent(ready); // getWelcomeMessage should return the initial game introduction or room description
+        game.updateEquipment(game.player.equipment);
+        game.updateInventory(game.player.inventory, capitalCase(game.scene.getCurrencyType()));
         game.updateExits(game.player.currentLocation);
-        inputBox.key(['enter'], async () => {
-            const input = inputBox.getValue();
-            const response = game.handleInput(input); // handleInput is the method that processes commands
+        game.inputBox.key(['enter'], async () => {
+            const input = game.inputBox.getValue();
+            const response = await game.handleInput(input); // handleInput is the method that processes commands
             // eslint-disable-next-line no-constant-condition
             if (input.split(' ')[0] === 'take' || 'equip' || 'unequip') {
                 // Example usage: update the inventory with a new list of items
-                updateInventory(game.player.inventory, capitalCase(game.scene.getCurrencyType()));
-                updateEquipment(game.player.equipment);
+                game.updateInventory(game.player.inventory, capitalCase(game.scene.getCurrencyType()));
+                game.updateEquipment(game.player.equipment);
             }
             // eslint-disable-next-line no-constant-condition
             if (input.split(' ')[0] === 'go' || 'lock' || 'unlock') {
                 game.updateExits(game.player.currentLocation);
             }
             if (input.split(' ')[0] === 'clear') {
-                logBox.setContent('');
+                game.logBox.setContent('');
             }
             gameLog.write(`Input response: ${response}`);
             if (response === null) {
@@ -196,10 +52,10 @@ export async function main(playerName, sceneSeed, options) {
                 gameLog.write(`<<<<<<<<--------- Terminating game`);
                 process.exit(0); // Exit the game
             }
-            logBox.pushLine(response);
-            logBox.scroll(1);
-            inputBox.clearValue();
-            inputBox.focus();
+            game.logBox.pushLine(response);
+            game.logBox.scroll(1);
+            game.inputBox.clearValue();
+            game.inputBox.focus();
             screen.render();
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ui.js","sourceRoot":"","sources":["../../../../../../src/commands/game/sideQuest/ui.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ui.js","sourceRoot":"","sources":["../../../../../../src/commands/game/sideQuest/ui.ts"],"names":[],"mappings":"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"}

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

@@ -35,8 +35,8 @@ Command.create({
             message: 'Which Run would you like to play?',
             name: 'sideQuestAnswer',
             choices: [
-                { name: 'Seattle Underground', value: shadowrunConfig1 },
-                { name: 'Shadows Over Touristville', value: shadowrunConfig2 },
+                { name: shadowrunConfig1.name, value: shadowrunConfig1 },
+                { name: shadowrunConfig2.name, value: shadowrunConfig2 },
             ]
         });
         if (playerName && sideQuestAnswer) {
@@ -52,6 +52,9 @@ Command.create({
                 if (code === 0) {
                     Log.bright(`Thanks for playing!`);
                 }
+                else if (code === 2) {
+                    Log.bright(`You died! Thanks for playing!`);
+                }
                 else {
                     Log.error(`Side quest exited with code ${code} or signal ${signal}`);
                 }

package/bundle/typescript/src/commands/game/sideQuest.sub.cmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"sideQuest.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/game/sideQuest.sub.cmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sideQuest.sub.cmd.js","sourceRoot":"","sources":["../../../../../src/commands/game/sideQuest.sub.cmd.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",