Merge branch 'dev' into feature/monaco-theme-editor

2026-04-21 08:42:53 +02:00 · 2022-03-10 23:16:44 -06:00
parent c7e228807b 372776c94e
commit 0236bdc73d
126 changed files with 1517 additions and 651 deletions
@@ -105,9 +105,11 @@ interface RunningScript {
  logs: string[];
  offlineExpGained: number;
  offlineMoneyMade: number;
+  /** Offline running time of the script, in seconds **/
  offlineRunningTime: number;
  onlineExpGained: number;
  onlineMoneyMade: number;
+  /** Online running time of the script, in seconds **/
  onlineRunningTime: number;
  pid: number;
  ramUsage: number;
@@ -533,6 +535,8 @@ export interface BitNodeMultipliers {
  CompanyWorkExpGain: number;
  /** Influences how much money the player earns when completing working their job. */
  CompanyWorkMoney: number;
+  /** Influences the money gain from dividends of corporations created by the player. */
+  CorporationSoftCap: number;
  /** Influences the valuation of corporations created by the player. */
  CorporationValuation: number;
  /** Influences the base experience gained for each ability when the player commits a crime. */
@@ -898,42 +902,75 @@ export interface GangTerritory {
 * @public
 */
 export interface GangMemberInfo {
+  /** Name of the gang member */
  name: string;
+  /** Currently assigned task */
  task: string;
  earnedRespect: number;
+
+  /** Hack skill level */
  hack: number;
+  /** Strength skill level */
  str: number;
+  /** Defense skill level */
  def: number;
+  /** Dexterity skill level */
  dex: number;
+  /** Agility skill level */
  agi: number;
+  /** Charisma skill level */
  cha: number;

+  /** Current hack experience */
  hack_exp: number;
+  /** Current strength experience */
  str_exp: number;
+  /** Current defense experience */
  def_exp: number;
+  /** Current dexterity experience */
  dex_exp: number;
+  /** Current agility experience */
  agi_exp: number;
+  /** Current charisma experience */
  cha_exp: number;

+  /** Hack multiplier from equipment */
  hack_mult: number;
+  /** Strength multiplier from equipment */
  str_mult: number;
+  /** Defense multiplier from equipment */
  def_mult: number;
+  /** Dexterity multiplier from equipment */
  dex_mult: number;
+  /** Agility multiplier from equipment */
  agi_mult: number;
+  /** Charisma multiplier from equipment */
  cha_mult: number;

+  /** Hack multiplier from ascensions */
  hack_asc_mult: number;
+  /** Strength multiplier from ascensions */
  str_asc_mult: number;
+  /** Defense multiplier from ascensions */
  def_asc_mult: number;
+  /** Dexterity multiplier from ascensions */
  dex_asc_mult: number;
+  /** Agility multiplier from ascensions */
  agi_asc_mult: number;
+  /** Charisma multiplier from ascensions */
  cha_asc_mult: number;

+  /** Total earned hack experience */
  hack_asc_points: number;
+  /** Total earned strength experience */
  str_asc_points: number;
+  /** Total earned defense experience */
  def_asc_points: number;
+  /** Total earned dexterity experience */
  dex_asc_points: number;
+  /** Total earned agility experience */
  agi_asc_points: number;
+  /** Total earned charisma experience */
  cha_asc_points: number;

  upgrades: string[];
@@ -1601,9 +1638,10 @@ export interface Singularity {
   * The actions that can be stopped with this function are:
   *
   * * Studying at a university
+   * * Working out at a gym
   * * Working for a company/faction
   * * Creating a program
-   * * Committing a Crime
+   * * Committing a crime
   *
   * This function will return true if the player’s action was ended.
   * It will return false if the player was not performing an action when this function was called.
@@ -4098,7 +4136,7 @@ interface UserInterface {
 *  ns.getHostname();
 *  // Some related functions are gathered under a sub-property of the ns object
 *  ns.stock.getPrice();
- *  // Some functions need to be await ed
+ *  // Some functions need to be awaited
 *  await ns.hack('n00dles');
 * }
 * ```
@@ -4926,6 +4964,34 @@ export interface NS extends Singularity {
   * @returns True if the script is successfully killed, and false otherwise.
   */
  kill(script: number): boolean;
+
+  /**
+   * {@inheritDoc NS.(kill:1)}
+   * @example
+   * ```ts
+   * // NS1:
+   * //The following example will try to kill a script named foo.script on the foodnstuff server that was ran with no arguments:
+   * kill("foo.script", "foodnstuff");
+   *
+   * //The following will try to kill a script named foo.script on the current server that was ran with no arguments:
+   * kill("foo.script", getHostname());
+   *
+   * //The following will try to kill a script named foo.script on the current server that was ran with the arguments 1 and “foodnstuff”:
+   * kill("foo.script", getHostname(), 1, "foodnstuff");
+   * ```
+   * @example
+   * ```ts
+   * // NS2:
+   * //The following example will try to kill a script named foo.script on the foodnstuff server that was ran with no arguments:
+   * ns.kill("foo.script", "foodnstuff");
+   *
+   * //The following will try to kill a script named foo.script on the current server that was ran with no arguments:
+   * ns.kill("foo.script", getHostname());
+   *
+   * //The following will try to kill a script named foo.script on the current server that was ran with the arguments 1 and “foodnstuff”:
+   * ns.kill("foo.script", getHostname(), 1, "foodnstuff");
+   * ```
+   */
  kill(script: string, host: string, ...args: string[]): boolean;

  /**
@@ -4991,6 +5057,37 @@ export interface NS extends Singularity {
   * @returns True if the script/literature file is successfully copied over and false otherwise. If the files argument is an array then this function will return true if at least one of the files in the array is successfully copied.
   */
  scp(files: string | string[], destination: string): Promise<boolean>;
+
+  /**
+   * {@inheritDoc NS.(scp:1)}
+   * @example
+   * ```ts
+   * // NS1:
+   * //Copies foo.lit from the helios server to the home computer:
+   * scp("foo.lit", "helios", "home");
+   *
+   * //Tries to copy three files from rothman-uni to home computer:
+   * files = ["foo1.lit", "foo2.script", "foo3.script"];
+   * scp(files, "rothman-uni", "home");
+   * ```
+   * @example
+   * ```ts
+   * // NS2:
+   * //Copies foo.lit from the helios server to the home computer:
+   * await ns.scp("foo.lit", "helios", "home");
+   *
+   * //Tries to copy three files from rothman-uni to home computer:
+   * files = ["foo1.lit", "foo2.script", "foo3.script"];
+   * await ns.scp(files, "rothman-uni", "home");
+   * ```
+   * @example
+   * ```ts
+   * //ns2, copies files from home to a target server
+   * const server = ns.args[0];
+   * const files = ["hack.js","weaken.js","grow.js"];
+   * await ns.scp(files, "home", server);
+   * ```
+   */
  scp(files: string | string[], source: string, destination: string): Promise<boolean>;

  /**
@@ -5017,8 +5114,8 @@ export interface NS extends Singularity {
   * @example
   * ```ts
   * // NS1:
-   * const scripts = ps("home");
-   * for (let i = 0; i < scripts.length; ++i) {
+   * var scripts = ps("home");
+   * for (var i = 0; i < scripts.length; ++i) {
   *     tprint(scripts[i].filename + ' ' + scripts[i].threads);
   *     tprint(scripts[i].args);
   * }
@@ -5027,8 +5124,8 @@ export interface NS extends Singularity {
   * ```ts
   * // NS2:
   * const ps = ns.ps("home");
-   * for (script of ps) {
-   *     ns.tprint(`${script.filename} ${ps[i].threads}`);
+   * for (let script of ps) {
+   *     ns.tprint(`${script.filename} ${script.threads}`);
   *     ns.tprint(script.args);
   * }
   * ```
@@ -5555,7 +5652,7 @@ export interface NS extends Singularity {
   * @param data - Data to write.
   * @returns True if the data is successfully written to the port, and false otherwise.
   */
-  tryWritePort(port: number, data: string[] | number): Promise<boolean>;
+  tryWritePort(port: number, data: string | number): Promise<boolean>;

  /**
   * Read content of a file.
@@ -5795,6 +5892,10 @@ export interface NS extends Singularity {
   * @returns Amount of income the specified script generates while online.
   */
  getScriptIncome(): [number, number];
+
+  /**
+   * {@inheritDoc NS.(getScriptIncome:1)}
+   */
  getScriptIncome(script: string, host: string, ...args: string[]): number;

  /**
@@ -5815,6 +5916,10 @@ export interface NS extends Singularity {
   * @returns Amount of hacking experience the specified script generates while online.
   */
  getScriptExpGain(): number;
+
+  /**
+   * {@inheritDoc NS.(getScriptExpGain:1)}
+   */
  getScriptExpGain(script: string, host: string, ...args: string[]): number;

  /**
@@ -6279,6 +6384,14 @@ export interface WarehouseAPI {
   * @param amt - Amount of material to buy
   */
  buyMaterial(divisionName: string, cityName: string, materialName: string, amt: number): void;
+  /**
+  * Set material to bulk buy
+  * @param divisionName - Name of the division
+  * @param cityName - Name of the city
+  * @param materialName - Name of the material
+  * @param amt - Amount of material to buy
+  */
+  bulkPurchase(divisionName: string, cityName: string, materialName: string, amt: number): void;
  /**
   * Get warehouse data
   * @param divisionName - Name of the division
@@ -6519,6 +6632,18 @@ export interface Corporation extends WarehouseAPI, OfficeAPI {
   * @param percent - Percent of profit to issue as dividends.
   */
  issueDividends(percent: number): void;
+  /**
+   * Buyback Shares
+   * @param amount - Amount of shares to buy back.
+   *
+   */
+  buyBackShares(amount: number): void;
+  /**
+   * Sell Shares
+   * @param amount -  Amount of shares to sell.
+   *
+   */
+  sellShares(amount: number): void;
 }

 /**
@@ -6779,3 +6904,14 @@ interface GameInfo {
  commit: string;
  platform: string;
 }
+
+/**
+ * Used for autocompletion
+ * @public
+ */
+interface AutocompleteData {
+  servers: string[];
+  scripts: string[];
+  txts: string[];
+  flags(schema: [string, string | number | boolean | string[]][]): any;
+}
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React, { useState, useEffect, useRef, useMemo } from "react";
 import Editor, { Monaco } from "@monaco-editor/react";
 import * as monaco from "monaco-editor";
@@ -33,8 +32,8 @@ import Typography from "@mui/material/Typography";
 import Link from "@mui/material/Link";
 import Box from "@mui/material/Box";
 import SettingsIcon from "@mui/icons-material/Settings";
-import SyncIcon from '@mui/icons-material/Sync';
-import CloseIcon from '@mui/icons-material/Close';
+import SyncIcon from "@mui/icons-material/Sync";
+import CloseIcon from "@mui/icons-material/Close";
 import Table from "@mui/material/Table";
 import TableCell from "@mui/material/TableCell";
 import TableRow from "@mui/material/TableRow";
@@ -134,13 +133,12 @@ export function Root(props: IProps): React.ReactElement {
  // Prevent Crash if script is open on deleted server
  openScripts = openScripts.filter((script) => {
    return GetServer(script.hostname) !== null;
-  })
-  if (currentScript && (GetServer(currentScript.hostname) === null)) {
+  });
+  if (currentScript && GetServer(currentScript.hostname) === null) {
    currentScript = openScripts[0];
    if (currentScript === undefined) currentScript = null;
  }

-
  const [dimensions, setDimensions] = useState({
    height: window.innerHeight,
    width: window.innerWidth,
@@ -206,9 +204,35 @@ export function Root(props: IProps): React.ReactElement {
            save();
            props.router.toTerminal();
          });
+
+          // Setup "go to next tab" and "go to previous tab". This is a little more involved
+          // since these aren't Ex commands (they run in normal mode, not after typing `:`)
+          MonacoVim.VimMode.Vim.defineAction("nextTabs", function (_cm: any, args: { repeat?: number }) {
+            const nTabs = args.repeat ?? 1;
+            // Go to the next tab (to the right). Wraps around when at the rightmost tab
+            const currIndex = currentTabIndex();
+            if (currIndex !== undefined) {
+              const nextIndex = (currIndex + nTabs) % openScripts.length;
+              onTabClick(nextIndex);
+            }
+          });
+          MonacoVim.VimMode.Vim.defineAction("prevTabs", function (_cm: any, args: { repeat?: number }) {
+            const nTabs = args.repeat ?? 1;
+            // Go to the previous tab (to the left). Wraps around when at the leftmost tab
+            const currIndex = currentTabIndex();
+            if (currIndex !== undefined) {
+              let nextIndex = currIndex - nTabs;
+              while (nextIndex < 0) {
+                nextIndex += openScripts.length;
+              }
+              onTabClick(nextIndex);
+            }
+          });
+          MonacoVim.VimMode.Vim.mapCommand("gt", "action", "nextTabs", {}, { context: "normal" });
+          MonacoVim.VimMode.Vim.mapCommand("gT", "action", "prevTabs", {}, { context: "normal" });
          editor.focus();
        });
-      } catch { }
+      } catch {}
    } else if (!options.vim) {
      // Whem vim mode is disabled
      vimEditor?.dispose();
@@ -317,13 +341,18 @@ export function Root(props: IProps): React.ReactElement {
        .loader();
      // replaced the bare tokens with regexes surrounded by \b, e.g. \b{token}\b which matches a word-break on either side
      // this prevents the highlighter from highlighting pieces of variables that start with a reserved token name
-      l.language.tokenizer.root.unshift([new RegExp('\\bns\\b'), { token: "ns" }]);
-      for (const symbol of symbols) l.language.tokenizer.root.unshift([new RegExp(`\\b${symbol}\\b`), { token: "netscriptfunction" }]);
+      l.language.tokenizer.root.unshift([new RegExp("\\bns\\b"), { token: "ns" }]);
+      for (const symbol of symbols)
+        l.language.tokenizer.root.unshift([new RegExp(`\\b${symbol}\\b`), { token: "netscriptfunction" }]);
      const otherKeywords = ["let", "const", "var", "function"];
      const otherKeyvars = ["true", "false", "null", "undefined"];
-      otherKeywords.forEach((k) => l.language.tokenizer.root.unshift([new RegExp(`\\b${k}\\b`), { token: "otherkeywords" }]));
-      otherKeyvars.forEach((k) => l.language.tokenizer.root.unshift([new RegExp(`\\b${k}\\b`), { token: "otherkeyvars" }]));
-      l.language.tokenizer.root.unshift([new RegExp('\\bthis\\b'), { token: "this" }]);
+      otherKeywords.forEach((k) =>
+        l.language.tokenizer.root.unshift([new RegExp(`\\b${k}\\b`), { token: "otherkeywords" }]),
+      );
+      otherKeyvars.forEach((k) =>
+        l.language.tokenizer.root.unshift([new RegExp(`\\b${k}\\b`), { token: "otherkeyvars" }]),
+      );
+      l.language.tokenizer.root.unshift([new RegExp("\\bthis\\b"), { token: "this" }]);
    })();

    const source = (libSource + "").replace(/export /g, "");
@@ -451,7 +480,7 @@ export function Root(props: IProps): React.ReactElement {
    }
    try {
      infLoop(newCode);
-    } catch (err) { }
+    } catch (err) {}
  }

  function saveScript(scriptToSave: OpenScript): void {
@@ -607,16 +636,26 @@ export function Root(props: IProps): React.ReactElement {
    openScripts = items;
  }

-  function onTabClick(index: number): void {
+  function currentTabIndex(): number | undefined {
    if (currentScript !== null) {
-      // Save currentScript to openScripts
-      const curIndex = openScripts.findIndex(
+      return openScripts.findIndex(
        (script) =>
          currentScript !== null &&
          script.fileName === currentScript.fileName &&
          script.hostname === currentScript.hostname,
      );
-      openScripts[curIndex] = currentScript;
+    }
+
+    return undefined;
+  }
+
+  function onTabClick(index: number): void {
+    if (currentScript !== null) {
+      // Save currentScript to openScripts
+      const curIndex = currentTabIndex();
+      if (curIndex !== undefined) {
+        openScripts[curIndex] = currentScript;
+      }
    }

    currentScript = { ...openScripts[index] };
@@ -704,15 +743,17 @@ export function Root(props: IProps): React.ReactElement {

    if (openScript.code !== serverScriptCode) {
      PromptEvent.emit({
-        txt: "Do you want to overwrite the current editor content with the contents of " +
-          openScript.fileName + " on the server? This cannot be undone.",
+        txt:
+          "Do you want to overwrite the current editor content with the contents of " +
+          openScript.fileName +
+          " on the server? This cannot be undone.",
        resolve: (result: boolean) => {
          if (result) {
            // Save changes
            openScript.code = serverScriptCode;

            // Switch to target tab
-            onTabClick(index)
+            onTabClick(index);

            if (editorRef.current !== null && openScript !== null) {
              if (openScript.model === undefined || openScript.model.isDisposed()) {
@@ -756,7 +797,11 @@ export function Root(props: IProps): React.ReactElement {
  //  44px bottom tool bar + 16px margin
  //  + vim bar 34px
  const editorHeight = dimensions.height - (130 + (options.vim ? 34 : 0));
-
+  const tabsMaxWidth = 1640;
+  const tabMargin = 5;
+  const tabMaxWidth = openScripts.length ? tabsMaxWidth / openScripts.length - tabMargin : 0;
+  const tabIconWidth = 25;
+  const tabTextWidth = tabMaxWidth - tabIconWidth * 2;
  return (
    <>
      <div style={{ display: currentScript !== null ? "block" : "none", height: "100%", width: "100%" }}>
@@ -764,7 +809,7 @@ export function Root(props: IProps): React.ReactElement {
          <Droppable droppableId="tabs" direction="horizontal">
            {(provided, snapshot) => (
              <Box
-                maxWidth="1640px"
+                maxWidth={`${tabsMaxWidth}px`}
                display="flex"
                flexDirection="row"
                alignItems="center"
@@ -780,20 +825,24 @@ export function Root(props: IProps): React.ReactElement {
              >
                {openScripts.map(({ fileName, hostname }, index) => {
                  const iconButtonStyle = {
-                    maxWidth: "25px",
-                    minWidth: "25px",
-                    minHeight: '38.5px',
-                    maxHeight: '38.5px',
-                    ...(currentScript?.fileName === openScripts[index].fileName ? {
-                      background: Settings.theme.button,
-                      borderColor: Settings.theme.button,
-                      color: Settings.theme.primary
-                    } : {
-                      background: Settings.theme.backgroundsecondary,
-                      borderColor: Settings.theme.backgroundsecondary,
-                      color: Settings.theme.secondary
-                    })
+                    maxWidth: `${tabIconWidth}px`,
+                    minWidth: `${tabIconWidth}px`,
+                    minHeight: "38.5px",
+                    maxHeight: "38.5px",
+                    ...(currentScript?.fileName === openScripts[index].fileName
+                      ? {
+                          background: Settings.theme.button,
+                          borderColor: Settings.theme.button,
+                          color: Settings.theme.primary,
+                        }
+                      : {
+                          background: Settings.theme.backgroundsecondary,
+                          borderColor: Settings.theme.backgroundsecondary,
+                          color: Settings.theme.secondary,
+                        }),
                  };
+
+                  const scriptTabText = `${hostname}:~/${fileName} ${dirty(index)}`;
                  return (
                    <Draggable
                      key={fileName + hostname}
@@ -808,43 +857,52 @@ export function Root(props: IProps): React.ReactElement {
                          {...provided.dragHandleProps}
                          style={{
                            ...provided.draggableProps.style,
-                            marginRight: "5px",
+                            maxWidth: `${tabMaxWidth}px`,
+                            marginRight: `${tabMargin}px`,
                            flexShrink: 0,
-                            border: '1px solid ' + Settings.theme.well,
+                            border: "1px solid " + Settings.theme.well,
                          }}
                        >
-                          <Button
-                            onClick={() => onTabClick(index)}
-                            onMouseDown={e => {
-                              e.preventDefault();
-                              if (e.button === 1) onTabClose(index);
-                            }}
-                            style={{
-                              ...(currentScript?.fileName === openScripts[index].fileName ? {
-                                background: Settings.theme.button,
-                                borderColor: Settings.theme.button,
-                                color: Settings.theme.primary
-                              } : {
-                                background: Settings.theme.backgroundsecondary,
-                                borderColor: Settings.theme.backgroundsecondary,
-                                color: Settings.theme.secondary
-                              })
-                            }}
-                          >
-                            {hostname}:~/{fileName} {dirty(index)}
-                          </Button>
+                          <Tooltip title={scriptTabText}>
+                            <Button
+                              onClick={() => onTabClick(index)}
+                              onMouseDown={(e) => {
+                                e.preventDefault();
+                                if (e.button === 1) onTabClose(index);
+                              }}
+                              style={{
+                                maxWidth: `${tabTextWidth}px`,
+                                overflow: "hidden",
+                                ...(currentScript?.fileName === openScripts[index].fileName
+                                  ? {
+                                      background: Settings.theme.button,
+                                      borderColor: Settings.theme.button,
+                                      color: Settings.theme.primary,
+                                    }
+                                  : {
+                                      background: Settings.theme.backgroundsecondary,
+                                      borderColor: Settings.theme.backgroundsecondary,
+                                      color: Settings.theme.secondary,
+                                    }),
+                              }}
+                            >
+                              <span style={{ overflow: "hidden", direction: "rtl", textOverflow: "ellipsis" }}>
+                                {scriptTabText}
+                              </span>
+                            </Button>
+                          </Tooltip>
                          <Tooltip title="Overwrite editor content with saved file content">
-                            <Button onClick={() => onTabUpdate(index)} style={iconButtonStyle} >
-                              <SyncIcon fontSize='small' />
+                            <Button onClick={() => onTabUpdate(index)} style={iconButtonStyle}>
+                              <SyncIcon fontSize="small" />
                            </Button>
                          </Tooltip>
                          <Button onClick={() => onTabClose(index)} style={iconButtonStyle}>
-                            <CloseIcon fontSize='small' />
+                            <CloseIcon fontSize="small" />
                          </Button>
                        </div>
                      )}
                    </Draggable>
-                  )
+                  );
                })}
                {provided.placeholder}
              </Box>
@@ -874,14 +932,24 @@ export function Root(props: IProps): React.ReactElement {
        ></Box>

        <Box display="flex" flexDirection="row" sx={{ m: 1 }} alignItems="center">
-          <Button startIcon={<SettingsIcon />} onClick={() => setOptionsOpen(true)} sx={{ mr: 1 }}>Options</Button>
+          <Button startIcon={<SettingsIcon />} onClick={() => setOptionsOpen(true)} sx={{ mr: 1 }}>
+            Options
+          </Button>
          <Button onClick={beautify}>Beautify</Button>
-          <Button color={updatingRam ? "secondary" : "primary"} sx={{ mx: 1 }} onClick={() => { setRamInfoOpen(true) }}>
+          <Button
+            color={updatingRam ? "secondary" : "primary"}
+            sx={{ mx: 1 }}
+            onClick={() => {
+              setRamInfoOpen(true);
+            }}
+          >
            {ram}
          </Button>
          <Button onClick={save}>Save (Ctrl/Cmd + s)</Button>
-          <Button onClick={props.router.toTerminal}>Close (Ctrl/Cmd + b)</Button>
-          <Typography sx={{ mx: 1 }}>
+          <Button sx={{ mx: 1 }} onClick={props.router.toTerminal}>
+            Terminal (Ctrl/Cmd + b)
+          </Button>
+          <Typography>
            {" "}
            Documentation:{" "}
            <Link target="_blank" href="https://bitburner.readthedocs.io/en/latest/index.html">
@@ -925,7 +993,9 @@ export function Root(props: IProps): React.ReactElement {
                <React.Fragment key={n + r}>
                  <TableRow>
                    <TableCell sx={{ color: Settings.theme.primary }}>{n}</TableCell>
-                    <TableCell align="right" sx={{ color: Settings.theme.primary }}>{r}</TableCell>
+                    <TableCell align="right" sx={{ color: Settings.theme.primary }}>
+                      {r}
+                    </TableCell>
                  </TableRow>
                </React.Fragment>
              ))}
@@ -474,7 +474,6 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
        foreground: "FFB86C",
        fontStyle: "italic",
      },
-
      {
        token: "netscriptfunction",
        foreground: "FF79C6",