From 14532cd0a8d2df18e21547e327b285860fd0721b Mon Sep 17 00:00:00 2001 From: 65-7a Date: Mon, 20 Dec 2021 21:11:28 +1100 Subject: [PATCH 1/2] Allow cat to work on scripts --- src/Terminal/commands/cat.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Terminal/commands/cat.ts b/src/Terminal/commands/cat.ts index 22453571e..f91a5950f 100644 --- a/src/Terminal/commands/cat.ts +++ b/src/Terminal/commands/cat.ts @@ -4,6 +4,7 @@ import { IPlayer } from "../../PersonObjects/IPlayer"; import { BaseServer } from "../../Server/BaseServer"; import { showMessage } from "../../Message/MessageHelpers"; import { showLiterature } from "../../Literature/LiteratureHelpers"; +import { dialogBoxCreate } from "../../ui/React/DialogBox"; export function cat( terminal: ITerminal, @@ -18,9 +19,9 @@ export function cat( } const relative_filename = args[0] + ""; const filename = terminal.getFilepath(relative_filename); - if (!filename.endsWith(".msg") && !filename.endsWith(".lit") && !filename.endsWith(".txt")) { + if (!filename.endsWith(".msg") && !filename.endsWith(".lit") && !filename.endsWith(".txt") && !filename.endsWith(".script") && !filename.endsWith(".js") && !filename.endsWith(".ns")) { terminal.error( - "Only .msg, .txt, and .lit files are viewable with cat (filename must end with .msg, .txt, or .lit)", + "Only .msg, .txt, .lit, .script, .js, and .ns files are viewable with cat (filename must end with .msg, .txt, .lit, .script, .js, or .ns)", ); return; } @@ -45,6 +46,12 @@ export function cat( txt.show(); return; } + } else if (filename.endsWith(".script") || filename.endsWith(".js") || filename.endsWith(".ns")) { + const script = terminal.getScript(player, relative_filename); + if (script != null) { + dialogBoxCreate(`${script.filename}

${script.code}`); + return; + } } terminal.error(`No such file ${filename}`); From 3df0fd3945b40376c6ba5220d0df8dcb5a020b0c Mon Sep 17 00:00:00 2001 From: 65-7a Date: Mon, 20 Dec 2021 21:11:58 +1100 Subject: [PATCH 2/2] Add script files to tab completion for cat --- src/Terminal/determineAllPossibilitiesForTabCompletion.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts index 53847ac98..5b07c0287 100644 --- a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts +++ b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts @@ -353,6 +353,7 @@ export async function determineAllPossibilitiesForTabCompletion( addAllLitFiles(); addAllTextFiles(); addAllDirectories(); + addAllScripts(); return allPos; }