all the lints

2024-09-18 20:08:32 +02:00 · 2021-05-01 03:17:31 -04:00 · 2021-05-01 03:17:31 -04:00 · d745150c45
commit d745150c45
parent abe0330dc3
231 changed files with 1458 additions and 1439 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -2,3 +2,7 @@ node_modules/
 doc/build/
 dist/
 tests/*.bundle.*
+src/ThirdParty/*
+src/ScriptEditor/CodeMirrorNetscriptMode.js
+src/ScriptEditor/CodeMirrorNetscriptLint.js
+src/JSInterpreter.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -858,8 +858,18 @@ module.exports = {
            "error",
            "never",
        ],
+        "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
    },
    "overrides": [
+        {
+          // enable the rule specifically for TypeScript files
+          "files": ["*.ts", "*.tsx"],
+          "rules": {
+            "@typescript-eslint/explicit-function-return-type": ["error"],
+            "@typescript-eslint/explicit-module-boundary-types": ["error"],
+          },
+        },
        {
            // TypeScript configuration
            "files": [ "**/*.ts", "**/*.tsx" ],
--- a/src/Alias.ts
+++ b/src/Alias.ts
@ -22,12 +22,12 @@ export function loadGlobalAliases(saveString: string): void {

 // Prints all aliases to terminal
 export function printAliases(): void {
-    for (var name in Aliases) {
+    for (const name in Aliases) {
        if (Aliases.hasOwnProperty(name)) {
            post("alias " + name + "=" + Aliases[name]);
        }
    }
-    for (var name in GlobalAliases) {
+    for (const name in GlobalAliases) {
        if (GlobalAliases.hasOwnProperty(name)) {
            post("global alias " + name + "=" + GlobalAliases[name]);
        }
@ -100,17 +100,17 @@ export function substituteAliases(origCommand: string): string {
        // For the unalias command, dont substite
        if (commandArray[0] === "unalias") { return commandArray.join(" "); }

-        var alias = getAlias(commandArray[0]);
+        const alias = getAlias(commandArray[0]);
        if (alias != null) {
            commandArray[0] = alias;
        } else {
-            var alias = getGlobalAlias(commandArray[0]);
+            const alias = getGlobalAlias(commandArray[0]);
            if (alias != null) {
                commandArray[0] = alias;
            }
        }
        for (let i = 0; i < commandArray.length; ++i) {
-            var alias = getGlobalAlias(commandArray[i]);
+            const alias = getGlobalAlias(commandArray[i]);
            if (alias != null) {
                commandArray[i] = alias;
            }
--- a/src/Augmentation/Augmentation.ts
+++ b/src/Augmentation/Augmentation.ts
@ -49,10 +49,6 @@ interface IConstructorParams {
 }

 export class Augmentation {
-    // Initiatizes a Augmentation object from a JSON save state.
-    static fromJSON(value: any): Augmentation {
-        return Generic_fromJSON(Augmentation, value.data);
-    }

    // How much money this costs to buy
    baseCost = 0;
@ -141,7 +137,7 @@ export class Augmentation {
                console.warn(`In Augmentation.addToFactions(), could not find faction with this name: ${factionList[i]}`);
                continue;
            }
-            faction!.augmentations.push(this.name);
+            faction.augmentations.push(this.name);
        }
    }

@ -154,7 +150,7 @@ export class Augmentation {
                    console.warn(`Invalid Faction object in addToAllFactions(). Key value: ${fac}`);
                    continue;
                }
-                facObj!.augmentations.push(this.name);
+                facObj.augmentations.push(this.name);
            }
        }
    }
@ -163,6 +159,12 @@ export class Augmentation {
    toJSON(): any {
        return Generic_toJSON("Augmentation", this);
    }
+
+    // Initiatizes a Augmentation object from a JSON save state.
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Augmentation {
+        return Generic_fromJSON(Augmentation, value.data);
+    }
 }

 Reviver.constructors.Augmentation = Augmentation;
--- a/src/Augmentation/AugmentationHelpers.jsx
+++ b/src/Augmentation/AugmentationHelpers.jsx
@ -8,29 +8,13 @@ import { AugmentationsRoot } from "./ui/Root";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { CONSTANTS } from "../Constants";
 import { Factions, factionExists } from "../Faction/Factions";
-import { startWorkerScript } from "../NetscriptWorker";
 import { Player } from "../Player";
 import { prestigeAugmentation } from "../Prestige";
 import { saveObject } from "../SaveObject";
-import { RunningScript } from "../Script/RunningScript";
-import { Script } from "../Script/Script";
-import { Server } from "../Server/Server";
-import { OwnedAugmentationsOrderSetting } from "../Settings/SettingEnums";
-import { Settings } from "../Settings/Settings";
 import { Page, routing } from "../ui/navigationTracking";

 import { dialogBoxCreate } from "../../utils/DialogBox";
-import { createAccordionElement } from "../../utils/uiHelpers/createAccordionElement";
-import {
-    Reviver,
-    Generic_toJSON,
-    Generic_fromJSON,
-} from "../../utils/JSONReviver";
-import { formatNumber } from "../../utils/StringHelperFunctions";
 import { clearObject } from "../../utils/helpers/clearObject";
-import { createElement } from "../../utils/uiHelpers/createElement";
-import { isString } from "../../utils/helpers/isString";
-import { removeChildrenFromElement } from "../../utils/uiHelpers/removeChildrenFromElement";
 import { Money } from "../ui/React/Money";

 import React from "react";
--- a/src/Augmentation/ui/InstalledAugmentationsAndSourceFiles.tsx
+++ b/src/Augmentation/ui/InstalledAugmentationsAndSourceFiles.tsx
@ -15,7 +15,9 @@ import { SourceFileMinus1 } from "./SourceFileMinus1";
 import { Settings } from "../../Settings/Settings";
 import { OwnedAugmentationsOrderSetting } from "../../Settings/SettingEnums";

-type IProps = {}
+type IProps = {
+    // nothing special.
+}

 type IState = {
    rerenderFlag: boolean;
@ -39,7 +41,7 @@ export class InstalledAugmentationsAndSourceFiles extends React.Component<IProps
        this.listRef = React.createRef();
    }

-    collapseAllHeaders() {
+    collapseAllHeaders(): void {
        const ul = this.listRef.current;
        if (ul == null) { return; }
        const tickers = ul.getElementsByClassName("accordion-header");
@ -55,7 +57,7 @@ export class InstalledAugmentationsAndSourceFiles extends React.Component<IProps
        }
    }

-    expandAllHeaders() {
+    expandAllHeaders(): void {
        const ul = this.listRef.current;
        if (ul == null) { return; }
        const tickers = ul.getElementsByClassName("accordion-header");
@ -71,7 +73,7 @@ export class InstalledAugmentationsAndSourceFiles extends React.Component<IProps
        }
    }

-    rerender() {
+    rerender(): void {
        this.setState((prevState) => {
            return {
                rerenderFlag: !prevState.rerenderFlag,
@ -79,17 +81,17 @@ export class InstalledAugmentationsAndSourceFiles extends React.Component<IProps
        });
    }

-    sortByAcquirementTime() {
+    sortByAcquirementTime(): void {
        Settings.OwnedAugmentationsOrder = OwnedAugmentationsOrderSetting.AcquirementTime;
        this.rerender();
    }

-    sortInOrder() {
+    sortInOrder(): void {
        Settings.OwnedAugmentationsOrder = OwnedAugmentationsOrderSetting.Alphabetically
        this.rerender();
    }

-    render() {
+    render(): React.ReactNode {
        return (
            <>
            <ListConfiguration
--- a/src/Augmentation/ui/PlayerMultipliers.tsx
+++ b/src/Augmentation/ui/PlayerMultipliers.tsx
@ -7,7 +7,7 @@ import { Player } from "../../Player";
 import { numeralWrapper } from "../../ui/numeralFormat";
 import { Augmentations} from "../Augmentations";

-function calculateAugmentedStats() {
+function calculateAugmentedStats(): any {
    const augP: any = {};
    for(const aug of Player.queuedAugmentations) {
        const augObj = Augmentations[aug.name];
@ -22,8 +22,8 @@ function calculateAugmentedStats() {
 export function PlayerMultipliers(): React.ReactElement {
    const mults = calculateAugmentedStats();
    function MultiplierTable(rows: any[]): React.ReactElement {
-        function improvements(r: number) {
-            let elems: any[] = [];
+        function improvements(r: number): JSX.Element[] {
+            let elems: JSX.Element[] = [];
            if(r) {
                elems = [
                    <td key="2">&nbsp;{"=>"}&nbsp;</td>,
--- a/src/Augmentation/ui/Root.tsx
+++ b/src/Augmentation/ui/Root.tsx
@ -25,7 +25,7 @@ export class AugmentationsRoot extends React.Component<IProps, IState> {
        super(props);
    }

-    render() {
+    render(): React.ReactNode {
        return (
            <div id="augmentations-content">
                <h1>Purchased Augmentations</h1>
--- a/src/Augmentation/ui/SourceFileMinus1.tsx
+++ b/src/Augmentation/ui/SourceFileMinus1.tsx
@ -5,9 +5,6 @@
 import * as React from "react";

 import { Player } from "../../Player";
-import { Settings } from "../../Settings/Settings";
-import { OwnedAugmentationsOrderSetting } from "../../Settings/SettingEnums";
-import { SourceFiles } from "../../SourceFile/SourceFiles";
 import { Exploit, ExploitName } from "../../Exploits/Exploit";

 import { Accordion } from "../../ui/React/Accordion";
--- a/src/BitNode/BitNode.ts
+++ b/src/BitNode/BitNode.ts
@ -252,7 +252,7 @@ BitNodes["BitNode22"] = new BitNode(22, "", "COMING SOON");
 BitNodes["BitNode23"] = new BitNode(23, "", "COMING SOON");
 BitNodes["BitNode24"] = new BitNode(24, "", "COMING SOON");

-export function initBitNodeMultipliers(p: IPlayer) {
+export function initBitNodeMultipliers(p: IPlayer): void {
    if (p.bitNodeN == null) {
        p.bitNodeN = 1;
    }
@ -433,15 +433,15 @@ export function initBitNodeMultipliers(p: IPlayer) {
            BitNodeMultipliers.FourSigmaMarketDataCost      = 4;
            BitNodeMultipliers.FourSigmaMarketDataApiCost   = 4;
            break;
-        case 12: //The Recursion
-            var sf12Lvl = 0;
+        case 12: { //The Recursion
+            let sf12Lvl = 0;
            for (let i = 0; i < p.sourceFiles.length; i++) {
                if (p.sourceFiles[i].n === 12) {
                    sf12Lvl = p.sourceFiles[i].lvl;
                }
            }
-            var inc = Math.pow(1.02, sf12Lvl);
-            var dec = 1/inc;
+            const inc = Math.pow(1.02, sf12Lvl);
+            const dec = 1/inc;

            // Multiplier for number of augs needed for Daedalus increases
            // up to a maximum of 1.34, which results in 40 Augs required
@ -499,6 +499,7 @@ export function initBitNodeMultipliers(p: IPlayer) {
            BitNodeMultipliers.BladeburnerRank      = dec;
            BitNodeMultipliers.BladeburnerSkillCost = inc;
            break;
+        }
        default:
            console.warn("Player.bitNodeN invalid");
            break;
--- a/src/Bladeburner.jsx
+++ b/src/Bladeburner.jsx
@ -1,7 +1,6 @@
 import { Augmentations } from "./Augmentation/Augmentations";
 import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
 import { BitNodeMultipliers } from "./BitNode/BitNodeMultipliers";
-import { CONSTANTS } from "./Constants";
 import { Engine } from "./engine";
 import { Faction } from "./Faction/Faction";
 import { Factions, factionExists } from "./Faction/Factions";
@ -20,14 +19,16 @@ import {
    Generic_fromJSON,
 } from "../utils/JSONReviver";
 import { setTimeoutRef } from "./utils/SetTimeoutRef";
-import { formatNumber } from "../utils/StringHelperFunctions";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../utils/StringHelperFunctions";

 import { ConsoleHelpText } from "./Bladeburner/data/Help";
 import { City } from "./Bladeburner/City";
 import { BladeburnerConstants } from "./Bladeburner/data/Constants";
 import { Skill } from "./Bladeburner/Skill";
 import { Skills } from "./Bladeburner/Skills";
-import { SkillNames } from "./Bladeburner/data/SkillNames";
 import { Operation } from "./Bladeburner/Operation";
 import { BlackOperation } from "./Bladeburner/BlackOperation";
 import { BlackOperations } from "./Bladeburner/BlackOperations";
@ -45,7 +46,6 @@ import { KEY } from "../utils/helpers/keyCodes";

 import { removeChildrenFromElement } from "../utils/uiHelpers/removeChildrenFromElement";
 import { appendLineBreaks } from "../utils/uiHelpers/appendLineBreaks";
-import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
 import { createElement } from "../utils/uiHelpers/createElement";
 import { createPopup } from "../utils/uiHelpers/createPopup";
 import { removeElement } from "../utils/uiHelpers/removeElement";
@ -2132,7 +2132,6 @@ Bladeburner.prototype.updateOperationsUIElement = function(el, action) {
    }));

    // General Info
-    var difficulty = action.getDifficulty();
    var actionTime = action.getActionTime(this);
    appendLineBreaks(el, 2);
    el.appendChild(createElement("pre", {
@ -2170,7 +2169,6 @@ Bladeburner.prototype.updateBlackOpsUIElement = function(el, action) {
    var isActive = el.classList.contains(ActiveActionCssClass);
    var isCompleted = (this.blackops[action.name] != null);
    var estimatedSuccessChance = action.getSuccessChance(this, {est:true});
-    var difficulty = action.getDifficulty();
    var actionTime = action.getActionTime(this);
    var hasReqdRank = this.rank >= action.reqdRank;

@ -3210,7 +3208,7 @@ Bladeburner.prototype.setTeamSizeNetscriptFn = function(type, name, size, worker
        return -1;
    }

-    const sanitizedSize = Math.round(size);
+    let sanitizedSize = Math.round(size);
    if (isNaN(sanitizedSize) || sanitizedSize < 0) {
        workerScript.log("bladeburner.setTeamSize", `Invalid size: ${size}`);
        return -1;
--- a/src/Bladeburner/Action.ts
+++ b/src/Bladeburner/Action.ts
@ -3,11 +3,12 @@ import { getRandomInt } from "../../utils/helpers/getRandomInt";
 import { addOffset } from "../../utils/helpers/addOffset";
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
 import { BladeburnerConstants } from "./data/Constants";
-// import { Contract } from "./Contract";
-// import { Operation } from "./Operation";
-// import { BlackOperation } from "./BlackOperation";
+import { IBladeburner } from "./IBladeburner";
+import { IAction, ISuccessChanceParams } from "./IAction";

 class StatsMultiplier {
+    [key: string]: number;
+
    hack = 0;
    str = 0;
    def = 0;
@ -15,8 +16,6 @@ class StatsMultiplier {
    agi = 0;
    cha = 0;
    int = 0;
-
-    [key: string]: number;
 }

 export interface IActionParams {
@ -43,7 +42,7 @@ export interface IActionParams {
    teamCount?: number;
 }

-export class Action {
+export class Action implements IAction {
    name = "";
    desc = "";

@ -138,7 +137,7 @@ export class Action {
     * Tests for success. Should be called when an action has completed
     * @param inst {Bladeburner} - Bladeburner instance
     */
