lint

.eslintignore

@@ -4,3 +4,4 @@ dist/
 tests/*.bundle.*
 src/ThirdParty/*
 src/JSInterpreter.js
+main.bundle.js

src/Augmentation/AugmentationHelpers.tsx

@@ -111,8 +111,8 @@ function getRandomBonus(): any {
   return bonuses[Math.floor(bonuses.length * randomNumber.random())];
 }
 
-function initAugmentations() {
+function initAugmentations(): void {
-  for (var name in Factions) {
+  for (const name in Factions) {
     if (Factions.hasOwnProperty(name)) {
       Factions[name].augmentations = [];
     }
@@ -2349,7 +2349,7 @@ function initAugmentations() {
     CONSTANTS.MultipleAugMultiplier * [1, 0.96, 0.94, 0.93][SourceFileFlags[11]],
     Player.queuedAugmentations.length,
   );
-  for (var name in Augmentations) {
+  for (const name in Augmentations) {
     if (Augmentations.hasOwnProperty(name)) {
       Augmentations[name].baseCost *= mult;
     }
@@ -2402,7 +2402,7 @@ function applyAugmentation(aug: IPlayerOwnedAugmentation, reapply = false): void
   }
 }
 
-function installAugmentations() {
+function installAugmentations(): boolean {
   if (Player.queuedAugmentations.length == 0) {
     dialogBoxCreate("You have not purchased any Augmentations to install!");
     return false;
@@ -2440,9 +2440,10 @@ function installAugmentations() {
       "<br>You wake up in your home...you feel different...",
   );
   prestigeAugmentation();
+  return true;
 }
 
-function augmentationExists(name: string) {
+function augmentationExists(name: string): boolean {
   return Augmentations.hasOwnProperty(name);
 }
 

src/Augmentation/ui/AugmentationsRoot.tsx

@@ -9,8 +9,6 @@ import { PlayerMultipliers } from "./PlayerMultipliers";
 import { PurchasedAugmentations } from "./PurchasedAugmentations";
 import { SourceFiles } from "./SourceFiles";
 
-import { Player } from "../../Player";
-import { StdButton } from "../../ui/React/StdButton";
 import { canGetBonus } from "../../ExportBonus";
 
 import Typography from "@mui/material/Typography";

src/Augmentation/ui/InstalledAugmentations.tsx

@@ -7,8 +7,6 @@
  */
 import React, { useState } from "react";
 
-import { OwnedSourceFiles } from "./OwnedSourceFiles";
-import { SourceFileMinus1 } from "./SourceFileMinus1";
 import { AugmentationAccordion } from "../../ui/React/AugmentationAccordion";
 import { Augmentations } from "../../Augmentation/Augmentations";
 import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
@@ -16,7 +14,6 @@ import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 import { Settings } from "../../Settings/Settings";
 import { use } from "../../ui/Context";
 import { OwnedAugmentationsOrderSetting } from "../../Settings/SettingEnums";
-import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Tooltip from "@mui/material/Tooltip";
 import List from "@mui/material/List";

src/Augmentation/ui/PlayerMultipliers.tsx

@@ -8,7 +8,6 @@ import { numeralWrapper } from "../../ui/numeralFormat";
 import { Augmentations } from "../Augmentations";
 import { Table, TableCell } from "../../ui/React/Table";
 import TableBody from "@mui/material/TableBody";
-import { Table as MuiTable } from "@mui/material";
 import TableRow from "@mui/material/TableRow";
 import Typography from "@mui/material/Typography";
 

src/Augmentation/ui/SourceFiles.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-import { use } from "../../ui/Context";
 import { SourceFileMinus1 } from "./SourceFileMinus1";
 import { OwnedSourceFiles } from "./OwnedSourceFiles";
 import List from "@mui/material/List";
