diff --git a/css/scripteditor.scss b/css/scripteditor.scss index 23a9f59a8..6a62d4a0f 100644 --- a/css/scripteditor.scss +++ b/css/scripteditor.scss @@ -68,13 +68,14 @@ @include boxShadow($boxShadowArgs); background-color: #555; + border: 2px solid var(--my-highlight-color); + color: #fff; display: inline-block; float: center; - resize: none; - color: #fff; margin: 4px; padding: 2px; - border: 2px solid var(--my-highlight-color); + resize: none; + width: 50%; } #script-editor-status { diff --git a/doc/source/basicgameplay/terminal.rst b/doc/source/basicgameplay/terminal.rst index 743c24808..24fd1c6ef 100644 --- a/doc/source/basicgameplay/terminal.rst +++ b/doc/source/basicgameplay/terminal.rst @@ -90,9 +90,10 @@ Note that in order to reference a file, :ref:`netscript` functions require the Missing Features ^^^^^^^^^^^^^^^^ -Terminal/Filesystem features that are not yet implemented: +These features that are typically in Linux filesystems have not yet been added to the game: * Tab autocompletion does not work with relative paths +* :code:`mv` only accepts full filepaths for the destination argument. It does not accept directories Commands -------- @@ -399,7 +400,10 @@ See :ref:`terminal_filesystem` for more details about the Terminal's filesystem. This command only works for scripts and text files (.txt). It cannot, however, be used to convert from script to text file, or vice versa. -Note that this function can also be used to rename files. +This function can also be used to rename files. + +.. note:: Unlike the Linux :code:`mv` command, the *destination* argument must be the + full filepath. It cannot be a directory. Examples:: diff --git a/src/Locations/ui/CompanyLocation.tsx b/src/Locations/ui/CompanyLocation.tsx index 8d5de042c..2f554a531 100644 --- a/src/Locations/ui/CompanyLocation.tsx +++ b/src/Locations/ui/CompanyLocation.tsx @@ -215,7 +215,7 @@ export class CompanyLocation extends React.Component {

Company reputation: {numeralWrapper.format(this.company.playerReputation, "0,0.000")} - You will earn ${numeralWrapper.format(favorGain[0], "0,0")} company + You will earn {numeralWrapper.format(favorGain[0], "0,0")} company favor upon resetting after installing Augmentations

diff --git a/src/Terminal.js b/src/Terminal.js index 23e4c44ef..544c9e602 100644 --- a/src/Terminal.js +++ b/src/Terminal.js @@ -1163,6 +1163,11 @@ let Terminal = { const source = commandArray[1]; const dest = commandArray[2]; + if (!isScriptFilename(source) && !source.endsWith(".txt")) { + postError(`'mv' can only be used on scripts and text files (.txt)`); + return; + } + const srcFile = Terminal.getFile(source); if (srcFile == null) { postError(`Source file ${source} does not exist`); @@ -1218,9 +1223,6 @@ let Terminal = { } srcFile.fn = destPath; - } else { - postError(`'mv' can only be used on scripts, literature files (.lit), and text files (.txt)`); - return; } } catch(e) { Terminal.postThrownError(e); diff --git a/src/Terminal/HelpText.ts b/src/Terminal/HelpText.ts index 388c5a3f8..70bb96756 100644 --- a/src/Terminal/HelpText.ts +++ b/src/Terminal/HelpText.ts @@ -166,8 +166,11 @@ export const HelpTexts: IMap = { "above will print the amount of RAM needed to run 'foo.script' with 50 threads.", mv: "mv [src] [dest]
" + "Move the source file to the specified destination. This can also be used to rename files. " + - "Note that this only works for scripts and text files (.txt). This command CANNOT be used to " + - "convert to different file types. Examples:

" + + "This command only works for scripts and text files (.txt). This command CANNOT be used to " + + "convert to different file types

" + + "Note that, unlike the Linux 'mv' command, the destination argument must be the " + + "full filepath. " + + "Examples:

" + "mv hacking-controller.script scripts/hacking-controller.script
" + "mv myScript.js myOldScript.js", nano: "nano [file name]
" +