-    attempt(inst: any): boolean {
+    attempt(inst: IBladeburner): boolean {
        return (Math.random() < this.getSuccessChance(inst));
    }

@ -147,7 +146,7 @@ export class Action {
        return 1;
    }

-    getActionTime(inst: any): number {
+    getActionTime(inst: IBladeburner): number {
        const difficulty = this.getDifficulty();
        let baseTime = difficulty / BladeburnerConstants.DifficultyToTimeFactor;
        const skillFac = inst.skillMultipliers.actionTime; // Always < 1
@ -165,15 +164,15 @@ export class Action {
    }

    // For actions that have teams. To be implemented by subtypes.
-    getTeamSuccessBonus(inst: any): number {
+    getTeamSuccessBonus(inst: IBladeburner): number {
        return 1;
    }

-    getActionTypeSkillSuccessBonus(inst: any): number {
+    getActionTypeSkillSuccessBonus(inst: IBladeburner): number {
        return 1;
    }

-    getChaosCompetencePenalty(inst: any, params: any): number {
+    getChaosCompetencePenalty(inst: IBladeburner, params: ISuccessChanceParams): number {
        const city = inst.getCurrentCity();
        if (params.est) {
            return Math.pow((city.popEst / BladeburnerConstants.PopulationThreshold), BladeburnerConstants.PopulationExponent);
@ -182,7 +181,7 @@ export class Action {
        }
    }

-    getChaosDifficultyBonus(inst: any, params: any): number {
+    getChaosDifficultyBonus(inst: IBladeburner/*, params: ISuccessChanceParams*/): number {
        const city = inst.getCurrentCity();
        if (city.chaos > BladeburnerConstants.ChaosThreshold) {
            const diff = 1 + (city.chaos - BladeburnerConstants.ChaosThreshold);
@ -198,7 +197,7 @@ export class Action {
     * @params - options:
     *  est (bool): Get success chance estimate instead of real success chance
     */
-    getSuccessChance(inst: any, params: any={}) {
+    getSuccessChance(inst: IBladeburner, params: ISuccessChanceParams={est: false}): number {
        if (inst == null) {throw new Error("Invalid Bladeburner instance passed into Action.getSuccessChance");}
        let difficulty = this.getDifficulty();
        let competence = 0;
@ -220,7 +219,7 @@ export class Action {
        competence *= this.getTeamSuccessBonus(inst);

        competence *= this.getChaosCompetencePenalty(inst, params);
-        difficulty *= this.getChaosDifficultyBonus(inst, params);
+        difficulty *= this.getChaosDifficultyBonus(inst);

        if(this.name == "Raid" && inst.getCurrentCity().comms <= 0) {
            return 0;
@ -253,18 +252,14 @@ export class Action {
        }
    }

-    static fromJSON(value: any): Action {
-        return Generic_fromJSON(Action, value.data);
-    }
-
    toJSON(): any {
        return Generic_toJSON("Action", this);
    }
+
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Action {
+        return Generic_fromJSON(Action, value.data);
+    }
 }

-
-
-
-
-
 Reviver.constructors.Action = Action;
--- a/src/Bladeburner/BlackOperation.ts
+++ b/src/Bladeburner/BlackOperation.ts
@ -13,21 +13,22 @@ export class BlackOperation extends Operation {
        return 1.5;
    }

-    getChaosCompetencePenalty(inst: any, params: any): number {
+    getChaosCompetencePenalty(/*inst: IBladeburner, params: ISuccessChanceParams*/): number {
        return 1;
    }

-    getChaosDifficultyBonus(inst: any, params: any): number {
+    getChaosDifficultyBonus(/*inst: IBladeburner, params: ISuccessChanceParams*/): number {
        return 1;
    }

-    static fromJSON(value: any): Operation {
-        return Generic_fromJSON(BlackOperation, value.data);
-    }
-
    toJSON(): any {
        return Generic_toJSON("BlackOperation", this);
    }
+
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Operation {
+        return Generic_fromJSON(BlackOperation, value.data);
+    }
 }

 Reviver.constructors.BlackOperation = BlackOperation;
--- a/src/Bladeburner/City.ts
+++ b/src/Bladeburner/City.ts
@ -154,19 +154,20 @@ export class City {
        if (this.chaos < 0) {this.chaos = 0;}
    }

-    /**
-     * Initiatizes a City object from a JSON save state.
-     */
-    static fromJSON(value: any): City {
-        return Generic_fromJSON(City, value.data);
-    }
-
    /**
     * Serialize the current object to a JSON save state.
     */
    toJSON(): any {
        return Generic_toJSON("City", this);
    }
+
+    /**
+     * Initiatizes a City object from a JSON save state.
+     */
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): City {
+        return Generic_fromJSON(City, value.data);
+    }
 }

 Reviver.constructors.City = City;
--- a/src/Bladeburner/Contract.ts
+++ b/src/Bladeburner/Contract.ts
@ -1,4 +1,4 @@
-// import { BladeburnerConstants } from "./data/Constants";
+import { IBladeburner } from "./IBladeburner";
 import { Action, IActionParams } from "./Action";
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";

@ -8,17 +8,18 @@ export class Contract extends Action {
        super(params);
    }

-    getActionTypeSkillSuccessBonus(inst: any): number {
+    getActionTypeSkillSuccessBonus(inst: IBladeburner): number {
        return inst.skillMultipliers.successChanceContract;
    }

-    static fromJSON(value: any): Contract {
-        return Generic_fromJSON(Contract, value.data);
-    }
-
    toJSON(): any {
        return Generic_toJSON("Contract", this);
    }
+
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Contract {
+        return Generic_fromJSON(Contract, value.data);
+    }
 }

 Reviver.constructors.Contract = Contract;
--- a/src/Bladeburner/IAction.ts
+++ b/src/Bladeburner/IAction.ts
@ -0,0 +1,71 @@
+import { IBladeburner } from "./IBladeburner";
+
+export interface IStatsMultiplier {
+    [key: string]: number;
+
+    hack: number;
+    str: number;
+    def: number;
+    dex: number;
+    agi: number;
+    cha: number;
+    int: number;
+}
+
+export interface ISuccessChanceParams {
+    est: boolean;
+}
+
+export interface IAction {
+    name: string;
+    desc: string;
+
+    // Difficulty scales with level. See getDifficulty() method
+    level: number;
+    maxLevel: number;
+    autoLevel: boolean;
+    baseDifficulty: number;
+    difficultyFac: number;
+
+    // Rank increase/decrease is affected by this exponent
+    rewardFac: number;
+
+    successes: number;
+    failures: number;
+
+    // All of these scale with level/difficulty
+    rankGain: number;
+    rankLoss: number;
+    hpLoss: number;
+    hpLost: number;
+
+    // Action Category. Current categories are stealth and kill
+    isStealth: boolean;
+    isKill: boolean;
+
+    /**
+     * Number of this contract remaining, and its growth rate
+     * Growth rate is an integer and the count will increase by that integer every "cycle"
+     */
+    count: number;
+    countGrowth: number;
+
+    // Weighting of each stat in determining action success rate
+    weights: IStatsMultiplier;
+    // Diminishing returns of stats (stat ^ decay where 0 <= decay <= 1)
+    decays: IStatsMultiplier;
+    teamCount: number;
+
+    getDifficulty(): number;
+    attempt(inst: IBladeburner): boolean;
+    getActionTimePenalty(): number;
+    getActionTime(inst: IBladeburner): number;
+    getTeamSuccessBonus(inst: IBladeburner): number;
+    getActionTypeSkillSuccessBonus(inst: IBladeburner): number;
+    getChaosCompetencePenalty(inst: IBladeburner, params: ISuccessChanceParams): number;
+    getChaosDifficultyBonus(inst: IBladeburner): number;
+    getSuccessChance(inst: IBladeburner, params: ISuccessChanceParams): number;
+    getSuccessesNeededForNextLevel(baseSuccessesPerLevel: number): number;
+    setMaxLevel(baseSuccessesPerLevel: number): void;
+    toJSON(): any;
+}
--- a/src/Bladeburner/IActionIdentifier.ts
+++ b/src/Bladeburner/IActionIdentifier.ts
@ -0,0 +1,4 @@
+export interface IActionIdentifier {
+    name: string;
+    type: string;
+}
--- a/src/Bladeburner/IBladeburner.ts
+++ b/src/Bladeburner/IBladeburner.ts
@ -0,0 +1,39 @@
+import { IActionIdentifier } from "./IActionIdentifier";
+import { City } from "./City";
+
+export interface IBladeburner {
+    numHosp: number;
+    moneyLost: number;
+    rank: number;
+    maxRank: number;
+    skillPoints: number;
+    totalSkillPoints: number;
+    teamSize: number;
+    teamLost: number;
+    storedCycles: number;
+    randomEventCounter: number;
+    actionTimeToComplete: number;
+    actionTimeCurrent: number;
+    action: IActionIdentifier;
+    cities: any;
+    city: string;
+    skills: any;
+    skillMultipliers: any;
+    staminaBonus: number;
+    maxStamina: number;
+    stamina: number;
+    contracts: any;
+    operations: any;
+    blackops: any;
+    logging: any;
+    automateEnabled: boolean;
+    automateActionHigh: number;
+    automateThreshHigh: number;
+    automateActionLow: number;
+    automateThreshLow: number;
+    consoleHistory: string[];
+    consoleLogs: string[];
+
+    getCurrentCity(): City;
+    calculateStaminaPenalty(): number;
+}
--- a/src/Bladeburner/Operation.ts
+++ b/src/Bladeburner/Operation.ts
@ -1,3 +1,4 @@
+import { IBladeburner } from "./IBladeburner";
 import { BladeburnerConstants } from "./data/Constants";
 import { Action, IActionParams } from "./Action";
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
@ -18,7 +19,7 @@ export class Operation extends Action {
    }

    // For actions that have teams. To be implemented by subtypes.
-    getTeamSuccessBonus(inst: any): number {
+    getTeamSuccessBonus(inst: IBladeburner): number {
        if (this.teamCount && this.teamCount > 0) {
            this.teamCount = Math.min(this.teamCount, inst.teamSize);
            const teamMultiplier = Math.pow(this.teamCount, 0.05);
@ -28,11 +29,11 @@ export class Operation extends Action {
        return 1;
    }

-    getActionTypeSkillSuccessBonus(inst: any): number {
+    getActionTypeSkillSuccessBonus(inst: IBladeburner): number {
        return inst.skillMultipliers.successChanceOperation;
    }

-    getChaosDifficultyBonus(inst: any, params: any): number {
+    getChaosDifficultyBonus(inst: IBladeburner/*, params: ISuccessChanceParams*/): number {
        const city = inst.getCurrentCity();
        if (city.chaos > BladeburnerConstants.ChaosThreshold) {
            const diff = 1 + (city.chaos - BladeburnerConstants.ChaosThreshold);
@ -43,13 +44,14 @@ export class Operation extends Action {
        return 1;
    }

-    static fromJSON(value: any): Operation {
-        return Generic_fromJSON(Operation, value.data);
-    }
-
    toJSON(): any {
        return Generic_toJSON("Operation", this);
    }
+
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Operation {
+        return Generic_fromJSON(Operation, value.data);
+    }
 }

 Reviver.constructors.Operation = Operation;
--- a/src/Bladeburner/data/Help.ts
+++ b/src/Bladeburner/data/Help.ts
@ -1,4 +1,14 @@
-export const ConsoleHelpText: {} = {
+export const ConsoleHelpText: {
+  helpList: string[];
+  automate: string[];
+  clear: string[];
+  cls: string[];
+  help: string[];
+  log: string[];
+  skill: string[];
+  start: string[];
+  stop: string[];
+} = {
    helpList: [
      "Use 'help [command]' to get more information about a particular Bladeburner console command.",
      "",
--- a/src/Bladeburner/ui/BlackOperationsPage.tsx
+++ b/src/Bladeburner/ui/BlackOperationsPage.tsx
@ -38,7 +38,7 @@ for (var i = blackops.length-1; i >= 0 ; --i) {

 import * as React from "react";

-export function BlackOperationsPage(inst: any): React.ReactElement {
+export function BlackOperationsPage(): React.ReactElement {
    // Put Black Operations in sequence of required rank
    const blackops = [];
    for (const name in BlackOperations) {
@ -55,7 +55,7 @@ export function BlackOperationsPage(inst: any): React.ReactElement {
            Black Operations (Black Ops) are special, one-time covert operations. Each Black Op must be unlocked successively by completing the one before it.<br /><br />
        <b>Your ultimate goal to climb through the ranks of Bladeburners is to complete all of the Black Ops.</b><br /><br />
        Like normal operations, you may use a team for Black Ops. Failing a black op will incur heavy HP and rank losses.</p>
-        {blackops.map( op => <div className="bladeburner-action">
+        {blackops.map(() => <div className="bladeburner-action">
            </div>,
        )}
    </div>)
--- a/src/Casino/CoinFlip.tsx
+++ b/src/Casino/CoinFlip.tsx
@ -41,7 +41,7 @@ export class CoinFlip extends Game<IProps, IState> {
        this.updateInvestment = this.updateInvestment.bind(this);
    }

-    updateInvestment(e: React.FormEvent<HTMLInputElement>) {
+    updateInvestment(e: React.FormEvent<HTMLInputElement>): void {
        let investment: number = parseInt(e.currentTarget.value);
        if (isNaN(investment)) {
            investment = minPlay;
@ -55,7 +55,7 @@ export class CoinFlip extends Game<IProps, IState> {
        this.setState({investment: investment});
    }

-    play(guess: string) {
+    play(guess: string): void {
        if(this.reachedLimit(this.props.p)) return;
        const v = BadRNG.random();
        let letter: string;
@ -80,7 +80,7 @@ export class CoinFlip extends Game<IProps, IState> {
    }


-    render() {
+    render(): React.ReactNode {
        return <>
 <pre>
 +———————+<br />
--- a/src/Casino/RNG.ts
+++ b/src/Casino/RNG.ts
@ -18,7 +18,7 @@ class RNG0 implements RNG {
 		this.reset();
 	}

-	step() {
+	step(): void {
 		this.x = (this.a*this.x+this.c) % this.m;
 	}

@ -27,7 +27,7 @@ class RNG0 implements RNG {
 		return this.x/this.m;
 	}

-	reset() {
+	reset(): void {
 		this.x = (new Date()).getTime() % this.m;
 	}
 }
@ -51,7 +51,7 @@ export class WHRNG implements RNG {
 		this.s3 = v;
 	}

-	step() {
+	step(): void {
 		this.s1 = (171 * this.s1) % 30269;
 		this.s2 = (172 * this.s2) % 30307;
 		this.s3 = (170 * this.s3) % 30323;
--- a/src/Casino/Roulette.tsx
+++ b/src/Casino/Roulette.tsx
@ -28,10 +28,6 @@ function isRed(n: number): boolean {
        21, 23, 25, 27, 30, 32, 34, 36].includes(n);
 }

-function isBlack(n: number): boolean {
-    return !isRed(n);
-}
-
 type Strategy = {
    match: (n: number) => boolean;
    payout: number;
@ -140,7 +136,7 @@ export class Roulette extends Game<IProps, IState> {
            lock: true,
            strategy: {
                payout: 0,
-                match: (n: number): boolean => { return false },
+                match: (): boolean => { return false },
            },
        }

@ -150,21 +146,21 @@ export class Roulette extends Game<IProps, IState> {
    }


-    componentDidMount() {
+    componentDidMount(): void {
        this.interval = setInterval(this.step, 50);
    }

-    step() {
+    step(): void {
        if (!this.state.lock) {
            this.setState({n: Math.floor(Math.random()*37)});
        }
    }

-    componentWillUnmount() {
+    componentWillUnmount(): void {
      clearInterval(this.interval);
    }

-    updateInvestment(e: React.FormEvent<HTMLInputElement>) {
+    updateInvestment(e: React.FormEvent<HTMLInputElement>): void {
        let investment: number = parseInt(e.currentTarget.value);
        if (isNaN(investment)) {
            investment = minPlay;
@ -178,13 +174,13 @@ export class Roulette extends Game<IProps, IState> {
        this.setState({investment: investment});
    }

-    currentNumber() {
+    currentNumber(): string {
        if (this.state.n === 0) return '0';
        const color = isRed(this.state.n) ? 'R' : 'B';
        return `${this.state.n}${color}`;
    }

-    play(s: Strategy) {
+    play(s: Strategy): void {
        if(this.reachedLimit(this.props.p)) return;
        this.setState({
            canPlay: false,
@ -223,7 +219,7 @@ export class Roulette extends Game<IProps, IState> {
    }


-    render() {
+    render(): React.ReactNode {
        return <>
        <h1>{this.currentNumber()}</h1>
        <input type="number" className="text-input" onChange={this.updateInvestment} placeholder={"Amount to play"} value={this.state.investment} disabled={!this.state.canPlay} />
--- a/src/Casino/SlotMachine.tsx
+++ b/src/Casino/SlotMachine.tsx
@ -86,11 +86,11 @@ export class SlotMachine extends Game<IProps, IState> {
        this.updateInvestment = this.updateInvestment.bind(this);
    }

-    componentDidMount() {
+    componentDidMount(): void {
        this.interval = setInterval(this.step, 50);
    }

-    step() {
+    step(): void {
        let stoppedOne = false;
        const index = this.state.index.slice();
        for(const i in index) {
@ -106,7 +106,7 @@ export class SlotMachine extends Game<IProps, IState> {
        }
    }

-    componentWillUnmount() {
+    componentWillUnmount(): void {
      clearInterval(this.interval);
    }

@ -118,7 +118,7 @@ export class SlotMachine extends Game<IProps, IState> {
        ];
    }

-    play() {
+    play(): void {
        if(this.reachedLimit(this.props.p)) return;
        this.setState({status: 'playing'});
        this.win(this.props.p, -this.state.investment);
@ -127,7 +127,7 @@ export class SlotMachine extends Game<IProps, IState> {
        setTimeout(this.lock, this.rng.random()*2000+1000);
    }

-    lock() {
+    lock(): void {
        this.setState({
            locks: [
                Math.floor(this.rng.random()*symbols.length),
@ -139,7 +139,7 @@ export class SlotMachine extends Game<IProps, IState> {
        })
    }

-    checkWinnings() {
+    checkWinnings(): void {
        const t = this.getTable();
        const getPaylineData = function(payline: number[][]): string[] {
            const data = [];
@ -176,14 +176,14 @@ export class SlotMachine extends Game<IProps, IState> {
        if(this.reachedLimit(this.props.p)) return;
    }

-    unlock() {
+    unlock(): void {
        this.setState({
            locks: [-1, -1, -1, -1, -1],
            canPlay: false,
        })
    }

-    updateInvestment(e: React.FormEvent<HTMLInputElement>) {
+    updateInvestment(e: React.FormEvent<HTMLInputElement>): void {
        let investment: number = parseInt(e.currentTarget.value);
        if (isNaN(investment)) {
            investment = minPlay;
@ -197,7 +197,7 @@ export class SlotMachine extends Game<IProps, IState> {
        this.setState({investment: investment});
    }

-    render() {
+    render(): React.ReactNode {
        const t = this.getTable();
        return <>
 <pre>
--- a/src/CinematicText.js
+++ b/src/CinematicText.js
@ -90,7 +90,7 @@ function cinematicTextEnd() {
    var mainMenu = document.getElementById("mainmenu-container");
    container.appendChild(createElement("br"));

-    return new Promise (function(resolve, reject) {
+    return new Promise (function(resolve) {
        container.appendChild(createElement("a", {
            class:"a-link-button", innerText:"Continue...",
            clickListener:()=>{
--- a/src/CodingContractGenerator.ts
+++ b/src/CodingContractGenerator.ts
@ -15,7 +15,7 @@ import { HacknetServer } from "./Hacknet/HacknetServer";
 import { getRandomInt } from "../utils/helpers/getRandomInt";


-export function generateRandomContract() {
+export function generateRandomContract(): void {
    // First select a random problem type
    const problemType = getRandomProblemType();

@ -31,7 +31,7 @@ export function generateRandomContract() {
    randServer.addContract(contract);
 }

-export function generateRandomContractOnHome() {
+export function generateRandomContractOnHome(): void {
    // First select a random problem type
    const problemType = getRandomProblemType();

@ -53,7 +53,7 @@ export interface IGenerateContractParams {
    fn?: string;
 }

-export function generateContract(params: IGenerateContractParams) {
+export function generateContract(params: IGenerateContractParams): void {
    // Problem Type
    let problemType;
    const problemTypes = Object.keys(CodingContractTypes);
@ -117,7 +117,7 @@ function sanitizeRewardType(rewardType: CodingContractRewardType): CodingContrac
    return type;
 }

-function getRandomProblemType() {
+function getRandomProblemType(): string {
    const problemTypes = Object.keys(CodingContractTypes);
    const randIndex = getRandomInt(0, problemTypes.length - 1);

--- a/src/CodingContracts.ts
+++ b/src/CodingContracts.ts
@ -108,12 +108,6 @@ export interface ICodingContractReward {
 * The player receives a reward if the problem is solved correctly
 */
 export class CodingContract {
-    /**
-     * Initiatizes a CodingContract from a JSON save state.
-     */
-    static fromJSON(value: any): CodingContract {
-        return Generic_fromJSON(CodingContract, value.data);
-    }

    /* Relevant data for the contract's problem */
    data: any;
@ -178,7 +172,7 @@ export class CodingContract {
     */
    async prompt(): Promise<CodingContractResult> {
        // tslint:disable-next-line
-        return new Promise<CodingContractResult>((resolve: Function, reject: Function) => {
+        return new Promise<CodingContractResult>((resolve) => {
            const contractType: CodingContractType = CodingContractTypes[this.type];
            const popupId = `coding-contract-prompt-popup-${this.fn}`;
            const title: HTMLElement = createElement("h1", {
@ -190,10 +184,16 @@ export class CodingContract {
                            "after which the contract will self-destruct.<br><br>",
                            `${contractType.desc(this.data).replace(/\n/g, "<br>")}`].join(" "),
            });
-            let answerInput: HTMLInputElement;
            let solveBtn: HTMLElement;
-            let cancelBtn: HTMLElement;
-            answerInput = createElement("input", {
+            const cancelBtn = createElement("a", {
+                class: "a-link-button",
+                clickListener: () => {
+                    resolve(CodingContractResult.Cancelled);
+                    removeElementById(popupId);
+                },
+                innerText: "Cancel",
+            });
+            const answerInput = createElement("input", {
                onkeydown: (e: any) => {
                    if (e.keyCode === KEY.ENTER && answerInput.value !== "") {
                        e.preventDefault();
@ -219,14 +219,6 @@ export class CodingContract {
                },
                innerText: "Solve",
            });
-            cancelBtn = createElement("a", {
-                class: "a-link-button",
-                clickListener: () => {
-                    resolve(CodingContractResult.Cancelled);
-                    removeElementById(popupId);
-                },
-                innerText: "Cancel",
-            });
            const lineBreak: HTMLElement = createElement("br");
            createPopup(popupId, [title, lineBreak, txt, lineBreak, lineBreak, answerInput, solveBtn, cancelBtn]);
            answerInput.focus();
@ -239,6 +231,14 @@ export class CodingContract {
    toJSON(): any {
        return Generic_toJSON("CodingContract", this);
    }
+
+    /**
+     * Initiatizes a CodingContract from a JSON save state.
+     */
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): CodingContract {
+        return Generic_fromJSON(CodingContract, value.data);
+    }
 }

 Reviver.constructors.CodingContract = CodingContract;
--- a/src/Company/Companies.ts
+++ b/src/Company/Companies.ts
@ -6,7 +6,7 @@ import { Reviver }                      from "../../utils/JSONReviver";

 export let Companies: IMap<Company> = {};

-function addCompany(params: IConstructorParams) {
+function addCompany(params: IConstructorParams): void {
    if (Companies[params.name] != null) {
        console.warn(`Duplicate Company Position being defined: ${params.name}`);
    }
@ -15,7 +15,7 @@ function addCompany(params: IConstructorParams) {

 // Used to initialize new Company objects for the Companies map
 // Called when creating new game or after a prestige/reset
-export function initCompanies() {
+export function initCompanies(): void {
    // Save Old Company data for 'favor'
    const oldCompanies = Companies;

@ -40,11 +40,11 @@ export function initCompanies() {
 }

 // Used to load Companies map from a save
-export function loadCompanies(saveString: string) {
+export function loadCompanies(saveString: string): void {
    Companies = JSON.parse(saveString, Reviver);
 }

 // Utility function to check if a string is valid company name
-export function companyExists(name: string) {
+export function companyExists(name: string): boolean {
    return Companies.hasOwnProperty(name);
 }
--- a/src/Company/Company.ts
+++ b/src/Company/Company.ts
@ -25,12 +25,6 @@ const DefaultConstructorParams: IConstructorParams = {
 }

 export class Company {
-    /**
-     * Initiatizes a Company from a JSON save state.
-     */
-    static fromJSON(value: any): Company {
-        return Generic_fromJSON(Company, value.data);
-    }

    /**
     * Company name
@ -170,6 +164,14 @@ export class Company {
    toJSON(): any {
        return Generic_toJSON("Company", this);
    }
+
+    /**
+     * Initiatizes a Company from a JSON save state.
+     */
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Company {
+        return Generic_fromJSON(Company, value.data);
+    }
 }

 Reviver.constructors.Company = Company;
--- a/src/Company/CompanyPositions.ts
+++ b/src/Company/CompanyPositions.ts
@ -5,7 +5,7 @@ import { IMap } from "../types";

 export const CompanyPositions: IMap<CompanyPosition> = {};

-function addCompanyPosition(params: IConstructorParams) {
+function addCompanyPosition(params: IConstructorParams): void {
    if (CompanyPositions[params.name] != null) {
        console.warn(`Duplicate Company Position being defined: ${params.name}`);
    }
--- a/src/Corporation/Corporation.jsx
+++ b/src/Corporation/Corporation.jsx
@ -5,7 +5,6 @@ import { CorporationUpgrades }                          from "./data/Corporation
 import { EmployeePositions }                            from "./EmployeePositions";
 import { Industries,
         IndustryStartingCosts,
-         IndustryDescriptions,
         IndustryResearchTrees }                        from "./IndustryData";
 import { IndustryUpgrades }                             from "./IndustryUpgrades";
 import { Material }                                     from "./Material";
@ -15,11 +14,8 @@ import { ResearchMap }                                  from "./ResearchMap";
 import { Warehouse }                                    from "./Warehouse";

 import { BitNodeMultipliers }                           from "../BitNode/BitNodeMultipliers";
-import { CONSTANTS }                                    from "../Constants";
-import { Factions }                                     from "../Faction/Factions";
 import { showLiterature }                               from "../Literature/LiteratureHelpers";
 import { LiteratureNames }                              from "../Literature/data/LiteratureNames";
-import { createCityMap }                                from "../Locations/Cities";
 import { CityName }                                     from "../Locations/data/CityNames";
 import { Player }                                       from "../Player";

@ -29,7 +25,6 @@ import { Page, routing }                                from "../ui/navigationTr
 import { calculateEffectWithFactors }                   from "../utils/calculateEffectWithFactors";

 import { dialogBoxCreate }                              from "../../utils/DialogBox";
-import { clearSelector }                                from "../../utils/uiHelpers/clearSelector";
 import { Reviver,
         Generic_toJSON,
         Generic_fromJSON }                             from "../../utils/JSONReviver";
@ -99,7 +94,6 @@ export const BaseMaxProducts                = 3;    // Initial value for maximum
 let researchTreeBoxOpened = false;
 let researchTreeBox = null;
 $(document).mousedown(function(event) {
-    const boxId = "corporation-research-popup-box";
    const contentId = "corporation-research-popup-box-content";
    if (researchTreeBoxOpened) {
        if ( $(event.target).closest("#" + contentId).get(0) == null ) {
@ -111,7 +105,6 @@ $(document).mousedown(function(event) {
    }
 });

-var empManualAssignmentModeActive = false;
 function Industry(params={}) {
    this.offices = { //Maps locations to offices. 0 if no office at that location
        [CityName.Aevum]: 0,
@ -441,8 +434,7 @@ Industry.prototype.calculateProductionFactors = function() {
            continue;
        }

-        var materials = warehouse.materials,
-            office = this.offices[city];
+        var materials = warehouse.materials;

        var cityMult =  Math.pow(0.002 * materials.RealEstate.qty+1, this.reFac) *
                        Math.pow(0.002 * materials.Hardware.qty+1, this.hwFac) *
@ -535,7 +527,7 @@ Industry.prototype.process = function(marketCycles=1, state, company) {
 }

 // Process change in demand and competition for this industry's materials
-Industry.prototype.processMaterialMarket = function(marketCycles=1) {
+Industry.prototype.processMaterialMarket = function() {
    //References to prodMats and reqMats
    var reqMats = this.reqMats, prodMats = this.prodMats;

@ -589,7 +581,7 @@ Industry.prototype.processProductMarket = function(marketCycles=1) {

 //Process production, purchase, and import/export of materials
 Industry.prototype.processMaterials = function(marketCycles=1, company) {
-    var revenue = 0, expenses = 0, industry = this;
+    var revenue = 0, expenses = 0;
    this.calculateProductionFactors();

    //At the start of the export state, set the imports of everything to 0
@ -642,7 +634,7 @@ Industry.prototype.processMaterials = function(marketCycles=1, company) {
                        mat.qty += buyAmt;
                        expenses += (buyAmt * mat.bCost);
                    }
-                })(matName, industry);
+                })(matName, this);
                    this.updateWarehouseSizeUsed(warehouse);
                }
            } //End process purchase of materials
@ -1003,7 +995,7 @@ Industry.prototype.processProduct = function(marketCycles=1, product, corporatio
        if (warehouse instanceof Warehouse) {
            switch(this.state) {

-            case "PRODUCTION":
+            case "PRODUCTION": {
            //Calculate the maximum production of this material based
            //on the office's productivity
            var maxProd = this.getOfficeProductivity(office, {forProduct:true})
@ -1065,8 +1057,8 @@ Industry.prototype.processProduct = function(marketCycles=1, product, corporatio
            //Keep track of production Per second
            product.data[city][1] = prod * producableFrac / (SecsPerMarketCycle * marketCycles);
            break;
-
-            case "SALE":
+            }
+            case "SALE": {
            //Process sale of Products
            product.pCost = 0; //Estimated production cost
            for (var reqMatName in product.reqMats) {
@ -1174,7 +1166,7 @@ Industry.prototype.processProduct = function(marketCycles=1, product, corporatio
                product.data[city][2] = 0; //data[2] is sell property
            }
            break;
-
+            }
            case "START":
            case "PURCHASE":
            case "EXPORT":
@ -1199,10 +1191,9 @@ Industry.prototype.discontinueProduct = function(product) {
 }

 Industry.prototype.upgrade = function(upgrade, refs) {
-    var corporation = refs.corporation, division = refs.division,
-        office = refs.office;
-    var upgN = upgrade[0], basePrice = upgrade[1], priceMult = upgrade[2],
-        upgradeBenefit = upgrade[3];
+    var corporation = refs.corporation;
+    var office = refs.office;
+    var upgN = upgrade[0];
    while (this.upgrades.length <= upgN) {this.upgrades.push(0);}
    ++this.upgrades[upgN];

@ -1374,9 +1365,6 @@ Industry.prototype.createResearchBox = function() {
        },
    }

-    // Construct the tree with Treant
-    const treantTree = new Treant(markup);
-
    // Add Event Listeners for all Nodes
    const allResearch = researchTree.getAllNodes();
    for (let i = 0; i < allResearch.length; ++i) {
@ -1658,7 +1646,7 @@ OfficeSpace.prototype.atCapacity = function() {
 }

 OfficeSpace.prototype.process = function(marketCycles=1, parentRefs) {
-    var corporation = parentRefs.corporation, industry = parentRefs.industry;
+    var industry = parentRefs.industry;

    // HRBuddy AutoRecruitment and training
    if (industry.hasResearch("HRBuddy-Recruitment") && !this.atCapacity()) {
@ -1741,7 +1729,6 @@ OfficeSpace.prototype.calculateEmployeeProductivity = function(parentRefs) {

 //Takes care of UI as well
 OfficeSpace.prototype.findEmployees = function(parentRefs) {
-    var company = parentRefs.corporation, division = parentRefs.industry;
    if (this.atCapacity()) { return; }
    if (document.getElementById("cmpy-mgmt-hire-employee-popup") != null) {return;}

@ -1825,7 +1812,7 @@ OfficeSpace.prototype.findEmployees = function(parentRefs) {
 }

 OfficeSpace.prototype.hireEmployee = function(employee, parentRefs) {
-    var company = parentRefs.corporation, division = parentRefs.industry;
+    var company = parentRefs.corporation;
    var yesBtn = yesNoTxtInpBoxGetYesButton(),
        noBtn = yesNoTxtInpBoxGetNoButton();
    yesBtn.innerHTML = "Hire";
@ -1958,15 +1945,14 @@ Corporation.prototype.storeCycles = function(numCycles=1) {
 }

 Corporation.prototype.process = function() {
-    var corp = this;
    if (this.storedCycles >= CyclesPerIndustryStateCycle) {
        const state = this.getState();
        const marketCycles = 1;
        const gameCycles = (marketCycles * CyclesPerIndustryStateCycle);
        this.storedCycles -= gameCycles;

-        this.divisions.forEach(function(ind) {
-            ind.process(marketCycles, state, corp);
+        this.divisions.forEach((ind) => {
+            ind.process(marketCycles, state, this);
        });

        // Process cooldowns
@ -2208,7 +2194,6 @@ Corporation.prototype.calculateShareSale = function(numShares) {

 Corporation.prototype.convertCooldownToString = function(cd) {
    // The cooldown value is based on game cycles. Convert to a simple string
-    const CyclesPerSecond = 1000 / CONSTANTS.MilliPerCycle;
    const seconds = cd / 5;

    const SecondsPerMinute = 60;
--- a/src/Corporation/CorporationState.ts
+++ b/src/Corporation/CorporationState.ts
@ -6,17 +6,11 @@ import { Generic_fromJSON,
 export const AllCorporationStates: string[] = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"];

 export class CorporationState {
-    // Initiatizes a CorporationState object from a JSON save state.
-    static fromJSON(value: any): CorporationState {
-        return Generic_fromJSON(CorporationState, value.data);
-    }

    // Number representing what state the Corporation is in. The number
    // is an index for the array that holds all Corporation States
    state = 0;

-    constructor() {}
-
    // Get the name of the current state
    // NOTE: This does NOT return the number stored in the 'state' property,
    // which is just an index for the array of all possible Corporation States.
@ -40,6 +34,12 @@ export class CorporationState {
    toJSON(): any {
        return Generic_toJSON("CorporationState", this);
    }
+
+    // Initiatizes a CorporationState object from a JSON save state.
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): CorporationState {
+        return Generic_fromJSON(CorporationState, value.data);
+    }
 }

 Reviver.constructors.CorporationState = CorporationState;
--- a/src/Corporation/IndustryData.ts
+++ b/src/Corporation/IndustryData.ts
@ -4,8 +4,6 @@ import { getBaseResearchTreeCopy,

 import { numeralWrapper } from "../ui/numeralFormat";

-import { Reviver } from "../../utils/JSONReviver";
-
 interface IIndustryMap<T> {
    Energy: T;
    Utilities: T;
@ -124,7 +122,7 @@ export const IndustryResearchTrees: IIndustryMap<ResearchTree> = {
    RealEstate: getProductIndustryResearchTreeCopy(),
 }

-export function resetIndustryResearchTrees() {
+export function resetIndustryResearchTrees(): void {
    IndustryResearchTrees.Energy         = getBaseResearchTreeCopy();
    IndustryResearchTrees.Utilities      = getBaseResearchTreeCopy();
    IndustryResearchTrees.Agriculture    = getBaseResearchTreeCopy();
--- a/src/Corporation/Material.ts
+++ b/src/Corporation/Material.ts
@ -7,10 +7,6 @@ interface IConstructorParams {
 }

 export class Material {
-    // Initiatizes a Material object from a JSON save state.
-    static fromJSON(value: any): Material {
-        return Generic_fromJSON(Material, value.data);
-    }

    // Name of material
    name = "InitName";
@ -192,6 +188,12 @@ export class Material {
    toJSON(): any {
        return Generic_toJSON("Material", this);
    }
+
+    // Initiatizes a Material object from a JSON save state.
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Material {
+        return Generic_fromJSON(Material, value.data);
+    }
 }

 Reviver.constructors.Material = Material;
--- a/src/Corporation/Product.ts
+++ b/src/Corporation/Product.ts
@ -42,10 +42,6 @@ interface IIndustry {


 export class Product {
-    // Initiatizes a Product object from a JSON save state.
-    static fromJSON(value: any): Product {
-        return Generic_fromJSON(Product, value.data);
-    }

    // Product name
    name = "";
@ -196,7 +192,7 @@ export class Product {

        //Calculate the product's required materials
        //For now, just set it to be the same as the requirements to make materials
-        for (var matName in industry.reqMats) {
+        for (const matName in industry.reqMats) {
            if (industry.reqMats.hasOwnProperty(matName)) {
                this.reqMats[matName] = industry.reqMats[matName];
            }
@ -205,7 +201,7 @@ export class Product {
        //Calculate the product's size
        //For now, just set it to be the same size as the requirements to make materials
        this.siz = 0;
-        for (var matName in industry.reqMats) {
+        for (const matName in industry.reqMats) {
            this.siz += MaterialSizes[matName] * industry.reqMats[matName];
        }

@ -240,6 +236,12 @@ export class Product {
    toJSON(): any {
        return Generic_toJSON("Product", this);
    }
+
+    // Initiatizes a Product object from a JSON save state.
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Product {
+        return Generic_fromJSON(Product, value.data);
+    }
 }

 Reviver.constructors.Product = Product;
--- a/src/Corporation/ProductRatingWeights.ts
+++ b/src/Corporation/ProductRatingWeights.ts
@ -10,7 +10,7 @@ export interface IProductRatingWeight {
    Reliability?: number;
 }

-export const ProductRatingWeights: IMap<object> = {
+export const ProductRatingWeights: IMap<any> = {
    [Industries.Food]: {
        Quality:        0.7,
        Durability:     0.1,
--- a/src/Corporation/ResearchMap.ts
+++ b/src/Corporation/ResearchMap.ts
@ -7,7 +7,7 @@ import { IMap } from "../types";

 export const ResearchMap: IMap<Research> = {};

-function addResearch(p: IConstructorParams) {
+function addResearch(p: IConstructorParams): void {
    if (ResearchMap[p.name] != null) {
        console.warn(`Duplicate Research being defined: ${p.name}`);
    }
--- a/src/Corporation/ResearchTree.ts
+++ b/src/Corporation/ResearchTree.ts
@ -56,14 +56,14 @@ export class Node {
        }
    }

-    addChild(n: Node) {
+    addChild(n: Node): void {
        this.children.push(n);
        n.parent = this;
    }

    // Return an object that describes a TreantJS-compatible markup/config for this Node
    // See: http://fperucic.github.io/treant-js/
-    createTreantMarkup(): object {
+    createTreantMarkup(): any {
        const childrenArray = [];
        for (let i = 0; i < this.children.length; ++i) {
            childrenArray.push(this.children[i].createTreantMarkup());
@ -109,7 +109,7 @@ export class Node {
        return null;
    }

-    setParent(n: Node) {
+    setParent(n: Node): void {
        this.parent =  n;
    }
 }
@ -124,11 +124,9 @@ export class ResearchTree {
    // Root Node
    root: Node | null = null;

-    constructor() {}
-
    // Return an object that contains a Tree markup for TreantJS (using the JSON approach)
    // See: http://fperucic.github.io/treant-js/
-    createTreantMarkup(): object {
+    createTreantMarkup(): any {
        if (this.root == null) { return {}; }

        const treeMarkup = this.root.createTreantMarkup();
--- a/src/Corporation/Warehouse.ts
+++ b/src/Corporation/Warehouse.ts
@ -19,10 +19,6 @@ interface IConstructorParams {
 }

 export class Warehouse {
-    // Initiatizes a Warehouse object from a JSON save state.
-    static fromJSON(value: any): Warehouse {
-        return Generic_fromJSON(Warehouse, value.data);
-    }

    // Text that describes how the space in this Warehouse is being used
    // Used to create a tooltip in the UI
@ -79,7 +75,7 @@ export class Warehouse {
    }

    // Re-calculate how much space is being used by this Warehouse
-    updateMaterialSizeUsed() {
+    updateMaterialSizeUsed(): void {
        this.sizeUsed = 0;
        this.breakdown = "";
        for (const matName in this.materials) {
@ -96,7 +92,7 @@ export class Warehouse {
        }
    }

-    updateSize(corporation: IParent, industry: IParent) {
+    updateSize(corporation: IParent, industry: IParent): void {
        try {
            this.size = (this.level * 100)
                      * corporation.getStorageMultiplier()
@ -110,6 +106,12 @@ export class Warehouse {
    toJSON(): any {
        return Generic_toJSON("Warehouse", this);
    }
+
+    // Initiatizes a Warehouse object from a JSON save state.
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Warehouse {
+        return Generic_fromJSON(Warehouse, value.data);
+    }
 }

 Reviver.constructors.Warehouse = Warehouse;
--- a/src/Corporation/ui/BaseReactComponent.js
+++ b/src/Corporation/ui/BaseReactComponent.js
@ -17,6 +17,4 @@ export class BaseReactComponent extends Component {
    routing() {
        return this.props.routing;
    }
-
-    render() {}
 }
--- a/src/Corporation/ui/CorporationUIEventHandler.js
+++ b/src/Corporation/ui/CorporationUIEventHandler.js
@ -16,7 +16,7 @@ import { Corporation,
 import { Industries,
         IndustryStartingCosts,
         IndustryDescriptions,
-         IndustryResearchTrees } from "../IndustryData";
+} from "../IndustryData";

 import { MaterialSizes } from "../MaterialSizes";

@ -679,8 +679,6 @@ export class CorporationEventHandler {

    // Create a popup that lets the player use the Market TA research for Materials
    createMaterialMarketTaPopup(mat, industry) {
-        const corp = this.corp;
-
        const popupId = "cmpy-mgmt-marketta-popup";
        const markupLimit = mat.getMarkupLimit();
        const ta1 = createElement("p", {
@ -964,8 +962,6 @@ export class CorporationEventHandler {

    // Create a popup that lets the player use the Market TA research for Products
    createProductMarketTaPopup(product, industry) {
-        const corp = this.corp;
-
        const popupId = "cmpy-mgmt-marketta-popup";
        const markupLimit = product.rat / product.mku;
        const ta1 = createElement("p", {
@ -1515,8 +1511,6 @@ export class CorporationEventHandler {
                } else {
                    const stockSaleResults = this.corp.calculateShareSale(numShares);
                    const profit = stockSaleResults[0];
-                    const newSharePrice = stockSaleResults[1];
-                    const newSharesUntilUpdate = stockSaleResults[2];
                    profitIndicator.innerText = "Sell " + numShares + " shares for a total of " +
                                                numeralWrapper.format(profit, '$0.000a');
                }
--- a/src/Corporation/ui/HeaderTabs.jsx
+++ b/src/Corporation/ui/HeaderTabs.jsx
@ -4,8 +4,6 @@
 import React from "react";
 import { BaseReactComponent } from "./BaseReactComponent";

-import { overviewPage } from "./Routing";
-
 function HeaderTab(props) {
    let className = "cmpy-mgmt-header-tab";
    if (props.current) {
--- a/src/Corporation/ui/IndustryOffice.jsx
+++ b/src/Corporation/ui/IndustryOffice.jsx
@ -62,7 +62,6 @@ export class IndustryOffice extends BaseReactComponent {

        // Calculate how many NEW emplyoees we need to account for
        const currentNumEmployees = office.employees.length;
-        const newEmployees = currentNumEmployees - this.state.numEmployees;

        // Record the number of employees in each position, for NEW employees only
        for (let i = this.state.numEmployees; i < office.employees.length; ++i) {
--- a/src/Corporation/ui/IndustryOverview.jsx
+++ b/src/Corporation/ui/IndustryOverview.jsx
@ -12,7 +12,6 @@ import { createProgressBarText }    from "../../../utils/helpers/createProgressB

 export class IndustryOverview extends BaseReactComponent {
    renderMakeProductButton() {
-        const corp = this.corp();
        const division = this.routing().currentDivision; // Validated inside render()

        var createProductButtonText, createProductPopupText;
@ -97,7 +96,6 @@ export class IndustryOverview extends BaseReactComponent {
        const popularity = `Popularity: ${numeralWrapper.format(division.popularity, "0.000")}`;

        let advertisingInfo = false;
-        let advertisingTooltip;
        const advertisingFactors = division.getAdvertisingFactors();
        const awarenessFac = advertisingFactors[1];
        const popularityFac = advertisingFactors[2];
--- a/src/Corporation/ui/IndustryWarehouse.jsx
+++ b/src/Corporation/ui/IndustryWarehouse.jsx
@ -19,7 +19,6 @@ import { isString }                     from "../../../utils/helpers/isString";
 function ProductComponent(props) {
    const corp = props.corp;
    const division = props.division;
-    const warehouse = props.warehouse;
    const city = props.city;
    const product = props.product;
    const eventHandler = props.eventHandler;
@ -203,15 +202,6 @@ function MaterialComponent(props) {
    // Total gain or loss of this material (per second)
    const totalGain = mat.buy + mat.prd + mat.imp - mat.sll - mat.totalExp;

-    // Competition and demand info, if they're unlocked
-    let cmpAndDmdText = "";
-    if (corp.unlockUpgrades[2] === 1) {
-        cmpAndDmdText += "<br>Demand: " + numeralWrapper.format(mat.dmd, nf);
-    }
-    if (corp.unlockUpgrades[3] === 1) {
-        cmpAndDmdText += "<br>Competition: " + numeralWrapper.format(mat.cmp, nf);
-    }
-
    // Flag that determines whether this industry is "new" and the current material should be
    // marked with flashing-red lights
    const tutorial = division.newInd && Object.keys(division.reqMats).includes(mat.name) &&
@ -511,7 +501,6 @@ export class IndustryWarehouse extends BaseReactComponent {
    }

    render() {
-        const corp = this.corp();
        const division = this.routing().currentDivision;
        if (division == null) {
            throw new Error(`Routing does not hold reference to the current Industry`);
--- a/src/Corporation/ui/MainPanel.jsx
+++ b/src/Corporation/ui/MainPanel.jsx
@ -7,7 +7,6 @@ import { BaseReactComponent } from "./BaseReactComponent";
 import { CityTabs } from "./CityTabs";
 import { Industry } from "./Industry";
 import { Overview } from "./Overview";
-import { overviewPage } from "./Routing";

 import { OfficeSpace } from "../Corporation";

--- a/src/Corporation/ui/Routing.ts
+++ b/src/Corporation/ui/Routing.ts
@ -4,7 +4,19 @@ export const overviewPage = "Overview";

 // Interfaces for whatever's required to sanitize routing with Corporation Data
 interface IOfficeSpace {
-
+    loc: string;
+    cost: number;
+    size: number;
+    comf: number;
+    beau: number;
+    tier: any;
+    minEne: number;
+    maxEne: number;
+    minHap: number;
+    maxHap: number;
+    maxMor: number;
+    employees: any;
+    employeeProd: any;
 }

 interface IDivision {
--- a/src/Crime/CrimeHelpers.ts
+++ b/src/Crime/CrimeHelpers.ts
@ -1,9 +1,10 @@
 import { Crimes } from "./Crimes";
+import { Crime } from "./Crime";
 import { IPlayer } from "../PersonObjects/IPlayer";

 import { dialogBoxCreate } from "../../utils/DialogBox";

-export function determineCrimeSuccess(p: IPlayer, type: string) {
+export function determineCrimeSuccess(p: IPlayer, type: string): boolean {
    let chance = 0;
    let found = false;
    for (const i in Crimes) {
@ -17,7 +18,7 @@ export function determineCrimeSuccess(p: IPlayer, type: string) {

    if (!found) {
        dialogBoxCreate(`ERR: Unrecognized crime type: ${type} This is probably a bug please contact the developer`, false);
-        return;
+        return false;
    }

    if (Math.random() <= chance) {
@ -29,7 +30,7 @@ export function determineCrimeSuccess(p: IPlayer, type: string) {
    }
 }

-export function findCrime(roughName: string) {
+export function findCrime(roughName: string): Crime | null {
    if (roughName.includes("shoplift")) {
        return Crimes.Shoplift;
    } else if (roughName.includes("rob") && roughName.includes("store")) {
--- a/src/Crime/formulas/crime.ts
+++ b/src/Crime/formulas/crime.ts
@ -22,7 +22,7 @@ export interface IPerson {
    crime_success_mult: number;
 }

-export function calculateCrimeSuccessChance(crime: ICrime, person: IPerson) {
+export function calculateCrimeSuccessChance(crime: ICrime, person: IPerson): number {
    let chance: number = (crime.hacking_success_weight * person.hacking_skill +
                          crime.strength_success_weight * person.strength +
                          crime.defense_success_weight * person.defense +
--- a/src/DarkWeb/DarkWeb.tsx
+++ b/src/DarkWeb/DarkWeb.tsx
@ -7,8 +7,6 @@ import { post, postElement }                    from "../ui/postToTerminal";
 import { Money }                                from "../ui/React/Money";

 import { isValidIPAddress }                     from "../../utils/helpers/isValidIPAddress";
-import { formatNumber }                         from "../../utils/StringHelperFunctions";
-import { numeralWrapper } from "../ui/numeralFormat";

 //Posts a "help" message if connected to DarkWeb
 export function checkIfConnectedToDarkweb(): void {
@ -29,27 +27,28 @@ export function checkIfConnectedToDarkweb(): void {
 export function executeDarkwebTerminalCommand(commandArray: string[]): void {
    if (commandArray.length == 0) {return;}
    switch (commandArray[0]) {
-        case "buy":
+        case "buy": {
            if (commandArray.length != 2) {
                post("Incorrect number of arguments. Usage: ");
                post("buy -l");
                post("buy [item name]");
                return;
            }
-            var arg = commandArray[1];
+            const arg = commandArray[1];
            if (arg == "-l") {
                listAllDarkwebItems();
            } else {
                buyDarkwebItem(arg);
            }
            break;
+        }
        default:
            post("Command not found");
            break;
    }
 }

-function listAllDarkwebItems() {
+function listAllDarkwebItems(): void {
    for(const key in DarkWebItems) {
        const item = DarkWebItems[key];
        postElement(<>{item.program} - {Money(item.price)} - {item.description}</>);
--- a/src/DarkWeb/DarkWebItem.ts
+++ b/src/DarkWeb/DarkWebItem.ts
@ -1,5 +1,3 @@
-import { numeralWrapper } from "../ui/numeralFormat";
-
 export class DarkWebItem {
    program: string;
    price: number;
--- a/src/DevMenu.jsx
+++ b/src/DevMenu.jsx
@ -6,7 +6,6 @@ import {
    generateRandomContractOnHome,
 } from "./CodingContractGenerator";
 import { Companies } from "./Company/Companies";
-import { Company } from "./Company/Company";
 import { Programs } from "./Programs/Programs";
 import { Factions } from "./Faction/Factions";
 import { Player } from "./Player";
@ -14,17 +13,11 @@ import { PlayerOwnedSourceFile } from "./SourceFile/PlayerOwnedSourceFile";
 import { AllServers } from "./Server/AllServers";
 import { GetServerByHostname } from "./Server/ServerHelpers";
 import { hackWorldDaemon } from "./RedPill";
-import { StockMarket, SymbolToStockMap } from "./StockMarket/StockMarket";
+import { StockMarket } from "./StockMarket/StockMarket";
 import { Stock } from "./StockMarket/Stock";
-import { Terminal } from "./Terminal";
-
-import { numeralWrapper } from "./ui/numeralFormat";

 import { dialogBoxCreate } from "../utils/DialogBox";
-import { exceptionAlert } from "../utils/helpers/exceptionAlert";
 import { createElement } from "../utils/uiHelpers/createElement";
-import { createOptionElement } from "../utils/uiHelpers/createOptionElement";
-import { getSelectText } from "../utils/uiHelpers/getSelectData";
 import { removeElementById } from "../utils/uiHelpers/removeElementById";
 import { Money } from "./ui/React/Money";

@ -54,7 +47,6 @@ class ValueAdjusterComponent extends Component {

    render() {
        const { title, add, subtract, reset } = this.props;
-        const { value } = this.state;
        return (
            <>
            <button className="std-button add-exp-button" onClick={() => add(this.state.value)}>+</button>
@ -281,9 +273,8 @@ class DevMenuComponent extends Component {
    }

    modifyFactionRep(modifier) {
-        const component = this;
-        return function(reputation) {
-            const fac = Factions[component.state.faction];
+        return (reputation) => {
+            const fac = Factions[this.state.faction];
            if (fac != null && !isNaN(reputation)) {
                fac.playerReputation += reputation*modifier;
            }
@ -298,9 +289,8 @@ class DevMenuComponent extends Component {
    }

    modifyFactionFavor(modifier) {
-        const component = this;
-        return function(favor) {
-            const fac = Factions[component.state.faction];
+        return (favor) => {
+            const fac = Factions[this.state.faction];
            if (fac != null && !isNaN(favor)) {
                fac.favor += favor*modifier;
            }
@ -370,10 +360,9 @@ class DevMenuComponent extends Component {
    }

    setAllSF(sfLvl) {
-        const component = this;
-        return function(){
+        return () => {
            for (let i = 0; i < validSFN.length; i++) {
-                component.setSF(validSFN[i], sfLvl)();
+                this.setSF(validSFN[i], sfLvl)();
            }
        }
    }
@ -443,9 +432,8 @@ class DevMenuComponent extends Component {
    }

    modifyCompanyRep(modifier) {
-        const component = this;
-        return function(reputation) {
-            const company = Companies[component.state.company];
+        return (reputation) => {
+            const company = Companies[this.state.company];
            if (company != null && !isNaN(reputation)) {
                company.playerReputation += reputation*modifier;
            }
@ -458,9 +446,8 @@ class DevMenuComponent extends Component {
    }

    modifyCompanyFavor(modifier) {
-        const component = this;
-        return function(favor) {
-            const company = Companies[component.state.company];
+        return (favor) => {
+            const company = Companies[this.state.company];
            if (company != null && !isNaN(favor)) {
                company.favor += favor*modifier;
            }
@ -582,10 +569,10 @@ class DevMenuComponent extends Component {
        });
    }

-    processStocks(cb) {
+    processStocks(sub) {
        const inputSymbols = document.getElementById('dev-stock-symbol').value.toString().replace(/\s/g, '');

-        let match = function(symbol) { return true; }
+        let match = function() { return true; }

        if (inputSymbols !== '' && inputSymbols !== 'all') {
            match = function(symbol) {
@ -597,7 +584,7 @@ class DevMenuComponent extends Component {
            if (StockMarket.hasOwnProperty(name)) {
                const stock = StockMarket[name];
                if (stock instanceof Stock && match(stock.symbol)) {
-                    cb(stock);
+                    sub(stock);
                }
            }
        }
@ -638,13 +625,13 @@ class DevMenuComponent extends Component {
        }
    }

-    sleeveMaxAllSync() {
+    sleeveSyncMaxAll() {
        for (let i = 0; i < Player.sleeves.length; ++i) {
            Player.sleeves[i].sync = 100;
        }
    }

-    sleeveClearAllSync() {
+    sleeveSyncClearAll() {
        for (let i = 0; i < Player.sleeves.length; ++i) {
            Player.sleeves[i].sync = 0;
        }
@ -1212,8 +1199,8 @@ class DevMenuComponent extends Component {
                    </tr>
                    <tr>
                        <td><span className="text">Sync:</span></td>
-                        <td><button className="std-button" onClick={this.sleeveMaxAllSync}>Max all</button></td>
-                        <td><button className="std-button" onClick={this.sleeveClearAllSync}>Clear all</button></td>
+                        <td><button className="std-button" onClick={this.sleeveSyncMaxAll}>Max all</button></td>
+                        <td><button className="std-button" onClick={this.sleeveSyncClearAll}>Clear all</button></td>
                    </tr>
                </tbody>
            </table>
--- a/src/Exploits/applyExploits.ts
+++ b/src/Exploits/applyExploits.ts
@ -1,6 +1,6 @@
 import { Player } from "../Player";

-export function applyExploit() {
+export function applyExploit(): void {
    if (Player.exploits && Player.exploits.length === 0) {
        return;
    }
--- a/src/Exploits/unclickable.ts
+++ b/src/Exploits/unclickable.ts
@ -2,7 +2,7 @@ import { Player } from "../Player";
 import { Exploit } from "./Exploit";

 (function() {
-	function clickTheUnclickable(event: MouseEvent) {
+	function clickTheUnclickable(event: MouseEvent): void {
 		if(!event.target || !(event.target instanceof Element)) return;
 		const display = window.getComputedStyle(event.target as Element).display;
 		if(display === 'none' && event.isTrusted)
@ -10,7 +10,7 @@ import { Exploit } from "./Exploit";
 	}


-	function targetElement() {
+	function targetElement(): void {
 		const elem = document.getElementById('unclickable');
 		if(elem == null) {
 			console.error('Could not find the unclickable elem for the related exploit.');
--- a/src/Faction/Faction.ts
+++ b/src/Faction/Faction.ts
@ -4,12 +4,6 @@ import { FactionInfo,
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";

 export class Faction {
-    /**
-     * Initiatizes a Faction object from a JSON save state.
-     */
-    static fromJSON(value: any): Faction {
-        return Generic_fromJSON(Faction, value.data);
-    }

    /**
     * Flag signalling whether the player has already received an invitation
@ -103,6 +97,14 @@ export class Faction {
    toJSON(): any {
        return Generic_toJSON("Faction", this);
    }
+
+    /**
+     * Initiatizes a Faction object from a JSON save state.
+     */
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Faction {
+        return Generic_fromJSON(Faction, value.data);
+    }
 }

 Reviver.constructors.Faction = Faction;
--- a/src/Faction/FactionHelpers.jsx
+++ b/src/Faction/FactionHelpers.jsx
@ -24,13 +24,6 @@ import {
 import { Page, routing } from "../ui/navigationTracking";
 import { dialogBoxCreate } from "../../utils/DialogBox";
 import { factionInvitationBoxCreate } from "../../utils/FactionInvitationBox";
-import {
-    Reviver,
-    Generic_toJSON,
-    Generic_fromJSON,
-} from "../../utils/JSONReviver";
-import { formatNumber } from "../../utils/StringHelperFunctions";
-import { numeralWrapper } from "../ui/numeralFormat";
 import { Money } from "../ui/React/Money";
 import {
    yesNoBoxCreate,
--- a/src/Faction/Factions.ts
+++ b/src/Faction/Factions.ts
@ -16,7 +16,7 @@ export function loadFactions(saveString: string): void {
    Factions = JSON.parse(saveString, Reviver);
 }

-export function AddToFactions(faction: Faction) {
+export function AddToFactions(faction: Faction): void {
 	const name: string = faction.name;
 	Factions[name] = faction;
 }
@ -25,7 +25,7 @@ export function factionExists(name: string): boolean {
    return Factions.hasOwnProperty(name);
 }

-export function initFactions(bitNode=1) {
+export function initFactions(): void {
    for (const name in FactionInfos) {
        resetFaction(new Faction(name));
    }
@ -34,7 +34,7 @@ export function initFactions(bitNode=1) {
 //Resets a faction during (re-)initialization. Saves the favor in the new
 //Faction object and deletes the old Faction Object from "Factions". Then
 //reinserts the new Faction object
-export function resetFaction(newFactionObject: Faction) {
+export function resetFaction(newFactionObject: Faction): void {
    if (!(newFactionObject instanceof Faction)) {
        throw new Error("Invalid argument 'newFactionObject' passed into resetFaction()");
    }
--- a/src/Faction/ui/AugmentationsPage.tsx
+++ b/src/Faction/ui/AugmentationsPage.tsx
@ -118,22 +118,21 @@ export class AugmentationsPage extends React.Component<IProps, IState> {
        });
    }

-    render() {
+    render(): React.ReactNode {
        const augs = this.getAugsSorted();
        const purchasable = augs.filter((aug: string) => aug === AugmentationNames.NeuroFluxGovernor ||
            (!this.props.p.augmentations.some(a => a.name === aug) && 
            !this.props.p.queuedAugmentations.some(a => a.name === aug)),
        )

-        const parent = this;
-        function purchaseableAugmentation(aug: string) {
+        const purchaseableAugmentation = (aug: string): React.ReactNode => {
            return (
                <PurchaseableAugmentation
                    augName={aug}
-                    faction={parent.props.faction}
+                    faction={this.props.faction}
                    key={aug}
-                    p={parent.props.p}
-                    rerender={parent.rerender}
+                    p={this.props.p}
+                    rerender={this.rerender}
                />
            )
        }
--- a/src/Faction/ui/DonateOption.tsx
+++ b/src/Faction/ui/DonateOption.tsx
@ -7,7 +7,6 @@ import { CONSTANTS } from "../../Constants";
 import { Faction } from "../../Faction/Faction";
 import { IPlayer } from "../../PersonObjects/IPlayer";

-import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";
 import { Reputation } from "../../ui/React/Reputation";

@ -32,7 +31,7 @@ const inputStyleMarkup = {

 export class DonateOption extends React.Component<IProps, IState> {
    // Style markup for block elements. Stored as property
-    blockStyle: object = { display: "block" };
+    blockStyle: any = { display: "block" };

    constructor(props: IProps) {
        super(props);
@ -87,7 +86,7 @@ export class DonateOption extends React.Component<IProps, IState> {
        }
    }

-    render() {
+    render(): React.ReactNode {
        return (
            <div className={"faction-work-div"}>
                <div className={"faction-work-div-wrapper"}>
--- a/src/Faction/ui/Info.tsx
+++ b/src/Faction/ui/Info.tsx
@ -6,7 +6,6 @@ import * as React from "react";

 import { Faction } from "../../Faction/Faction";
 import { FactionInfo } from "../../Faction/FactionInfo";
-import { numeralWrapper } from "../../ui/numeralFormat";

 import { AutoupdatingParagraph } from "../../ui/React/AutoupdatingParagraph";
 import { ParagraphWithTooltip } from "../../ui/React/ParagraphWithTooltip";
@ -48,7 +47,7 @@ export class Info extends React.Component<IProps, any> {
        return <>Reputation: {Reputation(this.props.faction.playerReputation)}</>
    }

-    render() {
+    render(): React.ReactNode {
        const favorTooltip = "Faction favor increases the rate at which you earn reputation for " +
                             "this faction by 1% per favor. Faction favor is gained whenever you " +
                             "reset after installing an Augmentation. The amount of " +
--- a/src/Faction/ui/Option.tsx
+++ b/src/Faction/ui/Option.tsx
@ -14,7 +14,7 @@ type IProps = {
 }

 export class Option extends React.Component<IProps, any> {
-    render() {
+    render(): React.ReactNode {
        return (
            <div className={"faction-work-div"}>
                <div className={"faction-work-div-wrapper"}>
--- a/src/Faction/ui/PurchaseableAugmentation.tsx
+++ b/src/Faction/ui/PurchaseableAugmentation.tsx
@ -17,7 +17,6 @@ import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 import { Faction } from "../../Faction/Faction";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Settings } from "../../Settings/Settings";
-import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";
 import { Reputation } from "../../ui/React/Reputation";
 import { IMap } from "../../types";
@ -42,35 +41,37 @@ const inlineStyleMarkup = {
 }

 export class PurchaseableAugmentation extends React.Component<IProps, any> {
-    aug: Augmentation | null;
+    aug: Augmentation;

    constructor(props: IProps) {
        super(props);

-        this.aug = Augmentations[this.props.augName];
+        const aug = Augmentations[this.props.augName];
+        if(aug == null) throw new Error(`aug ${this.props.augName} does not exists`);
+        this.aug = aug;

        this.handleClick = this.handleClick.bind(this);
    }

    getMoneyCost(): number {
-        return this.aug!.baseCost * this.props.faction.getInfo().augmentationPriceMult;
+        return this.aug.baseCost * this.props.faction.getInfo().augmentationPriceMult;
    }

    getRepCost(): number {
-        return this.aug!.baseRepRequirement * this.props.faction.getInfo().augmentationRepRequirementMult;
+        return this.aug.baseRepRequirement * this.props.faction.getInfo().augmentationRepRequirementMult;
    }

-    handleClick() {
+    handleClick(): void {
        if (!Settings.SuppressBuyAugmentationConfirmation) {
-            purchaseAugmentationBoxCreate(this.aug!, this.props.faction);
+            purchaseAugmentationBoxCreate(this.aug, this.props.faction);
        } else {
-            purchaseAugmentation(this.aug!, this.props.faction);
+            purchaseAugmentation(this.aug, this.props.faction);
        }
    }

    // Whether the player has the prerequisite Augmentations
    hasPrereqs(): boolean {
-        return hasAugmentationPrereqs(this.aug!);
+        return hasAugmentationPrereqs(this.aug);
    }

    // Whether the player has enough rep for this Augmentation
@ -98,7 +99,7 @@ export class PurchaseableAugmentation extends React.Component<IProps, any> {
        return owned;
    }

-    render() {
+    render(): React.ReactNode {
        if (this.aug == null) {
            console.error(`Invalid Augmentation when trying to create PurchaseableAugmentation display element: ${this.props.augName}`);
            return null;
--- a/src/Faction/ui/Root.tsx
+++ b/src/Faction/ui/Root.tsx
@ -92,7 +92,7 @@ export class FactionRoot extends React.Component<IProps, IState> {
        this.startSecurityWork = this.startSecurityWork.bind(this);
    }

-    manageGang() {
+    manageGang(): void {
        // If player already has a gang, just go to the gang UI
        if (this.props.p.inGang()) {
            return this.props.engine.loadGangContent();
@ -146,7 +146,7 @@ export class FactionRoot extends React.Component<IProps, IState> {
                       "create a Gang with, and each of these Factions have all Augmentations available.");
    }

-    rerender() {
+    rerender(): void {
        this.setState((prevState) => {
            return {
                rerenderFlag: !prevState.rerenderFlag,
@ -155,42 +155,42 @@ export class FactionRoot extends React.Component<IProps, IState> {
    }

    // Route to the main faction page
-    routeToMain() {
+    routeToMain(): void {
        this.setState({ purchasingAugs: false });
    }

    // Route to the purchase augmentation UI for this faction
-    routeToPurchaseAugs() {
+    routeToPurchaseAugs(): void {
        this.setState({ purchasingAugs: true });
    }

-    sleevePurchases() {
+    sleevePurchases(): void {
        createSleevePurchasesFromCovenantPopup(this.props.p);
    }

-    startFieldWork() {
+    startFieldWork(): void {
        this.props.p.startFactionFieldWork(this.props.faction);
    }

-    startHackingContracts() {
+    startHackingContracts(): void {
        this.props.p.startFactionHackWork(this.props.faction);
    }

-    startHackingMission() {
+    startHackingMission(): void {
        const fac = this.props.faction;
        this.props.engine.loadMissionContent();
        this.props.startHackingMissionFn(fac);
    }

-    startSecurityWork() {
+    startSecurityWork(): void {
        this.props.p.startFactionSecurityWork(this.props.faction);
    }

-    render() {
+    render(): React.ReactNode {
        return this.state.purchasingAugs ? this.renderAugmentationsPage() : this.renderMainPage();
    }

-    renderMainPage() {
+    renderMainPage(): React.ReactNode {
        const p = this.props.p;
        const faction = this.props.faction;
        const factionInfo = faction.getInfo();
@ -288,7 +288,7 @@ export class FactionRoot extends React.Component<IProps, IState> {
        )
    }

-    renderAugmentationsPage() {
+    renderAugmentationsPage(): React.ReactNode {
        return (
            <div>
                <AugmentationsPage
--- a/src/Gang.jsx
+++ b/src/Gang.jsx
@ -21,7 +21,10 @@ import {
    Generic_toJSON,
    Generic_fromJSON,
 } from "../utils/JSONReviver";
-import { formatNumber } from "../utils/StringHelperFunctions";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../utils/StringHelperFunctions";

 import { exceptionAlert } from "../utils/helpers/exceptionAlert";
 import { getRandomInt } from "../utils/helpers/getRandomInt";
@ -33,7 +36,6 @@ import { createPopup } from "../utils/uiHelpers/createPopup";
 import { removeChildrenFromElement } from "../utils/uiHelpers/removeChildrenFromElement";
 import { removeElement } from "../utils/uiHelpers/removeElement";
 import { removeElementById } from "../utils/uiHelpers/removeElementById";
-import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";

 import { StatsTable } from "./ui/React/StatsTable";
 import { Money } from "./ui/React/Money";
@ -47,7 +49,6 @@ import { renderToStaticMarkup } from "react-dom/server"
 // Constants
 const GangRespectToReputationRatio = 5; // Respect is divided by this to get rep gain
 const MaximumGangMembers = 30;
-const GangRecruitCostMultiplier = 2;
 const CyclesPerTerritoryAndPowerUpdate = 100;
 const AscensionMultiplierRatio = 15 / 100; // Portion of upgrade multiplier that is kept after ascending

@ -69,7 +70,6 @@ $(document).keydown(function(event) {

 // Delete upgrade box when clicking outside
 $(document).mousedown(function(event) {
-    var boxId = "gang-member-upgrade-popup-box";
    var contentId = "gang-member-upgrade-popup-box-content";
    if (UIElems.gangMemberUpgradeBoxOpened) {
        if ( $(event.target).closest("#" + contentId).get(0) == null ) {
@ -461,8 +461,6 @@ Gang.prototype.clash = function(won=false) {
 }

 Gang.prototype.killMember = function(memberObj) {
-    const gangName = this.facName;
-
    // Player loses a percentage of total respect, plus whatever respect that member has earned
    const totalRespect = this.respect;
    const lostRespect = (0.05 * totalRespect) + memberObj.earnedRespect;
@ -1266,10 +1264,7 @@ Gang.prototype.displayGangContent = function(player) {
        });

        // Get variables
-        var facName = this.facName,
-            members = this.members,
-            wanted = this.wanted,
-            respect = this.respect;
+        var facName = this.facName;

        // Back button
        UIElems.gangContainer.appendChild(createElement("a", {
@ -1757,7 +1752,6 @@ Gang.prototype.createGangMemberDisplayElement = function(memberObj) {
        hdrText: name,
    });
    const li = accordion[0];
-    const hdr = accordion[1];
    const gangMemberDiv = accordion[2];

    UIElems.gangMemberPanels[name]["panel"] = gangMemberDiv;
--- a/src/Hacking.ts
+++ b/src/Hacking.ts
@ -1,9 +1,7 @@
 import { BitNodeMultipliers } from "./BitNode/BitNodeMultipliers";
-import { Player } from "./Player";
 import { IPlayer } from "./PersonObjects/IPlayer";
 import { calculateIntelligenceBonus } from "./PersonObjects/formulas/intelligence";
 import { Server } from "./Server/Server";
-import { HacknetServer } from "./Hacknet/HacknetServer";

 /**
 * Returns the chance the player has to successfully hack a server
--- a/src/Hacknet/HacknetHelpers.jsx
+++ b/src/Hacknet/HacknetHelpers.jsx
@ -28,8 +28,6 @@ import { GetServerByHostname } from "../Server/ServerHelpers";
 import { SourceFileFlags } from "../SourceFile/SourceFileFlags";
 import { Page, routing } from "../ui/navigationTracking";

-import { getElementById } from "../../utils/uiHelpers/getElementById";
-
 import React from "react";
 import ReactDOM from "react-dom";
 import { HacknetRoot } from "./ui/Root";
@ -68,7 +66,7 @@ export function purchaseHacknet() {

        if (!Player.canAfford(cost)) { return -1; }
        Player.loseMoney(cost);
-        const server = Player.createHacknetServer();
+        Player.createHacknetServer();
        updateHashManagerCapacity();

        return numOwned;
--- a/src/Hacknet/HacknetNode.ts
+++ b/src/Hacknet/HacknetNode.ts
@ -8,7 +8,6 @@ import { IHacknetNode } from "./IHacknetNode";

 import { CONSTANTS } from "../Constants";

-import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import {
    calculateMoneyGainRate,
    calculateLevelUpgradeCost,
@ -23,12 +22,6 @@ import { Generic_fromJSON,
         Reviver } from "../../utils/JSONReviver";

 export class HacknetNode implements IHacknetNode {
-    /**
-     * Initiatizes a HacknetNode object from a JSON save state.
-     */
-    static fromJSON(value: any): HacknetNode {
-        return Generic_fromJSON(HacknetNode, value.data);
-    }

    // Node's number of cores
    cores = 1;
@ -127,6 +120,14 @@ export class HacknetNode implements IHacknetNode {
    toJSON(): any {
        return Generic_toJSON("HacknetNode", this);
    }
+
+    /**
+     * Initiatizes a HacknetNode object from a JSON save state.
+     */
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): HacknetNode {
+        return Generic_fromJSON(HacknetNode, value.data);
+    }
 }

 Reviver.constructors.HacknetNode = HacknetNode;
--- a/src/Hacknet/HacknetServer.ts
+++ b/src/Hacknet/HacknetServer.ts
@ -5,7 +5,6 @@ import { CONSTANTS } from "../Constants";

 import { IHacknetNode } from "./IHacknetNode";

-import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { BaseServer } from "../Server/BaseServer";
 import { RunningScript } from "../Script/RunningScript";
 import { HacknetServerConstants } from "./data/Constants";
@ -35,10 +34,6 @@ interface IConstructorParams {
 }

 export class HacknetServer extends BaseServer implements IHacknetNode {
-    // Initializes a HacknetServer Object from a JSON save state
-    static fromJSON(value: any): HacknetServer {
-        return Generic_fromJSON(HacknetServer, value.data);
-    }

    // Cache level. Affects hash Capacity
    cache = 1;
@ -141,6 +136,12 @@ export class HacknetServer extends BaseServer implements IHacknetNode {
    toJSON(): any {
        return Generic_toJSON("HacknetServer", this);
    }
+
+    // Initializes a HacknetServer Object from a JSON save state
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): HacknetServer {
+        return Generic_fromJSON(HacknetServer, value.data);
+    }
 }

 Reviver.constructors.HacknetServer = HacknetServer;
--- a/src/Hacknet/HashManager.ts
+++ b/src/Hacknet/HashManager.ts
@ -15,10 +15,6 @@ import { Generic_fromJSON,
         Reviver } from "../../utils/JSONReviver";

 export class HashManager {
-    // Initiatizes a HashManager object from a JSON save state.
-    static fromJSON(value: any): HashManager {
-        return Generic_fromJSON(HashManager, value.data);
-    }

    // Max number of hashes this can hold. Equal to the sum of capacities of
    // all Hacknet Servers
@ -159,6 +155,12 @@ export class HashManager {
    toJSON(): any {
        return Generic_toJSON("HashManager", this);
    }
+
+    // Initiatizes a HashManager object from a JSON save state.
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): HashManager {
+        return Generic_fromJSON(HashManager, value.data);
+    }
 }

 Reviver.constructors.HashManager = HashManager;
--- a/src/Hacknet/HashUpgrades.ts
+++ b/src/Hacknet/HashUpgrades.ts
@ -9,7 +9,7 @@ import { IMap } from "../types";

 export const HashUpgrades: IMap<HashUpgrade> = {};

-function createHashUpgrade(p: IConstructorParams) {
+function createHashUpgrade(p: IConstructorParams): void {
    HashUpgrades[p.name] = new HashUpgrade(p);
 }

--- a/src/Hacknet/ui/HacknetNode.jsx
+++ b/src/Hacknet/ui/HacknetNode.jsx
@ -16,7 +16,6 @@ import {

 import { Player } from "../../Player";

-import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";
 import { MoneyRate } from "../../ui/React/MoneyRate";

--- a/src/Hacknet/ui/HacknetServer.jsx
+++ b/src/Hacknet/ui/HacknetServer.jsx
@ -19,7 +19,6 @@ import {

 import { Player } from "../../Player";

-import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";
 import { Hashes } from "../../ui/React/Hashes";
 import { HashRate } from "../../ui/React/HashRate";
--- a/src/Hacknet/ui/HashUpgradePopup.jsx
+++ b/src/Hacknet/ui/HashUpgradePopup.jsx
@ -8,12 +8,9 @@ import { HashManager }          from "../HashManager";
 import { HashUpgrades }         from "../HashUpgrades";

 import { Player }               from "../../Player";
-import { AllServers }           from "../../Server/AllServers";
-import { Server }               from "../../Server/Server";

 import { numeralWrapper }       from "../../ui/numeralFormat";

-import { removePopup }          from "../../ui/React/createPopup";
 import { PopupCloseButton }     from "../../ui/React/PopupCloseButton";
 import { ServerDropdown,
         ServerType }           from "../../ui/React/ServerDropdown"
--- a/src/Hacknet/ui/PlayerInfo.jsx
+++ b/src/Hacknet/ui/PlayerInfo.jsx
@ -8,7 +8,6 @@ import React from "react";

 import { hasHacknetServers } from "../HacknetHelpers";
 import { Player } from "../../Player";
-import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";
 import { MoneyRate } from "../../ui/React/MoneyRate";
 import { HashRate } from "../../ui/React/HashRate";
--- a/src/Hacknet/ui/PurchaseButton.jsx
+++ b/src/Hacknet/ui/PurchaseButton.jsx
@ -6,7 +6,6 @@ import React from "react";
 import { hasHacknetServers,
         hasMaxNumberHacknetServers } from "../HacknetHelpers";
 import { Player } from "../../Player";
-import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";

 export function PurchaseButton(props) {
--- a/src/Hacknet/ui/Root.jsx
+++ b/src/Hacknet/ui/Root.jsx
@ -20,7 +20,6 @@ import { Player } from "../../Player";
 import { AllServers } from "../../Server/AllServers";

 import { createPopup } from "../../ui/React/createPopup";
-import { PopupCloseButton } from "../../ui/React/PopupCloseButton";

 export const PurchaseMultipliers = Object.freeze({
    "x1": 1,
--- a/src/Infiltration.js
+++ b/src/Infiltration.js
@ -490,7 +490,6 @@ function updateInfiltrationLevelText(inst) {
                           BitNodeMultipliers.InfiltrationMoney;
    }

-    var expMultiplier = 2 * inst.clearanceLevel / inst.maxClearanceLevel;
    // TODO: fix this to not rely on <pre> and whitespace for formatting...
    /* eslint-disable no-irregular-whitespace */
    document.getElementById("infiltration-level-text").innerHTML =
--- a/src/Locations/LocationsHelpers.tsx
+++ b/src/Locations/LocationsHelpers.tsx
@ -116,7 +116,7 @@ export function createPurchaseServerPopup(ram: number, p: IPlayer): void {
 * Create a popup that lets the player start a Corporation
 * @param {IPlayer} p - Player object
 */
-export function createStartCorporationPopup(p: IPlayer) {
+export function createStartCorporationPopup(p: IPlayer): void {
    if (!p.canAccessCorporation() || p.hasCorporation()) { return; }

    const popupId = "create-corporation-popup";
@ -196,7 +196,7 @@ export function createStartCorporationPopup(p: IPlayer) {
 * Create a popup that lets the player upgrade the cores on his/her home computer
 * @param {IPlayer} p - Player object
 */
-export function createUpgradeHomeCoresPopup(p: IPlayer) {
+export function createUpgradeHomeCoresPopup(p: IPlayer): void {
    const currentCores = p.getHomeComputer().cpuCores;
    if (currentCores >= 8) {
        dialogBoxCreate(<>
@ -252,7 +252,7 @@ cost {Money(cost)}</>);
 * Create a popup that lets the player upgrade the RAM on his/her home computer
 * @param {IPlayer} p - Player object
 */
-export function createUpgradeHomeRamPopup(p: IPlayer) {
+export function createUpgradeHomeRamPopup(p: IPlayer): void {
    const cost: number = p.getUpgradeHomeRamCost();
    const ram: number = p.getHomeComputer().maxRam;

@ -291,7 +291,7 @@ export function createUpgradeHomeRamPopup(p: IPlayer) {
 * Attempt to purchase a TOR router
 * @param {IPlayer} p - Player object
 */
-export function purchaseTorRouter(p: IPlayer) {
+export function purchaseTorRouter(p: IPlayer): void {
    if (p.hasTorRouter()) {
        dialogBoxCreate(`You already have a TOR Router`);
        return;
--- a/src/Locations/ui/ApplyToJobButton.tsx
+++ b/src/Locations/ui/ApplyToJobButton.tsx
@ -15,7 +15,7 @@ type IProps = {
    entryPosType: CompanyPosition;
    onClick: (e: React.MouseEvent<HTMLElement>) => void;
    p: IPlayer;
-    style?: object;
+    style?: any;
    text: string;
 }

@ -35,7 +35,7 @@ export class ApplyToJobButton extends React.Component<IProps, any> {
        return getJobRequirementText(this.props.company, pos, true);
    }

-    render() {
+    render(): React.ReactNode {
        return (
            <StdButton
                onClick={this.props.onClick}
--- a/src/Locations/ui/City.tsx
+++ b/src/Locations/ui/City.tsx
@ -17,13 +17,14 @@ type IProps = {
 }

 export class LocationCity extends React.Component<IProps, any> {
-    asciiCity() {
-        const thiscity = this;
-        const topprop = this.props;
-
-        function LocationLetter(location: LocationName) {
+    asciiCity(): React.ReactNode {
+        const LocationLetter = (location: LocationName): JSX.Element => {
            if (location)
-                return <span key={location} className="tooltip" style={{color: 'blue', whiteSpace: 'nowrap', margin: '0px', padding: '0px', cursor: 'pointer'}} onClick={topprop.enterLocation.bind(thiscity, location)}>
+                return <span
+                    key={location}
+                    className="tooltip"
+                    style={{color: 'blue', whiteSpace: 'nowrap', margin: '0px', padding: '0px', cursor: 'pointer'}}
+                    onClick={this.props.enterLocation.bind(this, location)}>
                    X
                </span>
            return <span>*</span>
@ -35,8 +36,7 @@ export class LocationCity extends React.Component<IProps, any> {
            'P': 15,'Q': 16,'R': 17,'S': 18,'T': 19,'U': 20,'V': 21,'W': 22,
            'X': 23,'Y': 24,'Z': 25}

-        let locI = 0;
-        function lineElems(s: string) {
+        const lineElems = (s: string): JSX.Element[] => {
            const elems: any[] = [];
            const matches: any[] = [];
            let match: any;
@ -48,20 +48,18 @@ export class LocationCity extends React.Component<IProps, any> {
                return elems;
            }

-            const parts: any[] = [];
            for(let i = 0; i < matches.length; i++) {
                const startI = i === 0 ? 0 : matches[i-1].index+1;
                const endI = matches[i].index;
                elems.push(s.slice(startI, endI))
                const locationI = letterMap[s[matches[i].index]];
-                elems.push(LocationLetter(thiscity.props.city.locations[locationI]))
-                locI++;
+                elems.push(LocationLetter(this.props.city.locations[locationI]))
            }
            elems.push(s.slice(matches[matches.length-1].index+1))
            return elems;
        }

-        const elems: any[] = [];
+        const elems: JSX.Element[] = [];
        const lines = this.props.city.asciiArt.split('\n');
        for(const i in lines) {
            elems.push(<pre key={i}>{lineElems(lines[i])}</pre>)
@ -70,7 +68,7 @@ export class LocationCity extends React.Component<IProps, any> {
        return elems;
    }

-    listCity() {
+    listCity(): React.ReactNode {
        const locationButtons = this.props.city.locations.map((locName) => {
            return (
                <li key={locName}>
@ -86,7 +84,7 @@ export class LocationCity extends React.Component<IProps, any> {
        )
    }

-    render() {
+    render(): React.ReactNode {
        return (
            <>
                {Settings.DisableASCIIArt ? this.listCity() : this.asciiCity()}
--- a/src/Locations/ui/CompanyLocation.tsx
+++ b/src/Locations/ui/CompanyLocation.tsx
@ -21,7 +21,6 @@ import { CompanyPositions }         from "../../Company/CompanyPositions";
 import * as posNames                from "../../Company/data/companypositionnames";
 import { IPlayer }                  from "../../PersonObjects/IPlayer";

-import { numeralWrapper }           from "../../ui/numeralFormat";
 import { StdButton }                from "../../ui/React/StdButton";
 import { Reputation }               from "../../ui/React/Reputation";
 import { Favor }                    from "../../ui/React/Favor";
@ -63,7 +62,7 @@ export class CompanyLocation extends React.Component<IProps, IState> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    /**
     * Reference to the Location that this component is being rendered for
@ -112,73 +111,73 @@ export class CompanyLocation extends React.Component<IProps, IState> {
        this.checkIfEmployedHere(false);
    }

-    applyForAgentJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForAgentJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForAgentJob();
        this.checkIfEmployedHere(true);
    }

-    applyForBusinessConsultantJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForBusinessConsultantJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForBusinessConsultantJob();
        this.checkIfEmployedHere(true);
    }

-    applyForBusinessJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForBusinessJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForBusinessJob();
        this.checkIfEmployedHere(true);
    }

-    applyForEmployeeJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForEmployeeJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForEmployeeJob();
        this.checkIfEmployedHere(true);
    }

-    applyForItJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForItJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForItJob();
        this.checkIfEmployedHere(true);
    }

-    applyForPartTimeEmployeeJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForPartTimeEmployeeJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForPartTimeEmployeeJob();
        this.checkIfEmployedHere(true);
    }

-    applyForPartTimeWaiterJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForPartTimeWaiterJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForPartTimeWaiterJob();
        this.checkIfEmployedHere(true);
    }

-    applyForSecurityJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForSecurityJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForSecurityJob();
        this.checkIfEmployedHere(true);
    }

-    applyForSoftwareConsultantJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForSoftwareConsultantJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForSoftwareConsultantJob();
        this.checkIfEmployedHere(true);
    }

-    applyForSoftwareJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForSoftwareJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForSoftwareJob();
        this.checkIfEmployedHere(true);
    }

-    applyForWaiterJob(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    applyForWaiterJob(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        this.props.p.applyForWaiterJob();
        this.checkIfEmployedHere(true);
    }

-    checkIfEmployedHere(updateState=false) {
+    checkIfEmployedHere(updateState=false): void {
        this.jobTitle = this.props.p.jobs[this.props.locName];
        if (this.jobTitle != null) {
            this.companyPosition = CompanyPositions[this.jobTitle];
@ -191,19 +190,19 @@ export class CompanyLocation extends React.Component<IProps, IState> {
        }
    }

-    startInfiltration(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    startInfiltration(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }
        const loc = this.location;

        this.props.engine.loadInfiltrationContent();

        const data = loc.infiltrationData;
-        if (data == null) { return false; }
+        if (data == null) { return; }
        beginInfiltration(this.props.locName, data.startingSecurityLevel, data.baseRewardValue, data.maxClearanceLevel, data.difficulty);
    }

-    work(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    work(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }

        const pos = this.companyPosition;
        if (pos instanceof CompanyPosition) {
@ -215,8 +214,8 @@ export class CompanyLocation extends React.Component<IProps, IState> {
        }
    }

-    quit(e: React.MouseEvent<HTMLElement>) {
-        if (!e.isTrusted) { return false; }
+    quit(e: React.MouseEvent<HTMLElement>): void {
+        if (!e.isTrusted) { return; }

        const yesBtn = yesNoBoxGetYesButton();
        const noBtn = yesNoBoxGetNoButton();
@ -235,7 +234,7 @@ export class CompanyLocation extends React.Component<IProps, IState> {
        yesNoBoxCreate(<>Would you like to quit your job at {this.company.name}?</>);
    }

-    render() {
+    render(): React.ReactNode {
        const isEmployedHere = this.jobTitle != null;
        const favorGain = this.company.getFavorGain();

--- a/src/Locations/ui/GenericLocation.tsx
+++ b/src/Locations/ui/GenericLocation.tsx
@ -42,7 +42,7 @@ export class GenericLocation extends React.Component<IProps, any> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -149,7 +149,7 @@ export class GenericLocation extends React.Component<IProps, any> {
        return content;
    }

-    render() {
+    render(): React.ReactNode {
        const locContent: React.ReactNode[] = this.getLocationSpecificContent();
        const ip = SpecialServerIps.getIp(this.props.loc.name);
        const server = getServer(ip);
--- a/src/Locations/ui/GymLocation.tsx
+++ b/src/Locations/ui/GymLocation.tsx
@ -13,7 +13,6 @@ import { getServer }              from "../../Server/ServerHelpers";
 import { Server }                 from "../../Server/Server";
 import { SpecialServerIps }       from "../../Server/SpecialServerIps";

-import { numeralWrapper }   from "../../ui/numeralFormat";
 import { StdButton }        from "../../ui/React/StdButton";
 import { Money }            from "../../ui/React/Money";

@ -26,7 +25,7 @@ export class GymLocation extends React.Component<IProps, any> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -50,28 +49,28 @@ export class GymLocation extends React.Component<IProps, any> {
        return this.props.loc.costMult * discount;
    }

-    train(stat: string) {
+    train(stat: string): void {
        const loc = this.props.loc;
        this.props.p.startClass(this.calculateCost(), loc.expMult, stat);
    }

-    trainStrength() {
-        return this.train(CONSTANTS.ClassGymStrength);
+    trainStrength(): void {
+        this.train(CONSTANTS.ClassGymStrength);
    }

-    trainDefense() {
-        return this.train(CONSTANTS.ClassGymDefense);
+    trainDefense(): void {
+        this.train(CONSTANTS.ClassGymDefense);
    }

-    trainDexterity() {
-        return this.train(CONSTANTS.ClassGymDexterity);
+    trainDexterity(): void {
+        this.train(CONSTANTS.ClassGymDexterity);
    }

-    trainAgility() {
-        return this.train(CONSTANTS.ClassGymAgility);
+    trainAgility(): void {
+        this.train(CONSTANTS.ClassGymAgility);
    }

-    render() {
+    render(): React.ReactNode {
        const cost = CONSTANTS.ClassGymBaseCost * this.calculateCost();

        return (
--- a/src/Locations/ui/HospitalLocation.tsx
+++ b/src/Locations/ui/HospitalLocation.tsx
@ -5,11 +5,9 @@
 */
 import * as React from "react";

-import { CONSTANTS }                from "../../Constants";
 import { IPlayer }                  from "../../PersonObjects/IPlayer";
 import { getHospitalizationCost }   from "../../Hospital/Hospital";

-import { numeralWrapper }           from "../../ui/numeralFormat";
 import { AutoupdatingStdButton }    from "../../ui/React/AutoupdatingStdButton";
 import { Money }                    from "../../ui/React/Money";

@ -27,7 +25,7 @@ export class HospitalLocation extends React.Component<IProps, IState> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -65,7 +63,7 @@ export class HospitalLocation extends React.Component<IProps, IState> {
        dialogBoxCreate(<>You were healed to full health! The hospital billed you for {Money(cost)}</>);
    }

-    render() {
+    render(): React.ReactNode {
        const cost = this.getCost();

        return (
--- a/src/Locations/ui/Root.tsx
+++ b/src/Locations/ui/Root.tsx
@ -141,7 +141,7 @@ export class LocationRoot extends React.Component<IProps, IState> {
        }
    }

-    render() {
+    render(): React.ReactNode {
        if (this.state.inCity) {
            return this.renderCity();
        } else {
--- a/src/Locations/ui/SlumsLocation.tsx
+++ b/src/Locations/ui/SlumsLocation.tsx
@ -19,7 +19,7 @@ export class SlumsLocation extends React.Component<IProps, any> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -100,7 +100,7 @@ export class SlumsLocation extends React.Component<IProps, any> {
        Crimes.Heist.commit(this.props.p);
    }

-    render() {
+    render(): React.ReactNode {
        const shopliftChance = Crimes.Shoplift.successRate(this.props.p);
        const robStoreChance = Crimes.RobStore.successRate(this.props.p);
        const mugChance = Crimes.Mug.successRate(this.props.p);
--- a/src/Locations/ui/SpecialLocation.tsx
+++ b/src/Locations/ui/SpecialLocation.tsx
@ -38,7 +38,7 @@ export class SpecialLocation extends React.Component<IProps, IState> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -57,14 +57,14 @@ export class SpecialLocation extends React.Component<IProps, IState> {
    /**
     * Click handler for "Create Corporation" button at Sector-12 City Hall
     */
-    createCorporationPopup() {
+    createCorporationPopup(): void {
        createStartCorporationPopup(this.props.p);
    }

    /**
     * Click handler for Bladeburner button at Sector-12 NSA
     */
-    handleBladeburner() {
+    handleBladeburner(): void {
        const p = this.props.p;
        if (p.inBladeburner()) {
            // Enter Bladeburner division
@ -91,7 +91,7 @@ export class SpecialLocation extends React.Component<IProps, IState> {
    /**
     * Click handler for Resleeving button at New Tokyo VitaLife
     */
-    handleResleeving() {
+    handleResleeving(): void {
        this.props.engine.loadResleevingContent();
    }

@ -130,7 +130,7 @@ export class SpecialLocation extends React.Component<IProps, IState> {
        )
    }

-    render() {
+    render(): React.ReactNode {
        switch (this.props.loc.name) {
            case LocationName.NewTokyoVitaLife: {
                return this.renderResleeving();
--- a/src/Locations/ui/TechVendorLocation.tsx
+++ b/src/Locations/ui/TechVendorLocation.tsx
@ -15,7 +15,6 @@ import { CONSTANTS }                    from "../../Constants";
 import { IPlayer }                      from "../../PersonObjects/IPlayer";
 import { getPurchaseServerCost }        from "../../Server/ServerPurchases";

-import { numeralWrapper }               from "../../ui/numeralFormat";
 import { StdButtonPurchased }           from "../../ui/React/StdButtonPurchased";
 import { StdButton }                    from "../../ui/React/StdButton";
 import { Money }                        from "../../ui/React/Money";
@ -29,7 +28,7 @@ export class TechVendorLocation extends React.Component<IProps, any> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -45,22 +44,22 @@ export class TechVendorLocation extends React.Component<IProps, any> {
        this.purchaseTorRouter = this.purchaseTorRouter.bind(this);
    }

-    createUpgradeHomeCoresPopup() {
+    createUpgradeHomeCoresPopup(): void {
        createUpgradeHomeCoresPopup(this.props.p);
    }

-    createUpgradeHomeRamPopup() {
+    createUpgradeHomeRamPopup(): void {
        createUpgradeHomeRamPopup(this.props.p);
    }

-    purchaseTorRouter() {
+    purchaseTorRouter(): void {
        purchaseTorRouter(this.props.p);
        this.setState({
            torPurchased: this.props.p.hasTorRouter(),
        });
    }

-    render() {
+    render(): React.ReactNode {
        const loc: Location = this.props.loc;

        const purchaseServerButtons: React.ReactNode[] = [];
--- a/src/Locations/ui/TravelAgencyLocation.tsx
+++ b/src/Locations/ui/TravelAgencyLocation.tsx
@ -12,7 +12,6 @@ import { CONSTANTS }            from "../../Constants";
 import { IPlayer }              from "../../PersonObjects/IPlayer";
 import { Settings }             from "../../Settings/Settings";

-import { numeralWrapper }       from "../../ui/numeralFormat";
 import { StdButton }            from "../../ui/React/StdButton";
 import { Money }                from "../../ui/React/Money";

@ -25,7 +24,7 @@ export class TravelAgencyLocation extends React.Component<IProps, any> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -33,12 +32,10 @@ export class TravelAgencyLocation extends React.Component<IProps, any> {
        this.btnStyle = { display: "block" };
    }

-    asciiWorldMap() {
-        const thisTravelAgencyLocation = this;
-
-        function LocationLetter(props: any) {
-            if(props.city !== thisTravelAgencyLocation.props.p.city) {
-                return <span className="tooltip" style={{color: 'blue', whiteSpace: 'nowrap', margin: '0px', padding: '0px'}} onClick={createTravelPopup.bind(null, props.city, thisTravelAgencyLocation.props.travel)}>
+    asciiWorldMap(): React.ReactNode {
+        const LocationLetter = (props: any): JSX.Element => {
+            if(props.city !== this.props.p.city) {
+                return <span className="tooltip" style={{color: 'blue', whiteSpace: 'nowrap', margin: '0px', padding: '0px'}} onClick={createTravelPopup.bind(null, props.city, this.props.travel)}>
                    <span className="tooltiptext">{props.city}</span>
                    {props.city[0]}
                </span>
@ -79,7 +76,7 @@ export class TravelAgencyLocation extends React.Component<IProps, any> {
    }


-    listWorldMap() {
+    listWorldMap(): React.ReactNode {
        const travelBtns: React.ReactNode[] = [];
        for (const key in CityName) {
            const city: CityName = (CityName as any)[key];
@ -108,7 +105,7 @@ export class TravelAgencyLocation extends React.Component<IProps, any> {
        )
    }

-    render() {
+    render(): React.ReactNode {
        if (Settings.DisableASCIIArt) {
            return this.listWorldMap();
        } else {
--- a/src/Locations/ui/UniversityLocation.tsx
+++ b/src/Locations/ui/UniversityLocation.tsx
@ -13,7 +13,6 @@ import { getServer }              from "../../Server/ServerHelpers";
 import { Server }                 from "../../Server/Server";
 import { SpecialServerIps }       from "../../Server/SpecialServerIps";

-import { numeralWrapper }   from "../../ui/numeralFormat";
 import { StdButton }        from "../../ui/React/StdButton";
 import { Money }            from "../../ui/React/Money";

@ -26,7 +25,7 @@ export class UniversityLocation extends React.Component<IProps, any> {
    /**
     * Stores button styling that sets them all to block display
     */
-    btnStyle: object;
+    btnStyle: any;

    constructor(props: IProps) {
        super(props);
@ -53,36 +52,36 @@ export class UniversityLocation extends React.Component<IProps, any> {
        return this.props.loc.costMult * discount;
    }

-    take(stat: string) {
+    take(stat: string): void {
        const loc = this.props.loc;
        this.props.p.startClass(this.calculateCost(), loc.expMult, stat);
    }

-    study() {
-        return this.take(CONSTANTS.ClassStudyComputerScience);
+    study(): void {
+        this.take(CONSTANTS.ClassStudyComputerScience);
    }

-    dataStructures() {
-        return this.take(CONSTANTS.ClassDataStructures);
+    dataStructures(): void {
+        this.take(CONSTANTS.ClassDataStructures);
    }

-    networks() {
-        return this.take(CONSTANTS.ClassNetworks);
+    networks(): void {
+        this.take(CONSTANTS.ClassNetworks);
    }

-    algorithms() {
-        return this.take(CONSTANTS.ClassAlgorithms);
+    algorithms(): void {
+        this.take(CONSTANTS.ClassAlgorithms);
    }

-    management() {
-        return this.take(CONSTANTS.ClassManagement);
+    management(): void {
+        this.take(CONSTANTS.ClassManagement);
    }

-    leadership() {
-        return this.take(CONSTANTS.ClassLeadership);
+    leadership(): void {
+        this.take(CONSTANTS.ClassLeadership);
    }

-    render() {
+    render(): React.ReactNode {
        const costMult: number = this.calculateCost();

        const dataStructuresCost = CONSTANTS.ClassDataStructuresBaseCost * costMult;
--- a/src/Message/Message.ts
+++ b/src/Message/Message.ts
@ -3,10 +3,6 @@ import { Reviver,
         Generic_fromJSON } from "../../utils/JSONReviver";

 export class Message {
-    // Initializes a Message Object from a JSON save state
-    static fromJSON(value: any): Message {
-        return Generic_fromJSON(Message, value.data);
-    }

    // Name of Message file
    filename = "";
@ -27,6 +23,12 @@ export class Message {
    toJSON(): any {
        return Generic_toJSON("Message", this);
    }
+
+    // Initializes a Message Object from a JSON save state
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): Message {
+        return Generic_fromJSON(Message, value.data);
+    }
 }

 Reviver.constructors.Message = Message;
--- a/src/Message/MessageHelpers.js
+++ b/src/Message/MessageHelpers.js
@ -1,5 +1,4 @@
 import { Message } from "./Message";
-import { Augmentatation } from "../Augmentation/Augmentation";
 import { Augmentations } from "../Augmentation/Augmentations";
 import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
 import { Programs } from "../Programs/Programs";
--- a/src/Milestones/MilestoneHelpers.tsx
+++ b/src/Milestones/MilestoneHelpers.tsx
@ -7,7 +7,7 @@ import * as ReactDOM from "react-dom";
 let milestonesContainer: HTMLElement | null = null;

 (function(){
-    function setContainer() {
+    function setContainer(): void {
        milestonesContainer = document.getElementById("milestones-container");
        document.removeEventListener("DOMContentLoaded", setContainer);
    }
@ -15,7 +15,7 @@ let milestonesContainer: HTMLElement | null = null;
    document.addEventListener("DOMContentLoaded", setContainer);
 })();

-export function displayMilestonesContent() {
+export function displayMilestonesContent(): void {
    if (!routing.isOn(Page.Milestones)) {
        return;
    }
--- a/src/Milestones/Milestones.ts
+++ b/src/Milestones/Milestones.ts
@ -1,5 +1,4 @@
 import { Milestone } from "./Milestone";
-import { IMap } from "../types";
 import { IPlayer } from "../PersonObjects/IPlayer";
 import { Factions } from "../Faction/Factions";
 import { Faction } from "../Faction/Faction";
@ -16,7 +15,7 @@ function allFactionAugs(p: IPlayer, f: Faction): boolean {
 export const Milestones: Milestone[] = [
    {
        title: "Gain root access on CSEC",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (): boolean => {
            const server = GetServerByHostname("CSEC");
            if(!server || !server.hasOwnProperty('hasAdminRights')) return false;
            return (server as any).hasAdminRights;
@ -24,7 +23,7 @@ export const Milestones: Milestone[] = [
    },
    {
        title: "Install the backdoor on CSEC",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (): boolean => {
            const server = GetServerByHostname("CSEC");
            if(!server || !server.hasOwnProperty('backdoorInstalled')) return false;
            return (server as any).backdoorInstalled;
@ -32,67 +31,67 @@ export const Milestones: Milestone[] = [
    },
    {
        title: "Join the faction hinted at in j1.msg",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return p.factions.includes("CyberSec");
        },
    },
    {
        title: "Install all the Augmentations from CSEC",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return allFactionAugs(p, Factions["CyberSec"]);
        },
    },
    {
        title: "Join the faction hinted at in j2.msg",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return p.factions.includes("NiteSec");
        },
    },
    {
        title: "Install all the Augmentations from NiteSec",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return allFactionAugs(p, Factions["NiteSec"]);
        },
    },
    {
        title: "Join the faction hinted at in j3.msg",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return p.factions.includes("The Black Hand");
        },
    },
    {
        title: "Install all the Augmentations from The Black Hand",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return allFactionAugs(p, Factions["The Black Hand"]);
        },
    },
    {
        title: "Join the faction hinted at in j4.msg",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return p.factions.includes("BitRunners");
        },
    },
    {
        title: "Install all the Augmentations from BitRunners",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return allFactionAugs(p, Factions["BitRunners"]);
        },
    },
    {
        title: "Join the final faction",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return p.factions.includes("Daedalus");
        },
    },
    {
        title: "Install the special Augmentation from Daedalus",
-        fulfilled: (p: IPlayer) => {
+        fulfilled: (p: IPlayer): boolean => {
            return p.augmentations.some(aug => aug.name == "The Red Pill")
        },
    },
    {
        title: "Install the final backdoor and free yourself.",
-        fulfilled: () => {
+        fulfilled: (): boolean => {
            return false;
        },
    },
--- a/src/Milestones/ui/Root.tsx
+++ b/src/Milestones/ui/Root.tsx
@ -16,7 +16,7 @@ function highestMilestone(p: IPlayer, milestones: Milestone[]): number {
    return n;
 }

-export function Root(props: IProps) {
+export function Root(props: IProps): JSX.Element {
    const n = highestMilestone(props.player, Milestones);
    const milestones = Milestones.map((milestone: Milestone, i: number) => {
            if (i<=n+1) {
--- a/src/Missions.jsx
+++ b/src/Missions.jsx
@ -5,7 +5,6 @@ import { Player } from "./Player";

 import { dialogBoxCreate } from "../utils/DialogBox";
 import { formatNumber } from "../utils/StringHelperFunctions";
-import { numeralWrapper } from "./ui/numeralFormat";
 import { Reputation } from "./ui/React/Reputation";

 import { addOffset } from "../utils/helpers/addOffset";
@ -14,8 +13,6 @@ import { isString } from "../utils/helpers/isString";

 import { clearEventListeners } from "../utils/uiHelpers/clearEventListeners";

-import jsplumb from "jsplumb";
-
 import React from "react";
 import ReactDOM from "react-dom";

@ -783,11 +780,11 @@ HackingMission.prototype.updateNodeDomElement = function(nodeObj) {
        return;
    }

-    var id = "hacking-mission-node-" + nodeObj.pos[0] + "-" + nodeObj.pos[1];
-    var nodeDiv = document.getElementById(id), txtEl = document.getElementById(id + "-txt");
+    let id = "hacking-mission-node-" + nodeObj.pos[0] + "-" + nodeObj.pos[1];
+    let txtEl = document.getElementById(id + "-txt");

    // Set node classes based on type
-    var txt;
+    let txt;
    switch (nodeObj.type) {
        case NodeTypes.Core:
            txt = "CPU Core<br>" + "HP: " +
@ -901,14 +898,13 @@ HackingMission.prototype.configurePlayerNodeElement = function(el) {
    if (nodeObj == null) {console.error("Failed getting Node object");}

    // Add event listener
-    var self = this;
-    function selectNodeWrapper() {
-        selectNode(self, el);
+    const selectNodeWrapper = () => {
+        selectNode(this, el);
    }
    el.addEventListener("click", selectNodeWrapper);

-    function multiselectNodeWrapper() {
-        multiselectNode(self, el);
+    const multiselectNodeWrapper = () => {
+        multiselectNode(this, el);
    }
    el.addEventListener("dblclick", multiselectNodeWrapper);

@ -1021,7 +1017,7 @@ HackingMission.prototype.initJsPlumb = function() {
    }

    // Clicking a connection drops it
-    instance.bind("click", (conn, originalEvent) => {
+    instance.bind("click", (conn) => {
        // Cannot drop enemy's connections
        const sourceNode = this.getNodeFromElement(conn.source);
        if (sourceNode.enmyCtrl) { return; }
@ -1051,7 +1047,7 @@ HackingMission.prototype.initJsPlumb = function() {
    });

    // Detach Connection events
-    instance.bind("connectionDetached", (info, originalEvent) => {
+    instance.bind("connectionDetached", (info) => {
        var sourceNode = this.getNodeFromElement(info.source);
        sourceNode.conn = null;
        var targetNode = this.getNodeFromElement(info.target);
--- a/src/Netscript/Environment.ts
+++ b/src/Netscript/Environment.ts
@ -32,6 +32,7 @@ export class Environment {
     * Finds the scope where the variable with the given name is defined
     */
    lookup(name: string): Environment | null {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
        let scope: Environment | null = this;
        while (scope) {
            if (Object.prototype.hasOwnProperty.call(scope.vars, name)) {
@ -53,7 +54,8 @@ export class Environment {
    }

 	//Sets the value of a variable in any scope
-    set(name: string, value: any) {
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    set(name: string, value: any): any {
        const scope = this.lookup(name);

        //If scope has a value, then this variable is already set in a higher scope, so
@ -66,7 +68,8 @@ export class Environment {
    }

 	//Creates (or overwrites) a variable in the current scope
-    def(name: string, value: any) {
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    def(name: string, value: any): any {
        return this.vars[name] = value;
    }
 }
--- a/src/Netscript/WorkerScript.ts
+++ b/src/Netscript/WorkerScript.ts
@ -106,7 +106,7 @@ export class WorkerScript {
     */
    serverIp: string;

-    constructor(runningScriptObj: RunningScript, pid: number, nsFuncsGenerator?: (ws: WorkerScript) => object) {
+    constructor(runningScriptObj: RunningScript, pid: number, nsFuncsGenerator?: (ws: WorkerScript) => any) {
        this.name 			= runningScriptObj.filename;
    	this.serverIp 		= runningScriptObj.server;

@ -146,8 +146,10 @@ export class WorkerScript {
    /**
     * Returns the Server on which this script is running
     */
-    getServer() {
-    	return AllServers[this.serverIp];
+    getServer(): BaseServer {
+        const server = AllServers[this.serverIp];
+        if(server == null) throw new Error(`Script ${this.name} pid ${this.pid} is running on non-existent server?`);
+    	return server;
    }

    /**
--- a/src/Netscript/killWorkerScript.ts
+++ b/src/Netscript/killWorkerScript.ts
@ -124,7 +124,7 @@ function removeWorkerScript(workerScript: WorkerScript, rerenderUi=true): void {
 * timed, blocked operation (like hack(), sleep(), etc.). This allows scripts to
 * be killed immediately even if they're in the middle of one of those long operations
 */
-function killNetscriptDelay(workerScript: WorkerScript) {
+function killNetscriptDelay(workerScript: WorkerScript): void {
    if (workerScript instanceof WorkerScript) {
        if (workerScript.delay) {
            clearTimeout(workerScript.delay);
--- a/Show More
+++ b/Show More