@@ -7,7 +6,6 @@ import List from "@mui/material/List";
 import Typography from "@mui/material/Typography";
 
 export function SourceFiles(): React.ReactElement {
-  const player = use.Player();
   return (
     <>
       <Typography variant="h4">Source Files</Typography>

src/Bladeburner/ui/BladeburnerRoot.tsx

@@ -4,7 +4,6 @@ import { Console } from "./Console";
 import { AllPages } from "./AllPages";
 
 import { use } from "../../ui/Context";
-import { IBladeburner } from "../IBladeburner";
 
 export function BladeburnerRoot(): React.ReactElement {
   const player = use.Player();

src/Corporation/ui/CorporationRoot.tsx

@@ -7,7 +7,6 @@ import { IIndustry } from "../IIndustry";
 import { NewIndustryPopup } from "./NewIndustryPopup";
 import { createPopup } from "../../ui/React/createPopup";
 import { ICorporation } from "../ICorporation";
-import { IPlayer } from "../../PersonObjects/IPlayer";
 import { MainPanel } from "./MainPanel";
 import { Industries } from "../IndustryData";
 import { use } from "../../ui/Context";

src/Faction/FactionHelpers.tsx

@@ -93,7 +93,8 @@ export function purchaseAugmentation(aug: Augmentation, fac: Faction, sing = fal
   const factionInfo = fac.getInfo();
   const hasPrereqs = hasAugmentationPrereqs(aug);
   if (!hasPrereqs) {
-    const txt = "You must first purchase or install " + aug.prereqs.join(",") + " before you can " + "purchase this one.";
+    const txt =
+      "You must first purchase or install " + aug.prereqs.join(",") + " before you can " + "purchase this one.";
     if (sing) {
       return txt;
     } else {
@@ -166,14 +167,14 @@ export function purchaseAugmentation(aug: Augmentation, fac: Faction, sing = fal
 export function getNextNeurofluxLevel(): number {
   // Get current Neuroflux level based on Player's augmentations
   let currLevel = 0;
-  for (var i = 0; i < Player.augmentations.length; ++i) {
+  for (let i = 0; i < Player.augmentations.length; ++i) {
     if (Player.augmentations[i].name === AugmentationNames.NeuroFluxGovernor) {
       currLevel = Player.augmentations[i].level;
     }
   }
 
   // Account for purchased but uninstalled Augmentations
-  for (var i = 0; i < Player.queuedAugmentations.length; ++i) {
+  for (let i = 0; i < Player.queuedAugmentations.length; ++i) {
     if (Player.queuedAugmentations[i].name == AugmentationNames.NeuroFluxGovernor) {
       ++currLevel;
     }

src/Faction/ui/AugmentationsPage.tsx

@@ -12,7 +12,6 @@ import { PurchaseAugmentationsOrderSetting } from "../../Settings/SettingEnums";
 import { Settings } from "../../Settings/Settings";
 import { hasAugmentationPrereqs } from "../FactionHelpers";
 
-import { StdButton } from "../../ui/React/StdButton";
 import { use } from "../../ui/Context";
 
 import Button from "@mui/material/Button";
@@ -87,7 +86,6 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
     const augs = getAugs();
     function canBuy(augName: string): boolean {
       const aug = Augmentations[augName];
-      const moneyCost = aug.baseCost * props.faction.getInfo().augmentationPriceMult;
       const repCost = aug.baseRepRequirement * props.faction.getInfo().augmentationRepRequirementMult;
       const hasReq = props.faction.playerReputation >= repCost;
       const hasRep = hasAugmentationPrereqs(aug);

src/Faction/ui/DonateOption.tsx

@@ -12,8 +12,6 @@ import { Favor } from "../../ui/React/Favor";
 import { Money } from "../../ui/React/Money";
 import { Reputation } from "../../ui/React/Reputation";
 
-import { StdButton } from "../../ui/React/StdButton";
-
 import { numeralWrapper } from "../../ui/numeralFormat";
 
 import { dialogBoxCreate } from "../../../utils/DialogBox";
@@ -32,11 +30,6 @@ type IProps = {
   rerender: () => void;
 };
 
-const inputStyleMarkup = {
-  margin: "5px",
-  height: "26px",
-};
-
 export function DonateOption(props: IProps): React.ReactElement {
   const [donateAmt, setDonateAmt] = useState<number | null>(null);
   const digits = (CONSTANTS.DonateMoneyToRepDivisor + "").length - 1;

src/Faction/ui/FactionRoot.tsx

@@ -3,7 +3,7 @@
  * This is the component for displaying a single faction's UI, not the list of all
  * accessible factions
  */
-import React, { useState, useEffect } from "react";
+import React, { useState } from "react";
 
 import { AugmentationsPage } from "./AugmentationsPage";
 import { DonateOption } from "./DonateOption";

src/Faction/ui/Info.tsx

@@ -7,13 +7,10 @@ import React, { useState, useEffect } from "react";
 import { Faction } from "../../Faction/Faction";
 import { FactionInfo } from "../../Faction/FactionInfo";
 
-import { AutoupdatingParagraph } from "../../ui/React/AutoupdatingParagraph";
-import { ParagraphWithTooltip } from "../../ui/React/ParagraphWithTooltip";
 import { Reputation } from "../../ui/React/Reputation";
 import { Favor } from "../../ui/React/Favor";
 import { MathComponent } from "mathjax-react";
 
-import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";
 import Typography from "@mui/material/Typography";
@@ -25,7 +22,7 @@ type IProps = {
   factionInfo: FactionInfo;
 };
 
-const useStyles = makeStyles((theme: Theme) =>
+const useStyles = makeStyles(() =>
   createStyles({
     noformat: {
       whiteSpace: "pre-wrap",

src/Faction/ui/Option.tsx

@@ -5,8 +5,6 @@
  */
 import * as React from "react";
 
-import { StdButton } from "../../ui/React/StdButton";
-
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Paper from "@mui/material/Paper";

src/Faction/ui/PurchaseableAugmentation.tsx

@@ -15,9 +15,7 @@ import { Settings } from "../../Settings/Settings";
 import { Money } from "../../ui/React/Money";
 import { Reputation } from "../../ui/React/Reputation";
 import { createPopup } from "../../ui/React/createPopup";
-import { IMap } from "../../types";
 
-import { StdButton } from "../../ui/React/StdButton";
 import { Augmentation as AugFormat } from "../../ui/React/Augmentation";
 import Button from "@mui/material/Button";
 import Typography from "@mui/material/Typography";
@@ -51,7 +49,6 @@ function Requirements(props: IReqProps): React.ReactElement {
     );
   }
 
-  const color = !props.hasRep || !props.hasCost ? "error" : "primary";
   return (
     <React.Fragment key="f">
       <TableCell key={1}>
@@ -80,26 +77,6 @@ export function PurchaseableAugmentation(props: IProps): React.ReactElement {
   const aug = Augmentations[props.augName];
   if (aug == null) throw new Error(`aug ${props.augName} does not exists`);
 
-  // Whether the player has this augmentations (purchased OR installed)
-  function owned(): boolean {
-    let owned = false;
-    for (const queuedAug of props.p.queuedAugmentations) {
-      if (queuedAug.name === props.augName) {
-        owned = true;
-        break;
-      }
-    }
-
-    for (const installedAug of props.p.augmentations) {
-      if (installedAug.name === props.augName) {
-        owned = true;
-        break;
-      }
-    }
-
-    return owned;
-  }
-
   if (aug == null) {
     console.error(
       `Invalid Augmentation when trying to create PurchaseableAugmentation display element: ${props.augName}`,

src/Gang/ui/GangRoot.tsx

@@ -6,7 +6,6 @@ import { ManagementSubpage } from "./ManagementSubpage";
 import { TerritorySubpage } from "./TerritorySubpage";
 import { use } from "../../ui/Context";
 import { Factions } from "../../Faction/Factions";
-import { Gang } from "../Gang";
 
 export function GangRoot(): React.ReactElement {
   const player = use.Player();

src/Infiltration/utils.ts

@@ -1,5 +1,3 @@
-import React from "react";
-
 export function random(min: number, max: number): number {
   return Math.random() * (max - min) + min;
 }

src/Message/MessageHelpers.ts

@@ -39,9 +39,9 @@ function addMessageToServer(msg: Message, serverHostname: string): void {
     return;
   }
   for (let i = 0; i < server.messages.length; ++i) {
-    const msg = server.messages[i];
+    const other = server.messages[i];
-    if (typeof msg === "string") continue;
+    if (typeof other === "string") continue;
-    if (msg.filename === msg.filename) {
+    if (msg.filename === other.filename) {
       return; //Already exists
     }
   }
@@ -49,7 +49,7 @@ function addMessageToServer(msg: Message, serverHostname: string): void {
 }
 
 //Checks if any of the 'timed' messages should be sent
-function checkForMessagesToSend() {
+function checkForMessagesToSend(): void {
   if (redPillFlag) return;
   const jumper0 = Messages[MessageFilenames.Jumper0];
   const jumper1 = Messages[MessageFilenames.Jumper1];
@@ -119,7 +119,7 @@ const MessageFilenames = {
   RedPill: "icarus.msg",
 };
 
-function initMessages() {
+function initMessages(): void {
   //Reset
   Messages = {};
 

src/NetscriptEvaluator.ts

@@ -14,12 +14,8 @@ export function netscriptDelay(time: number, workerScript: WorkerScript): Promis
   });
 }
 
-export function makeRuntimeRejectMsg(workerScript: WorkerScript, msg: string, exp: any = null) {
+export function makeRuntimeRejectMsg(workerScript: WorkerScript, msg: string): string {
-  let lineNum = "";
+  const lineNum = "";
-  if (exp != null) {
-    const num = getErrorLineNumber(exp, workerScript);
-    lineNum = " (Line " + num + ")";
-  }
   const server = AllServers[workerScript.serverIp];
   if (server == null) {
     throw new Error(`WorkerScript constructed with invalid server ip: ${workerScript.serverIp}`);
@@ -32,7 +28,7 @@ export function resolveNetscriptRequestedThreads(
   workerScript: WorkerScript,
   functionName: string,
   requestedThreads: number,
-) {
+): number {
   const threads = workerScript.scriptRef.threads;
   if (!requestedThreads) {
     return isNaN(threads) || threads < 1 ? 1 : threads;
@@ -53,21 +49,6 @@ export function resolveNetscriptRequestedThreads(
   return requestedThreadsAsInt;
 }
 
-function getErrorLineNumber(exp: any, workerScript: WorkerScript): number {
-  return -1;
-  // TODO wtf is codeCode?
-
-  // var code = workerScript.scriptRef.codeCode();
-
-  // //Split code up to the start of the node
-  // try {
-  //   code = code.substring(0, exp.start);
-  //   return (code.match(/\n/g) || []).length + 1;
-  // } catch (e) {
-  //   return -1;
-  // }
-}
-
 export function isScriptErrorMessage(msg: string): boolean {
   if (!isString(msg)) {
     return false;

src/NetscriptFunctions.ts

@@ -136,7 +136,6 @@ import { workerScripts } from "./Netscript/WorkerScripts";
 import { WorkerScript } from "./Netscript/WorkerScript";
 import { makeRuntimeRejectMsg, netscriptDelay, resolveNetscriptRequestedThreads } from "./NetscriptEvaluator";
 import { Interpreter } from "./ThirdParty/JSInterpreter";
-import { NetscriptPort } from "./NetscriptPort";
 import { SleeveTaskType } from "./PersonObjects/Sleeve/SleeveTaskTypesEnum";
 import { findSleevePurchasableAugs } from "./PersonObjects/Sleeve/SleeveHelpers";
 import { Exploit } from "./Exploits/Exploit";
@@ -166,6 +165,12 @@ import { Faction } from "./Faction/Faction";
 import { Augmentation } from "./Augmentation/Augmentation";
 import { HacknetNode } from "./Hacknet/HacknetNode";
 
+import { CodingContract } from "./CodingContracts";
+import { GangMember } from "./Gang/GangMember";
+import { GangMemberTask } from "./Gang/GangMemberTask";
+import { Stock } from "./StockMarket/Stock";
+import { BaseServer } from "./Server/BaseServer";
+
 const defaultInterpreter = new Interpreter("", () => undefined);
 
 // the acorn interpreter has a bug where it doesn't convert arrays correctly.
@@ -206,7 +211,7 @@ interface NS {
 }
 
 function NetscriptFunctions(workerScript: WorkerScript): NS {
-  const updateDynamicRam = function (fnName: string, ramCost: number) {
+  const updateDynamicRam = function (fnName: string, ramCost: number): void {
     if (workerScript.dynamicLoadedFns[fnName]) {
       return;
     }
@@ -252,7 +257,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
    * @param {string} callingFnName - Name of calling function. For logging purposes
    * @returns {Server} The specified Server
    */
-  const safeGetServer = function (ip: any, callingFnName: any = "") {
+  const safeGetServer = function (ip: any, callingFnName: any = ""): BaseServer {
     const server = getServer(ip);
     if (server == null) {
       throw makeRuntimeErrorMsg(callingFnName, `Invalid IP/hostname: ${ip}`);
@@ -271,7 +276,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
    *      exists, or the current running script if the first argument 'fn'
    *      is not specified.
    */
-  const getRunningScript = function (fn: any, ip: any, callingFnName: any, scriptArgs: any) {
+  const getRunningScript = function (fn: any, ip: any, callingFnName: any, scriptArgs: any): RunningScript | null {
     if (typeof callingFnName !== "string" || callingFnName === "") {
       callingFnName = "getRunningScript";
     }
@@ -298,7 +303,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     return workerScript.scriptRef;
   };
 
-  const getRunningScriptByPid = function (pid: any, callingFnName: any) {
+  const getRunningScriptByPid = function (pid: any, callingFnName: any): RunningScript | null {
     if (typeof callingFnName !== "string" || callingFnName === "") {
       callingFnName = "getRunningScriptgetRunningScriptByPid";
     }
@@ -319,7 +324,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
    * @param {any[]} scriptArgs - Running script's arguments
    * @returns {string} Error message to print to logs
    */
-  const getCannotFindRunningScriptErrorMessage = function (fn: any, ip: any, scriptArgs: any) {
+  const getCannotFindRunningScriptErrorMessage = function (fn: any, ip: any, scriptArgs: any): string {
     if (!Array.isArray(scriptArgs)) {
       scriptArgs = [];
     }
@@ -330,7 +335,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
   /**
    * Checks if the player has TIX API access. Throws an error if the player does not
    */
-  const checkTixApiAccess = function (callingFn: any = "") {
+  const checkTixApiAccess = function (callingFn: any = ""): void {
     if (!Player.hasWseAccount) {
       throw makeRuntimeErrorMsg(callingFn, `You don't have WSE Access! Cannot use ${callingFn}()`);
     }
@@ -344,7 +349,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
    * @param {string} symbol - Stock's symbol
    * @returns {Stock} stock object
    */
-  const getStockFromSymbol = function (symbol: any, callingFn: any = "") {
+  const getStockFromSymbol = function (symbol: any, callingFn: any = ""): Stock {
     const stock = SymbolToStockMap[symbol];
     if (stock == null) {
       throw makeRuntimeErrorMsg(callingFn, `Invalid stock symbol: '${symbol}'`);
@@ -360,7 +365,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
    * @param {string} callingFn - Name of calling function. For logging purposes
    * @returns {boolean} True if the server is a Hacknet Server, false otherwise
    */
-  const failOnHacknetServer = function (server: any, callingFn: any = "") {
+  const failOnHacknetServer = function (server: any, callingFn: any = ""): boolean {
     if (server instanceof HacknetServer) {
       workerScript.log(callingFn, `Does not work on Hacknet Servers`);
       return true;
@@ -398,7 +403,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const makeRuntimeErrorMsg = function (caller: string, msg: string) {
+  const makeRuntimeErrorMsg = function (caller: string, msg: string): string {
     const errstack = new Error().stack;
     if (errstack === undefined) throw new Error("how did we not throw an error?");
     const stack = errstack.split("\n").slice(1);
@@ -418,7 +423,12 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
       if (!filename) continue;
 
-      function parseChromeStackline(line: string) {
+      interface ILine {
+        line: string;
+        func: string;
+      }
+
+      function parseChromeStackline(line: string): ILine | null {
         const lineRe = /.*:(\d+):\d+.*/;
         const funcRe = /.*at (.+) \(.*/;
 
@@ -435,7 +445,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
         call = chromeCall;
       }
 
-      function parseFirefoxStackline(line: string) {
+      function parseFirefoxStackline(line: string): ILine | null {
         const lineRe = /.*:(\d+):\d+$/;
         const lineMatch = line.match(lineRe);
 
@@ -461,7 +471,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     return makeRuntimeRejectMsg(workerScript, rejectMsg);
   };
 
-  const checkFormulasAccess = function (func: any, n: any) {
+  const checkFormulasAccess = function (func: any, n: any): void {
     if ((SourceFileFlags[5] < 1 && Player.bitNodeN !== 5) || (SourceFileFlags[n] < 1 && Player.bitNodeN !== n)) {
       let extra = "";
       if (n !== 5) {
@@ -471,7 +481,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const checkSingularityAccess = function (func: any, n: any) {
+  const checkSingularityAccess = function (func: any, n: any): void {
     if (Player.bitNodeN !== 4) {
       if (SourceFileFlags[4] < n) {
         throw makeRuntimeErrorMsg(func, `This singularity function requires Source-File 4-${n} to run.`);
@@ -479,7 +489,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const checkBladeburnerAccess = function (func: any, skipjoined: any = false) {
+  const checkBladeburnerAccess = function (func: any, skipjoined: any = false): void {
     const bladeburner = Player.bladeburner;
     if (bladeburner === null) throw new Error("Must have joined bladeburner");
     const apiAccess =
@@ -500,7 +510,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const checkBladeburnerCity = function (func: any, city: any) {
+  const checkBladeburnerCity = function (func: any, city: any): void {
     const bladeburner = Player.bladeburner;
     if (bladeburner === null) throw new Error("Must have joined bladeburner");
     if (!bladeburner.cities.hasOwnProperty(city)) {
@@ -508,7 +518,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const checkSleeveAPIAccess = function (func: any) {
+  const checkSleeveAPIAccess = function (func: any): void {
     if (Player.bitNodeN !== 10 && !SourceFileFlags[10]) {
       throw makeRuntimeErrorMsg(
         `sleeve.${func}`,
@@ -517,7 +527,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const checkSleeveNumber = function (func: any, sleeveNumber: any) {
+  const checkSleeveNumber = function (func: any, sleeveNumber: any): void {
     if (sleeveNumber >= Player.sleeves.length || sleeveNumber < 0) {
       const msg = `Invalid sleeve number: ${sleeveNumber}`;
       workerScript.log(func, msg);
@@ -525,7 +535,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const getCodingContract = function (func: any, ip: any, fn: any) {
+  const getCodingContract = function (func: any, ip: any, fn: any): CodingContract {
     const server = safeGetServer(ip, func);
     const contract = server.getContract(fn);
     if (contract == null) {
@@ -535,7 +545,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     return contract;
   };
 
-  const checkGangApiAccess = function (func: any) {
+  const checkGangApiAccess = function (func: any): void {
     const gang = Player.gang;
     if (gang === null) throw new Error("Must have joined gang");
     const hasAccess = gang instanceof Gang;
@@ -544,14 +554,14 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const getGangMember = function (func: any, name: any) {
+  const getGangMember = function (func: any, name: any): GangMember {
     const gang = Player.gang;
     if (gang === null) throw new Error("Must have joined gang");
     for (const member of gang.members) if (member.name === name) return member;
     throw makeRuntimeErrorMsg(`gang.${func}`, `Invalid gang member: '${name}'`);
   };
 
-  const getGangTask = function (func: any, name: any) {
+  const getGangTask = function (func: any, name: any): GangMemberTask {
     const task = GangMemberTasks[name];
     if (!task) {
       throw makeRuntimeErrorMsg(`gang.${func}`, `Invalid task: '${name}'`);
@@ -644,7 +654,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     return employee;
   }
 
-  const runAfterReset = function (cbScript = null) {
+  const runAfterReset = function (cbScript = null): void {
     //Run a script after reset
     if (cbScript && isString(cbScript)) {
       const home = Player.getHomeComputer();
@@ -663,7 +673,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     }
   };
 
-  const hack = function (ip: any, manual: any, { threads: requestedThreads, stock }: any = {}) {
+  const hack = function (ip: any, manual: any, { threads: requestedThreads, stock }: any = {}): Promise<number> {
     if (ip === undefined) {
       throw makeRuntimeErrorMsg("hack", "Takes 1 argument.");
     }
@@ -764,7 +774,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
     });
   };
 
-  const argsToString = function (args: IArguments): string {
+  const argsToString = function (args: any[]): string {
     let out = "";
     for (let arg of args) {
       arg = toNative(arg);
@@ -924,7 +934,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
       const out = [];
       for (let i = 0; i < server.serversOnNetwork.length; i++) {
-        var entry;
+        let entry;
         const s = getServerOnNetwork(server, i);
         if (s === null) continue;
         if (hostnames) {
@@ -1126,17 +1136,17 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
         return Promise.resolve(CONSTANTS.ServerWeakenAmount * threads);
       });
     },
-    print: function (): any {
+    print: function (...args: any[]): void {
-      if (arguments.length === 0) {
+      if (args.length === 0) {
         throw makeRuntimeErrorMsg("print", "Takes at least 1 argument.");
       }
-      workerScript.print(argsToString(arguments));
+      workerScript.print(argsToString(args));
     },
-    tprint: function (): any {
+    tprint: function (...args: any[]): void {
-      if (arguments.length === 0) {
+      if (args.length === 0) {
         throw makeRuntimeErrorMsg("tprint", "Takes at least 1 argument.");
       }
-      Terminal.print(`${workerScript.scriptRef.filename}: ${argsToString(arguments)}`);
+      Terminal.print(`${workerScript.scriptRef.filename}: ${argsToString(args)}`);
     },
     tprintf: function (format: any, ...args: any): any {
       Terminal.print(vsprintf(format, args));
@@ -1347,7 +1357,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
       return true;
     },
-    run: function (scriptname: any, threads: any = 1): any {
+    run: function (scriptname: any, threads: any = 1, ...args: any[]): any {
       updateDynamicRam("run", getRamCost("run"));
       if (scriptname === undefined) {
         throw makeRuntimeErrorMsg("run", "Usage: run(scriptname, [numThreads], [arg1], [arg2]...)");
@@ -1355,18 +1365,14 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       if (isNaN(threads) || threads <= 0) {
         throw makeRuntimeErrorMsg("run", `Invalid thread count. Must be numeric and > 0, is ${threads}`);
       }
-      const argsForNewScript = [];
-      for (let i = 2; i < arguments.length; ++i) {
-        argsForNewScript.push(arguments[i]);
-      }
       const scriptServer = getServer(workerScript.serverIp);
       if (scriptServer == null) {
         throw makeRuntimeErrorMsg("run", "Could not find server. This is a bug. Report to dev.");
       }
 
-      return runScriptFromScript("run", scriptServer, scriptname, argsForNewScript, workerScript, threads);
+      return runScriptFromScript("run", scriptServer, scriptname, args, workerScript, threads);
     },
-    exec: function (scriptname: any, ip: any, threads: any = 1): any {
+    exec: function (scriptname: any, ip: any, threads: any = 1, ...args: any[]): any {
       updateDynamicRam("exec", getRamCost("exec"));
       if (scriptname === undefined || ip === undefined) {
         throw makeRuntimeErrorMsg("exec", "Usage: exec(scriptname, server, [numThreads], [arg1], [arg2]...)");
@@ -1374,17 +1380,13 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       if (isNaN(threads) || threads <= 0) {
         throw makeRuntimeErrorMsg("exec", `Invalid thread count. Must be numeric and > 0, is ${threads}`);
       }
-      const argsForNewScript = [];
-      for (let i = 3; i < arguments.length; ++i) {
-        argsForNewScript.push(arguments[i]);
-      }
       const server = getServer(ip);
       if (server == null) {
         throw makeRuntimeErrorMsg("exec", `Invalid IP/hostname: ${ip}`);
       }
-      return runScriptFromScript("exec", server, scriptname, argsForNewScript, workerScript, threads);
+      return runScriptFromScript("exec", server, scriptname, args, workerScript, threads);
     },
-    spawn: function (scriptname: any, threads: any): any {
+    spawn: function (scriptname: any, threads: any, ...args: any[]): any {
       updateDynamicRam("spawn", getRamCost("spawn"));
       if (!scriptname || !threads) {
         throw makeRuntimeErrorMsg("spawn", "Usage: spawn(scriptname, threads)");
@@ -1395,16 +1397,12 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
         if (isNaN(threads) || threads <= 0) {
           throw makeRuntimeErrorMsg("spawn", `Invalid thread count. Must be numeric and > 0, is ${threads}`);
         }
-        const argsForNewScript = [];
-        for (let i = 2; i < arguments.length; ++i) {
-          argsForNewScript.push(arguments[i]);
-        }
         const scriptServer = getServer(workerScript.serverIp);
         if (scriptServer == null) {
           throw makeRuntimeErrorMsg("spawn", "Could not find server. This is a bug. Report to dev");
         }
 
-        return runScriptFromScript("spawn", scriptServer, scriptname, argsForNewScript, workerScript, threads);
+        return runScriptFromScript("spawn", scriptServer, scriptname, args, workerScript, threads);
       }, spawnDelay * 1e3);
 
       workerScript.log("spawn", `Will execute '${scriptname}' in ${spawnDelay} seconds`);
@@ -1546,7 +1544,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       // Scp for lit files
       if (scriptname.endsWith(".lit")) {
         let found = false;
-        for (var i = 0; i < currServ.messages.length; ++i) {
+        for (let i = 0; i < currServ.messages.length; ++i) {
           if (!(currServ.messages[i] instanceof Message) && currServ.messages[i] == scriptname) {
             found = true;
             break;
@@ -1558,7 +1556,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
           return false;
         }
 
-        for (var i = 0; i < destServer.messages.length; ++i) {
+        for (let i = 0; i < destServer.messages.length; ++i) {
           if (destServer.messages[i] === scriptname) {
             workerScript.log("scp", `File '${scriptname}' copied over to '${destServer.hostname}'.`);
             return true; // Already exists
@@ -1572,7 +1570,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       // Scp for text files
       if (scriptname.endsWith(".txt")) {
         let txtFile;
-        for (var i = 0; i < currServ.textFiles.length; ++i) {
+        for (let i = 0; i < currServ.textFiles.length; ++i) {
           if (currServ.textFiles[i].fn === scriptname) {
             txtFile = currServ.textFiles[i];
             break;
@@ -1583,7 +1581,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
           return false;
         }
 
-        for (var i = 0; i < destServer.textFiles.length; ++i) {
+        for (let i = 0; i < destServer.textFiles.length; ++i) {
           if (destServer.textFiles[i].fn === scriptname) {
             // Overwrite
             destServer.textFiles[i].text = txtFile.text;
@@ -1973,17 +1971,17 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       if (server == null) {
         throw makeRuntimeErrorMsg("fileExists", `Invalid IP/hostname: ${ip}`);
       }
-      for (var i = 0; i < server.scripts.length; ++i) {
+      for (let i = 0; i < server.scripts.length; ++i) {
         if (filename == server.scripts[i].filename) {
           return true;
         }
       }
-      for (var i = 0; i < server.programs.length; ++i) {
+      for (let i = 0; i < server.programs.length; ++i) {
         if (filename.toLowerCase() == server.programs[i].toLowerCase()) {
           return true;
         }
       }
-      for (var i = 0; i < server.messages.length; ++i) {
+      for (let i = 0; i < server.messages.length; ++i) {
         if (!(server.messages[i] instanceof Message) && filename.toLowerCase() === server.messages[i]) {
           return true;
         }
@@ -2433,7 +2431,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
 
       // Delete from player's purchasedServers array
       let found = false;
-      for (var i = 0; i < Player.purchasedServers.length; ++i) {
+      for (let i = 0; i < Player.purchasedServers.length; ++i) {
         if (ip == Player.purchasedServers[i]) {
           found = true;
           Player.purchasedServers.splice(i, 1);
@@ -2455,7 +2453,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       // Delete from home computer
       found = false;
       const homeComputer = Player.getHomeComputer();
-      for (var i = 0; i < homeComputer.serversOnNetwork.length; ++i) {
+      for (let i = 0; i < homeComputer.serversOnNetwork.length; ++i) {
         if (ip == homeComputer.serversOnNetwork[i]) {
           homeComputer.serversOnNetwork.splice(i, 1);
           workerScript.log("deleteServer", `Deleted server '${hostnameStr}`);
@@ -2750,18 +2748,18 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       }
       return 0;
     },
-    getRunningScript: function (fn: any, ip: any): any {
+    getRunningScript: function (fn: any, ip: any, ...args: any[]): any {
       updateDynamicRam("getRunningScript", getRamCost("getRunningScript"));
 
       let runningScript;
-      if (arguments.length === 0) {
+      if (args.length === 0) {
         runningScript = workerScript.scriptRef;
       } else if (typeof fn === "number") {
         runningScript = getRunningScriptByPid(fn, "getRunningScript");
       } else {
         const scriptArgs = [];
-        for (let i = 2; i < arguments.length; ++i) {
+        for (let i = 2; i < args.length; ++i) {
-          scriptArgs.push(arguments[i]);
+          scriptArgs.push(args[i]);
         }
         runningScript = getRunningScript(fn, ip, "getRunningScript", scriptArgs);
       }
@@ -2821,7 +2819,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
 
       return calculateWeakenTime(server, Player); // Returns seconds
     },
-    getScriptIncome: function (scriptname: any, ip: any): any {
+    getScriptIncome: function (scriptname: any, ip: any, ...args: any[]): any {
       updateDynamicRam("getScriptIncome", getRamCost("getScriptIncome"));
       if (arguments.length === 0) {
         const res = [];
@@ -2842,22 +2840,18 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
         if (server == null) {
           throw makeRuntimeErrorMsg("getScriptIncome", `Invalid IP/hostnamed: ${ip}`);
         }
-        const argsForScript = [];
+        const runningScriptObj = findRunningScript(scriptname, args, server);
-        for (let i = 2; i < arguments.length; ++i) {
-          argsForScript.push(arguments[i]);
-        }
-        const runningScriptObj = findRunningScript(scriptname, argsForScript, server);
         if (runningScriptObj == null) {
           workerScript.log(
             "getScriptIncome",
-            `No such script '${scriptname}' on '${server.hostname}' with args: ${arrayToString(argsForScript)}`,
+            `No such script '${scriptname}' on '${server.hostname}' with args: ${arrayToString(args)}`,
           );
           return -1;
         }
         return runningScriptObj.onlineMoneyMade / runningScriptObj.onlineRunningTime;
       }
     },
-    getScriptExpGain: function (scriptname: any, ip: any): any {
+    getScriptExpGain: function (scriptname: any, ip: any, ...args: any[]): any {
       updateDynamicRam("getScriptExpGain", getRamCost("getScriptExpGain"));
       if (arguments.length === 0) {
         let total = 0;
@@ -2871,15 +2865,11 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
         if (server == null) {
           throw makeRuntimeErrorMsg("getScriptExpGain", `Invalid IP/hostnamed: ${ip}`);
         }
-        const argsForScript = [];
+        const runningScriptObj = findRunningScript(scriptname, args, server);
-        for (let i = 2; i < arguments.length; ++i) {
-          argsForScript.push(arguments[i]);
-        }
-        const runningScriptObj = findRunningScript(scriptname, argsForScript, server);
         if (runningScriptObj == null) {
           workerScript.log(
             "getScriptExpGain",
-            `No such script '${scriptname}' on '${server.hostname}' with args: ${arrayToString(argsForScript)}`,
+            `No such script '${scriptname}' on '${server.hostname}' with args: ${arrayToString(args)}`,
           );
           return -1;
         }
@@ -4002,11 +3992,11 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
       updateDynamicRam("getOwnedAugmentations", getRamCost("getOwnedAugmentations"));
       checkSingularityAccess("getOwnedAugmentations", 3);
       const res = [];
-      for (var i = 0; i < Player.augmentations.length; ++i) {
+      for (let i = 0; i < Player.augmentations.length; ++i) {
         res.push(Player.augmentations[i].name);
       }
       if (purchased) {
-        for (var i = 0; i < Player.queuedAugmentations.length; ++i) {
+        for (let i = 0; i < Player.queuedAugmentations.length; ++i) {
           res.push(Player.queuedAugmentations[i].name);
         }
       }
@@ -4784,7 +4774,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
         const warehouse = getWarehouse(divisionName, cityName);
         SetSmartSupply(warehouse, enabled);
       },
-      setSmartSupplyUseLeftovers: function (): any {},
+      // setSmartSupplyUseLeftovers: function (): any {},
       buyMaterial: function (divisionName: any, cityName: any, materialName: any, amt: any): any {
         const material = getMaterial(divisionName, cityName, materialName);
         BuyMaterial(material, amt);

src/NetscriptJSEvaluator.ts

@@ -16,8 +16,7 @@ function makeScriptBlob(code: string): Blob {
 // (i.e. hack, grow, etc.).
 // When the promise returned by this resolves, we'll have finished
 // running the main function of the script.
-export async function executeJSScript(scripts: Script[] = [], workerScript: WorkerScript) {
+export async function executeJSScript(scripts: Script[] = [], workerScript: WorkerScript): Promise<void> {
-  let loadedModule;
   let uurls: ScriptUrl[] = [];
   const script = workerScript.getScript();
   if (script === null) throw new Error("script is null");
@@ -35,7 +34,7 @@ export async function executeJSScript(scripts: Script[] = [], workerScript: Work
     script.module = new Promise((resolve) => resolve(eval("import(uurls[uurls.length - 1].url)")));
     script.dependencies = uurls;
   }
-  loadedModule = await script.module;
+  const loadedModule = await script.module;
 
   const ns = workerScript.env.vars;
 

src/NetscriptWorker.ts

@@ -14,13 +14,11 @@ import { isScriptErrorMessage, makeRuntimeRejectMsg } from "./NetscriptEvaluator
 import { NetscriptFunctions } from "./NetscriptFunctions";
 import { executeJSScript } from "./NetscriptJSEvaluator";
 import { NetscriptPort, IPort } from "./NetscriptPort";
-import { Player } from "./Player";
 import { RunningScript } from "./Script/RunningScript";
 import { getRamUsageFromRunningScript } from "./Script/RunningScriptHelpers";
 import { scriptCalculateOfflineProduction } from "./Script/ScriptHelpers";
 import { Script } from "./Script/Script";
 import { AllServers } from "./Server/AllServers";
-import { Server } from "./Server/Server";
 import { BaseServer } from "./Server/BaseServer";
 import { Settings } from "./Settings/Settings";
 import { setTimeoutRef } from "./utils/SetTimeoutRef";
@@ -42,7 +40,7 @@ for (let i = 0; i < CONSTANTS.NumNetscriptPorts; ++i) {
   NetscriptPorts.push(NetscriptPort());
 }
 
-export function prestigeWorkerScripts() {
+export function prestigeWorkerScripts(): void {
   for (const ws of workerScripts.values()) {
     ws.env.stopFlag = true;
     killWorkerScript(ws);
@@ -65,7 +63,7 @@ function startNetscript2Script(workerScript: WorkerScript): Promise<WorkerScript
   // We need to go through the environment and wrap each function in such a way that it
   // can be called at most once at a time. This will prevent situations where multiple
   // hack promises are outstanding, for example.
-  function wrap(propName: string, f: Function): Function {
+  function wrap(propName: string, f: (...args: any[]) => Promise<void>): (...args: any[]) => Promise<void> {
     // This function unfortunately cannot be an async function, because we don't
     // know if the original one was, and there's no way to tell.
     return function (...args: any[]) {
@@ -85,7 +83,7 @@ function startNetscript2Script(workerScript: WorkerScript): Promise<WorkerScript
         "Did you forget to await hack(), grow(), or some other " +
         "promise-returning function? (Currently running: %s tried to run: %s)";
       if (runningFn) {
-        workerScript.errorMessage = makeRuntimeRejectMsg(workerScript, sprintf(msg, runningFn, propName), null);
+        workerScript.errorMessage = makeRuntimeRejectMsg(workerScript, sprintf(msg, runningFn, propName));
         throw workerScript;
       }
       runningFn = propName;
@@ -158,7 +156,7 @@ function startNetscript1Script(workerScript: WorkerScript): Promise<WorkerScript
     return Promise.resolve(workerScript);
   }
 
-  const interpreterInitialization = function (int: any, scope: any) {
+  const interpreterInitialization = function (int: any, scope: any): void {
     //Add the Netscript environment
     const ns = NetscriptFunctions(workerScript);
     for (const name in ns) {
@@ -173,20 +171,20 @@ function startNetscript1Script(workerScript: WorkerScript): Promise<WorkerScript
           name === "prompt" ||
           name === "manualHack"
         ) {
-          const tempWrapper = function () {
+          const tempWrapper = function (...args: any[]): void {
             const fnArgs = [];
 
             //All of the Object/array elements are in JSInterpreter format, so
             //we have to convert them back to native format to pass them to these fns
-            for (let i = 0; i < arguments.length - 1; ++i) {
+            for (let i = 0; i < args.length - 1; ++i) {
-              if (typeof arguments[i] === "object" || arguments[i].constructor === Array) {
+              if (typeof args[i] === "object" || args[i].constructor === Array) {
-                fnArgs.push(int.pseudoToNative(arguments[i]));
+                fnArgs.push(int.pseudoToNative(args[i]));
               } else {
-                fnArgs.push(arguments[i]);
+                fnArgs.push(args[i]);
               }
             }
-            const cb = arguments[arguments.length - 1];
+            const cb = args[args.length - 1];
-            const fnPromise = entry.apply(null, fnArgs);
+            const fnPromise = entry(...fnArgs);
             fnPromise
               .then(function (res: any) {
                 cb(res);
@@ -206,25 +204,25 @@ function startNetscript1Script(workerScript: WorkerScript): Promise<WorkerScript
           name === "run" ||
           name === "exec"
         ) {
-          const tempWrapper = function () {
+          const tempWrapper = function (...args: any[]): void {
             const fnArgs = [];
 
             //All of the Object/array elements are in JSInterpreter format, so
             //we have to convert them back to native format to pass them to these fns
-            for (let i = 0; i < arguments.length; ++i) {
+            for (let i = 0; i < args.length; ++i) {
-              if (typeof arguments[i] === "object" || arguments[i].constructor === Array) {
+              if (typeof args[i] === "object" || args[i].constructor === Array) {
-                fnArgs.push(int.pseudoToNative(arguments[i]));
+                fnArgs.push(int.pseudoToNative(args[i]));
               } else {
-                fnArgs.push(arguments[i]);
+                fnArgs.push(args[i]);
               }
             }
 
-            return entry.apply(null, fnArgs);
+            return entry(...fnArgs);
           };
           int.setProperty(scope, name, int.createNativeFunction(tempWrapper));
         } else {
-          const tempWrapper = function () {
+          const tempWrapper = function (...args: any[]): any {
-            const res = entry.apply(null, arguments);
+            const res = entry(...args);
 
             if (res == null) {
               return res;
@@ -259,7 +257,7 @@ function startNetscript1Script(workerScript: WorkerScript): Promise<WorkerScript
   }
 
   return new Promise(function (resolve, reject) {
-    function runInterpreter() {
+    function runInterpreter(): void {
       try {
         if (workerScript.env.stopFlag) {
           return reject(workerScript);
@@ -595,7 +593,7 @@ export function createAndAddWorkerScript(
 /**
  * Updates the online running time stat of all running scripts
  */
-export function updateOnlineScriptTimes(numCycles = 1) {
+export function updateOnlineScriptTimes(numCycles = 1): void {
   const time = (numCycles * CONSTANTS._idleSpeed) / 1000; //seconds
   for (const ws of workerScripts.values()) {
     ws.scriptRef.onlineRunningTime += time;
@@ -606,7 +604,7 @@ export function updateOnlineScriptTimes(numCycles = 1) {
  * Called when the game is loaded. Loads all running scripts (from all servers)
  * into worker scripts so that they will start running
  */
-export function loadAllRunningScripts() {
+export function loadAllRunningScripts(): void {
   const skipScriptLoad = window.location.href.toLowerCase().indexOf("?noscripts") !== -1;
   if (skipScriptLoad) {
     console.info("Skipping the load of any scripts during startup");

src/PersonObjects/Player/PlayerObject.ts

@@ -409,8 +409,8 @@ export class PlayerObject implements IPlayer {
 
     this.crimeType = "";
 
-    (this.timeWorked = 0), //in m;
+    this.timeWorked = 0; //in m;
-      (this.timeWorkedCreateProgram = 0);
+    this.timeWorkedCreateProgram = 0;
     this.timeNeededToCompleteWork = 0;
 
     this.work_money_mult = 1;
@@ -438,15 +438,15 @@ export class PlayerObject implements IPlayer {
     this.bladeburner = null;
     this.bladeburner_max_stamina_mult = 1;
     this.bladeburner_stamina_gain_mult = 1;
-    (this.bladeburner_analysis_mult = 1), //Field Analysis Onl;
+    this.bladeburner_analysis_mult = 1; //Field Analysis Onl;
-      (this.bladeburner_success_chance_mult = 1);
+    this.bladeburner_success_chance_mult = 1;
 
     // Sleeves & Re-sleeving
     this.sleeves = [];
     this.resleeves = [];
-    (this.sleevesFromCovenant = 0), // # of Duplicate sleeves purchased from the covenan;
+    this.sleevesFromCovenant = 0; // # of Duplicate sleeves purchased from the covenan;
-      //bitnode
+    //bitnode
-      (this.bitNodeN = 1);
+    this.bitNodeN = 1;
 
     //Used to store the last update time.
     this.lastUpdate = 0;
@@ -455,10 +455,10 @@ export class PlayerObject implements IPlayer {
     this.playtimeSinceLastBitnode = 0;
 
     // Keep track of where money comes from
-    (this.moneySourceA = new MoneySourceTracker()), // Where money comes from since last-installed Augmentatio;
+    this.moneySourceA = new MoneySourceTracker(); // Where money comes from since last-installed Augmentatio;
-      (this.moneySourceB = new MoneySourceTracker()), // Where money comes from for this entire BitNode ru;
+    this.moneySourceB = new MoneySourceTracker(); // Where money comes from for this entire BitNode ru;
-      // Production since last Augmentation installation
+    // Production since last Augmentation installation
-      (this.scriptProdSinceLastAug = 0);
+    this.scriptProdSinceLastAug = 0;
 
     this.exploits = [];
 

src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts

@@ -2,7 +2,7 @@ import { Bladeburner } from "../../Bladeburner/Bladeburner";
 import { SourceFileFlags } from "../../SourceFile/SourceFileFlags";
 import { IPlayer } from "../IPlayer";
 
-export function canAccessBladeburner(this: IPlayer) {
+export function canAccessBladeburner(this: IPlayer): boolean {
   if (this.bitNodeN === 8) {
     return false;
   }

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -4,7 +4,7 @@ import { applyAugmentation } from "../../Augmentation/AugmentationHelpers";
 import { PlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
 import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
-import { CodingContractRewardType } from "../../CodingContracts";
+import { CodingContractRewardType, ICodingContractReward } from "../../CodingContracts";
 import { Company } from "../../Company/Company";
 import { Companies } from "../../Company/Companies";
 import { getNextCompanyPositionHelper } from "../../Company/GetNextCompanyPosition";
@@ -15,13 +15,11 @@ import * as posNames from "../../Company/data/companypositionnames";
 import { CONSTANTS } from "../../Constants";
 import { Programs } from "../../Programs/Programs";
 import { determineCrimeSuccess } from "../../Crime/CrimeHelpers";
-import { ICodingContractReward } from "../../CodingContracts";
 import { Crimes } from "../../Crime/Crimes";
 import { Exploit } from "../../Exploits/Exploit";
 import { Faction } from "../../Faction/Faction";
 import { Factions } from "../../Faction/Factions";
 import { resetGangs } from "../../Gang/AllGangs";
-import { hasHacknetServers } from "../../Hacknet/HacknetHelpers";
 import { Cities } from "../../Locations/Cities";
 import { Locations } from "../../Locations/Locations";
 import { CityName } from "../../Locations/data/CityNames";
@@ -60,7 +58,7 @@ import { Money } from "../../ui/React/Money";
 
 import React from "react";
 
-export function init(this: IPlayer) {
+export function init(this: IPlayer): void {
   /* Initialize Player's home computer */
   const t_homeComp = safetlyCreateUniqueServer({
     adminRights: true,
@@ -78,7 +76,7 @@ export function init(this: IPlayer) {
   this.getHomeComputer().programs.push(Programs.NukeProgram.name);
 }
 
-export function prestigeAugmentation(this: IPlayer) {
+export function prestigeAugmentation(this: IPlayer): void {
   const homeComp = this.getHomeComputer();
   this.currentServer = homeComp.ip;
   this.homeComputer = homeComp.ip;
@@ -178,7 +176,7 @@ export function prestigeAugmentation(this: IPlayer) {
   this.hp = this.max_hp;
 }
 
-export function prestigeSourceFile(this: IPlayer) {
+export function prestigeSourceFile(this: IPlayer): void {
   this.prestigeAugmentation();
   // Duplicate sleeves are reset to level 1 every Bit Node (but the number of sleeves you have persists)
   for (let i = 0; i < this.sleeves.length; ++i) {
@@ -354,7 +352,7 @@ export function canAfford(this: IPlayer, cost: number): boolean {
   return this.money.gte(cost);
 }
 
-export function recordMoneySource(this: IPlayer, amt: number, source: string) {
+export function recordMoneySource(this: IPlayer, amt: number, source: string): void {
   if (!(this.moneySourceA instanceof MoneySourceTracker)) {
     console.warn(`Player.moneySourceA was not properly initialized. Resetting`);
     this.moneySourceA = new MoneySourceTracker();
@@ -367,7 +365,7 @@ export function recordMoneySource(this: IPlayer, amt: number, source: string) {
   this.moneySourceB.record(amt, source);
 }
 
-export function gainHackingExp(this: IPlayer, exp: number) {
+export function gainHackingExp(this: IPlayer, exp: number): void {
   if (isNaN(exp)) {
     console.error("ERR: NaN passed into Player.gainHackingExp()");
     return;
@@ -380,7 +378,7 @@ export function gainHackingExp(this: IPlayer, exp: number) {
   this.hacking_skill = calculateSkillF(this.hacking_exp, this.hacking_mult * BitNodeMultipliers.HackingLevelMultiplier);
 }
 
-export function gainStrengthExp(this: IPlayer, exp: number) {
+export function gainStrengthExp(this: IPlayer, exp: number): void {
   if (isNaN(exp)) {
     console.error("ERR: NaN passed into Player.gainStrengthExp()");
     return;
@@ -393,7 +391,7 @@ export function gainStrengthExp(this: IPlayer, exp: number) {
   this.strength = calculateSkillF(this.strength_exp, this.strength_mult * BitNodeMultipliers.StrengthLevelMultiplier);
 }
 
-export function gainDefenseExp(this: IPlayer, exp: number) {
+export function gainDefenseExp(this: IPlayer, exp: number): void {
   if (isNaN(exp)) {
     console.error("ERR: NaN passed into player.gainDefenseExp()");
     return;
@@ -406,7 +404,7 @@ export function gainDefenseExp(this: IPlayer, exp: number) {
   this.defense = calculateSkillF(this.defense_exp, this.defense_mult * BitNodeMultipliers.DefenseLevelMultiplier);
 }
 
-export function gainDexterityExp(this: IPlayer, exp: number) {
+export function gainDexterityExp(this: IPlayer, exp: number): void {
   if (isNaN(exp)) {
     console.error("ERR: NaN passed into Player.gainDexterityExp()");
     return;
@@ -520,7 +518,7 @@ export function resetWorkStatus(this: IPlayer, generalType?: string, group?: str
   this.className = "";
 }
 
-export function processWorkEarnings(this: IPlayer, numCycles = 1) {
+export function processWorkEarnings(this: IPlayer, numCycles = 1): void {
   const focusBonus = this.focus ? 1 : 0.8;
   const hackExpGain = focusBonus * this.workHackExpGainRate * numCycles;
   const strExpGain = focusBonus * this.workStrExpGainRate * numCycles;
@@ -574,7 +572,7 @@ export function startWork(this: IPlayer, router: IRouter, companyName: string):
   router.toWork();
 }
 
-export function cancelationPenalty(this: IPlayer) {
+export function cancelationPenalty(this: IPlayer): number {
   const specialIp = SpecialServerIps[this.companyName];
   if (typeof specialIp === "string" && specialIp !== "") {
     const server = AllServers[specialIp];
@@ -2547,8 +2545,7 @@ export function gainCodingContractReward(this: IPlayer, reward: ICodingContractR
 
       // Ignore Bladeburners and other special factions for this calculation
       const specialFactions = ["Bladeburners"];
-      const factions = this.factions.slice();
+      const factions = this.factions.slice().filter((f) => {
-      factions = factions.filter((f) => {
         return !specialFactions.includes(f);
       });
 
@@ -2567,7 +2564,7 @@ export function gainCodingContractReward(this: IPlayer, reward: ICodingContractR
       }
       return `Gained ${gainPerFaction} reputation for each of the following factions: ${factions.toString()}`;
       break;
-    case CodingContractRewardType.CompanyReputation:
+    case CodingContractRewardType.CompanyReputation: {
       if (reward.name == null || !(Companies[reward.name] instanceof Company)) {
         //If no/invalid company was designated, just give rewards to all factions
         reward.type = CodingContractRewardType.FactionReputationAll;
@@ -2576,14 +2573,14 @@ export function gainCodingContractReward(this: IPlayer, reward: ICodingContractR
       const repGain = CONSTANTS.CodingContractBaseCompanyRepGain * difficulty;
       Companies[reward.name].playerReputation += repGain;
       return `Gained ${repGain} company reputation for ${reward.name}`;
-      break;
+    }
     case CodingContractRewardType.Money:
-    default:
+    default: {
       const moneyGain = CONSTANTS.CodingContractBaseMoneyGain * difficulty * BitNodeMultipliers.CodingContractMoney;
       this.gainMoney(moneyGain);
       this.recordMoneySource(moneyGain, "codingcontract");
       return `Gained ${numeralWrapper.formatMoney(moneyGain)}`;
-      break;
+    }
   }
   /* eslint-enable no-case-declarations */
 }