From 5798c4c7d311f8792e74b49a58963b1c173451bd Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Sun, 28 Aug 2022 05:33:38 -0400
Subject: [PATCH 01/46] Unify error handling
---
src/Augmentation/AugmentationHelpers.tsx | 6 +-
src/Casino/Game.tsx | 4 +-
src/Corporation/Corporation.tsx | 2 +-
src/Corporation/Industry.ts | 35 +---
.../ui/modals/BribeFactionModal.tsx | 4 +-
.../ui/modals/IssueNewSharesModal.tsx | 13 +-
src/Corporation/ui/modals/ResearchModal.tsx | 4 +-
src/Corporation/ui/modals/ThrowPartyModal.tsx | 3 +-
src/Faction/FactionHelpers.tsx | 9 +-
src/Locations/LocationsHelpers.tsx | 4 +-
src/Locations/ui/TravelAgencyRoot.tsx | 2 +-
.../{MessageHelpers.ts => MessageHelpers.tsx} | 64 ++++---
src/Netscript/APIWrapper.ts | 2 +-
src/Netscript/NetscriptHelpers.ts | 53 +++---
src/Netscript/killWorkerScript.ts | 9 +-
src/NetscriptJSEvaluator.ts | 9 +-
src/NetscriptWorker.ts | 170 ++++--------------
src/SaveObject.tsx | 23 +--
src/Script/ScriptModule.ts | 2 +-
src/UncaughtPromiseHandler.ts | 25 +--
src/ui/React/DialogBox.tsx | 30 +++-
21 files changed, 149 insertions(+), 324 deletions(-)
rename src/Message/{MessageHelpers.ts => MessageHelpers.tsx} (82%)
diff --git a/src/Augmentation/AugmentationHelpers.tsx b/src/Augmentation/AugmentationHelpers.tsx
index a8ffa8e83..c388356f6 100644
--- a/src/Augmentation/AugmentationHelpers.tsx
+++ b/src/Augmentation/AugmentationHelpers.tsx
@@ -126,15 +126,15 @@ function installAugmentations(force?: boolean): boolean {
if (ownedAug.name === AugmentationNames.NeuroFluxGovernor) {
level = ` - ${ownedAug.level}`;
}
- augmentationList += aug.name + level + " extends React.Component {
reachedLimit(p: IPlayer): boolean {
const reached = p.getCasinoWinnings() > gainLimit;
if (reached) {
- dialogBoxCreate(<>Alright cheater get out of here. You're not allowed here anymore.);
+ dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
}
return reached;
}
diff --git a/src/Corporation/Corporation.tsx b/src/Corporation/Corporation.tsx
index cf6ac9125..d9643eddf 100644
--- a/src/Corporation/Corporation.tsx
+++ b/src/Corporation/Corporation.tsx
@@ -120,7 +120,7 @@ export class Corporation {
if (isNaN(this.funds) || this.funds === Infinity || this.funds === -Infinity) {
dialogBoxCreate(
"There was an error calculating your Corporations funds and they got reset to 0. " +
- "This is a bug. Please report to game developer." +
- msg.msg +
- " {msg.msg} This message was saved as {msg.filename} onto your home
+ computer.
+ ,
+ );
}
//Adds a message to a server
@@ -127,20 +125,20 @@ const Messages: Record = {
MessageFilenames.Jumper0,
"I know you can sense it. I know you're searching for it. " +
"It's why you spend night after " +
- "night at your computer. = {
MessageFilenames.Jumper2,
"Do not try to save the world. There is no world to save. If " +
"you want to find the truth, worry only about yourself. Ethics and " +
- `morals will get you killed. = {
MessageFilenames.CyberSecTest,
"We've been watching you. Your skills are very impressive. But you're wasting " +
"your talents. If you join us, you can put your skills to good use and change " +
- "the world for the better. If you join us, we can unlock your full potential. = {
"People say that the corrupted governments and corporations rule the world. " +
"Yes, maybe they do. But do you know who everyone really fears? People " +
"like us. Because they can't hide from us. Because they can't fight shadows " +
- "and ideas with bullets. = {
[MessageFilenames.TruthGazer]: new Message(
MessageFilenames.TruthGazer,
//"THE TRUTH CAN NO LONGER ESCAPE YOUR GAZE"
- "@&*($#@&__TH3__#@A&#@*)__TRU1H__(*)&*)($#@&()E&R)W& = new Map();
@@ -54,39 +52,8 @@ export function prestigeWorkerScripts(): void {
// JS script promises need a little massaging to have the same guarantees as netscript
// promises. This does said massaging and kicks the script off. It returns a promise
// that resolves or rejects when the corresponding worker script is done.
-function startNetscript2Script(workerScript: WorkerScript): Promise {
- return new Promise((resolve, reject) => {
- executeJSScript(Player, workerScript.getServer().scripts, workerScript)
- .then(() => {
- resolve();
- })
- .catch((e) => reject(e));
- }).catch((e) => {
- if (e instanceof Error) {
- if (e instanceof SyntaxError) {
- workerScript.errorMessage = helpers.makeRuntimeRejectMsg(
- workerScript,
- e.message + " (sorry we can't be more helpful)",
- );
- } else {
- workerScript.errorMessage = helpers.makeRuntimeRejectMsg(
- workerScript,
- e.message + ((e.stack && "\nstack:\n" + e.stack.toString()) || ""),
- );
- }
- throw new ScriptDeath(workerScript);
- } else if (helpers.isScriptErrorMessage(e)) {
- workerScript.errorMessage = e;
- throw new ScriptDeath(workerScript);
- } else if (e instanceof ScriptDeath) {
- throw e;
- }
-
- // Don't know what to do with it, let's try making an error message out of it
- workerScript.errorMessage = helpers.makeRuntimeRejectMsg(workerScript, "" + e);
- throw new ScriptDeath(workerScript);
- });
-}
+const startNetscript2Script = (workerScript: WorkerScript): Promise =>
+ executeJSScript(Player, workerScript.getServer().scripts, workerScript);
function startNetscript1Script(workerScript: WorkerScript): Promise {
const code = workerScript.code;
@@ -98,18 +65,16 @@ function startNetscript1Script(workerScript: WorkerScript): Promise {
codeWithImports = importProcessingRes.code;
codeLineOffset = importProcessingRes.lineOffset;
} catch (e: unknown) {
- dialogBoxCreate("Error processing Imports in " + workerScript.name + ": {
const result = await entry(...args.map((arg) => int.pseudoToNative(arg)));
return callback(int.nativeToPseudo(result));
} catch (e: unknown) {
- // TODO: Unify error handling, this was stolen from previous async handler
- if (typeof e === "string") {
- console.error(e);
- const errorTextArray = e.split("|DELIMITER|");
- const hostname = errorTextArray[1];
- const scriptName = errorTextArray[2];
- const errorMsg = errorTextArray[3];
- let msg = `${scriptName}@${hostname} {
} else {
// new object layer, e.g. bladeburner
int.setProperty(intLayer, name, int.nativeToPseudo({}));
- wrapNS1Layer(int, (intLayer as BasicObject).properties[name], [...path, name]);
+ wrapNS1Layer(int, (intLayer as BasicObject).properties[name], nsLayer[name]);
}
}
}
@@ -154,54 +109,30 @@ function startNetscript1Script(workerScript: WorkerScript): Promise {
try {
interpreter = new Interpreter(codeWithImports, wrapNS1Layer, codeLineOffset);
} catch (e: unknown) {
- dialogBoxCreate("Syntax ERROR in " + workerScript.name + ":;
+ main?: (ns: NS) => unknown;
autocomplete?: (data: AutocompleteData, flags: string[]) => unknown;
}
diff --git a/src/UncaughtPromiseHandler.ts b/src/UncaughtPromiseHandler.ts
index e37404a33..a786c384a 100644
--- a/src/UncaughtPromiseHandler.ts
+++ b/src/UncaughtPromiseHandler.ts
@@ -1,24 +1,7 @@
-import { ScriptDeath } from "./Netscript/ScriptDeath";
-import { helpers } from "./Netscript/NetscriptHelpers";
-import { dialogBoxCreate } from "./ui/React/DialogBox";
+import { errorDialog } from "./ui/React/DialogBox";
export function setupUncaughtPromiseHandler(): void {
- window.addEventListener("unhandledrejection", function (e) {
- if (helpers.isScriptErrorMessage(e.reason)) {
- const errorTextArray = e.reason.split("|DELIMITER|");
- const hostname = errorTextArray[1];
- const scriptName = errorTextArray[2];
- const errorMsg = errorTextArray[3];
-
- let msg = `UNCAUGHT PROMISE ERROR{txt} : txt);
+}
+
+export function errorDialog(e: unknown, initialText = "") {
+ let errorText = "";
+ if (typeof e === "string") errorText = e;
+ else if (e instanceof ScriptDeath) {
+ if (!e.errorMessage) return; //No need for a dialog for an empty ScriptDeath
+ errorText = e.errorMessage;
+ } else if (e instanceof SyntaxError) errorText = e.message + " (sorry we can't be more helpful)";
+ else if (e instanceof Error) errorText = e.message + (e.stack ? `\nstack:\n${e.stack.toString()}` : "");
+ else {
+ errorText = "An unknown error was thrown, see console.";
+ console.error(e);
+ }
+
+ if (!initialText) {
+ if (e instanceof ScriptDeath) initialText = `${e.name}@${e.hostname} (PID - ${e.pid})\n\n`;
+ }
+
+ dialogBoxCreate(initialText + errorText);
}
From 572c68738fb9aa6545308e16ae46974a4ca04e2f Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 29 Aug 2022 02:41:17 -0400
Subject: [PATCH 02/46] Unify error handling
---
src/Electron.tsx | 2 +-
src/Hacknet/HacknetServer.ts | 8 +-
src/Netscript/APIWrapper.ts | 3 +-
src/Netscript/NetscriptHelpers.ts | 53 ++++-----
src/Netscript/RamCostGenerator.ts | 17 ++-
src/Netscript/killWorkerScript.ts | 5 +-
src/NetscriptFunctions.ts | 28 +++--
src/NetscriptJSEvaluator.ts | 51 +--------
src/NetscriptWorker.ts | 105 +++++++-----------
src/RemoteFileAPI/MessageHandlers.ts | 3 +-
src/Script/RamCalculations.ts | 18 ++-
src/Script/Script.ts | 15 ++-
src/ScriptEditor/ui/ScriptEditorRoot.tsx | 20 +---
src/Server/BaseServer.ts | 9 +-
src/Server/ServerHelpers.ts | 2 +-
src/Terminal/commands/cp.ts | 2 +-
src/Terminal/commands/scp.ts | 2 +-
src/Terminal/commands/wget.ts | 2 +-
...termineAllPossibilitiesForTabCompletion.ts | 2 +-
src/ui/GameRoot.tsx | 52 ++++-----
src/ui/LoadingScreen.tsx | 4 +-
src/ui/React/DialogBox.tsx | 6 +-
src/utils/v1APIBreak.ts | 2 +-
23 files changed, 156 insertions(+), 255 deletions(-)
diff --git a/src/Electron.tsx b/src/Electron.tsx
index 32e1ad552..a07621afc 100644
--- a/src/Electron.tsx
+++ b/src/Electron.tsx
@@ -106,7 +106,7 @@ function initWebserver(): void {
msg: "Home server does not exist.",
};
}
- const { success, overwritten } = home.writeToScriptFile(Player, filename, code);
+ const { success, overwritten } = home.writeToScriptFile(filename, code);
let script;
if (success) {
script = home.getScript(filename);
diff --git a/src/Hacknet/HacknetServer.ts b/src/Hacknet/HacknetServer.ts
index 1de09e52d..e2b005dd5 100644
--- a/src/Hacknet/HacknetServer.ts
+++ b/src/Hacknet/HacknetServer.ts
@@ -19,7 +19,7 @@ import {
import { createRandomIp } from "../utils/IPAddress";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
interface IConstructorParams {
adminRights?: boolean;
@@ -123,9 +123,9 @@ export class HacknetServer extends BaseServer implements IHacknetNode {
}
}
- updateRamUsed(ram: number, player: IPlayer): void {
- super.updateRamUsed(ram, player);
- this.updateHashRate(player.mults.hacknet_node_money);
+ updateRamUsed(ram: number): void {
+ super.updateRamUsed(ram);
+ this.updateHashRate(Player.mults.hacknet_node_money);
}
updateHashCapacity(): void {
diff --git a/src/Netscript/APIWrapper.ts b/src/Netscript/APIWrapper.ts
index 0bd5817d4..22b30ab23 100644
--- a/src/Netscript/APIWrapper.ts
+++ b/src/Netscript/APIWrapper.ts
@@ -1,6 +1,5 @@
import { getRamCost } from "./RamCostGenerator";
import type { WorkerScript } from "./WorkerScript";
-import { Player } from "../Player";
import { helpers } from "./NetscriptHelpers";
import { ScriptArg } from "./ScriptArg";
import { NSEnums } from "src/ScriptEditor/NetscriptDefinitions";
@@ -50,7 +49,7 @@ function wrapFunction(
};
function wrappedFunction(...args: unknown[]): unknown {
helpers.checkEnvFlags(ctx);
- helpers.updateDynamicRam(ctx, getRamCost(Player, ...tree, ctx.function));
+ helpers.updateDynamicRam(ctx, getRamCost(...tree, ctx.function));
return func(ctx)(...args);
}
const parent = getNestedProperty(wrappedAPI, tree);
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 0ca89db76..9655f941a 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -57,7 +57,6 @@ export const helpers = {
gangMember,
gangTask,
log,
- getFunctionNames,
getRunningScript,
getRunningScriptByArgs,
getCannotFindRunningScriptErrorMessage,
@@ -205,8 +204,8 @@ function makeRuntimeErrorMsg(ctx: NetscriptContext, msg: string): string {
}
log(ctx, () => msg);
- let rejectMsg = `${caller}: ${msg}`;
- if (userstack.length !== 0) rejectMsg += ` = {
[Property in keyof API]: API[Property] extends () => void
- ? number | ((p: IPlayer) => void)
+ ? number | (() => void)
: API[Property] extends object
? RamCostTree
: never;
@@ -89,10 +88,10 @@ export const RamCostConstants: IMap = {
ScriptStanekAcceptGift: 2,
};
-function SF4Cost(cost: number): (player: IPlayer) => number {
- return (player: IPlayer): number => {
- if (player.bitNodeN === 4) return cost;
- const sf4 = player.sourceFileLvl(4);
+function SF4Cost(cost: number): () => number {
+ return () => {
+ if (Player.bitNodeN === 4) return cost;
+ const sf4 = Player.sourceFileLvl(4);
if (sf4 <= 1) return cost * 16;
if (sf4 === 2) return cost * 4;
return cost;
@@ -611,7 +610,7 @@ export const RamCosts: IMap = SourceRamCosts;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const _typecheck: RamCostTree = SourceRamCosts;
-export function getRamCost(player: IPlayer, ...args: string[]): number {
+export function getRamCost(...args: string[]): number {
if (args.length === 0) {
console.warn(`No arguments passed to getRamCost()`);
return 0;
@@ -637,7 +636,7 @@ export function getRamCost(player: IPlayer, ...args: string[]): number {
}
if (typeof curr === "function") {
- return curr(player);
+ return curr();
}
console.warn(`Unexpected type (${curr}) for value [${args}]`);
diff --git a/src/Netscript/killWorkerScript.ts b/src/Netscript/killWorkerScript.ts
index f41e179c0..c70455124 100644
--- a/src/Netscript/killWorkerScript.ts
+++ b/src/Netscript/killWorkerScript.ts
@@ -12,7 +12,6 @@ import { GetServer } from "../Server/AllServers";
import { errorDialog } from "../ui/React/DialogBox";
import { AddRecentScript } from "./RecentScripts";
-import { Player } from "../Player";
import { ITutorial } from "../InteractiveTutorial";
import { AlertEvents } from "../ui/React/AlertManager";
@@ -102,8 +101,8 @@ function removeWorkerScript(workerScript: WorkerScript): void {
// Recalculate ram used on that server
- server.updateRamUsed(0, Player);
- for (const rs of server.runningScripts) server.updateRamUsed(server.ramUsed + rs.ramUsage * rs.threads, Player);
+ server.updateRamUsed(0);
+ for (const rs of server.runningScripts) server.updateRamUsed(server.ramUsed + rs.ramUsage * rs.threads);
// Delete script from global pool (workerScripts)
workerScripts.delete(workerScript.pid);
diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts
index db76cbbbb..51a54c3c0 100644
--- a/src/NetscriptFunctions.ts
+++ b/src/NetscriptFunctions.ts
@@ -931,13 +931,13 @@ const base: InternalAPI = {
}
// Create new script if it does not already exist
- const newScript = new Script(Player, file);
+ const newScript = new Script(file);
newScript.code = sourceScript.code;
newScript.ramUsage = sourceScript.ramUsage;
newScript.server = destServer.hostname;
destServer.scripts.push(newScript);
helpers.log(ctx, () => `File '${file}' copied over to '${destServer?.hostname}'.`);
- newScript.updateRamUsage(Player, destServer.scripts);
+ newScript.updateRamUsage(destServer.scripts);
}
return noFailures;
@@ -1492,12 +1492,12 @@ const base: InternalAPI = {
let script = ctx.workerScript.getScriptOnServer(fn, server);
if (script == null) {
// Create a new script
- script = new Script(Player, fn, String(data), server.hostname, server.scripts);
+ script = new Script(fn, String(data), server.hostname, server.scripts);
server.scripts.push(script);
- return script.updateRamUsage(Player, server.scripts);
+ return script.updateRamUsage(server.scripts);
}
mode === "w" ? (script.code = String(data)) : (script.code += data);
- return script.updateRamUsage(Player, server.scripts);
+ return script.updateRamUsage(server.scripts);
} else {
// Write to text file
if (!fn.endsWith(".txt")) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid filename: ${fn}`);
@@ -1820,7 +1820,7 @@ const base: InternalAPI = {
function (data) {
let res;
if (isScriptFilename(target)) {
- res = s.writeToScriptFile(Player, target, data);
+ res = s.writeToScriptFile(target, data);
} else {
res = s.writeToTextFile(target, data);
}
@@ -1950,4 +1950,18 @@ const ns = {
...NetscriptExtra(),
};
-const possibleLogs = Object.fromEntries([...helpers.getFunctionNames(ns, "")].map((a) => [a, true]));
+const possibleLogs = Object.fromEntries([...getFunctionNames(ns, "")].map((a) => [a, true]));
+/** Provides an array of all function names on a nested object */
+function getFunctionNames(obj: object, prefix: string): string[] {
+ const functionNames: string[] = [];
+ for (const [key, value] of Object.entries(obj)) {
+ if (key === "args") {
+ continue;
+ } else if (typeof value == "function") {
+ functionNames.push(prefix + key);
+ } else if (typeof value == "object") {
+ functionNames.push(...getFunctionNames(value, key + "."));
+ }
+ }
+ return functionNames;
+}
diff --git a/src/NetscriptJSEvaluator.ts b/src/NetscriptJSEvaluator.ts
index 9b384fe65..6cb28b16f 100644
--- a/src/NetscriptJSEvaluator.ts
+++ b/src/NetscriptJSEvaluator.ts
@@ -5,12 +5,9 @@
import * as walk from "acorn-walk";
import { parse } from "acorn";
-import { helpers } from "./Netscript/NetscriptHelpers";
import { ScriptUrl } from "./Script/ScriptUrl";
-import { WorkerScript } from "./Netscript/WorkerScript";
import { Script } from "./Script/Script";
import { areImportsEquals } from "./Terminal/DirectoryHelpers";
-import { IPlayer } from "./PersonObjects/IPlayer";
import { ScriptModule } from "./Script/ScriptModule";
// Acorn type def is straight up incomplete so we have to fill with our own.
@@ -21,7 +18,7 @@ function makeScriptBlob(code: string): Blob {
return new Blob([code], { type: "text/javascript" });
}
-export async function compile(player: IPlayer, script: Script, scripts: Script[]): Promise {
+export async function compile(script: Script, scripts: Script[]): Promise {
//!shouldCompile ensures that script.module is non-null, hence the "as".
if (!shouldCompile(script, scripts)) return script.module as Promise;
script.queueCompile = true;
@@ -31,7 +28,7 @@ export async function compile(player: IPlayer, script: Script, scripts: Script[]
//If multiple compiles were called on the same script before a compilation could be completed this ensures only one complilation is actually performed.
if (!script.queueCompile) return script.module as Promise;
script.queueCompile = false;
- script.updateRamUsage(player, scripts);
+ script.updateRamUsage(scripts);
const uurls = _getScriptUrls(script, scripts, []);
const url = uurls[uurls.length - 1].url;
if (script.url && script.url !== url) URL.revokeObjectURL(script.url);
@@ -50,50 +47,6 @@ export async function compile(player: IPlayer, script: Script, scripts: Script[]
return script.module;
}
-// Begin executing a user JS script, and return a promise that resolves
-// or rejects when the script finishes.
-// - script is a script to execute (see Script.js). We depend only on .filename and .code.
-// scripts is an array of other scripts on the server.
-// env is the global environment that should be visible to all the scripts
-// (i.e. hack, grow, etc.).
-// When the promise returned by this resolves, we'll have finished
-// running the main function of the script.
-export async function executeJSScript(
- player: IPlayer,
- scripts: Script[] = [],
- workerScript: WorkerScript,
-): Promise {
- const script = workerScript.getScript();
- if (script === null) throw new Error("script is null");
- const loadedModule = await compile(player, script, scripts);
- workerScript.ramUsage = script.ramUsage;
-
- const ns = workerScript.env.vars;
-
- if (!loadedModule) {
- throw helpers.makeBasicErrorMsg(
- workerScript,
- `${script.filename} cannot be run because the script module won't load`,
- );
- }
- // TODO: putting await in a non-async function yields unhelpful
- // "SyntaxError: unexpected reserved word" with no line number information.
- if (!loadedModule.main) {
- throw helpers.makeBasicErrorMsg(
- workerScript,
- `${script.filename} cannot be run because it does not have a main function.`,
- );
- }
- if (!ns) {
- throw helpers.makeBasicErrorMsg(
- workerScript,
- `${script.filename} cannot be run because the NS object hasn't been constructed properly.`,
- );
- }
- await loadedModule.main(ns);
- return;
-}
-
function isDependencyOutOfDate(filename: string, scripts: Script[], scriptModuleSequenceNumber: number): boolean {
const depScript = scripts.find((s) => s.filename == filename);
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index 1d05043aa..22c63fad6 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -12,7 +12,7 @@ import { generateNextPid } from "./Netscript/Pid";
import { CONSTANTS } from "./Constants";
import { Interpreter } from "./ThirdParty/JSInterpreter";
import { NetscriptFunctions } from "./NetscriptFunctions";
-import { executeJSScript, Node } from "./NetscriptJSEvaluator";
+import { compile, Node } from "./NetscriptJSEvaluator";
import { IPort } from "./NetscriptPort";
import { RunningScript } from "./Script/RunningScript";
import { getRamUsageFromRunningScript } from "./Script/RunningScriptHelpers";
@@ -31,7 +31,6 @@ import { roundToTwo } from "./utils/helpers/roundToTwo";
import { parse } from "acorn";
import { simple as walksimple } from "acorn-walk";
import { areFilesEqual } from "./Terminal/DirectoryHelpers";
-import { Player } from "./Player";
import { Terminal } from "./Terminal";
import { ScriptArg } from "./Netscript/ScriptArg";
@@ -49,14 +48,26 @@ export function prestigeWorkerScripts(): void {
workerScripts.clear();
}
-// JS script promises need a little massaging to have the same guarantees as netscript
-// promises. This does said massaging and kicks the script off. It returns a promise
-// that resolves or rejects when the corresponding worker script is done.
-const startNetscript2Script = (workerScript: WorkerScript): Promise =>
- executeJSScript(Player, workerScript.getServer().scripts, workerScript);
+async function startNetscript2Script(workerScript: WorkerScript): Promise {
+ const scripts = workerScript.getServer().scripts;
+ const script = workerScript.getScript();
+ if (script === null) throw "workerScript had no associated script. This is a bug.";
+ const loadedModule = await compile(script, scripts);
+ workerScript.ramUsage = script.ramUsage;
+ const ns = workerScript.env.vars;
-function startNetscript1Script(workerScript: WorkerScript): Promise {
+ if (!loadedModule) throw `${script.filename} cannot be run because the script module won't load`;
+ // TODO: Better error for "unexpected reserved word" when using await in non-async function?
+ if (typeof loadedModule.main !== "function")
+ throw `${script.filename} cannot be run because it does not have a main function.`;
+ if (!ns) throw `${script.filename} cannot be run because the NS object hasn't been constructed properly.`;
+ await loadedModule.main(ns);
+ return;
+}
+
+async function startNetscript1Script(workerScript: WorkerScript): Promise {
const code = workerScript.code;
+ let errorToThrow: unknown;
//Process imports
let codeWithImports, codeLineOffset;
@@ -65,10 +76,7 @@ function startNetscript1Script(workerScript: WorkerScript): Promise {
codeWithImports = importProcessingRes.code;
codeLineOffset = importProcessingRes.lineOffset;
} catch (e: unknown) {
- dialogBoxCreate(`Error processing Imports in ${workerScript.name} on ${workerScript.hostname}:\n\n${e}`);
- workerScript.env.stopFlag = true;
- killWorkerScript(workerScript);
- return Promise.resolve();
+ throw `Error processing Imports in ${workerScript.name}@${workerScript.hostname}:\n\n${e}`;
}
interface BasicObject {
@@ -77,20 +85,14 @@ function startNetscript1Script(workerScript: WorkerScript): Promise {
function wrapNS1Layer(int: Interpreter, intLayer: unknown, nsLayer = workerScript.env.vars as BasicObject) {
for (const [name, entry] of Object.entries(nsLayer)) {
if (typeof entry === "function") {
- // Async functions need to be wrapped. See JS-Interpreter documentation
const wrapper = async (...args: unknown[]) => {
- // This async wrapper is sent a resolver function as an extra arg.
- // See JSInterpreter.js:3209
try {
+ // Sent a resolver function as an extra arg. See createAsyncFunction JSInterpreter.js:3209
const callback = args.pop() as (value: unknown) => void;
const result = await entry(...args.map((arg) => int.pseudoToNative(arg)));
return callback(int.nativeToPseudo(result));
} catch (e: unknown) {
- // NS1 interpreter doesn't cleanly handle throwing. Need to show dialog here.
- errorDialog(e, `RUNTIME ERROR:\n${workerScript.name}@${workerScript.hostname}\n\n`);
- workerScript.env.stopFlag = true;
- killWorkerScript(workerScript);
- return;
+ errorToThrow = e;
}
};
int.setProperty(intLayer, name, int.createAsyncFunction(wrapper));
@@ -109,31 +111,16 @@ function startNetscript1Script(workerScript: WorkerScript): Promise {
try {
interpreter = new Interpreter(codeWithImports, wrapNS1Layer, codeLineOffset);
} catch (e: unknown) {
- dialogBoxCreate(`Syntax ERROR in ${workerScript.name} on ${workerScript.hostname}:\n\n${String(e)}`);
- workerScript.env.stopFlag = true;
- killWorkerScript(workerScript);
- return Promise.resolve();
+ throw `Syntax ERROR in ${workerScript.name}@${workerScript.hostname}:\n\n${String(e)}`;
}
- return new Promise((resolve) => {
- function runInterpreter(): void {
- if (workerScript.env.stopFlag) resolve();
-
- let more = true;
- let i = 0;
- while (i < 3 && more) {
- more = more && interpreter.step();
- i++;
- }
-
- if (more) {
- setTimeout(runInterpreter, Settings.CodeInstructionRunTime);
- } else {
- resolve();
- }
- }
- runInterpreter();
- });
+ let more = true;
+ while (more) {
+ if (errorToThrow) throw errorToThrow;
+ if (workerScript.env.stopFlag) return;
+ for (let i = 0; more && i < 3; i++) more = interpreter.step();
+ if (more) await new Promise((r) => setTimeout(r, Settings.CodeInstructionRunTime));
+ }
}
/* Since the JS Interpreter used for Netscript 1.0 only supports ES5, the keyword
@@ -326,7 +313,7 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
return false;
}
- server.updateRamUsed(roundToTwo(server.ramUsed + ramUsage), Player);
+ server.updateRamUsed(roundToTwo(server.ramUsed + ramUsage));
// Get the pid
const pid = generateNextPid();
@@ -346,20 +333,10 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
workerScripts.set(pid, workerScript);
WorkerScriptStartStopEventEmitter.emit();
- // Start the script's execution
- let scriptExecution: Promise | null = null; // Script's resulting promise
- if (workerScript.name.endsWith(".js")) {
- scriptExecution = startNetscript2Script(workerScript);
- } else {
- scriptExecution = startNetscript1Script(workerScript);
- if (!(scriptExecution instanceof Promise)) {
- return false;
- }
- }
-
- // Once the code finishes (either resolved or rejected, doesnt matter), set its
- // running status to false
- scriptExecution
+ // Start the script's execution using the correct function for file type
+ (workerScript.name.endsWith(".js") ? startNetscript2Script : startNetscript1Script)(workerScript)
+ // Once the code finishes (either resolved or rejected, doesnt matter), set its
+ // running status to false
.then(function () {
// On natural death, the earnings are transfered to the parent if it still exists.
if (parent && !parent.env.stopFlag) {
@@ -370,13 +347,15 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
workerScript.log("", () => "Script finished running");
})
.catch(function (e) {
- errorDialog(e, `RUNTIME ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n`);
- let logText = "Script crashed due to an error.";
- if (e instanceof ScriptDeath) logText = "Script killed.";
- workerScript.log("", () => logText);
+ let initialText = `ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n`;
+ if (e instanceof SyntaxError) e = `SYNTAX ${initialText}${e.message} (sorry we can't be more helpful)`;
+ else if (e instanceof Error) {
+ e = `RUNTIME ${initialText}${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`;
+ }
+ errorDialog(e, typeof e === "string" && e.includes(initialText) ? "" : initialText);
+ workerScript.log("", () => (e instanceof ScriptDeath ? "Script killed." : "Script crashed due to an error."));
killWorkerScript(workerScript);
});
-
return true;
}
diff --git a/src/RemoteFileAPI/MessageHandlers.ts b/src/RemoteFileAPI/MessageHandlers.ts
index a9e3dc3fc..d527d0198 100644
--- a/src/RemoteFileAPI/MessageHandlers.ts
+++ b/src/RemoteFileAPI/MessageHandlers.ts
@@ -1,4 +1,3 @@
-import { Player } from "../Player";
import { isScriptFilename } from "../Script/isScriptFilename";
import { GetServer } from "../Server/AllServers";
import { isValidFilePath } from "../Terminal/DirectoryHelpers";
@@ -29,7 +28,7 @@ export const RFARequestHandler: Record void | R
const server = GetServer(fileData.server);
if (!server) return error("Server hostname invalid", msg);
- if (isScriptFilename(fileData.filename)) server.writeToScriptFile(Player, fileData.filename, fileData.content);
+ if (isScriptFilename(fileData.filename)) server.writeToScriptFile(fileData.filename, fileData.content);
// Assume it's a text file
else server.writeToTextFile(fileData.filename, fileData.content);
diff --git a/src/Script/RamCalculations.ts b/src/Script/RamCalculations.ts
index 61538bf4b..aae7dcf17 100644
--- a/src/Script/RamCalculations.ts
+++ b/src/Script/RamCalculations.ts
@@ -13,7 +13,6 @@ import { RamCalculationErrorCode } from "./RamCalculationErrorCodes";
import { RamCosts, RamCostConstants } from "../Netscript/RamCostGenerator";
import { Script } from "./Script";
import { areImportsEquals } from "../Terminal/DirectoryHelpers";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { Node } from "../NetscriptJSEvaluator";
export interface RamUsageEntry {
@@ -40,11 +39,8 @@ const memCheckGlobalKey = ".__GLOBAL__";
* Parses code into an AST and walks through it recursively to calculate
* RAM usage. Also accounts for imported modules.
* @param {Script[]} otherScripts - All other scripts on the server. Used to account for imported scripts
- * @param {string} codeCopy - The code being parsed
- * @param {WorkerScript} workerScript - Object containing RAM costs of Netscript functions. Also used to
- * keep track of what functions have/havent been accounted for
- */
-function parseOnlyRamCalculate(player: IPlayer, otherScripts: Script[], code: string): RamCalculation {
+ * @param {string} code - The code being parsed */
+function parseOnlyRamCalculate(otherScripts: Script[], code: string): RamCalculation {
try {
/**
* Maps dependent identifiers to their dependencies.
@@ -157,11 +153,11 @@ function parseOnlyRamCalculate(player: IPlayer, otherScripts: Script[], code: st
// Check if this identifier is a function in the workerScript environment.
// If it is, then we need to get its RAM cost.
try {
- function applyFuncRam(cost: number | ((p: IPlayer) => number)): number {
+ function applyFuncRam(cost: number | (() => number)): number {
if (typeof cost === "number") {
return cost;
} else if (typeof cost === "function") {
- return cost(player);
+ return cost();
} else {
return 0;
}
@@ -178,7 +174,7 @@ function parseOnlyRamCalculate(player: IPlayer, otherScripts: Script[], code: st
prefix: string,
obj: object,
ref: string,
- ): { func: (p: IPlayer) => number | number; refDetail: string } | undefined => {
+ ): { func: () => number | number; refDetail: string } | undefined => {
if (!obj) return;
const elem = Object.entries(obj).find(([key]) => key === ref);
if (elem !== undefined && (typeof elem[1] === "function" || typeof elem[1] === "number")) {
@@ -381,9 +377,9 @@ function parseOnlyCalculateDeps(code: string, currentModule: string): ParseDepsR
* @param {Script[]} otherScripts - All other scripts on the server.
* Used to account for imported scripts
*/
-export function calculateRamUsage(player: IPlayer, codeCopy: string, otherScripts: Script[]): RamCalculation {
+export function calculateRamUsage(codeCopy: string, otherScripts: Script[]): RamCalculation {
try {
- return parseOnlyRamCalculate(player, otherScripts, codeCopy);
+ return parseOnlyRamCalculate(otherScripts, codeCopy);
} catch (e) {
console.error(`Failed to parse script for RAM calculations:`);
console.error(e);
diff --git a/src/Script/Script.ts b/src/Script/Script.ts
index e70c0433b..a28b81634 100644
--- a/src/Script/Script.ts
+++ b/src/Script/Script.ts
@@ -9,7 +9,6 @@ import { ScriptUrl } from "./ScriptUrl";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
import { roundToTwo } from "../utils/helpers/roundToTwo";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { ScriptModule } from "./ScriptModule";
let globalModuleSequenceNumber = 0;
@@ -52,13 +51,13 @@ export class Script {
// hostname of server that this script is on.
server = "";
- constructor(player: IPlayer | null = null, fn = "", code = "", server = "", otherScripts: Script[] = []) {
+ constructor(fn = "", code = "", server = "", otherScripts: Script[] = []) {
this.filename = fn;
this.code = code;
this.server = server; // hostname of server this script is on
this.moduleSequenceNumber = ++globalModuleSequenceNumber;
- if (this.code !== "" && player !== null) {
- this.updateRamUsage(player, otherScripts);
+ if (this.code !== "") {
+ this.updateRamUsage(otherScripts);
}
}
@@ -94,13 +93,13 @@ export class Script {
* @param {string} code - The new contents of the script
* @param {Script[]} otherScripts - Other scripts on the server. Used to process imports
*/
- saveScript(player: IPlayer, filename: string, code: string, hostname: string, otherScripts: Script[]): void {
+ saveScript(filename: string, code: string, hostname: string, otherScripts: Script[]): void {
// Update code and filename
this.code = Script.formatCode(code);
this.filename = filename;
this.server = hostname;
- this.updateRamUsage(player, otherScripts);
+ this.updateRamUsage(otherScripts);
this.markUpdated();
for (const dependent of this.dependents) {
const [dependentScript] = otherScripts.filter(
@@ -114,8 +113,8 @@ export class Script {
* Calculates and updates the script's RAM usage based on its code
* @param {Script[]} otherScripts - Other scripts on the server. Used to process imports
*/
- updateRamUsage(player: IPlayer, otherScripts: Script[]): void {
- const res = calculateRamUsage(player, this.code, otherScripts);
+ updateRamUsage(otherScripts: Script[]): void {
+ const res = calculateRamUsage(this.code, otherScripts);
if (res.cost > 0) {
this.ramUsage = roundToTwo(res.cost);
this.ramUsageEntries = res.entries;
diff --git a/src/ScriptEditor/ui/ScriptEditorRoot.tsx b/src/ScriptEditor/ui/ScriptEditorRoot.tsx
index 3cb10e3bd..f6f46f21e 100644
--- a/src/ScriptEditor/ui/ScriptEditorRoot.tsx
+++ b/src/ScriptEditor/ui/ScriptEditorRoot.tsx
@@ -252,7 +252,7 @@ export function Root(props: IProps): React.ReactElement {
return;
}
const codeCopy = newCode + "";
- const ramUsage = calculateRamUsage(props.player, codeCopy, props.player.getCurrentServer().scripts);
+ const ramUsage = calculateRamUsage(codeCopy, props.player.getCurrentServer().scripts);
if (ramUsage.cost > 0) {
const entries = ramUsage.entries?.sort((a, b) => b.cost - a.cost) ?? [];
const entriesDisp = [];
@@ -466,7 +466,6 @@ export function Root(props: IProps): React.ReactElement {
for (let i = 0; i < server.scripts.length; i++) {
if (scriptToSave.fileName == server.scripts[i].filename) {
server.scripts[i].saveScript(
- props.player,
scriptToSave.fileName,
scriptToSave.code,
props.player.currentServer,
@@ -480,13 +479,7 @@ export function Root(props: IProps): React.ReactElement {
//If the current script does NOT exist, create a new one
const script = new Script();
- script.saveScript(
- props.player,
- scriptToSave.fileName,
- scriptToSave.code,
- props.player.currentServer,
- server.scripts,
- );
+ script.saveScript(scriptToSave.fileName, scriptToSave.code, props.player.currentServer, server.scripts);
server.scripts.push(script);
} else if (scriptToSave.isTxt) {
for (let i = 0; i < server.textFiles.length; ++i) {
@@ -555,7 +548,6 @@ export function Root(props: IProps): React.ReactElement {
for (let i = 0; i < server.scripts.length; i++) {
if (currentScript.fileName == server.scripts[i].filename) {
server.scripts[i].saveScript(
- props.player,
currentScript.fileName,
currentScript.code,
props.player.currentServer,
@@ -569,13 +561,7 @@ export function Root(props: IProps): React.ReactElement {
//If the current script does NOT exist, create a new one
const script = new Script();
- script.saveScript(
- props.player,
- currentScript.fileName,
- currentScript.code,
- props.player.currentServer,
- server.scripts,
- );
+ script.saveScript(currentScript.fileName, currentScript.code, props.player.currentServer, server.scripts);
server.scripts.push(script);
} else if (currentScript.isTxt) {
for (let i = 0; i < server.textFiles.length; ++i) {
diff --git a/src/Server/BaseServer.ts b/src/Server/BaseServer.ts
index 85b6e77fc..6e00e71fd 100644
--- a/src/Server/BaseServer.ts
+++ b/src/Server/BaseServer.ts
@@ -12,7 +12,6 @@ import { isScriptFilename } from "../Script/isScriptFilename";
import { createRandomIp } from "../utils/IPAddress";
import { compareArrays } from "../utils/helpers/compareArrays";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { ScriptArg } from "../Netscript/ScriptArg";
interface IConstructorParams {
@@ -245,7 +244,7 @@ export class BaseServer {
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- updateRamUsed(ram: number, player: IPlayer): void {
+ updateRamUsed(ram: number): void {
this.ramUsed = ram;
}
@@ -266,7 +265,7 @@ export class BaseServer {
* Write to a script file
* Overwrites existing files. Creates new files if the script does not eixst
*/
- writeToScriptFile(player: IPlayer, fn: string, code: string): writeResult {
+ writeToScriptFile(fn: string, code: string): writeResult {
const ret = { success: false, overwritten: false };
if (!isValidFilePath(fn) || !isScriptFilename(fn)) {
return ret;
@@ -277,7 +276,7 @@ export class BaseServer {
if (fn === this.scripts[i].filename) {
const script = this.scripts[i];
script.code = code;
- script.updateRamUsage(player, this.scripts);
+ script.updateRamUsage(this.scripts);
script.markUpdated();
ret.overwritten = true;
ret.success = true;
@@ -286,7 +285,7 @@ export class BaseServer {
}
// Otherwise, create a new script
- const newScript = new Script(player, fn, code, this.hostname, this.scripts);
+ const newScript = new Script(fn, code, this.hostname, this.scripts);
this.scripts.push(newScript);
ret.success = true;
return ret;
diff --git a/src/Server/ServerHelpers.ts b/src/Server/ServerHelpers.ts
index 5196f7261..979ec91a3 100644
--- a/src/Server/ServerHelpers.ts
+++ b/src/Server/ServerHelpers.ts
@@ -326,7 +326,7 @@ export function prestigeHomeComputer(player: IPlayer, homeComp: Server): void {
//Update RAM usage on all scripts
homeComp.scripts.forEach(function (script) {
- script.updateRamUsage(player, homeComp.scripts);
+ script.updateRamUsage(homeComp.scripts);
});
homeComp.messages.length = 0; //Remove .lit and .msg files
diff --git a/src/Terminal/commands/cp.ts b/src/Terminal/commands/cp.ts
index e33f6a9fd..021e9c60d 100644
--- a/src/Terminal/commands/cp.ts
+++ b/src/Terminal/commands/cp.ts
@@ -89,7 +89,7 @@ export function cp(
return;
}
- const sRes = server.writeToScriptFile(player, dst, sourceScript.code);
+ const sRes = server.writeToScriptFile(dst, sourceScript.code);
if (!sRes.success) {
terminal.error(`cp failed`);
return;
diff --git a/src/Terminal/commands/scp.ts b/src/Terminal/commands/scp.ts
index 89d87e74e..d5def4d68 100644
--- a/src/Terminal/commands/scp.ts
+++ b/src/Terminal/commands/scp.ts
@@ -94,7 +94,7 @@ export function scp(
return;
}
- const sRes = destServer.writeToScriptFile(player, scriptname, sourceScript.code);
+ const sRes = destServer.writeToScriptFile(scriptname, sourceScript.code);
if (!sRes.success) {
terminal.error(`scp failed`);
return;
diff --git a/src/Terminal/commands/wget.ts b/src/Terminal/commands/wget.ts
index d6eaf141d..77e3444bc 100644
--- a/src/Terminal/commands/wget.ts
+++ b/src/Terminal/commands/wget.ts
@@ -28,7 +28,7 @@ export function wget(
function (data: unknown) {
let res;
if (isScriptFilename(target)) {
- res = server.writeToScriptFile(player, target, String(data));
+ res = server.writeToScriptFile(target, String(data));
} else {
res = server.writeToTextFile(target, String(data));
}
diff --git a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
index 7355c7d1d..df32766a3 100644
--- a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
+++ b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
@@ -286,7 +286,7 @@ export async function determineAllPossibilitiesForTabCompletion(
});
if (!script) return; // Doesn't exist.
//Will return the already compiled module if recompilation not needed.
- const loadedModule = await compile(p, script, currServ.scripts);
+ const loadedModule = await compile(script, currServ.scripts);
if (!loadedModule || !loadedModule.autocomplete) return; // Doesn't have an autocomplete function.
const runArgs = { "--tail": Boolean, "-t": Number };
diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx
index 66dd4e7ac..933521ac3 100644
--- a/src/ui/GameRoot.tsx
+++ b/src/ui/GameRoot.tsx
@@ -1,8 +1,8 @@
import React, { useState, useEffect } from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
-import { IEngine } from "../IEngine";
-import { ITerminal } from "../Terminal/ITerminal";
+import { Player } from "../Player";
+import { Engine } from "../engine";
+import { Terminal } from "../Terminal";
import { installAugmentations } from "../Augmentation/AugmentationHelpers";
import { saveObject } from "../SaveObject";
import { onExport } from "../ExportBonus";
@@ -84,12 +84,6 @@ import { V2Modal } from "../utils/V2Modal";
const htmlLocation = location;
-interface IProps {
- terminal: ITerminal;
- player: IPlayer;
- engine: IEngine;
-}
-
const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
@@ -148,20 +142,20 @@ export let Router: IRouter = {
toImportSave: uninitialized,
};
-function determineStartPage(player: IPlayer): Page {
+function determineStartPage(): Page {
if (RecoveryMode) return Page.Recovery;
- if (player.currentWork !== null) return Page.Work;
+ if (Player.currentWork !== null) return Page.Work;
return Page.Terminal;
}
-export function GameRoot({ player, engine, terminal }: IProps): React.ReactElement {
+export function GameRoot(): React.ReactElement {
const classes = useStyles();
const [{ files, vim }, setEditorOptions] = useState({ files: {}, vim: false });
- const [page, setPage] = useState(determineStartPage(player));
+ const [page, setPage] = useState(determineStartPage());
const setRerender = useState(0)[1];
const [augPage, setAugPage] = useState(false);
const [faction, setFaction] = useState(
- isFactionWork(player.currentWork) ? Factions[player.currentWork.factionName] : (undefined as unknown as Faction),
+ isFactionWork(Player.currentWork) ? Factions[Player.currentWork.factionName] : (undefined as unknown as Faction),
);
if (faction === undefined && page === Page.Faction)
throw new Error("Trying to go to a page without the proper setup");
@@ -243,7 +237,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
setPage(Page.City);
},
toTravel: () => {
- player.gotoLocation(LocationName.TravelAgency);
+ Player.gotoLocation(LocationName.TravelAgency);
setPage(Page.Travel);
},
toBitVerse: (flume: boolean, quick: boolean) => {
@@ -347,7 +341,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
break;
}
case Page.Terminal: {
- mainPage = saveObject.saveGame()}
export={() => {
// Apply the export bonus before saving the game
- onExport(player);
+ onExport(Player);
saveObject.exportGame();
}}
forceKill={killAllScripts}
@@ -469,7 +463,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
{
// Apply the export bonus before saving the game
- onExport(player);
+ onExport(Player);
saveObject.exportGame();
}}
installAugmentationsFn={() => {
@@ -496,7 +490,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
}
return (
-
+
@@ -511,7 +505,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme
{withSidebar ? (
diff --git a/src/ui/React/DialogBox.tsx b/src/ui/React/DialogBox.tsx
index f4fe5216d..bcbdd88f2 100644
--- a/src/ui/React/DialogBox.tsx
+++ b/src/ui/React/DialogBox.tsx
@@ -14,8 +14,10 @@ export function errorDialog(e: unknown, initialText = "") {
else if (e instanceof ScriptDeath) {
if (!e.errorMessage) return; //No need for a dialog for an empty ScriptDeath
errorText = e.errorMessage;
- } else if (e instanceof SyntaxError) errorText = e.message + " (sorry we can't be more helpful)";
- else if (e instanceof Error) errorText = e.message + (e.stack ? `\nstack:\n${e.stack.toString()}` : "");
+ if (!e.errorMessage.includes(`${e.name}@${e.hostname}`)) {
+ initialText += `${e.name}@${e.hostname} (PID - ${e.pid})\n\n`;
+ }
+ } else if (e instanceof Error) errorText = "Original error message:\n" + e.message;
else {
errorText = "An unknown error was thrown, see console.";
console.error(e);
diff --git a/src/utils/v1APIBreak.ts b/src/utils/v1APIBreak.ts
index e9f3bde1f..524432d79 100644
--- a/src/utils/v1APIBreak.ts
+++ b/src/utils/v1APIBreak.ts
@@ -126,7 +126,7 @@ export function v1APIBreak(): void {
for (const script of server.scripts) {
if (!hasChanges(script.code)) continue;
const prefix = script.filename.includes("/") ? "/BACKUP_" : "BACKUP_";
- backups.push(new Script(Player, prefix + script.filename, script.code, script.server));
+ backups.push(new Script(prefix + script.filename, script.code, script.server));
script.code = convert(script.code);
}
server.scripts = server.scripts.concat(backups);
From ad356cf28f354cc0e54e97d96174f90f7404a23b Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 29 Aug 2022 02:48:00 -0400
Subject: [PATCH 03/46] format/lint
---
src/NetscriptWorker.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index 22c63fad6..e134ded37 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -347,7 +347,7 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
workerScript.log("", () => "Script finished running");
})
.catch(function (e) {
- let initialText = `ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n`;
+ const initialText = `ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n`;
if (e instanceof SyntaxError) e = `SYNTAX ${initialText}${e.message} (sorry we can't be more helpful)`;
else if (e instanceof Error) {
e = `RUNTIME ${initialText}${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`;
From caf1a99c1d673febb10836fbc9df665a1773c4cf Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 29 Aug 2022 03:31:30 -0400
Subject: [PATCH 04/46] More reliable error message for ScriptDeaths
---
src/ui/React/DialogBox.tsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ui/React/DialogBox.tsx b/src/ui/React/DialogBox.tsx
index bcbdd88f2..00fc5b4cf 100644
--- a/src/ui/React/DialogBox.tsx
+++ b/src/ui/React/DialogBox.tsx
@@ -23,9 +23,9 @@ export function errorDialog(e: unknown, initialText = "") {
console.error(e);
}
- if (!initialText) {
- if (e instanceof ScriptDeath) initialText = `${e.name}@${e.hostname} (PID - ${e.pid})\n\n`;
+ if (!initialText && e instanceof ScriptDeath) {
+ const basicHeader = `ERROR\n${e.name}@${e.hostname} (PID - ${e.pid})\n\n`;
+ if (e.errorMessage.includes(basicHeader)) initialText = basicHeader;
}
-
dialogBoxCreate(initialText + errorText);
}
From 74be61cbdd769261cf95e3e323f7af651066d546 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 29 Aug 2022 03:34:38 -0400
Subject: [PATCH 05/46] remove unnecessary return
---
src/NetscriptWorker.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index e134ded37..8d39e9a71 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -62,7 +62,6 @@ async function startNetscript2Script(workerScript: WorkerScript): Promise
throw `${script.filename} cannot be run because it does not have a main function.`;
if (!ns) throw `${script.filename} cannot be run because the NS object hasn't been constructed properly.`;
await loadedModule.main(ns);
- return;
}
async function startNetscript1Script(workerScript: WorkerScript): Promise {
From b8496b4c2cec8a99243451e5c827142e7aaef546 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 29 Aug 2022 03:47:56 -0400
Subject: [PATCH 06/46] remove duplicate handling
---
src/ui/React/DialogBox.tsx | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/ui/React/DialogBox.tsx b/src/ui/React/DialogBox.tsx
index 00fc5b4cf..6974dfb94 100644
--- a/src/ui/React/DialogBox.tsx
+++ b/src/ui/React/DialogBox.tsx
@@ -22,10 +22,5 @@ export function errorDialog(e: unknown, initialText = "") {
errorText = "An unknown error was thrown, see console.";
console.error(e);
}
-
- if (!initialText && e instanceof ScriptDeath) {
- const basicHeader = `ERROR\n${e.name}@${e.hostname} (PID - ${e.pid})\n\n`;
- if (e.errorMessage.includes(basicHeader)) initialText = basicHeader;
- }
dialogBoxCreate(initialText + errorText);
}
From 8d0347577d98415586671586c554f0a10a0483ab Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 5 Sep 2022 08:56:39 -0400
Subject: [PATCH 07/46] Less hardcoding
---
src/Netscript/APIWrapper.ts | 2 +-
src/Netscript/NetscriptHelpers.ts | 6 +++---
src/NetscriptWorker.ts | 15 ++++++++++-----
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/Netscript/APIWrapper.ts b/src/Netscript/APIWrapper.ts
index 22b30ab23..b91501ab5 100644
--- a/src/Netscript/APIWrapper.ts
+++ b/src/Netscript/APIWrapper.ts
@@ -40,7 +40,7 @@ function wrapFunction(
const functionPath = tree.join(".");
const functionName = tree.pop();
if (typeof functionName !== "string") {
- throw helpers.makeBasicErrorMsg(workerScript, "Failure occured while wrapping netscript api");
+ throw helpers.makeBasicErrorMsg(workerScript, "Failure occured while wrapping netscript api", "INITIALIZATION");
}
const ctx = {
workerScript,
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 9655f941a..6b06926e2 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -131,11 +131,11 @@ function argsToString(args: unknown[]): string {
}
/** Creates an error message string containing hostname, scriptname, and the error message msg */
-function makeBasicErrorMsg(workerScript: WorkerScript, msg: string): string {
+function makeBasicErrorMsg(workerScript: WorkerScript, msg: string, type = "RUNTIME"): string {
for (const scriptUrl of workerScript.scriptRef.dependencies) {
msg = msg.replace(new RegExp(scriptUrl.url, "g"), scriptUrl.filename);
}
- return msg;
+ return `${type} ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n${msg}`;
}
/** Creates an error message string with a stack trace. */
@@ -204,7 +204,7 @@ function makeRuntimeErrorMsg(ctx: NetscriptContext, msg: string): string {
}
log(ctx, () => msg);
- let rejectMsg = `RUNTIME ERROR\n${ws.name}@${ws.hostname} (PID - ${ws.pid})\n\n${caller}: ${msg}`;
+ let rejectMsg = `${caller}: ${msg}`;
if (userstack.length !== 0) rejectMsg += `\n\nStack:\n${userstack.join("\n")}`;
return makeBasicErrorMsg(ws, rejectMsg);
}
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index 8d39e9a71..d75402576 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -33,6 +33,7 @@ import { simple as walksimple } from "acorn-walk";
import { areFilesEqual } from "./Terminal/DirectoryHelpers";
import { Terminal } from "./Terminal";
import { ScriptArg } from "./Netscript/ScriptArg";
+import { helpers } from "./Netscript/NetscriptHelpers";
export const NetscriptPorts: Map = new Map();
@@ -346,12 +347,16 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
workerScript.log("", () => "Script finished running");
})
.catch(function (e) {
- const initialText = `ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n`;
- if (e instanceof SyntaxError) e = `SYNTAX ${initialText}${e.message} (sorry we can't be more helpful)`;
- else if (e instanceof Error) {
- e = `RUNTIME ${initialText}${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`;
+ if (typeof e === "string") {
+ const headerText = helpers.makeBasicErrorMsg(workerScript, "", "");
+ //Add header info if it is not present;
+ if (!e.includes(headerText)) e = helpers.makeBasicErrorMsg(workerScript, e);
+ } else if (e instanceof SyntaxError) {
+ e = helpers.makeBasicErrorMsg(workerScript, `${e.message} (sorry we can't be more helpful)`, "SYNTAX");
+ } else if (e instanceof Error) {
+ e = helpers.makeBasicErrorMsg(workerScript, `${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`);
}
- errorDialog(e, typeof e === "string" && e.includes(initialText) ? "" : initialText);
+ errorDialog(e);
workerScript.log("", () => (e instanceof ScriptDeath ? "Script killed." : "Script crashed due to an error."));
killWorkerScript(workerScript);
});
From 7d3773605873201a6f556abd02be46c5dbd34bc0 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 5 Sep 2022 09:55:57 -0400
Subject: [PATCH 08/46] unified errors
---
src/Netscript/NetscriptHelpers.ts | 41 ++++++++++++++++++++++++++-----
src/Netscript/killWorkerScript.ts | 25 +++++--------------
src/NetscriptWorker.ts | 15 +++--------
src/UncaughtPromiseHandler.ts | 12 ++++++---
src/ui/React/DialogBox.tsx | 18 --------------
5 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 6b06926e2..909c2d60d 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -33,6 +33,7 @@ import { RunningScript as IRunningScript } from "../ScriptEditor/NetscriptDefini
import { arrayToString } from "../utils/helpers/arrayToString";
import { HacknetServer } from "../Hacknet/HacknetServer";
import { BaseServer } from "../Server/BaseServer";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
export const helpers = {
string,
@@ -131,11 +132,13 @@ function argsToString(args: unknown[]): string {
}
/** Creates an error message string containing hostname, scriptname, and the error message msg */
-function makeBasicErrorMsg(workerScript: WorkerScript, msg: string, type = "RUNTIME"): string {
- for (const scriptUrl of workerScript.scriptRef.dependencies) {
- msg = msg.replace(new RegExp(scriptUrl.url, "g"), scriptUrl.filename);
+function makeBasicErrorMsg(ws: WorkerScript | ScriptDeath, msg: string, type = "RUNTIME"): string {
+ if (ws instanceof WorkerScript) {
+ for (const scriptUrl of ws.scriptRef.dependencies) {
+ msg = msg.replace(new RegExp(scriptUrl.url, "g"), scriptUrl.filename);
+ }
}
- return `${type} ERROR\n${workerScript.name}@${workerScript.hostname} (PID - ${workerScript.pid})\n\n${msg}`;
+ return `${type} ERROR\n${ws.name}@${ws.hostname} (PID - ${ws.pid})\n\n${msg}`;
}
/** Creates an error message string with a stack trace. */
@@ -250,8 +253,7 @@ function checkEnvFlags(ctx: NetscriptContext): void {
throw new ScriptDeath(ws);
}
if (ws.env.runningFn && ctx.function !== "asleep") {
- //This one has no error message so it will not create a dialog
- if (ws.delayReject) ws.delayReject(new ScriptDeath(ws));
+ ws.delayReject?.(new ScriptDeath(ws));
ws.env.stopFlag = true;
log(ctx, () => "Failed to run due to failed concurrency check.");
throw makeRuntimeErrorMsg(
@@ -692,3 +694,30 @@ function failOnHacknetServer(ctx: NetscriptContext, server: BaseServer, callingF
return false;
}
}
+
+/** Generate an error dialog when workerscript is known */
+export function handleUnknownError(e: unknown, ws: WorkerScript | ScriptDeath | null = null, initialText = "") {
+ if (e instanceof ScriptDeath) {
+ //No dialog for an empty ScriptDeath
+ if (e.errorMessage === "") return;
+ if (!ws) {
+ ws = e;
+ e = ws.errorMessage;
+ }
+ }
+ if (ws && typeof e === "string") {
+ const headerText = makeBasicErrorMsg(ws, "", "");
+ if (!e.includes(headerText)) e = makeBasicErrorMsg(ws, e);
+ } else if (e instanceof SyntaxError) {
+ const msg = `${e.message} (sorry we can't be more helpful)`;
+ e = ws ? makeBasicErrorMsg(ws, msg, "SYNTAX") : `SYNTAX ERROR:\n\n${msg}`;
+ } else if (e instanceof Error) {
+ const msg = `${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`;
+ e = ws ? makeBasicErrorMsg(ws, msg) : `RUNTIME ERROR:\n\n${msg}`;
+ }
+ if (typeof e !== "string") {
+ console.error("Unexpected error type:", e);
+ e = "Unexpected type of error thrown. See console output.";
+ }
+ dialogBoxCreate(initialText + e);
+}
diff --git a/src/Netscript/killWorkerScript.ts b/src/Netscript/killWorkerScript.ts
index c70455124..84224ca49 100644
--- a/src/Netscript/killWorkerScript.ts
+++ b/src/Netscript/killWorkerScript.ts
@@ -10,10 +10,10 @@ import { WorkerScriptStartStopEventEmitter } from "./WorkerScriptStartStopEventE
import { RunningScript } from "../Script/RunningScript";
import { GetServer } from "../Server/AllServers";
-import { errorDialog } from "../ui/React/DialogBox";
import { AddRecentScript } from "./RecentScripts";
import { ITutorial } from "../InteractiveTutorial";
import { AlertEvents } from "../ui/React/AlertManager";
+import { handleUnknownError } from "./NetscriptHelpers";
export type killScriptParams = WorkerScript | number | { runningScript: RunningScript; hostname: string };
@@ -59,13 +59,16 @@ function killWorkerScriptByPid(pid: number): boolean {
}
function stopAndCleanUpWorkerScript(ws: WorkerScript): void {
- killNetscriptDelay(ws);
+ //Clean up any ongoing netscriptDelay
+ if (ws.delay) clearTimeout(ws.delay);
+ ws.delayReject?.(new ScriptDeath(ws));
+
if (typeof ws.atExit === "function") {
try {
ws.env.stopFlag = false;
ws.atExit();
} catch (e: unknown) {
- errorDialog(e, `Error during atExit ${ws.name}@${ws.hostname} (PID - ${ws.pid}\n\n`);
+ handleUnknownError(e, ws, "Error running atExit function.\n\n");
}
ws.atExit = undefined;
}
@@ -115,19 +118,3 @@ function removeWorkerScript(workerScript: WorkerScript): void {
WorkerScriptStartStopEventEmitter.emit();
}
-
-/**
- * Helper function that interrupts a script's delay if it is in the middle of a
- * 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): void {
- if (workerScript instanceof WorkerScript) {
- if (workerScript.delay) {
- clearTimeout(workerScript.delay);
- if (workerScript.delayReject) {
- workerScript.delayReject(new ScriptDeath(workerScript));
- }
- }
- }
-}
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index d75402576..a69548656 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -24,7 +24,7 @@ import { Settings } from "./Settings/Settings";
import { generate } from "escodegen";
-import { dialogBoxCreate, errorDialog } from "./ui/React/DialogBox";
+import { dialogBoxCreate } from "./ui/React/DialogBox";
import { arrayToString } from "./utils/helpers/arrayToString";
import { roundToTwo } from "./utils/helpers/roundToTwo";
@@ -33,7 +33,7 @@ import { simple as walksimple } from "acorn-walk";
import { areFilesEqual } from "./Terminal/DirectoryHelpers";
import { Terminal } from "./Terminal";
import { ScriptArg } from "./Netscript/ScriptArg";
-import { helpers } from "./Netscript/NetscriptHelpers";
+import { handleUnknownError } from "./Netscript/NetscriptHelpers";
export const NetscriptPorts: Map = new Map();
@@ -347,16 +347,7 @@ function createAndAddWorkerScript(runningScriptObj: RunningScript, server: BaseS
workerScript.log("", () => "Script finished running");
})
.catch(function (e) {
- if (typeof e === "string") {
- const headerText = helpers.makeBasicErrorMsg(workerScript, "", "");
- //Add header info if it is not present;
- if (!e.includes(headerText)) e = helpers.makeBasicErrorMsg(workerScript, e);
- } else if (e instanceof SyntaxError) {
- e = helpers.makeBasicErrorMsg(workerScript, `${e.message} (sorry we can't be more helpful)`, "SYNTAX");
- } else if (e instanceof Error) {
- e = helpers.makeBasicErrorMsg(workerScript, `${e.message}${e.stack ? `\nstack:\n${e.stack.toString()}` : ""}`);
- }
- errorDialog(e);
+ handleUnknownError(e, workerScript);
workerScript.log("", () => (e instanceof ScriptDeath ? "Script killed." : "Script crashed due to an error."));
killWorkerScript(workerScript);
});
diff --git a/src/UncaughtPromiseHandler.ts b/src/UncaughtPromiseHandler.ts
index a786c384a..d9ddc29d6 100644
--- a/src/UncaughtPromiseHandler.ts
+++ b/src/UncaughtPromiseHandler.ts
@@ -1,7 +1,11 @@
-import { errorDialog } from "./ui/React/DialogBox";
+import { handleUnknownError } from "./Netscript/NetscriptHelpers";
export function setupUncaughtPromiseHandler(): void {
- window.addEventListener("unhandledrejection", (e) =>
- errorDialog(e.reason, "UNCAUGHT PROMISE ERROR\nYou forgot to await a promise\nmaybe hack / grow / weaken ?\n"),
- );
+ window.addEventListener("unhandledrejection", (e) => {
+ handleUnknownError(
+ e.reason,
+ null,
+ "UNCAUGHT PROMISE ERROR\nYou forgot to await a promise\nmaybe hack / grow / weaken ?\n\n",
+ );
+ });
}
diff --git a/src/ui/React/DialogBox.tsx b/src/ui/React/DialogBox.tsx
index 6974dfb94..3d32dbe9b 100644
--- a/src/ui/React/DialogBox.tsx
+++ b/src/ui/React/DialogBox.tsx
@@ -2,25 +2,7 @@ import { AlertEvents } from "./AlertManager";
import React from "react";
import { Typography } from "@mui/material";
-import { ScriptDeath } from "../../Netscript/ScriptDeath";
export function dialogBoxCreate(txt: string | JSX.Element): void {
AlertEvents.emit(typeof txt === "string" ? {txt} : txt);
}
-
-export function errorDialog(e: unknown, initialText = "") {
- let errorText = "";
- if (typeof e === "string") errorText = e;
- else if (e instanceof ScriptDeath) {
- if (!e.errorMessage) return; //No need for a dialog for an empty ScriptDeath
- errorText = e.errorMessage;
- if (!e.errorMessage.includes(`${e.name}@${e.hostname}`)) {
- initialText += `${e.name}@${e.hostname} (PID - ${e.pid})\n\n`;
- }
- } else if (e instanceof Error) errorText = "Original error message:\n" + e.message;
- else {
- errorText = "An unknown error was thrown, see console.";
- console.error(e);
- }
- dialogBoxCreate(initialText + errorText);
-}
From 83c62bbc638fa2b6097bf6f50821c5e629d73192 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 5 Sep 2022 10:25:28 -0400
Subject: [PATCH 09/46] silent fail for tabcompletion compile error
---
.../determineAllPossibilitiesForTabCompletion.ts | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
index df32766a3..54393f894 100644
--- a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
+++ b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
@@ -285,8 +285,14 @@ export async function determineAllPossibilitiesForTabCompletion(
return processFilepath(script.filename) === fn || script.filename === "/" + fn;
});
if (!script) return; // Doesn't exist.
- //Will return the already compiled module if recompilation not needed.
- const loadedModule = await compile(script, currServ.scripts);
+ let loadedModule;
+ try {
+ //Will return the already compiled module if recompilation not needed.
+ loadedModule = await compile(script, currServ.scripts);
+ } catch (e) {
+ //fail silently if the script fails to compile (e.g. syntax error)
+ return;
+ }
if (!loadedModule || !loadedModule.autocomplete) return; // Doesn't have an autocomplete function.
const runArgs = { "--tail": Boolean, "-t": Number };
From 824d8db653391cbff2a070af1beeb19c9891ec20 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 5 Sep 2022 10:35:12 -0400
Subject: [PATCH 10/46] simplify/dehardcode failOnHacknetServer
---
src/Netscript/NetscriptHelpers.ts | 4 ++--
src/NetscriptFunctions.ts | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 909c2d60d..2b45ce1d9 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -686,9 +686,9 @@ function createPublicRunningScript(runningScript: RunningScript): IRunningScript
* @param {string} callingFn - Name of calling function. For logging purposes
* @returns {boolean} True if the server is a Hacknet Server, false otherwise
*/
-function failOnHacknetServer(ctx: NetscriptContext, server: BaseServer, callingFn = ""): boolean {
+function failOnHacknetServer(ctx: NetscriptContext, server: BaseServer): boolean {
if (server instanceof HacknetServer) {
- ctx.workerScript.log(callingFn, () => `Does not work on Hacknet Servers`);
+ log(ctx, () => `Does not work on Hacknet Servers`);
return true;
} else {
return false;
diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts
index 51a54c3c0..fa22e8fef 100644
--- a/src/NetscriptFunctions.ts
+++ b/src/NetscriptFunctions.ts
@@ -1110,7 +1110,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 0;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerMoneyAvailable")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 0;
}
if (server.hostname == "home") {
@@ -1130,7 +1130,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 1;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerSecurityLevel")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 1;
}
helpers.log(
@@ -1149,7 +1149,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 1;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerBaseSecurityLevel")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 1;
}
helpers.log(
@@ -1167,7 +1167,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 1;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerMinSecurityLevel")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 1;
}
helpers.log(
@@ -1185,7 +1185,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 1;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerRequiredHackingLevel")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 1;
}
helpers.log(
@@ -1203,7 +1203,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 0;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerMaxMoney")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 0;
}
helpers.log(ctx, () => `returned ${numeralWrapper.formatMoney(server.moneyMax)} for '${server.hostname}'`);
@@ -1218,7 +1218,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 1;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerGrowth")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 1;
}
helpers.log(ctx, () => `returned ${server.serverGrowth} for '${server.hostname}'`);
@@ -1233,7 +1233,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "Cannot be executed on this server.");
return 5;
}
- if (helpers.failOnHacknetServer(ctx, server, "getServerNumPortsRequired")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return 5;
}
helpers.log(ctx, () => `returned ${server.numOpenPortsRequired} for '${server.hostname}'`);
@@ -1679,7 +1679,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "invalid for this kind of server");
return Infinity;
}
- if (helpers.failOnHacknetServer(ctx, server, "getHackTime")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return Infinity;
}
@@ -1694,7 +1694,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "invalid for this kind of server");
return Infinity;
}
- if (helpers.failOnHacknetServer(ctx, server, "getGrowTime")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return Infinity;
}
@@ -1709,7 +1709,7 @@ const base: InternalAPI = {
helpers.log(ctx, () => "invalid for this kind of server");
return Infinity;
}
- if (helpers.failOnHacknetServer(ctx, server, "getWeakenTime")) {
+ if (helpers.failOnHacknetServer(ctx, server)) {
return Infinity;
}
From cc2246213f079d72b887b02845c1dffa3ef5a290 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 5 Sep 2022 14:12:48 -0400
Subject: [PATCH 11/46] Add more error types
---
src/Netscript/NetscriptHelpers.ts | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 2b45ce1d9..4657cd81c 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -91,7 +91,7 @@ const debugType = (v: unknown): string => {
function string(ctx: NetscriptContext, argName: string, v: unknown): string {
if (typeof v === "string") return v;
if (typeof v === "number") return v + ""; // cast to string;
- throw makeRuntimeErrorMsg(ctx, `'${argName}' should be a string. ${debugType(v)}`);
+ throw makeRuntimeErrorMsg(ctx, `'${argName}' should be a string. ${debugType(v)}`, "TYPE");
}
/** Convert provided value v for argument argName to number. Throw if could not convert to a non-NaN number. */
@@ -103,12 +103,12 @@ function number(ctx: NetscriptContext, argName: string, v: unknown): number {
if (isNaN(v)) throw makeRuntimeErrorMsg(ctx, `'${argName}' is NaN.`);
return v;
}
- throw makeRuntimeErrorMsg(ctx, `'${argName}' should be a number. ${debugType(v)}`);
+ throw makeRuntimeErrorMsg(ctx, `'${argName}' should be a number. ${debugType(v)}`, "TYPE");
}
/** Returns args back if it is a ScriptArg[]. Throws an error if it is not. */
function scriptArgs(ctx: NetscriptContext, args: unknown) {
- if (!isScriptArgs(args)) throw makeRuntimeErrorMsg(ctx, "'args' is not an array of script args");
+ if (!isScriptArgs(args)) throw makeRuntimeErrorMsg(ctx, "'args' is not an array of script args", "TYPE");
return args;
}
@@ -142,7 +142,7 @@ function makeBasicErrorMsg(ws: WorkerScript | ScriptDeath, msg: string, type = "
}
/** Creates an error message string with a stack trace. */
-function makeRuntimeErrorMsg(ctx: NetscriptContext, msg: string): string {
+function makeRuntimeErrorMsg(ctx: NetscriptContext, msg: string, type = "RUNTIME"): string {
const errstack = new Error().stack;
if (errstack === undefined) throw new Error("how did we not throw an error?");
const stack = errstack.split("\n").slice(1);
@@ -209,7 +209,7 @@ function makeRuntimeErrorMsg(ctx: NetscriptContext, msg: string): string {
log(ctx, () => msg);
let rejectMsg = `${caller}: ${msg}`;
if (userstack.length !== 0) rejectMsg += `\n\nStack:\n${userstack.join("\n")}`;
- return makeBasicErrorMsg(ws, rejectMsg);
+ return makeBasicErrorMsg(ws, rejectMsg, type);
}
/** Validate requested number of threads for h/g/w options */
@@ -241,6 +241,7 @@ function checkSingularityAccess(ctx: NetscriptContext): void {
ctx,
`This singularity function requires Source-File 4 to run. A power up you obtain later in the game.
It will be very obvious when and how you can obtain it.`,
+ "API ACCESS",
);
}
}
@@ -262,6 +263,7 @@ function checkEnvFlags(ctx: NetscriptContext): void {
Did you forget to await hack(), grow(), or some other
promise-returning function?
Currently running: ${ws.env.runningFn} tried to run: ${ctx.function}`,
+ "CONCURRENCY",
);
}
}
@@ -304,8 +306,8 @@ function updateDynamicRam(ctx: NetscriptContext, ramCost: number): void {
This is probably because you somehow circumvented the static RAM calculation.
Threads: ${threads}
- Dynamic RAM Usage: ${numeralWrapper.formatRAM(ws.dynamicRamUsage)}
- Static RAM Usage: ${numeralWrapper.formatRAM(ws.ramUsage)}
+ Dynamic RAM Usage: ${numeralWrapper.formatRAM(ws.dynamicRamUsage)} per thread
+ Static RAM Usage: ${numeralWrapper.formatRAM(ws.ramUsage)} per thread
One of these could be the reason:
* Using eval() to get a reference to a ns function
@@ -315,6 +317,7 @@ function updateDynamicRam(ctx: NetscriptContext, ramCost: number): void {
\u00a0\u00a0const myScan = ns['scan'];
Sorry :(`,
+ "RAM USAGE",
);
}
}
@@ -346,7 +349,7 @@ function scriptIdentifier(
args,
};
}
- throw new Error("not implemented");
+ throw makeRuntimeErrorMsg(ctx, "An unknown type of input was provided as a script identifier.", "TYPE");
}
/**
@@ -514,7 +517,7 @@ function player(ctx: NetscriptContext, p: unknown): IPlayer {
hasCorporation: undefined,
entropy: undefined,
};
- if (!roughlyIs(fakePlayer, p)) throw makeRuntimeErrorMsg(ctx, `player should be a Player.`);
+ if (!roughlyIs(fakePlayer, p)) throw makeRuntimeErrorMsg(ctx, `player should be a Player.`, "TYPE");
return p as IPlayer;
}
@@ -545,7 +548,7 @@ function server(ctx: NetscriptContext, s: unknown): Server {
requiredHackingSkill: undefined,
serverGrowth: undefined,
};
- if (!roughlyIs(fakeServer, s)) throw makeRuntimeErrorMsg(ctx, `server should be a Server.`);
+ if (!roughlyIs(fakeServer, s)) throw makeRuntimeErrorMsg(ctx, `server should be a Server.`, "TYPE");
return s as Server;
}
@@ -563,18 +566,18 @@ function roughlyIs(expect: object, actual: unknown): boolean {
function gang(ctx: NetscriptContext, g: unknown): FormulaGang {
if (!roughlyIs({ respect: 0, territory: 0, wantedLevel: 0 }, g))
- throw makeRuntimeErrorMsg(ctx, `gang should be a Gang.`);
+ throw makeRuntimeErrorMsg(ctx, `gang should be a Gang.`, "TYPE");
return g as FormulaGang;
}
function gangMember(ctx: NetscriptContext, m: unknown): GangMember {
- if (!roughlyIs(new GangMember(), m)) throw makeRuntimeErrorMsg(ctx, `member should be a GangMember.`);
+ if (!roughlyIs(new GangMember(), m)) throw makeRuntimeErrorMsg(ctx, `member should be a GangMember.`, "TYPE");
return m as GangMember;
}
function gangTask(ctx: NetscriptContext, t: unknown): GangMemberTask {
if (!roughlyIs(new GangMemberTask("", "", false, false, { hackWeight: 100 }), t))
- throw makeRuntimeErrorMsg(ctx, `task should be a GangMemberTask.`);
+ throw makeRuntimeErrorMsg(ctx, `task should be a GangMemberTask.`, "TYPE");
return t as GangMemberTask;
}
From 83d357e758031b0eb25d00031c3006d6c7146757 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 6 Sep 2022 09:07:12 -0400
Subject: [PATCH 12/46] commit1
---
src/Achievements/Achievements.ts | 18 +-
src/Augmentation/Augmentation.tsx | 22 +-
src/Augmentation/ui/AugmentationsRoot.tsx | 26 +-
.../ui/PurchasableAugmentations.tsx | 35 +-
.../ui/PurchaseAugmentationModal.tsx | 2 +-
src/BitNode/BitNode.tsx | 6 +-
src/Bladeburner/Bladeburner.tsx | 117 +++---
src/Bladeburner/IBladeburner.ts | 39 +-
src/Bladeburner/ui/ActionLevel.tsx | 4 +-
src/Bladeburner/ui/AllPages.tsx | 10 +-
src/Bladeburner/ui/BlackOpElem.tsx | 5 +-
src/Bladeburner/ui/BlackOpList.tsx | 4 +-
src/Bladeburner/ui/BlackOpPage.tsx | 4 +-
src/Bladeburner/ui/BladeburnerRoot.tsx | 6 +-
src/Bladeburner/ui/Console.tsx | 4 +-
src/Bladeburner/ui/ContractElem.tsx | 5 +-
src/Bladeburner/ui/ContractList.tsx | 4 +-
src/Bladeburner/ui/ContractPage.tsx | 4 +-
src/Bladeburner/ui/GeneralActionElem.tsx | 7 +-
src/Bladeburner/ui/GeneralActionList.tsx | 4 +-
src/Bladeburner/ui/GeneralActionPage.tsx | 4 +-
src/Bladeburner/ui/OperationElem.tsx | 5 +-
src/Bladeburner/ui/OperationList.tsx | 4 +-
src/Bladeburner/ui/OperationPage.tsx | 4 +-
src/Bladeburner/ui/StartButton.tsx | 2 +-
src/Bladeburner/ui/Stats.tsx | 16 +-
src/Casino/Blackjack.tsx | 26 +-
src/Casino/CoinFlip.tsx | 15 +-
src/Casino/Game.ts | 16 +
src/Casino/Game.tsx | 31 --
src/Casino/Roulette.tsx | 13 +-
src/Casino/SlotMachine.tsx | 18 +-
src/Corporation/Actions.ts | 11 +-
src/Corporation/Corporation.tsx | 10 +-
src/Corporation/ui/Industry.tsx | 1 -
src/Corporation/ui/IndustryWarehouse.tsx | 2 -
.../ui/modals/BuybackSharesModal.tsx | 2 +-
.../ui/modals/CreateCorporationModal.tsx | 2 +-
src/Corporation/ui/modals/SellSharesModal.tsx | 2 +-
src/Crime/CrimeHelpers.ts | 6 +-
src/DevMenu.tsx | 44 +--
src/DevMenu/ui/Achievements.tsx | 33 +-
src/DevMenu/ui/Augmentations.tsx | 16 +-
src/DevMenu/ui/Bladeburner.tsx | 14 +-
src/DevMenu/ui/Corporation.tsx | 40 +-
src/DevMenu/ui/Entropy.tsx | 26 +-
src/DevMenu/ui/Factions.tsx | 12 +-
src/DevMenu/ui/Gang.tsx | 20 +-
src/DevMenu/ui/General.tsx | 29 +-
src/DevMenu/ui/Programs.tsx | 16 +-
src/DevMenu/ui/Sleeves.tsx | 28 +-
src/DevMenu/ui/SourceFiles.tsx | 24 +-
src/DevMenu/ui/Stats.tsx | 88 ++---
src/DevMenu/ui/TimeSkip.tsx | 15 +-
src/ExportBonus.tsx | 6 +-
src/Faction/FactionHelpers.tsx | 13 +-
src/Faction/formulas/donation.ts | 6 +-
src/Faction/ui/AugmentationsPage.tsx | 29 +-
src/Faction/ui/DonateOption.tsx | 13 +-
src/Faction/ui/FactionRoot.tsx | 35 +-
src/Faction/ui/FactionsRoot.tsx | 57 +--
src/GameOptions/ui/GameOptionsRoot.tsx | 6 -
src/GameOptions/ui/GameOptionsSidebar.tsx | 11 +-
src/Hacking.ts | 38 +-
src/Hacking/netscriptCanHack.ts | 6 +-
src/Hacknet/HacknetHelpers.tsx | 229 ++++++-----
src/Hacknet/ui/HacknetNodeElem.tsx | 39 +-
src/Hacknet/ui/HacknetRoot.tsx | 43 +-
src/Hacknet/ui/HacknetServerElem.tsx | 61 ++-
src/Hacknet/ui/HacknetUpgradeElem.tsx | 5 +-
src/Hacknet/ui/HashUpgradeModal.tsx | 17 +-
src/Hacknet/ui/PlayerInfo.tsx | 10 +-
src/Hacknet/ui/PurchaseButton.tsx | 8 +-
src/Hospital/Hospital.ts | 18 +-
src/Locations/LocationsHelpers.tsx | 40 --
src/Locations/ui/CasinoLocation.tsx | 15 +-
src/Locations/ui/CoresButton.tsx | 15 +-
src/Locations/ui/GenericLocation.tsx | 14 +-
src/Locations/ui/GymLocation.tsx | 20 +-
src/Locations/ui/HospitalLocation.tsx | 24 +-
src/Locations/ui/PurchaseServerModal.tsx | 4 +-
src/Locations/ui/RamButton.tsx | 13 +-
src/Locations/ui/TechVendorLocation.tsx | 14 +-
src/Locations/ui/TorButton.tsx | 44 ++-
src/Locations/ui/TravelAgencyRoot.tsx | 36 +-
src/Locations/ui/TravelConfirmationModal.tsx | 2 +-
src/Locations/ui/UniversityLocation.tsx | 10 +-
src/Milestones/ui/MilestonesRoot.tsx | 16 +-
src/Netscript/NetscriptHelpers.ts | 2 +-
src/NetscriptFunctions/Bladeburner.ts | 154 +++-----
src/NetscriptFunctions/Corporation.ts | 4 +-
src/NetscriptFunctions/Formulas.ts | 6 +-
src/NetscriptFunctions/Grafting.ts | 11 +-
src/NetscriptFunctions/Hacknet.ts | 44 +--
src/NetscriptFunctions/Singularity.ts | 371 +++++++++---------
src/NetscriptFunctions/Sleeve.ts | 60 +--
.../Grafting/EntropyAccumulation.ts | 64 +--
src/PersonObjects/Grafting/GraftingHelpers.ts | 14 +-
.../Grafting/ui/GraftingRoot.tsx | 50 +--
.../Player/PlayerObjectAugmentationMethods.ts | 2 +-
.../Player/PlayerObjectBladeburnerMethods.ts | 2 +-
.../Player/PlayerObjectGeneralMethods.ts | 14 +-
.../Player/PlayerObjectWorkMethods.ts | 6 +-
src/PersonObjects/Sleeve/Sleeve.ts | 93 +++--
src/PersonObjects/Sleeve/SleeveHelpers.ts | 15 +-
.../Sleeve/Work/SleeveBladeburnerWork.ts | 32 +-
.../Sleeve/Work/SleeveClassWork.ts | 10 +-
.../Sleeve/Work/SleeveCompanyWork.ts | 10 +-
.../Sleeve/Work/SleeveCrimeWork.ts | 8 +-
.../Sleeve/Work/SleeveFactionWork.ts | 14 +-
.../Sleeve/Work/SleeveInfiltrateWork.ts | 8 +-
.../Sleeve/Work/SleeveRecoveryWork.ts | 5 +-
.../Sleeve/Work/SleeveSupportWork.ts | 10 +-
.../Sleeve/Work/SleeveSynchroWork.ts | 8 +-
src/PersonObjects/Sleeve/Work/Work.ts | 12 +-
.../Sleeve/ui/CovenantPurchasesRoot.tsx | 6 +-
.../Sleeve/ui/CovenantSleeveMemoryUpgrade.tsx | 11 +-
.../Sleeve/ui/SleeveAugmentationsModal.tsx | 14 +-
src/PersonObjects/Sleeve/ui/SleeveElem.tsx | 29 +-
src/PersonObjects/Sleeve/ui/StatsElement.tsx | 6 +-
src/PersonObjects/Sleeve/ui/TaskSelector.tsx | 101 +++--
src/PersonObjects/Sleeve/ui/TravelModal.tsx | 11 +-
src/Prestige.ts | 12 +-
src/Programs/Program.ts | 9 +-
src/Programs/ProgramHelpers.ts | 8 +-
src/Programs/data/ProgramsMetadata.ts | 137 ++++---
src/Programs/ui/ProgramsRoot.tsx | 33 +-
src/ScriptEditor/ui/ScriptEditorRoot.tsx | 32 +-
src/Server/ServerPurchases.ts | 24 +-
src/Sidebar/ui/SidebarRoot.tsx | 93 +++--
src/StockMarket/ui/InfoAndPurchases.tsx | 63 ++-
src/StockMarket/ui/StockMarketRoot.tsx | 7 +-
src/StockMarket/ui/StockTicker.tsx | 15 +-
src/StockMarket/ui/StockTickerHeaderText.tsx | 5 +-
src/StockMarket/ui/StockTickerOrderList.tsx | 3 -
.../ui/StockTickerPositionText.tsx | 5 +-
src/StockMarket/ui/StockTickers.tsx | 7 +-
src/Terminal/ITerminal.tsx | 44 +--
src/Terminal/Terminal.ts | 153 ++++----
src/Terminal/commands/alias.ts | 19 +-
src/Terminal/commands/analyze.ts | 17 +-
src/Terminal/commands/backdoor.ts | 29 +-
src/Terminal/commands/buy.ts | 36 +-
src/Terminal/commands/cat.ts | 24 +-
src/Terminal/commands/cd.ts | 27 +-
src/Terminal/commands/check.ts | 20 +-
src/Terminal/commands/common/editor.ts | 43 +-
src/Terminal/commands/connect.ts | 24 +-
src/Terminal/commands/cp.ts | 49 ++-
src/Terminal/commands/download.ts | 26 +-
src/Terminal/commands/expr.ts | 19 +-
src/Terminal/commands/free.ts | 30 +-
src/Terminal/commands/grow.ts | 24 +-
src/Terminal/commands/hack.ts | 24 +-
src/Terminal/commands/help.ts | 21 +-
src/Terminal/commands/history.ts | 26 +-
src/Terminal/commands/home.ts | 22 +-
src/Terminal/commands/hostname.ts | 16 +-
src/Terminal/commands/kill.ts | 26 +-
src/Terminal/commands/killall.ts | 8 +-
src/Terminal/commands/ls.tsx | 49 ++-
src/Terminal/commands/lscpu.ts | 9 +-
src/Terminal/commands/mem.ts | 29 +-
src/Terminal/commands/mv.ts | 50 +--
src/Terminal/commands/nano.ts | 13 +-
src/Terminal/commands/ps.ts | 18 +-
src/Terminal/commands/rm.ts | 18 +-
src/Terminal/commands/run.ts | 17 +-
src/Terminal/commands/runProgram.ts | 28 +-
src/Terminal/commands/runScript.ts | 29 +-
src/Terminal/commands/scan.ts | 17 +-
src/Terminal/commands/scananalyze.ts | 32 +-
src/Terminal/commands/scp.ts | 86 ++--
src/Terminal/commands/sudov.ts | 15 +-
src/Terminal/commands/tail.ts | 30 +-
src/Terminal/commands/top.ts | 15 +-
src/Terminal/commands/unalias.ts | 15 +-
src/Terminal/commands/vim.ts | 13 +-
src/Terminal/commands/weaken.ts | 27 +-
src/Terminal/commands/wget.ts | 23 +-
src/Terminal/ui/TerminalInput.tsx | 65 ++-
src/Terminal/ui/TerminalRoot.tsx | 31 +-
src/Themes/ui/ThemeBrowser.tsx | 9 +-
src/Themes/ui/ThemeEditorButton.tsx | 9 +-
src/Themes/ui/ThemeEditorModal.tsx | 5 +-
src/Work/ClassWork.tsx | 12 +-
src/Work/CompanyWork.tsx | 16 +-
src/Work/CreateProgramWork.ts | 32 +-
src/Work/CrimeWork.ts | 32 +-
src/Work/FactionWork.tsx | 26 +-
src/Work/GraftingWork.tsx | 25 +-
src/Work/Work.ts | 5 +-
src/Work/WorkStats.ts | 5 +-
src/Work/formulas/Class.ts | 19 +-
src/Work/formulas/Company.ts | 8 +-
src/engine.tsx | 20 +-
src/ui/ErrorBoundary.tsx | 15 +-
src/ui/GameRoot.tsx | 42 +-
src/ui/React/CharacterOverview.tsx | 4 +-
src/ui/React/ImportSaveRoot.tsx | 9 +-
src/ui/React/Money.tsx | 11 +-
src/ui/React/RecoveryRoot.tsx | 7 +-
src/ui/WorkInProgressRoot.tsx | 116 +++---
203 files changed, 2263 insertions(+), 3018 deletions(-)
create mode 100644 src/Casino/Game.ts
delete mode 100644 src/Casino/Game.tsx
delete mode 100644 src/Locations/LocationsHelpers.tsx
diff --git a/src/Achievements/Achievements.ts b/src/Achievements/Achievements.ts
index 2085a031e..acbf35dd8 100644
--- a/src/Achievements/Achievements.ts
+++ b/src/Achievements/Achievements.ts
@@ -347,18 +347,18 @@ export const achievements: IMap = {
FIRST_HACKNET_NODE: {
...achievementData["FIRST_HACKNET_NODE"],
Icon: "node",
- Condition: () => !hasHacknetServers(Player) && Player.hacknetNodes.length > 0,
+ Condition: () => !hasHacknetServers() && Player.hacknetNodes.length > 0,
},
"30_HACKNET_NODE": {
...achievementData["30_HACKNET_NODE"],
Icon: "hacknet-all",
- Condition: () => !hasHacknetServers(Player) && Player.hacknetNodes.length >= 30,
+ Condition: () => !hasHacknetServers() && Player.hacknetNodes.length >= 30,
},
MAX_HACKNET_NODE: {
...achievementData["MAX_HACKNET_NODE"],
Icon: "hacknet-max",
Condition: (): boolean => {
- if (hasHacknetServers(Player)) return false;
+ if (hasHacknetServers()) return false;
for (const h of Player.hacknetNodes) {
if (!(h instanceof HacknetNode)) return false;
if (
@@ -374,7 +374,7 @@ export const achievements: IMap = {
HACKNET_NODE_10M: {
...achievementData["HACKNET_NODE_10M"],
Icon: "hacknet-10m",
- Condition: () => !hasHacknetServers(Player) && Player.moneySourceB.hacknet >= 10e6,
+ Condition: () => !hasHacknetServers() && Player.moneySourceB.hacknet >= 10e6,
},
REPUTATION_10M: {
...achievementData["REPUTATION_10M"],
@@ -515,14 +515,14 @@ export const achievements: IMap = {
...achievementData["FIRST_HACKNET_SERVER"],
Icon: "HASHNET",
Visible: () => hasAccessToSF(Player, 9),
- Condition: () => hasHacknetServers(Player) && Player.hacknetNodes.length > 0,
+ Condition: () => hasHacknetServers() && Player.hacknetNodes.length > 0,
AdditionalUnlock: [achievementData.FIRST_HACKNET_NODE.ID],
},
ALL_HACKNET_SERVER: {
...achievementData["ALL_HACKNET_SERVER"],
Icon: "HASHNETALL",
Visible: () => hasAccessToSF(Player, 9),
- Condition: () => hasHacknetServers(Player) && Player.hacknetNodes.length === HacknetServerConstants.MaxServers,
+ Condition: () => hasHacknetServers() && Player.hacknetNodes.length === HacknetServerConstants.MaxServers,
AdditionalUnlock: [achievementData["30_HACKNET_NODE"].ID],
},
MAX_HACKNET_SERVER: {
@@ -530,7 +530,7 @@ export const achievements: IMap = {
Icon: "HASHNETALL",
Visible: () => hasAccessToSF(Player, 9),
Condition: (): boolean => {
- if (!hasHacknetServers(Player)) return false;
+ if (!hasHacknetServers()) return false;
for (const h of Player.hacknetNodes) {
if (typeof h !== "string") return false;
const hs = GetServer(h);
@@ -551,7 +551,7 @@ export const achievements: IMap = {
...achievementData["HACKNET_SERVER_1B"],
Icon: "HASHNETMONEY",
Visible: () => hasAccessToSF(Player, 9),
- Condition: () => hasHacknetServers(Player) && Player.moneySourceB.hacknet >= 1e9,
+ Condition: () => hasHacknetServers() && Player.moneySourceB.hacknet >= 1e9,
AdditionalUnlock: [achievementData.HACKNET_NODE_10M.ID],
},
MAX_CACHE: {
@@ -559,7 +559,7 @@ export const achievements: IMap = {
Icon: "HASHNETCAP",
Visible: () => hasAccessToSF(Player, 9),
Condition: () =>
- hasHacknetServers(Player) &&
+ hasHacknetServers() &&
Player.hashManager.hashes === Player.hashManager.capacity &&
Player.hashManager.capacity > 0,
},
diff --git a/src/Augmentation/Augmentation.tsx b/src/Augmentation/Augmentation.tsx
index e1154bb5c..9dafe06e0 100644
--- a/src/Augmentation/Augmentation.tsx
+++ b/src/Augmentation/Augmentation.tsx
@@ -8,7 +8,7 @@ import { Money } from "../ui/React/Money";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
import { FactionNames } from "../Faction/data/FactionNames";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { AugmentationNames } from "./data/AugmentationNames";
import { CONSTANTS } from "../Constants";
import { StaticAugmentations } from "./StaticAugmentations";
@@ -531,26 +531,26 @@ export class Augmentation {
}
}
- getCost(player: IPlayer): AugmentationCosts {
+ getCost(): AugmentationCosts {
const augmentationReference = StaticAugmentations[this.name];
let moneyCost = augmentationReference.baseCost;
let repCost = augmentationReference.baseRepRequirement;
if (augmentationReference.name === AugmentationNames.NeuroFluxGovernor) {
- let nextLevel = this.getLevel(player);
+ let nextLevel = this.getLevel();
--nextLevel;
const multiplier = Math.pow(CONSTANTS.NeuroFluxGovernorLevelMult, nextLevel);
repCost = augmentationReference.baseRepRequirement * multiplier * BitNodeMultipliers.AugmentationRepCost;
moneyCost = augmentationReference.baseCost * multiplier * BitNodeMultipliers.AugmentationMoneyCost;
- for (let i = 0; i < player.queuedAugmentations.length; ++i) {
+ for (let i = 0; i < Player.queuedAugmentations.length; ++i) {
moneyCost *= getBaseAugmentationPriceMultiplier();
}
} else if (augmentationReference.factions.includes(FactionNames.ShadowsOfAnarchy)) {
const soaAugmentationNames = initSoAAugmentations().map((augmentation) => augmentation.name);
const soaMultiplier = Math.pow(
CONSTANTS.SoACostMult,
- soaAugmentationNames.filter((augmentationName) => player.hasAugmentation(augmentationName)).length,
+ soaAugmentationNames.filter((augmentationName) => Player.hasAugmentation(augmentationName)).length,
);
moneyCost = augmentationReference.baseCost * soaMultiplier;
if (soaAugmentationNames.find((augmentationName) => augmentationName === augmentationReference.name)) {
@@ -566,19 +566,19 @@ export class Augmentation {
return { moneyCost, repCost };
}
- getLevel(player: IPlayer): number {
+ getLevel(): number {
// Get current Neuroflux level based on Player's augmentations
if (this.name === AugmentationNames.NeuroFluxGovernor) {
let currLevel = 0;
- for (let i = 0; i < player.augmentations.length; ++i) {
- if (player.augmentations[i].name === AugmentationNames.NeuroFluxGovernor) {
- currLevel = player.augmentations[i].level;
+ for (let i = 0; i < Player.augmentations.length; ++i) {
+ if (Player.augmentations[i].name === AugmentationNames.NeuroFluxGovernor) {
+ currLevel = Player.augmentations[i].level;
}
}
// Account for purchased but uninstalled Augmentations
- for (let i = 0; i < player.queuedAugmentations.length; ++i) {
- if (player.queuedAugmentations[i].name == AugmentationNames.NeuroFluxGovernor) {
+ for (let i = 0; i < Player.queuedAugmentations.length; ++i) {
+ if (Player.queuedAugmentations[i].name == AugmentationNames.NeuroFluxGovernor) {
++currLevel;
}
}
diff --git a/src/Augmentation/ui/AugmentationsRoot.tsx b/src/Augmentation/ui/AugmentationsRoot.tsx
index 033ac95d6..f5d024c86 100644
--- a/src/Augmentation/ui/AugmentationsRoot.tsx
+++ b/src/Augmentation/ui/AugmentationsRoot.tsx
@@ -20,7 +20,7 @@ import Paper from "@mui/material/Paper";
import Container from "@mui/material/Container";
import { Settings } from "../../Settings/Settings";
import { ConfirmationModal } from "../../ui/React/ConfirmationModal";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { AugmentationNames } from "../data/AugmentationNames";
import { StaticAugmentations } from "../StaticAugmentations";
import { CONSTANTS } from "../../Constants";
@@ -29,12 +29,8 @@ import { Info } from "@mui/icons-material";
import { Link } from "@mui/material";
import { AlertEvents } from "../../ui/React/AlertManager";
-interface NFGDisplayProps {
- player: IPlayer;
-}
-
-const NeuroFluxDisplay = ({ player }: NFGDisplayProps): React.ReactElement => {
- const level = player.augmentations.find((e) => e.name === AugmentationNames.NeuroFluxGovernor)?.level ?? 0;
+const NeuroFluxDisplay = (): React.ReactElement => {
+ const level = Player.augmentations.find((e) => e.name === AugmentationNames.NeuroFluxGovernor)?.level ?? 0;
const openBloodDonation = () => {
AlertEvents.emit(
@@ -67,18 +63,14 @@ const NeuroFluxDisplay = ({ player }: NFGDisplayProps): React.ReactElement => {
);
};
-interface EntropyDisplayProps {
- player: IPlayer;
-}
-
-const EntropyDisplay = ({ player }: EntropyDisplayProps): React.ReactElement => {
- return player.entropy > 0 ? (
+const EntropyDisplay = (): React.ReactElement => {
+ return Player.entropy > 0 ? (
- Entropy Virus - Level {player.entropy}
+ Entropy Virus - Level {Player.entropy}
- All multipliers decreased by: {formatNumber((1 - CONSTANTS.EntropyEffect ** player.entropy) * 100, 3)}%
+ All multipliers decreased by: {formatNumber((1 - CONSTANTS.EntropyEffect ** Player.entropy) * 100, 3)}%
(multiplicative)
@@ -222,8 +214,8 @@ export function AugmentationsRoot(props: IProps): React.ReactElement {
gap: 1,
}}
>
-
diff --git a/src/Augmentation/ui/PurchasableAugmentations.tsx b/src/Augmentation/ui/PurchasableAugmentations.tsx
index 27a8f927b..4b97c261e 100644
--- a/src/Augmentation/ui/PurchasableAugmentations.tsx
+++ b/src/Augmentation/ui/PurchasableAugmentations.tsx
@@ -6,7 +6,7 @@ import { CheckBox, CheckBoxOutlineBlank, CheckCircle, NewReleases, Report } from
import { Box, Button, Container, Paper, Tooltip, Typography } from "@mui/material";
import React, { useState } from "react";
import { Faction } from "../../Faction/Faction";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Settings } from "../../Settings/Settings";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Augmentation } from "../Augmentation";
@@ -15,12 +15,11 @@ import { StaticAugmentations } from "../StaticAugmentations";
import { PurchaseAugmentationModal } from "./PurchaseAugmentationModal";
interface IPreReqsProps {
- player: IPlayer;
aug: Augmentation;
}
const PreReqs = (props: IPreReqsProps): React.ReactElement => {
- const ownedPreReqs = props.aug.prereqs.filter((aug) => props.player.hasAugmentation(aug));
+ const ownedPreReqs = props.aug.prereqs.filter((aug) => Player.hasAugmentation(aug));
const hasPreReqs = props.aug.prereqs.length > 0 && ownedPreReqs.length === props.aug.prereqs.length;
return (
@@ -32,7 +31,7 @@ const PreReqs = (props: IPreReqsProps): React.ReactElement => {
{props.aug.prereqs.map((preAug) => (
{
};
interface IExclusiveProps {
- player: IPlayer;
aug: Augmentation;
}
@@ -85,12 +83,12 @@ const Exclusive = (props: IExclusiveProps): React.ReactElement => {
{props.aug.factions[0]} faction
- {props.player.isAwareOfGang() && !props.aug.isSpecial && (
+ {Player.isAwareOfGang() && !props.aug.isSpecial && (
Certain gangs
)}
- {props.player.canAccessGrafting() &&
+ {Player.canAccessGrafting() &&
!props.aug.isSpecial &&
props.aug.name !== AugmentationNames.TheRedPill && (
@@ -130,10 +128,9 @@ const Requirement = (props: IReqProps): React.ReactElement => {
interface IPurchasableAugsProps {
augNames: string[];
ownedAugNames: string[];
- player: IPlayer;
- canPurchase: (player: IPlayer, aug: Augmentation) => boolean;
- purchaseAugmentation: (player: IPlayer, aug: Augmentation, showModal: (open: boolean) => void) => void;
+ canPurchase: (aug: Augmentation) => boolean;
+ purchaseAugmentation: (aug: Augmentation, showModal: (open: boolean) => void) => void;
rep?: number;
sleeveAugs?: boolean;
@@ -167,7 +164,7 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
const [open, setOpen] = useState(false);
const aug = StaticAugmentations[props.augName];
- const augCosts = aug.getCost(props.parent.player);
+ const augCosts = aug.getCost();
const cost = props.parent.sleeveAugs ? aug.baseCost : augCosts.moneyCost;
const repCost = augCosts.repCost;
const info = typeof aug.info === "string" ? {aug.info} : aug.info;
@@ -195,11 +192,11 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
- props.parent.purchaseAugmentation(props.parent.player, aug, (open): void => {
+ props.parent.purchaseAugmentation(aug, (open): void => {
setOpen(open);
})
}
- disabled={!props.parent.canPurchase(props.parent.player, aug) || props.owned}
+ disabled={!props.parent.canPurchase(aug) || props.owned}
sx={{ width: "48px", height: "36px", float: "left", clear: "none", mr: 1 }}
>
{props.owned ? "Owned" : "Buy"}
@@ -213,7 +210,7 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
{props.augName}
{props.augName === AugmentationNames.NeuroFluxGovernor &&
- ` - Level ${aug.getLevel(props.parent.player)}`}
+ ` - Level ${aug.getLevel()}`}
{description}
@@ -226,20 +223,20 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
whiteSpace: "nowrap",
overflow: "hidden",
color:
- props.owned || !props.parent.canPurchase(props.parent.player, aug)
+ props.owned || !props.parent.canPurchase(aug)
? Settings.theme.disabled
: Settings.theme.primary,
}}
>
{aug.name}
- {aug.name === AugmentationNames.NeuroFluxGovernor && ` - Level ${aug.getLevel(props.parent.player)}`}
+ {aug.name === AugmentationNames.NeuroFluxGovernor && ` - Level ${aug.getLevel()}`}
{aug.factions.length === 1 && !props.parent.sleeveAugs && (
-
@@ -247,7 +244,7 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
{props.owned || (
cost}
+ fulfilled={cost === 0 || Player.money > cost}
value={numeralWrapper.formatMoney(cost)}
color={Settings.theme.money}
/>
diff --git a/src/Augmentation/ui/PurchaseAugmentationModal.tsx b/src/Augmentation/ui/PurchaseAugmentationModal.tsx
index 05bd9d4ec..bf3157a18 100644
--- a/src/Augmentation/ui/PurchaseAugmentationModal.tsx
+++ b/src/Augmentation/ui/PurchaseAugmentationModal.tsx
@@ -44,7 +44,7 @@ export function PurchaseAugmentationModal(props: IProps): React.ReactElement {
- {value === 0 &&
diff --git a/src/Bladeburner/ui/BlackOpElem.tsx b/src/Bladeburner/ui/BlackOpElem.tsx
index 7c45836c3..e5e586d84 100644
--- a/src/Bladeburner/ui/BlackOpElem.tsx
+++ b/src/Bladeburner/ui/BlackOpElem.tsx
@@ -6,7 +6,7 @@ import { TeamSizeButton } from "./TeamSizeButton";
import { IBladeburner } from "../IBladeburner";
import { BlackOperation } from "../BlackOperation";
import { BlackOperations } from "../data/BlackOperations";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { CopyableText } from "../../ui/React/CopyableText";
import { SuccessChance } from "./SuccessChance";
import { StartButton } from "./StartButton";
@@ -16,7 +16,6 @@ import Paper from "@mui/material/Paper";
interface IProps {
bladeburner: IBladeburner;
- player: IPlayer;
action: BlackOperation;
}
@@ -37,7 +36,7 @@ export function BlackOpElem(props: IProps): React.ReactElement {
const isActive =
props.bladeburner.action.type === ActionTypes["BlackOperation"] &&
props.action.name === props.bladeburner.action.name;
- const actionTime = props.action.getActionTime(props.bladeburner, props.player);
+ const actionTime = props.action.getActionTime(props.bladeburner, Player);
const hasReqdRank = props.bladeburner.rank >= props.action.reqdRank;
const computedActionTimeCurrent = Math.min(
props.bladeburner.actionTimeCurrent + props.bladeburner.actionTimeOverflow,
diff --git a/src/Bladeburner/ui/BlackOpList.tsx b/src/Bladeburner/ui/BlackOpList.tsx
index 834119cbd..17706bf6f 100644
--- a/src/Bladeburner/ui/BlackOpList.tsx
+++ b/src/Bladeburner/ui/BlackOpList.tsx
@@ -3,11 +3,9 @@ import { BlackOperations } from "../BlackOperations";
import { BlackOperation } from "../BlackOperation";
import { BlackOpElem } from "./BlackOpElem";
import { IBladeburner } from "../IBladeburner";
-import { IPlayer } from "../../PersonObjects/IPlayer";
interface IProps {
bladeburner: IBladeburner;
- player: IPlayer;
}
export function BlackOpList(props: IProps): React.ReactElement {
@@ -35,7 +33,7 @@ export function BlackOpList(props: IProps): React.ReactElement {
return (
<>
{blackops.map((blackop: BlackOperation) => (
-
-
-
);
}
diff --git a/src/Bladeburner/ui/Console.tsx b/src/Bladeburner/ui/Console.tsx
index 8a6a82935..bcc07b447 100644
--- a/src/Bladeburner/ui/Console.tsx
+++ b/src/Bladeburner/ui/Console.tsx
@@ -2,7 +2,6 @@ import React, { useState, useRef, useEffect } from "react";
import { IBladeburner } from "../IBladeburner";
import { KEY } from "../../utils/helpers/keyCodes";
-import { IPlayer } from "../../PersonObjects/IPlayer";
import Paper from "@mui/material/Paper";
import List from "@mui/material/List";
import ListItem from "@mui/material/ListItem";
@@ -50,7 +49,6 @@ function Line(props: ILineProps): React.ReactElement {
interface IProps {
bladeburner: IBladeburner;
- player: IPlayer;
}
export function Console(props: IProps): React.ReactElement {
@@ -81,7 +79,7 @@ export function Console(props: IProps): React.ReactElement {
event.preventDefault();
if (command.length > 0) {
props.bladeburner.postToConsole("> " + command);
- props.bladeburner.executeConsoleCommands(props.player, command);
+ props.bladeburner.executeConsoleCommands(command);
setConsoleHistoryIndex(props.bladeburner.consoleHistory.length);
setCommand("");
}
diff --git a/src/Bladeburner/ui/ContractElem.tsx b/src/Bladeburner/ui/ContractElem.tsx
index 5edf04842..376236ca7 100644
--- a/src/Bladeburner/ui/ContractElem.tsx
+++ b/src/Bladeburner/ui/ContractElem.tsx
@@ -5,7 +5,7 @@ import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/Stri
import { Contracts } from "../data/Contracts";
import { IBladeburner } from "../IBladeburner";
import { IAction } from "../IAction";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { SuccessChance } from "./SuccessChance";
import { CopyableText } from "../../ui/React/CopyableText";
import { ActionLevel } from "./ActionLevel";
@@ -17,7 +17,6 @@ import Paper from "@mui/material/Paper";
interface IProps {
bladeburner: IBladeburner;
- player: IPlayer;
action: IAction;
}
@@ -32,7 +31,7 @@ export function ContractElem(props: IProps): React.ReactElement {
props.bladeburner.actionTimeCurrent + props.bladeburner.actionTimeOverflow,
props.bladeburner.actionTimeToComplete,
);
- const actionTime = props.action.getActionTime(props.bladeburner, props.player);
+ const actionTime = props.action.getActionTime(props.bladeburner, Player);
const actionData = Contracts[props.action.name];
if (actionData === undefined) {
diff --git a/src/Bladeburner/ui/ContractList.tsx b/src/Bladeburner/ui/ContractList.tsx
index 7bd24c53b..499a437fe 100644
--- a/src/Bladeburner/ui/ContractList.tsx
+++ b/src/Bladeburner/ui/ContractList.tsx
@@ -1,11 +1,9 @@
import React from "react";
import { ContractElem } from "./ContractElem";
import { IBladeburner } from "../IBladeburner";
-import { IPlayer } from "../../PersonObjects/IPlayer";
interface IProps {
bladeburner: IBladeburner;
- player: IPlayer;
}
export function ContractList(props: IProps): React.ReactElement {
@@ -14,7 +12,7 @@ export function ContractList(props: IProps): React.ReactElement {
return (
<>
{names.map((name: string) => (
- These are generic actions that will assist you in your Bladeburner duties.
- Skill Points: {formatNumber(props.bladeburner.skillPoints, 0)}
- Aug. Success Chance mult: {formatNumber(props.player.mults.bladeburner_success_chance * 100, 1)}%
+ Aug. Success Chance mult: {formatNumber(Player.mults.bladeburner_success_chance * 100, 1)}%
diff --git a/src/Casino/Blackjack.tsx b/src/Casino/Blackjack.tsx
index 542989e0d..54eb13b85 100644
--- a/src/Casino/Blackjack.tsx
+++ b/src/Casino/Blackjack.tsx
@@ -1,8 +1,8 @@
import * as React from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { Money } from "../ui/React/Money";
-import { Game, reachedLimit } from "./Game";
+import { win, reachedLimit } from "./Game";
import { Deck } from "./CardDeck/Deck";
import { Hand } from "./CardDeck/Hand";
import { InputAdornment } from "@mui/material";
@@ -24,10 +24,6 @@ enum Result {
Tie = "Push! (Tie)",
}
-type Props = {
- p: IPlayer;
-};
-
type State = {
playerHand: Hand;
dealerHand: Hand;
@@ -40,11 +36,11 @@ type State = {
wagerInvalidHelperText: string;
};
-export class Blackjack extends Game {
+export class Blackjack extends React.Component<{},State> {
deck: Deck;
- constructor(props: Props) {
- super(props);
+ constructor() {
+ super({});
this.deck = new Deck(DECK_COUNT);
@@ -64,20 +60,19 @@ export class Blackjack extends Game {
}
canStartGame = (): boolean => {
- const { p } = this.props;
const { bet } = this.state;
- return p.canAfford(bet);
+ return Player.canAfford(bet);
};
startGame = (): void => {
- if (!this.canStartGame() || reachedLimit(this.props.p)) {
+ if (!this.canStartGame() || reachedLimit()) {
return;
}
// Take money from player right away so that player's dont just "leave" to avoid the loss (I mean they could
// always reload without saving but w.e) TODO: Save/Restore the RNG state to limit the value of save-scumming.
- this.props.p.loseMoney(this.state.bet, "casino");
+ win(-this.state.bet);
const playerHand = new Hand([this.deck.safeDrawCard(), this.deck.safeDrawCard()]);
const dealerHand = new Hand([this.deck.safeDrawCard(), this.deck.safeDrawCard()]);
@@ -230,7 +225,7 @@ export class Blackjack extends Game {
: (() => {
throw new Error(`Unexpected result: ${result}`);
})(); // This can't happen, right?
- this.win(this.props.p, gains);
+ win(gains);
this.setState({
gameInProgress: false,
result,
@@ -239,7 +234,6 @@ export class Blackjack extends Game {
};
wagerOnChange = (event: React.ChangeEvent): void => {
- const { p } = this.props;
const betInput = event.target.value;
const wager = Math.round(parseFloat(betInput));
if (isNaN(wager)) {
@@ -263,7 +257,7 @@ export class Blackjack extends Game {
wagerInvalid: true,
wagerInvalidHelperText: "Exceeds max bet",
});
- } else if (!p.canAfford(wager)) {
+ } else if (!Player.canAfford(wager)) {
this.setState({
bet: 0,
betInput,
diff --git a/src/Casino/CoinFlip.tsx b/src/Casino/CoinFlip.tsx
index 17b09488c..32fdae274 100644
--- a/src/Casino/CoinFlip.tsx
+++ b/src/Casino/CoinFlip.tsx
@@ -5,7 +5,6 @@
*/
import React, { useState } from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { BadRNG } from "./RNG";
import { win, reachedLimit } from "./Game";
import { trusted } from "./utils";
@@ -15,14 +14,10 @@ import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
import Box from "@mui/material/Box";
-type IProps = {
- p: IPlayer;
-};
-
const minPlay = 0;
const maxPlay = 10e3;
-export function CoinFlip(props: IProps): React.ReactElement {
+export function CoinFlip(): React.ReactElement {
const [investment, setInvestment] = useState(1000);
const [result, setResult] = useState( );
const [status, setStatus] = useState("");
@@ -43,7 +38,7 @@ export function CoinFlip(props: IProps): React.ReactElement {
}
function play(guess: string): void {
- if (reachedLimit(props.p)) return;
+ if (reachedLimit()) return;
const v = BadRNG.random();
let letter: string;
if (v < 0.5) {
@@ -65,11 +60,11 @@ export function CoinFlip(props: IProps): React.ReactElement {
setTimeout(() => setPlayLock(false), 250);
if (correct) {
- win(props.p, investment);
+ win(investment);
} else {
- win(props.p, -investment);
+ win(-investment);
}
- if (reachedLimit(props.p)) return;
+ if (reachedLimit()) return;
}
return (
diff --git a/src/Casino/Game.ts b/src/Casino/Game.ts
new file mode 100644
index 000000000..378f4f0cd
--- /dev/null
+++ b/src/Casino/Game.ts
@@ -0,0 +1,16 @@
+import { Player } from "../Player";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+
+const gainLimit = 10e9;
+
+export function win(n: number): void {
+ Player.gainMoney(n, "casino");
+}
+
+export function reachedLimit(): boolean {
+ const reached = Player.getCasinoWinnings() > gainLimit;
+ if (reached) {
+ dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
+ }
+ return reached;
+}
\ No newline at end of file
diff --git a/src/Casino/Game.tsx b/src/Casino/Game.tsx
deleted file mode 100644
index b20eda813..000000000
--- a/src/Casino/Game.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as React from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
-import { dialogBoxCreate } from "../ui/React/DialogBox";
-
-const gainLimit = 10e9;
-
-export function win(p: IPlayer, n: number): void {
- p.gainMoney(n, "casino");
-}
-
-export function reachedLimit(p: IPlayer): boolean {
- const reached = p.getCasinoWinnings() > gainLimit;
- if (reached) {
- dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
- }
- return reached;
-}
-
-export class Game extends React.Component {
- win(p: IPlayer, n: number): void {
- p.gainMoney(n, "casino");
- }
-
- reachedLimit(p: IPlayer): boolean {
- const reached = p.getCasinoWinnings() > gainLimit;
- if (reached) {
- dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
- }
- return reached;
- }
-}
diff --git a/src/Casino/Roulette.tsx b/src/Casino/Roulette.tsx
index da1dd59d2..f45af1cb3 100644
--- a/src/Casino/Roulette.tsx
+++ b/src/Casino/Roulette.tsx
@@ -1,6 +1,5 @@
import React, { useState, useEffect } from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { Money } from "../ui/React/Money";
import { win, reachedLimit } from "./Game";
import { WHRNG } from "./RNG";
@@ -9,10 +8,6 @@ import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
-type IProps = {
- p: IPlayer;
-};
-
const minPlay = 0;
const maxPlay = 1e7;
@@ -111,7 +106,7 @@ function Single(s: number): Strategy {
};
}
-export function Roulette(props: IProps): React.ReactElement {
+export function Roulette(): React.ReactElement {
const [rng] = useState(new WHRNG(new Date().getTime()));
const [investment, setInvestment] = useState(1000);
const [canPlay, setCanPlay] = useState(true);
@@ -151,7 +146,7 @@ export function Roulette(props: IProps): React.ReactElement {
}
function play(strategy: Strategy): void {
- if (reachedLimit(props.p)) return;
+ if (reachedLimit()) return;
setCanPlay(false);
setLock(false);
@@ -184,14 +179,14 @@ export function Roulette(props: IProps): React.ReactElement {
);
}
- win(props.p, gain);
+ win(gain);
setCanPlay(true);
setLock(true);
setStatus(status);
setN(n);
- reachedLimit(props.p);
+ reachedLimit();
}, 1600);
}
diff --git a/src/Casino/SlotMachine.tsx b/src/Casino/SlotMachine.tsx
index a7fdbd083..6655f041b 100644
--- a/src/Casino/SlotMachine.tsx
+++ b/src/Casino/SlotMachine.tsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { Money } from "../ui/React/Money";
import { WHRNG } from "./RNG";
import { win, reachedLimit } from "./Game";
@@ -9,10 +9,6 @@ import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
-type IProps = {
- p: IPlayer;
-};
-
// statically shuffled array of symbols.
const symbols = [
"D",
@@ -141,8 +137,8 @@ const payLines = [
const minPlay = 0;
const maxPlay = 1e6;
-export function SlotMachine(props: IProps): React.ReactElement {
- const [rng] = useState(new WHRNG(props.p.totalPlaytime));
+export function SlotMachine(): React.ReactElement {
+ const [rng] = useState(new WHRNG(Player.totalPlaytime));
const [index, setIndex] = useState([0, 0, 0, 0, 0]);
const [locks, setLocks] = useState([0, 0, 0, 0, 0]);
const [investment, setInvestment] = useState(1000);
@@ -191,9 +187,9 @@ export function SlotMachine(props: IProps): React.ReactElement {
}
function play(): void {
- if (reachedLimit(props.p)) return;
+ if (reachedLimit()) return;
setStatus("playing");
- win(props.p, -investment);
+ win(-investment);
if (!canPlay) return;
unlock();
setTimeout(lock, rng.random() * 2000 + 1000);
@@ -235,7 +231,7 @@ export function SlotMachine(props: IProps): React.ReactElement {
if (count < 3) continue;
const payout = getPayout(data[0], count - 3);
gains += investment * payout;
- win(props.p, investment * payout);
+ win(investment * payout);
}
setStatus(
@@ -244,7 +240,7 @@ export function SlotMachine(props: IProps): React.ReactElement {
,
);
setCanPlay(true);
- if (reachedLimit(props.p)) return;
+ if (reachedLimit()) return;
}
function unlock(): void {
diff --git a/src/Corporation/Actions.ts b/src/Corporation/Actions.ts
index bf53d1e2f..07e475b6f 100644
--- a/src/Corporation/Actions.ts
+++ b/src/Corporation/Actions.ts
@@ -1,5 +1,4 @@
import { Player } from "../Player";
-import { IPlayer } from "src/PersonObjects/IPlayer";
import { MaterialSizes } from "./MaterialSizes";
import { ICorporation } from "./ICorporation";
import { Corporation } from "./Corporation";
@@ -271,7 +270,7 @@ export function BulkPurchase(corp: ICorporation, warehouse: Warehouse, material:
}
}
-export function SellShares(corporation: ICorporation, player: IPlayer, numShares: number): number {
+export function SellShares(corporation: ICorporation, numShares: number): number {
if (isNaN(numShares)) throw new Error("Invalid value for number of shares");
if (numShares < 0) throw new Error("Invalid value for number of shares");
if (numShares > corporation.numShares) throw new Error("You don't have that many shares to sell!");
@@ -287,20 +286,20 @@ export function SellShares(corporation: ICorporation, player: IPlayer, numShares
corporation.sharePrice = newSharePrice;
corporation.shareSalesUntilPriceUpdate = newSharesUntilUpdate;
corporation.shareSaleCooldown = CorporationConstants.SellSharesCooldown;
- player.gainMoney(profit, "corporation");
+ Player.gainMoney(profit, "corporation");
return profit;
}
-export function BuyBackShares(corporation: ICorporation, player: IPlayer, numShares: number): boolean {
+export function BuyBackShares(corporation: ICorporation, numShares: number): boolean {
if (isNaN(numShares)) throw new Error("Invalid value for number of shares");
if (numShares < 0) throw new Error("Invalid value for number of shares");
if (numShares > corporation.issuedShares) throw new Error("You don't have that many shares to buy!");
if (!corporation.public) throw new Error("You haven't gone public!");
const buybackPrice = corporation.sharePrice * 1.1;
- if (player.money < numShares * buybackPrice) throw new Error("You cant afford that many shares!");
+ if (Player.money < numShares * buybackPrice) throw new Error("You cant afford that many shares!");
corporation.numShares += numShares;
corporation.issuedShares -= numShares;
- player.loseMoney(numShares * buybackPrice, "corporation");
+ Player.loseMoney(numShares * buybackPrice, "corporation");
return true;
}
diff --git a/src/Corporation/Corporation.tsx b/src/Corporation/Corporation.tsx
index d9643eddf..edb3314e0 100644
--- a/src/Corporation/Corporation.tsx
+++ b/src/Corporation/Corporation.tsx
@@ -8,7 +8,7 @@ import { Industry } from "./Industry";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { showLiterature } from "../Literature/LiteratureHelpers";
import { LiteratureNames } from "../Literature/data/LiteratureNames";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { dialogBoxCreate } from "../ui/React/DialogBox";
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
@@ -76,7 +76,7 @@ export class Corporation {
this.storedCycles += numCycles;
}
- process(player: IPlayer): void {
+ process(): void {
if (this.storedCycles >= CorporationConstants.CyclesPerIndustryStateCycle) {
const state = this.getState();
const marketCycles = 1;
@@ -139,7 +139,7 @@ export class Corporation {
} else {
const totalDividends = this.dividendRate * cycleProfit;
const retainedEarnings = cycleProfit - totalDividends;
- player.gainMoney(this.getCycleDividends(), "corporation");
+ Player.gainMoney(this.getCycleDividends(), "corporation");
this.addFunds(retainedEarnings);
}
} else {
@@ -428,9 +428,9 @@ export class Corporation {
// Adds the Corporation Handbook (Starter Guide) to the player's home computer.
// This is a lit file that gives introductory info to the player
// This occurs when the player clicks the "Getting Started Guide" button on the overview panel
- getStarterGuide(player: IPlayer): void {
+ getStarterGuide(): void {
// Check if player already has Corporation Handbook
- const homeComp = player.getHomeComputer();
+ const homeComp = Player.getHomeComputer();
let hasHandbook = false;
const handbookFn = LiteratureNames.CorporationManagementHandbook;
for (let i = 0; i < homeComp.messages.length; ++i) {
diff --git a/src/Corporation/ui/Industry.tsx b/src/Corporation/ui/Industry.tsx
index 9c1fafadf..c02643db8 100644
--- a/src/Corporation/ui/Industry.tsx
+++ b/src/Corporation/ui/Industry.tsx
@@ -31,7 +31,6 @@ export function Industry(props: IProps): React.ReactElement {
void;
}
diff --git a/src/Corporation/ui/modals/BuybackSharesModal.tsx b/src/Corporation/ui/modals/BuybackSharesModal.tsx
index 5d6b33e49..2e92cdcd9 100644
--- a/src/Corporation/ui/modals/BuybackSharesModal.tsx
+++ b/src/Corporation/ui/modals/BuybackSharesModal.tsx
@@ -35,7 +35,7 @@ export function BuybackSharesModal(props: IProps): React.ReactElement {
function buy(): void {
if (disabled) return;
try {
- BuyBackShares(corp, player, shares);
+ BuyBackShares(corp, shares);
} catch (err) {
dialogBoxCreate(err + "");
}
diff --git a/src/Corporation/ui/modals/CreateCorporationModal.tsx b/src/Corporation/ui/modals/CreateCorporationModal.tsx
index 2c63baf4e..9e77fcc14 100644
--- a/src/Corporation/ui/modals/CreateCorporationModal.tsx
+++ b/src/Corporation/ui/modals/CreateCorporationModal.tsx
@@ -72,7 +72,7 @@ export function CreateCorporationModal(props: IProps): React.ReactElement {
)}
- Self-Fund (
);
diff --git a/src/Corporation/ui/modals/SellSharesModal.tsx b/src/Corporation/ui/modals/SellSharesModal.tsx
index 5a414d0d7..fdb178029 100644
--- a/src/Corporation/ui/modals/SellSharesModal.tsx
+++ b/src/Corporation/ui/modals/SellSharesModal.tsx
@@ -49,7 +49,7 @@ export function SellSharesModal(props: IProps): React.ReactElement {
function sell(): void {
if (disabled) return;
try {
- const profit = SellShares(corp, player, shares);
+ const profit = SellShares(corp, shares);
props.onClose();
dialogBoxCreate(
<>
diff --git a/src/Crime/CrimeHelpers.ts b/src/Crime/CrimeHelpers.ts
index dbbec2f35..56cbe7bc6 100644
--- a/src/Crime/CrimeHelpers.ts
+++ b/src/Crime/CrimeHelpers.ts
@@ -1,16 +1,16 @@
import { Crimes } from "./Crimes";
import { Crime } from "./Crime";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { dialogBoxCreate } from "../ui/React/DialogBox";
-export function determineCrimeSuccess(p: IPlayer, type: string): boolean {
+export function determineCrimeSuccess(type: string): boolean {
let chance = 0;
let found = false;
for (const i of Object.keys(Crimes)) {
const crime = Crimes[i];
if (crime.type === type) {
- chance = crime.successRate(p);
+ chance = crime.successRate(Player);
found = true;
break;
}
diff --git a/src/DevMenu.tsx b/src/DevMenu.tsx
index 6bcb2eab3..b590fc6df 100644
--- a/src/DevMenu.tsx
+++ b/src/DevMenu.tsx
@@ -1,7 +1,5 @@
-import { IPlayer } from "./PersonObjects/IPlayer";
+import { Player } from "./Player";
import { Bladeburner } from "./Bladeburner/Bladeburner";
-import { IEngine } from "./IEngine";
-import { IRouter } from "./ui/Router";
import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
import React, { useEffect } from "react";
@@ -28,44 +26,38 @@ import { Entropy } from "./DevMenu/ui/Entropy";
import Typography from "@mui/material/Typography";
import { Exploit } from "./Exploits/Exploit";
-interface IProps {
- player: IPlayer;
- engine: IEngine;
- router: IRouter;
-}
-
-export function DevMenuRoot(props: IProps): React.ReactElement {
+export function DevMenuRoot(): React.ReactElement {
useEffect(() => {
- props.player.giveExploit(Exploit.YoureNotMeantToAccessThis);
+ Player.giveExploit(Exploit.YoureNotMeantToAccessThis);
}, []);
return (
<>
Development Menu - Only meant to be used for testing/debugging
- ): void {
setAugmentation(event.target.value);
}
function queueAug(): void {
- props.player.queueAugmentation(augmentation);
+ Player.queueAugmentation(augmentation);
}
function queueAllAugs(): void {
for (const augName of Object.values(AugmentationNames)) {
- props.player.queueAugmentation(augName);
+ Player.queueAugmentation(augName);
}
}
function clearAugs(): void {
- props.player.augmentations = [];
+ Player.augmentations = [];
}
function clearQueuedAugs(): void {
- props.player.queuedAugmentations = [];
+ Player.queuedAugmentations = [];
}
return (
diff --git a/src/DevMenu/ui/Bladeburner.tsx b/src/DevMenu/ui/Bladeburner.tsx
index 6726167a3..538fe8a78 100644
--- a/src/DevMenu/ui/Bladeburner.tsx
+++ b/src/DevMenu/ui/Bladeburner.tsx
@@ -7,21 +7,17 @@ import AccordionDetails from "@mui/material/AccordionDetails";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import { Adjuster } from "./Adjuster";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
const bigNumber = 1e27;
-interface IProps {
- player: IPlayer;
-}
-
-export function Bladeburner(props: IProps): React.ReactElement {
- const bladeburner = props.player.bladeburner;
+export function Bladeburner(): React.ReactElement {
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) return <>;
function modifyBladeburnerRank(modify: number): (x: number) => void {
return function (rank: number): void {
if (!bladeburner) return;
- bladeburner.changeRank(props.player, rank * modify);
+ bladeburner.changeRank(Player, rank * modify);
};
}
@@ -34,7 +30,7 @@ export function Bladeburner(props: IProps): React.ReactElement {
function addTonsBladeburnerRank(): void {
if (!bladeburner) return;
- bladeburner.changeRank(props.player, bigNumber);
+ bladeburner.changeRank(Player, bigNumber);
}
function modifyBladeburnerCycles(modify: number): (x: number) => void {
diff --git a/src/DevMenu/ui/Corporation.tsx b/src/DevMenu/ui/Corporation.tsx
index ce4250a91..9dbd3ac9b 100644
--- a/src/DevMenu/ui/Corporation.tsx
+++ b/src/DevMenu/ui/Corporation.tsx
@@ -8,58 +8,54 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { Adjuster } from "./Adjuster";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
const bigNumber = 1e27;
-interface IProps {
- player: IPlayer;
-}
-
-export function Corporation(props: IProps): React.ReactElement {
+export function Corporation(): React.ReactElement {
function addTonsCorporationFunds(): void {
- if (props.player.corporation) {
- props.player.corporation.funds = props.player.corporation.funds + bigNumber;
+ if (Player.corporation) {
+ Player.corporation.funds = Player.corporation.funds + bigNumber;
}
}
function modifyCorporationFunds(modify: number): (x: number) => void {
return function (funds: number): void {
- if (props.player.corporation) {
- props.player.corporation.funds += funds * modify;
+ if (Player.corporation) {
+ Player.corporation.funds += funds * modify;
}
};
}
function resetCorporationFunds(): void {
- if (props.player.corporation) {
- props.player.corporation.funds = props.player.corporation.funds - props.player.corporation.funds;
+ if (Player.corporation) {
+ Player.corporation.funds = Player.corporation.funds - Player.corporation.funds;
}
}
function addTonsCorporationCycles(): void {
- if (props.player.corporation) {
- props.player.corporation.storedCycles = bigNumber;
+ if (Player.corporation) {
+ Player.corporation.storedCycles = bigNumber;
}
}
function modifyCorporationCycles(modify: number): (x: number) => void {
return function (cycles: number): void {
- if (props.player.corporation) {
- props.player.corporation.storedCycles += cycles * modify;
+ if (Player.corporation) {
+ Player.corporation.storedCycles += cycles * modify;
}
};
}
function resetCorporationCycles(): void {
- if (props.player.corporation) {
- props.player.corporation.storedCycles = 0;
+ if (Player.corporation) {
+ Player.corporation.storedCycles = 0;
}
}
function finishCorporationProducts(): void {
- if (!props.player.corporation) return;
- props.player.corporation.divisions.forEach((div) => {
+ if (!Player.corporation) return;
+ Player.corporation.divisions.forEach((div) => {
Object.keys(div.products).forEach((prod) => {
const product = div.products[prod];
if (product === undefined) throw new Error("Impossible product undefined");
@@ -69,8 +65,8 @@ export function Corporation(props: IProps): React.ReactElement {
}
function addCorporationResearch(): void {
- if (!props.player.corporation) return;
- props.player.corporation.divisions.forEach((div) => {
+ if (!Player.corporation) return;
+ Player.corporation.divisions.forEach((div) => {
div.sciResearch.qty += 1e10;
});
}
diff --git a/src/DevMenu/ui/Entropy.tsx b/src/DevMenu/ui/Entropy.tsx
index acac53af0..47d90d9a6 100644
--- a/src/DevMenu/ui/Entropy.tsx
+++ b/src/DevMenu/ui/Entropy.tsx
@@ -6,18 +6,12 @@ import AccordionDetails from "@mui/material/AccordionDetails";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Adjuster } from "./Adjuster";
-import { IEngine } from "../../IEngine";
// Update as additional BitNodes get implemented
-interface IProps {
- player: IPlayer;
- engine: IEngine;
-}
-
-export function Entropy(props: IProps): React.ReactElement {
+export function Entropy(): React.ReactElement {
return (
): void {
@@ -33,11 +29,11 @@ export function Factions(props: IProps): React.ReactElement {
}
function receiveInvite(): void {
- props.player.receiveInvite(faction);
+ Player.receiveInvite(faction);
}
function receiveAllInvites(): void {
- Object.values(FactionNames).forEach((faction) => props.player.receiveInvite(faction));
+ Object.values(FactionNames).forEach((faction) => Player.receiveInvite(faction));
}
function modifyFactionRep(modifier: number): (x: number) => void {
diff --git a/src/DevMenu/ui/Gang.tsx b/src/DevMenu/ui/Gang.tsx
index cef6bd24d..3b0566738 100644
--- a/src/DevMenu/ui/Gang.tsx
+++ b/src/DevMenu/ui/Gang.tsx
@@ -7,32 +7,28 @@ import AccordionDetails from "@mui/material/AccordionDetails";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import { Adjuster } from "./Adjuster";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
const bigNumber = 1e27;
-interface IProps {
- player: IPlayer;
-}
-
-export function Gang(props: IProps): React.ReactElement {
+export function Gang(): React.ReactElement {
function addTonsGangCycles(): void {
- if (props.player.gang) {
- props.player.gang.storedCycles = bigNumber;
+ if (Player.gang) {
+ Player.gang.storedCycles = bigNumber;
}
}
function modifyGangCycles(modify: number): (x: number) => void {
return function (cycles: number): void {
- if (props.player.gang) {
- props.player.gang.storedCycles += cycles * modify;
+ if (Player.gang) {
+ Player.gang.storedCycles += cycles * modify;
}
};
}
function resetGangCycles(): void {
- if (props.player.gang) {
- props.player.gang.storedCycles = 0;
+ if (Player.gang) {
+ Player.gang.storedCycles = 0;
}
}
diff --git a/src/DevMenu/ui/General.tsx b/src/DevMenu/ui/General.tsx
index 9b96e8326..2c0b39902 100644
--- a/src/DevMenu/ui/General.tsx
+++ b/src/DevMenu/ui/General.tsx
@@ -8,61 +8,56 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { Money } from "../../ui/React/Money";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { IRouter } from "../../ui/Router";
+import { Player } from "../../Player";
+import { Router } from "../../ui/GameRoot";
import { MenuItem, SelectChangeEvent, TextField, Select } from "@mui/material";
import { Bladeburner } from "../../Bladeburner/Bladeburner";
import { GangConstants } from "../../Gang/data/Constants";
import { FactionNames } from "../../Faction/data/FactionNames";
import { checkForMessagesToSend } from "../../Message/MessageHelpers";
-interface IProps {
- player: IPlayer;
- router: IRouter;
-}
-
-export function General(props: IProps): React.ReactElement {
+export function General(): React.ReactElement {
const [error, setError] = useState(false);
const [corporationName, setCorporationName] = useState("");
const [gangFaction, setGangFaction] = useState("");
function addMoney(n: number) {
return function () {
- props.player.gainMoney(n, "other");
+ Player.gainMoney(n, "other");
};
}
function upgradeRam(): void {
- props.player.getHomeComputer().maxRam *= 2;
+ Player.getHomeComputer().maxRam *= 2;
}
function quickB1tFlum3(): void {
- props.router.toBitVerse(true, true);
+ Router.toBitVerse(true, true);
}
function b1tflum3(): void {
- props.router.toBitVerse(true, false);
+ Router.toBitVerse(true, false);
}
function quickHackW0r1dD43m0n(): void {
- props.router.toBitVerse(false, true);
+ Router.toBitVerse(false, true);
}
function hackW0r1dD43m0n(): void {
- props.router.toBitVerse(false, false);
+ Router.toBitVerse(false, false);
}
function createCorporation(): void {
- props.player.startCorporation(corporationName);
+ Player.startCorporation(corporationName);
}
function joinBladeburner(): void {
- props.player.bladeburner = new Bladeburner(props.player);
+ Player.bladeburner = new Bladeburner();
}
function startGang(): void {
const isHacking = gangFaction === FactionNames.NiteSec || gangFaction === FactionNames.TheBlackHand;
- props.player.startGang(gangFaction, isHacking);
+ Player.startGang(gangFaction, isHacking);
}
function setGangFactionDropdown(event: SelectChangeEvent): void {
diff --git a/src/DevMenu/ui/Programs.tsx b/src/DevMenu/ui/Programs.tsx
index 830a99b2e..b32f5e870 100644
--- a/src/DevMenu/ui/Programs.tsx
+++ b/src/DevMenu/ui/Programs.tsx
@@ -8,29 +8,25 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import Select, { SelectChangeEvent } from "@mui/material/Select";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Programs as AllPrograms } from "../../Programs/Programs";
import MenuItem from "@mui/material/MenuItem";
-interface IProps {
- player: IPlayer;
-}
-
-export function Programs(props: IProps): React.ReactElement {
+export function Programs(): React.ReactElement {
const [program, setProgram] = useState("NUKE.exe");
function setProgramDropdown(event: SelectChangeEvent): void {
setProgram(event.target.value);
}
function addProgram(): void {
- if (!props.player.hasProgram(program)) {
- props.player.getHomeComputer().programs.push(program);
+ if (!Player.hasProgram(program)) {
+ Player.getHomeComputer().programs.push(program);
}
}
function addAllPrograms(): void {
for (const i of Object.keys(AllPrograms)) {
- if (!props.player.hasProgram(AllPrograms[i].name)) {
- props.player.getHomeComputer().programs.push(AllPrograms[i].name);
+ if (!Player.hasProgram(AllPrograms[i].name)) {
+ Player.getHomeComputer().programs.push(AllPrograms[i].name);
}
}
}
diff --git a/src/DevMenu/ui/Sleeves.tsx b/src/DevMenu/ui/Sleeves.tsx
index 5dcbcf455..fa1941ed6 100644
--- a/src/DevMenu/ui/Sleeves.tsx
+++ b/src/DevMenu/ui/Sleeves.tsx
@@ -7,41 +7,37 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Button from "@mui/material/Button";
import Typography from "@mui/material/Typography";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Adjuster } from "./Adjuster";
-interface IProps {
- player: IPlayer;
-}
-
-export function Sleeves(props: IProps): React.ReactElement {
+export function Sleeves(): React.ReactElement {
function sleeveMaxAllShock(): void {
- for (let i = 0; i < props.player.sleeves.length; ++i) {
- props.player.sleeves[i].shock = 0;
+ for (let i = 0; i < Player.sleeves.length; ++i) {
+ Player.sleeves[i].shock = 0;
}
}
function sleeveClearAllShock(): void {
- for (let i = 0; i < props.player.sleeves.length; ++i) {
- props.player.sleeves[i].shock = 100;
+ for (let i = 0; i < Player.sleeves.length; ++i) {
+ Player.sleeves[i].shock = 100;
}
}
function sleeveSyncMaxAll(): void {
- for (let i = 0; i < props.player.sleeves.length; ++i) {
- props.player.sleeves[i].sync = 100;
+ for (let i = 0; i < Player.sleeves.length; ++i) {
+ Player.sleeves[i].sync = 100;
}
}
function sleeveSyncClearAll(): void {
- for (let i = 0; i < props.player.sleeves.length; ++i) {
- props.player.sleeves[i].sync = 0;
+ for (let i = 0; i < Player.sleeves.length; ++i) {
+ Player.sleeves[i].sync = 0;
}
}
function sleeveSetStoredCycles(cycles: number): void {
- for (let i = 0; i < props.player.sleeves.length; ++i) {
- props.player.sleeves[i].storedCycles = cycles;
+ for (let i = 0; i < Player.sleeves.length; ++i) {
+ Player.sleeves[i].storedCycles = cycles;
}
}
diff --git a/src/DevMenu/ui/SourceFiles.tsx b/src/DevMenu/ui/SourceFiles.tsx
index cab4440a6..fa4576135 100644
--- a/src/DevMenu/ui/SourceFiles.tsx
+++ b/src/DevMenu/ui/SourceFiles.tsx
@@ -8,35 +8,31 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { PlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import ButtonGroup from "@mui/material/ButtonGroup";
// Update as additional BitNodes get implemented
const validSFN = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
-interface IProps {
- player: IPlayer;
-}
-
-export function SourceFiles(props: IProps): React.ReactElement {
+export function SourceFiles(): React.ReactElement {
function setSF(sfN: number, sfLvl: number) {
return function () {
if (sfN === 9) {
- props.player.hacknetNodes = [];
+ Player.hacknetNodes = [];
}
if (sfLvl === 0) {
- props.player.sourceFiles = props.player.sourceFiles.filter((sf) => sf.n !== sfN);
+ Player.sourceFiles = Player.sourceFiles.filter((sf) => sf.n !== sfN);
return;
}
- if (!props.player.sourceFiles.some((sf) => sf.n === sfN)) {
- props.player.sourceFiles.push(new PlayerOwnedSourceFile(sfN, sfLvl));
+ if (!Player.sourceFiles.some((sf) => sf.n === sfN)) {
+ Player.sourceFiles.push(new PlayerOwnedSourceFile(sfN, sfLvl));
return;
}
- for (let i = 0; i < props.player.sourceFiles.length; i++) {
- if (props.player.sourceFiles[i].n === sfN) {
- props.player.sourceFiles[i].lvl = sfLvl;
+ for (let i = 0; i < Player.sourceFiles.length; i++) {
+ if (Player.sourceFiles[i].n === sfN) {
+ Player.sourceFiles[i].lvl = sfLvl;
}
}
};
@@ -51,7 +47,7 @@ export function SourceFiles(props: IProps): React.ReactElement {
}
function clearExploits(): void {
- props.player.exploits = [];
+ Player.exploits = [];
}
return (
diff --git a/src/DevMenu/ui/Stats.tsx b/src/DevMenu/ui/Stats.tsx
index a664214cf..c9a1c0966 100644
--- a/src/DevMenu/ui/Stats.tsx
+++ b/src/DevMenu/ui/Stats.tsx
@@ -8,132 +8,128 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { Adjuster } from "./Adjuster";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
const bigNumber = 1e27;
-interface IProps {
- player: IPlayer;
-}
-
-export function Stats(props: IProps): React.ReactElement {
+export function Stats(): React.ReactElement {
function modifyExp(stat: string, modifier: number) {
return function (exp: number) {
switch (stat) {
case "hacking":
if (exp) {
- props.player.gainHackingExp(exp * modifier);
+ Player.gainHackingExp(exp * modifier);
}
break;
case "strength":
if (exp) {
- props.player.gainStrengthExp(exp * modifier);
+ Player.gainStrengthExp(exp * modifier);
}
break;
case "defense":
if (exp) {
- props.player.gainDefenseExp(exp * modifier);
+ Player.gainDefenseExp(exp * modifier);
}
break;
case "dexterity":
if (exp) {
- props.player.gainDexterityExp(exp * modifier);
+ Player.gainDexterityExp(exp * modifier);
}
break;
case "agility":
if (exp) {
- props.player.gainAgilityExp(exp * modifier);
+ Player.gainAgilityExp(exp * modifier);
}
break;
case "charisma":
if (exp) {
- props.player.gainCharismaExp(exp * modifier);
+ Player.gainCharismaExp(exp * modifier);
}
break;
case "intelligence":
if (exp) {
- props.player.gainIntelligenceExp(exp * modifier);
+ Player.gainIntelligenceExp(exp * modifier);
}
break;
}
- props.player.updateSkillLevels();
+ Player.updateSkillLevels();
};
}
function modifyKarma(modifier: number) {
return function (amt: number) {
- props.player.karma += amt * modifier;
+ Player.karma += amt * modifier;
};
}
function tonsOfExp(): void {
- props.player.gainHackingExp(bigNumber);
- props.player.gainStrengthExp(bigNumber);
- props.player.gainDefenseExp(bigNumber);
- props.player.gainDexterityExp(bigNumber);
- props.player.gainAgilityExp(bigNumber);
- props.player.gainCharismaExp(bigNumber);
- props.player.gainIntelligenceExp(bigNumber);
- props.player.updateSkillLevels();
+ Player.gainHackingExp(bigNumber);
+ Player.gainStrengthExp(bigNumber);
+ Player.gainDefenseExp(bigNumber);
+ Player.gainDexterityExp(bigNumber);
+ Player.gainAgilityExp(bigNumber);
+ Player.gainCharismaExp(bigNumber);
+ Player.gainIntelligenceExp(bigNumber);
+ Player.updateSkillLevels();
}
function resetAllExp(): void {
- props.player.exp.hacking = 0;
- props.player.exp.strength = 0;
- props.player.exp.defense = 0;
- props.player.exp.dexterity = 0;
- props.player.exp.agility = 0;
- props.player.exp.charisma = 0;
- props.player.exp.intelligence = 0;
- props.player.updateSkillLevels();
+ Player.exp.hacking = 0;
+ Player.exp.strength = 0;
+ Player.exp.defense = 0;
+ Player.exp.dexterity = 0;
+ Player.exp.agility = 0;
+ Player.exp.charisma = 0;
+ Player.exp.intelligence = 0;
+ Player.updateSkillLevels();
}
function resetExperience(stat: string): () => void {
return function () {
switch (stat) {
case "hacking":
- props.player.exp.hacking = 0;
+ Player.exp.hacking = 0;
break;
case "strength":
- props.player.exp.strength = 0;
+ Player.exp.strength = 0;
break;
case "defense":
- props.player.exp.defense = 0;
+ Player.exp.defense = 0;
break;
case "dexterity":
- props.player.exp.dexterity = 0;
+ Player.exp.dexterity = 0;
break;
case "agility":
- props.player.exp.agility = 0;
+ Player.exp.agility = 0;
break;
case "charisma":
- props.player.exp.charisma = 0;
+ Player.exp.charisma = 0;
break;
case "intelligence":
- props.player.exp.intelligence = 0;
+ Player.exp.intelligence = 0;
break;
}
- props.player.updateSkillLevels();
+ Player.updateSkillLevels();
};
}
function resetKarma(): () => void {
return function () {
- props.player.karma = 0;
+ Player.karma = 0;
};
}
function enableIntelligence(): void {
- if (props.player.skills.intelligence === 0) {
- props.player.skills.intelligence = 1;
- props.player.updateSkillLevels();
+ if (Player.skills.intelligence === 0) {
+ Player.skills.intelligence = 1;
+ Player.updateSkillLevels();
}
}
function disableIntelligence(): void {
- props.player.exp.intelligence = 0;
- props.player.skills.intelligence = 0;
- props.player.updateSkillLevels();
+ Player.exp.intelligence = 0;
+ Player.skills.intelligence = 0;
+ Player.updateSkillLevels();
}
return (
diff --git a/src/DevMenu/ui/TimeSkip.tsx b/src/DevMenu/ui/TimeSkip.tsx
index f44f65a6d..b8da48b02 100644
--- a/src/DevMenu/ui/TimeSkip.tsx
+++ b/src/DevMenu/ui/TimeSkip.tsx
@@ -7,22 +7,17 @@ import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { saveObject } from "../../SaveObject";
-import { IEngine } from "../../IEngine";
+import { Engine } from "../../engine";
// Update as additional BitNodes get implemented
-interface IProps {
- player: IPlayer;
- engine: IEngine;
-}
-
-export function TimeSkip(props: IProps): React.ReactElement {
+export function TimeSkip(): React.ReactElement {
function timeskip(time: number) {
return () => {
- props.player.lastUpdate -= time;
- props.engine._lastUpdate -= time;
+ Player.lastUpdate -= time;
+ Engine._lastUpdate -= time;
saveObject.saveGame();
setTimeout(() => location.reload(), 1000);
};
diff --git a/src/ExportBonus.tsx b/src/ExportBonus.tsx
index c75bce683..f4a0a404d 100644
--- a/src/ExportBonus.tsx
+++ b/src/ExportBonus.tsx
@@ -1,5 +1,5 @@
import { Factions } from "./Faction/Factions";
-import { IPlayer } from "./PersonObjects/IPlayer";
+import { Player } from "./Player";
export let LastExportBonus = 0;
@@ -9,9 +9,9 @@ export function canGetBonus(): boolean {
return now - LastExportBonus > bonusTimer;
}
-export function onExport(p: IPlayer): void {
+export function onExport(): void {
if (!canGetBonus()) return;
- for (const facName of p.factions) {
+ for (const facName of Player.factions) {
Factions[facName].favor++;
}
LastExportBonus = new Date().getTime();
diff --git a/src/Faction/FactionHelpers.tsx b/src/Faction/FactionHelpers.tsx
index 6e7d9509b..c5cea74ae 100644
--- a/src/Faction/FactionHelpers.tsx
+++ b/src/Faction/FactionHelpers.tsx
@@ -7,7 +7,6 @@ import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { Faction } from "./Faction";
import { Factions } from "./Factions";
import { Player } from "../Player";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { Settings } from "../Settings/Settings";
import {
getHackingWorkRepGain,
@@ -59,7 +58,7 @@ export function hasAugmentationPrereqs(aug: Augmentation): boolean {
export function purchaseAugmentation(aug: Augmentation, fac: Faction, sing = false): string {
const hasPrereqs = hasAugmentationPrereqs(aug);
- const augCosts = aug.getCost(Player);
+ const augCosts = aug.getCost();
if (!hasPrereqs) {
const txt = `You must first purchase or install ${aug.prereqs
.filter((req) => !Player.hasAugmentation(req))
@@ -84,7 +83,7 @@ export function purchaseAugmentation(aug: Augmentation, fac: Faction, sing = fal
} else if (augCosts.moneyCost === 0 || Player.money >= augCosts.moneyCost) {
const queuedAugmentation = new PlayerOwnedAugmentation(aug.name);
if (aug.name == AugmentationNames.NeuroFluxGovernor) {
- queuedAugmentation.level = aug.getLevel(Player);
+ queuedAugmentation.level = aug.getLevel();
}
Player.queuedAugmentations.push(queuedAugmentation);
@@ -134,20 +133,20 @@ export function processPassiveFactionRepGain(numCycles: number): void {
}
}
-export const getFactionAugmentationsFiltered = (player: IPlayer, faction: Faction): string[] => {
+export const getFactionAugmentationsFiltered = (faction: Faction): string[] => {
// If player has a gang with this faction, return (almost) all augmentations
- if (player.hasGangWith(faction.name)) {
+ if (Player.hasGangWith(faction.name)) {
let augs = Object.values(StaticAugmentations);
// Remove special augs
augs = augs.filter((a) => !a.isSpecial && a.name !== AugmentationNames.CongruityImplant);
- if (player.bitNodeN === 2) {
+ if (Player.bitNodeN === 2) {
// TRP is not available outside of BN2 for Gangs
augs.push(StaticAugmentations[AugmentationNames.TheRedPill]);
}
- const rng = SFC32RNG(`BN${player.bitNodeN}.${player.sourceFileLvl(player.bitNodeN)}`);
+ const rng = SFC32RNG(`BN${Player.bitNodeN}.${Player.sourceFileLvl(Player.bitNodeN)}`);
// Remove faction-unique augs that don't belong to this faction
const uniqueFilter = (a: Augmentation): boolean => {
// Keep all the non-unique one
diff --git a/src/Faction/formulas/donation.ts b/src/Faction/formulas/donation.ts
index ea0e99b11..0bcd8c645 100644
--- a/src/Faction/formulas/donation.ts
+++ b/src/Faction/formulas/donation.ts
@@ -1,6 +1,6 @@
import { CONSTANTS } from "../../Constants";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { IPerson } from "../../PersonObjects/IPerson";
-export function repFromDonation(amt: number, player: IPlayer): number {
- return (amt / CONSTANTS.DonateMoneyToRepDivisor) * player.mults.faction_rep;
+export function repFromDonation(amt: number, person: IPerson): number {
+ return (amt / CONSTANTS.DonateMoneyToRepDivisor) * person.mults.faction_rep;
}
diff --git a/src/Faction/ui/AugmentationsPage.tsx b/src/Faction/ui/AugmentationsPage.tsx
index cb3b8cc45..939ad8e0e 100644
--- a/src/Faction/ui/AugmentationsPage.tsx
+++ b/src/Faction/ui/AugmentationsPage.tsx
@@ -10,7 +10,7 @@ import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { PurchasableAugmentations } from "../../Augmentation/ui/PurchasableAugmentations";
import { PurchaseAugmentationsOrderSetting } from "../../Settings/SettingEnums";
import { Settings } from "../../Settings/Settings";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Favor } from "../../ui/React/Favor";
import { Reputation } from "../../ui/React/Reputation";
@@ -24,8 +24,6 @@ type IProps = {
};
export function AugmentationsPage(props: IProps): React.ReactElement {
- const player = use.Player();
-
const setRerender = useState(false)[1];
function rerender(): void {
@@ -33,7 +31,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
}
function getAugs(): string[] {
- return getFactionAugmentationsFiltered(player, props.faction);
+ return getFactionAugmentationsFiltered(props.faction);
}
function getAugsSorted(): string[] {
@@ -61,7 +59,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
throw new Error("Invalid Augmentation Names");
}
- return aug1.getCost(player).moneyCost - aug2.getCost(player).moneyCost;
+ return aug1.getCost().moneyCost - aug2.getCost().moneyCost;
});
return augs;
@@ -71,11 +69,11 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
const augs = getAugs();
function canBuy(augName: string): boolean {
const aug = StaticAugmentations[augName];
- const augCosts = aug.getCost(player);
+ const augCosts = aug.getCost();
const repCost = augCosts.repCost;
const hasReq = props.faction.playerReputation >= repCost;
const hasRep = hasAugmentationPrereqs(aug);
- const hasCost = augCosts.moneyCost !== 0 && player.money > augCosts.moneyCost;
+ const hasCost = augCosts.moneyCost !== 0 && Player.money > augCosts.moneyCost;
return hasCost && hasReq && hasRep;
}
const buy = augs.filter(canBuy).sort((augName1, augName2) => {
@@ -85,7 +83,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
throw new Error("Invalid Augmentation Names");
}
- return aug1.getCost(player).moneyCost - aug2.getCost(player).moneyCost;
+ return aug1.getCost().moneyCost - aug2.getCost().moneyCost;
});
const cantBuy = augs
.filter((aug) => !canBuy(aug))
@@ -95,7 +93,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
if (aug1 == null || aug2 == null) {
throw new Error("Invalid Augmentation Names");
}
- return aug1.getCost(player).repCost - aug2.getCost(player).repCost;
+ return aug1.getCost().repCost - aug2.getCost().repCost;
});
return buy.concat(cantBuy);
@@ -109,7 +107,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
if (aug1 == null || aug2 == null) {
throw new Error("Invalid Augmentation Names");
}
- return aug1.getCost(player).repCost - aug2.getCost(player).repCost;
+ return aug1.getCost().repCost - aug2.getCost().repCost;
});
return augs;
@@ -128,7 +126,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
const purchasable = augs.filter(
(aug: string) =>
aug === AugmentationNames.NeuroFluxGovernor ||
- (!player.augmentations.some((a) => a.name === aug) && !player.queuedAugmentations.some((a) => a.name === aug)),
+ (!Player.augmentations.some((a) => a.name === aug) && !Player.queuedAugmentations.some((a) => a.name === aug)),
);
const owned = augs.filter((aug: string) => !purchasable.includes(aug));
@@ -195,16 +193,15 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
{
- const costs = aug.getCost(player);
+ canPurchase={(aug) => {
+ const costs = aug.getCost();
return (
hasAugmentationPrereqs(aug) &&
props.faction.playerReputation >= costs.repCost &&
- (costs.moneyCost === 0 || player.money > costs.moneyCost)
+ (costs.moneyCost === 0 || Player.money > costs.moneyCost)
);
}}
- purchaseAugmentation={(player, aug, showModal) => {
+ purchaseAugmentation={(aug, showModal) => {
if (!Settings.SuppressBuyAugmentationConfirmation) {
showModal(true);
} else {
diff --git a/src/Faction/ui/DonateOption.tsx b/src/Faction/ui/DonateOption.tsx
index afd840dbb..052b7d397 100644
--- a/src/Faction/ui/DonateOption.tsx
+++ b/src/Faction/ui/DonateOption.tsx
@@ -5,7 +5,7 @@ import React, { useState } from "react";
import { CONSTANTS } from "../../Constants";
import { Faction } from "../Faction";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { repFromDonation } from "../formulas/donation";
import { Favor } from "../../ui/React/Favor";
@@ -24,7 +24,6 @@ type IProps = {
faction: Faction;
disabled: boolean;
favorToDonate: number;
- p: IPlayer;
rerender: () => void;
};
@@ -35,7 +34,7 @@ export function DonateOption(props: IProps): React.ReactElement {
function canDonate(): boolean {
if (isNaN(donateAmt)) return false;
if (isNaN(donateAmt) || donateAmt <= 0) return false;
- if (props.p.money < donateAmt) return false;
+ if (Player.money < donateAmt) return false;
return true;
}
@@ -44,8 +43,8 @@ export function DonateOption(props: IProps): React.ReactElement {
const amt = donateAmt;
if (isNaN(amt)) return;
if (!canDonate()) return;
- props.p.loseMoney(amt, "other");
- const repGain = repFromDonation(amt, props.p);
+ Player.loseMoney(amt, "other");
+ const repGain = repFromDonation(amt, Player);
props.faction.playerReputation += repGain;
dialogBoxCreate(
<>
@@ -58,12 +57,12 @@ export function DonateOption(props: IProps): React.ReactElement {
function Status(): React.ReactElement {
if (isNaN(donateAmt)) return <>;
if (!canDonate()) {
- if (props.p.money < donateAmt) return Insufficient funds ;
+ if (Player.money < donateAmt) return Insufficient funds ;
return Invalid donate amount entered! ;
}
return (
- This donation will result in
);
}
diff --git a/src/Faction/ui/FactionRoot.tsx b/src/Faction/ui/FactionRoot.tsx
index ef5ad72fd..7e633b2d9 100644
--- a/src/Faction/ui/FactionRoot.tsx
+++ b/src/Faction/ui/FactionRoot.tsx
@@ -15,7 +15,8 @@ import { CONSTANTS } from "../../Constants";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { Faction } from "../Faction";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { Typography, Button } from "@mui/material";
import { CovenantPurchasesRoot } from "../../PersonObjects/Sleeve/ui/CovenantPurchasesRoot";
@@ -58,18 +59,16 @@ interface IMainProps {
}
function MainPage({ faction, rerender, onAugmentations }: IMainProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const [sleevesOpen, setSleevesOpen] = useState(false);
const factionInfo = faction.getInfo();
function startWork(): void {
- player.startFocusing();
- router.toWork();
+ Player.startFocusing();
+ Router.toWork();
}
function startFieldWork(faction: Faction): void {
- player.startWork(
+ Player.startWork(
new FactionWork({
singularity: false,
faction: faction.name,
@@ -80,7 +79,7 @@ function MainPage({ faction, rerender, onAugmentations }: IMainProps): React.Rea
}
function startHackingContracts(faction: Faction): void {
- player.startWork(
+ Player.startWork(
new FactionWork({
singularity: false,
faction: faction.name,
@@ -91,7 +90,7 @@ function MainPage({ faction, rerender, onAugmentations }: IMainProps): React.Rea
}
function startSecurityWork(faction: Faction): void {
- player.startWork(
+ Player.startWork(
new FactionWork({
singularity: false,
faction: faction.name,
@@ -103,18 +102,18 @@ function MainPage({ faction, rerender, onAugmentations }: IMainProps): React.Rea
// We have a special flag for whether the player this faction is the player's
// gang faction because if the player has a gang, they cannot do any other action
- const isPlayersGang = player.inGang() && player.getGangName() === faction.name;
+ const isPlayersGang = Player.inGang() && Player.getGangName() === faction.name;
// Flags for whether special options (gang, sleeve purchases, donate, etc.)
// should be shown
const favorToDonate = Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction);
const canDonate = faction.favor >= favorToDonate;
- const canPurchaseSleeves = faction.name === FactionNames.TheCovenant && player.bitNodeN === 10;
+ const canPurchaseSleeves = faction.name === FactionNames.TheCovenant && Player.bitNodeN === 10;
return (
<>
- router.toFactions()}>Back
+ Router.toFactions()}>Back
{faction.name}
@@ -134,13 +133,7 @@ function MainPage({ faction, rerender, onAugmentations }: IMainProps): React.Rea
startSecurityWork(faction)} />
)}
{!isPlayersGang && factionInfo.offersWork() && (
-
You have not joined {faction.name} yet!
- router.toFactions()}>Back to Factions
+ Router.toFactions()}>Back to Factions
);
}
diff --git a/src/Faction/ui/FactionsRoot.tsx b/src/Faction/ui/FactionsRoot.tsx
index 8e338a215..c82073291 100644
--- a/src/Faction/ui/FactionsRoot.tsx
+++ b/src/Faction/ui/FactionsRoot.tsx
@@ -1,10 +1,10 @@
import { Explore, Info, LastPage, LocalPolice, NewReleases, Report, SportsMma } from "@mui/icons-material";
import { Box, Button, Container, Paper, Tooltip, Typography, useTheme } from "@mui/material";
import React, { useEffect, useState } from "react";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Settings } from "../../Settings/Settings";
import { numeralWrapper } from "../../ui/numeralFormat";
-import { IRouter } from "../../ui/Router";
+import { Router } from "../../ui/GameRoot";
import { FactionNames } from "../data/FactionNames";
import { Faction } from "../Faction";
import { getFactionAugmentationsFiltered, joinFaction } from "../FactionHelpers";
@@ -12,10 +12,10 @@ import { Factions } from "../Factions";
export const InvitationsSeen: string[] = [];
-const getAugsLeft = (faction: Faction, player: IPlayer): number => {
- const augs = getFactionAugmentationsFiltered(player, faction);
+const getAugsLeft = (faction: Faction): number => {
+ const augs = getFactionAugmentationsFiltered(faction);
- return augs.filter((augmentation: string) => !player.hasAugmentation(augmentation)).length;
+ return augs.filter((augmentation: string) => !Player.hasAugmentation(augmentation)).length;
};
interface IWorkTypeProps {
@@ -50,8 +50,6 @@ const WorkTypesOffered = (props: IWorkTypeProps): React.ReactElement => {
};
interface IFactionProps {
- player: IPlayer;
- router: IRouter;
faction: Faction;
joined: boolean;
@@ -63,11 +61,11 @@ const FactionElement = (props: IFactionProps): React.ReactElement => {
const facInfo = props.faction.getInfo();
function openFaction(faction: Faction): void {
- props.router.toFaction(faction);
+ Router.toFaction(faction);
}
function openFactionAugPage(faction: Faction): void {
- props.router.toFaction(faction, true);
+ Router.toFaction(faction, true);
}
function acceptInvitation(event: React.MouseEvent, faction: string): void {
@@ -124,7 +122,7 @@ const FactionElement = (props: IFactionProps): React.ReactElement => {
- {props.player.hasGangWith(props.faction.name) && (
+ {Player.hasGangWith(props.faction.name) && (
@@ -157,11 +155,11 @@ const FactionElement = (props: IFactionProps): React.ReactElement => {
- {!props.player.hasGangWith(props.faction.name) &&
- {getAugsLeft(props.faction, props.player)} Augmentations left
+ {getAugsLeft(props.faction)} Augmentations left
)}
@@ -182,12 +180,7 @@ const FactionElement = (props: IFactionProps): React.ReactElement => {
);
};
-interface IProps {
- player: IPlayer;
- router: IRouter;
-}
-
-export function FactionsRoot(props: IProps): React.ReactElement {
+export function FactionsRoot(): React.ReactElement {
const theme = useTheme();
const setRerender = useState(false)[1];
function rerender(): void {
@@ -199,16 +192,16 @@ export function FactionsRoot(props: IProps): React.ReactElement {
}, []);
useEffect(() => {
- props.player.factionInvitations.forEach((faction) => {
+ Player.factionInvitations.forEach((faction) => {
if (InvitationsSeen.includes(faction)) return;
InvitationsSeen.push(faction);
});
}, []);
const allFactions = Object.values(FactionNames).map((faction) => faction as string);
- const allJoinedFactions = [...props.player.factions];
+ const allJoinedFactions = [...Player.factions];
allJoinedFactions.sort((a, b) => allFactions.indexOf(a) - allFactions.indexOf(b));
- const invitations = props.player.factionInvitations;
+ const invitations = Player.factionInvitations;
return (
@@ -249,16 +242,7 @@ export function FactionsRoot(props: IProps): React.ReactElement {
{invitations.map((facName) => {
if (!Factions.hasOwnProperty(facName)) return null;
- return (
-
@@ -272,16 +256,7 @@ export function FactionsRoot(props: IProps): React.ReactElement {
{allJoinedFactions.length > 0 ? (
allJoinedFactions.map((facName) => {
if (!Factions.hasOwnProperty(facName)) return null;
- return (
- You have not yet joined any Factions.
diff --git a/src/GameOptions/ui/GameOptionsRoot.tsx b/src/GameOptions/ui/GameOptionsRoot.tsx
index 49eeed0f0..f7c85999b 100644
--- a/src/GameOptions/ui/GameOptionsRoot.tsx
+++ b/src/GameOptions/ui/GameOptionsRoot.tsx
@@ -1,7 +1,5 @@
import { Box, Container, Typography } from "@mui/material";
import React, { useState } from "react";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { IRouter } from "../../ui/Router";
import { GameOptionsTab } from "../GameOptionsTab";
import { GameOptionsSidebar } from "./GameOptionsSidebar";
import { GameplayPage } from "./GameplayPage";
@@ -11,8 +9,6 @@ import { RemoteAPIPage } from "./RemoteAPIPage";
import { SystemPage } from "./SystemPage";
interface IProps {
- player: IPlayer;
- router: IRouter;
save: () => void;
export: () => void;
forceKill: () => void;
@@ -29,8 +25,6 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
void;
- player: IPlayer;
- router: IRouter;
save: () => void;
export: () => void;
forceKill: () => void;
@@ -94,7 +91,7 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => {
function compareSaveGame(): void {
if (!importData) return;
- props.router.toImportSave(importData.base64);
+ Router.toImportSave(importData.base64);
setImportSaveOpen(false);
setImportData(null);
}
@@ -219,12 +216,12 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => {
-
-
+{multiplier} -
-
);
@@ -79,9 +78,9 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
function upgradeLevelOnClick(): void {
const numUpgrades =
purchaseMult === "MAX"
- ? getMaxNumberLevelUpgrades(props.player, node, HacknetNodeConstants.MaxLevel)
+ ? getMaxNumberLevelUpgrades(node, HacknetNodeConstants.MaxLevel)
: purchaseMult;
- purchaseLevelUpgrade(props.player, node, numUpgrades);
+ purchaseLevelUpgrade(node, numUpgrades);
rerender();
}
@@ -91,7 +90,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
} else {
let multiplier = 0;
if (purchaseMult === "MAX") {
- multiplier = getMaxNumberRamUpgrades(props.player, node, HacknetNodeConstants.MaxRam);
+ multiplier = getMaxNumberRamUpgrades(node, HacknetNodeConstants.MaxRam);
} else {
const levelsToMax = Math.round(Math.log2(HacknetNodeConstants.MaxRam / node.ram));
multiplier = Math.min(levelsToMax, purchaseMult);
@@ -102,9 +101,9 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
node.level,
node.ram * Math.pow(2, multiplier),
node.cores,
- props.player.mults.hacknet_node_money,
+ Player.mults.hacknet_node_money,
) - node.moneyGainRatePerSecond;
- const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, props.player.mults.hacknet_node_ram_cost);
+ const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, Player.mults.hacknet_node_ram_cost);
upgradeRAMButton = (
+{multiplier} -
-
);
}
function upgradeRamOnClick(): void {
const numUpgrades =
- purchaseMult === "MAX" ? getMaxNumberRamUpgrades(props.player, node, HacknetNodeConstants.MaxRam) : purchaseMult;
- purchaseRamUpgrade(props.player, node, numUpgrades);
+ purchaseMult === "MAX" ? getMaxNumberRamUpgrades(node, HacknetNodeConstants.MaxRam) : purchaseMult;
+ purchaseRamUpgrade(node, numUpgrades);
rerender();
}
function upgradeCoresOnClick(): void {
const numUpgrades =
purchaseMult === "MAX"
- ? getMaxNumberCoreUpgrades(props.player, node, HacknetNodeConstants.MaxCores)
+ ? getMaxNumberCoreUpgrades(node, HacknetNodeConstants.MaxCores)
: purchaseMult;
- purchaseCoreUpgrade(props.player, node, numUpgrades);
+ purchaseCoreUpgrade(node, numUpgrades);
rerender();
}
let upgradeCoresButton;
@@ -141,16 +140,16 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
} else {
let multiplier = 0;
if (purchaseMult === "MAX") {
- multiplier = getMaxNumberCoreUpgrades(props.player, node, HacknetNodeConstants.MaxCores);
+ multiplier = getMaxNumberCoreUpgrades(node, HacknetNodeConstants.MaxCores);
} else {
const levelsToMax = HacknetNodeConstants.MaxCores - node.cores;
multiplier = Math.min(levelsToMax, purchaseMult);
}
const increase =
- calculateMoneyGainRate(node.level, node.ram, node.cores + multiplier, props.player.mults.hacknet_node_money) -
+ calculateMoneyGainRate(node.level, node.ram, node.cores + multiplier, Player.mults.hacknet_node_money) -
node.moneyGainRatePerSecond;
- const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, props.player.mults.hacknet_node_core_cost);
+ const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, Player.mults.hacknet_node_core_cost);
upgradeCoresButton = (
+{multiplier} -
-
);
diff --git a/src/Hacknet/ui/HacknetRoot.tsx b/src/Hacknet/ui/HacknetRoot.tsx
index eb8f43666..16bb14612 100644
--- a/src/Hacknet/ui/HacknetRoot.tsx
+++ b/src/Hacknet/ui/HacknetRoot.tsx
@@ -21,7 +21,7 @@ import {
purchaseHacknet,
} from "../HacknetHelpers";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { GetServer } from "../../Server/AllServers";
import Typography from "@mui/material/Typography";
@@ -29,11 +29,7 @@ import Grid from "@mui/material/Grid";
import Button from "@mui/material/Button";
import { Box } from "@mui/material";
-interface IProps {
- player: IPlayer;
-}
-
-export function HacknetRoot(props: IProps): React.ReactElement {
+export function HacknetRoot(): React.ReactElement {
const [open, setOpen] = useState(false);
const setRerender = useState(false)[1];
function rerender(): void {
@@ -47,9 +43,9 @@ export function HacknetRoot(props: IProps): React.ReactElement {
}, []);
let totalProduction = 0;
- for (let i = 0; i < props.player.hacknetNodes.length; ++i) {
- const node = props.player.hacknetNodes[i];
- if (hasHacknetServers(props.player)) {
+ for (let i = 0; i < Player.hacknetNodes.length; ++i) {
+ const node = Player.hacknetNodes[i];
+ if (hasHacknetServers()) {
if (node instanceof HacknetNode) throw new Error("node was hacknet node"); // should never happen
const hserver = GetServer(node);
if (!(hserver instanceof HacknetServer)) throw new Error("node was not hacknet server"); // should never happen
@@ -65,16 +61,16 @@ export function HacknetRoot(props: IProps): React.ReactElement {
}
function handlePurchaseButtonClick(): void {
- purchaseHacknet(props.player);
+ purchaseHacknet();
rerender();
}
// Cost to purchase a new Hacknet Node
let purchaseCost;
- if (hasHacknetServers(props.player)) {
- purchaseCost = getCostOfNextHacknetServer(props.player);
+ if (hasHacknetServers()) {
+ purchaseCost = getCostOfNextHacknetServer();
} else {
- purchaseCost = getCostOfNextHacknetNode(props.player);
+ purchaseCost = getCostOfNextHacknetNode();
}
// onClick event handlers for purchase multiplier buttons
@@ -86,8 +82,8 @@ export function HacknetRoot(props: IProps): React.ReactElement {
];
// HacknetNode components
- const nodes = props.player.hacknetNodes.map((node: string | HacknetNode) => {
- if (hasHacknetServers(props.player)) {
+ const nodes = Player.hacknetNodes.map((node: string | HacknetNode) => {
+ if (hasHacknetServers()) {
if (node instanceof HacknetNode) throw new Error("node was hacknet node"); // should never happen
const hserver = GetServer(node);
if (hserver == null) {
@@ -96,7 +92,6 @@ export function HacknetRoot(props: IProps): React.ReactElement {
if (!(hserver instanceof HacknetServer)) throw new Error("node was not hacknet server"); // should never happen
return (
Hacknet {hasHacknetServers(props.player) ? "Servers" : "Nodes"}
- Hacknet {hasHacknetServers() ? "Servers" : "Nodes"}
+
-
- {hasHacknetServers(props.player) && setOpen(true)}>Spend Hashes on Upgrades }
+ {hasHacknetServers() && setOpen(true)}>Spend Hashes on Upgrades }
{nodes}
setOpen(false)} />
diff --git a/src/Hacknet/ui/HacknetServerElem.tsx b/src/Hacknet/ui/HacknetServerElem.tsx
index e60c62bb9..2a2a2d7ae 100644
--- a/src/Hacknet/ui/HacknetServerElem.tsx
+++ b/src/Hacknet/ui/HacknetServerElem.tsx
@@ -17,7 +17,7 @@ import {
updateHashManagerCapacity,
} from "../HacknetHelpers";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { HacknetServer } from "../HacknetServer";
import { Money } from "../../ui/React/Money";
@@ -39,7 +39,6 @@ interface IProps {
node: HacknetServer;
purchaseMultiplier: number | string;
rerender: () => void;
- player: IPlayer;
}
export function HacknetServerElem(props: IProps): React.ReactElement {
@@ -54,7 +53,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
} else {
let multiplier = 0;
if (purchaseMult === "MAX") {
- multiplier = getMaxNumberLevelUpgrades(props.player, node, HacknetServerConstants.MaxLevel);
+ multiplier = getMaxNumberLevelUpgrades(node, HacknetServerConstants.MaxLevel);
} else {
const levelsToMax = HacknetServerConstants.MaxLevel - node.level;
multiplier = Math.min(levelsToMax, purchaseMult as number);
@@ -66,11 +65,11 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
0,
node.maxRam,
node.cores,
- props.player.mults.hacknet_node_money,
- ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.mults.hacknet_node_money);
+ Player.mults.hacknet_node_money,
+ ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
const modded_increase = (base_increase * (node.maxRam - node.ramUsed)) / node.maxRam;
- const upgradeLevelCost = node.calculateLevelUpgradeCost(multiplier, props.player.mults.hacknet_node_level_cost);
+ const upgradeLevelCost = node.calculateLevelUpgradeCost(multiplier, Player.mults.hacknet_node_level_cost);
upgradeLevelButton = (
+{multiplier} -
-
);
@@ -94,18 +93,18 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
function upgradeLevelOnClick(): void {
let numUpgrades = purchaseMult;
if (purchaseMult === "MAX") {
- numUpgrades = getMaxNumberLevelUpgrades(props.player, node, HacknetServerConstants.MaxLevel);
+ numUpgrades = getMaxNumberLevelUpgrades(node, HacknetServerConstants.MaxLevel);
}
- purchaseLevelUpgrade(props.player, node, numUpgrades as number);
+ purchaseLevelUpgrade(node, numUpgrades as number);
rerender();
}
function upgradeRamOnClick(): void {
let numUpgrades = purchaseMult;
if (purchaseMult === "MAX") {
- numUpgrades = getMaxNumberRamUpgrades(props.player, node, HacknetServerConstants.MaxRam);
+ numUpgrades = getMaxNumberRamUpgrades(node, HacknetServerConstants.MaxRam);
}
- purchaseRamUpgrade(props.player, node, numUpgrades as number);
+ purchaseRamUpgrade(node, numUpgrades as number);
rerender();
}
// Upgrade RAM Button
@@ -115,7 +114,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
} else {
let multiplier = 0;
if (purchaseMult === "MAX") {
- multiplier = getMaxNumberRamUpgrades(props.player, node, HacknetServerConstants.MaxRam);
+ multiplier = getMaxNumberRamUpgrades(node, HacknetServerConstants.MaxRam);
} else {
const levelsToMax = Math.round(Math.log2(HacknetServerConstants.MaxRam / node.maxRam));
multiplier = Math.min(levelsToMax, purchaseMult as number);
@@ -127,8 +126,8 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
0,
node.maxRam * Math.pow(2, multiplier),
node.cores,
- props.player.mults.hacknet_node_money,
- ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.mults.hacknet_node_money);
+ Player.mults.hacknet_node_money,
+ ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
const modded_increase =
calculateHashGainRate(
@@ -136,11 +135,11 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
node.ramUsed,
node.maxRam * Math.pow(2, multiplier),
node.cores,
- props.player.mults.hacknet_node_money,
+ Player.mults.hacknet_node_money,
) -
- calculateHashGainRate(node.level, node.ramUsed, node.maxRam, node.cores, props.player.mults.hacknet_node_money);
+ calculateHashGainRate(node.level, node.ramUsed, node.maxRam, node.cores, Player.mults.hacknet_node_money);
- const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, props.player.mults.hacknet_node_ram_cost);
+ const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, Player.mults.hacknet_node_ram_cost);
upgradeRamButton = (
+{multiplier} -
-
);
@@ -165,9 +164,9 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
function upgradeCoresOnClick(): void {
let numUpgrades = purchaseMult;
if (purchaseMult === "MAX") {
- numUpgrades = getMaxNumberCoreUpgrades(props.player, node, HacknetServerConstants.MaxCores);
+ numUpgrades = getMaxNumberCoreUpgrades(node, HacknetServerConstants.MaxCores);
}
- purchaseCoreUpgrade(props.player, node, numUpgrades as number);
+ purchaseCoreUpgrade(node, numUpgrades as number);
rerender();
}
// Upgrade Cores Button
@@ -177,7 +176,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
} else {
let multiplier = 0;
if (purchaseMult === "MAX") {
- multiplier = getMaxNumberCoreUpgrades(props.player, node, HacknetServerConstants.MaxCores);
+ multiplier = getMaxNumberCoreUpgrades(node, HacknetServerConstants.MaxCores);
} else {
const levelsToMax = HacknetServerConstants.MaxCores - node.cores;
multiplier = Math.min(levelsToMax, purchaseMult as number);
@@ -189,11 +188,11 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
0,
node.maxRam,
node.cores + multiplier,
- props.player.mults.hacknet_node_money,
- ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, props.player.mults.hacknet_node_money);
+ Player.mults.hacknet_node_money,
+ ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
const modded_increase = (base_increase * (node.maxRam - node.ramUsed)) / node.maxRam;
- const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, props.player.mults.hacknet_node_core_cost);
+ const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, Player.mults.hacknet_node_core_cost);
upgradeCoresButton = (
+{multiplier} -
-
);
@@ -222,7 +221,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
} else {
let multiplier = 0;
if (purchaseMult === "MAX") {
- multiplier = getMaxNumberCacheUpgrades(props.player, node, HacknetServerConstants.MaxCache);
+ multiplier = getMaxNumberCacheUpgrades(node, HacknetServerConstants.MaxCache);
} else {
const levelsToMax = HacknetServerConstants.MaxCache - node.cache;
multiplier = Math.min(levelsToMax, purchaseMult as number);
@@ -240,22 +239,22 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
>
+{multiplier} -
-
);
- if (props.player.money < upgradeCacheCost) {
+ if (Player.money < upgradeCacheCost) {
} else {
}
}
function upgradeCacheOnClick(): void {
let numUpgrades = purchaseMult;
if (purchaseMult === "MAX") {
- numUpgrades = getMaxNumberCacheUpgrades(props.player, node, HacknetServerConstants.MaxCache);
+ numUpgrades = getMaxNumberCacheUpgrades(node, HacknetServerConstants.MaxCache);
}
- purchaseCacheUpgrade(props.player, node, numUpgrades as number);
+ purchaseCacheUpgrade(node, numUpgrades as number);
rerender();
- updateHashManagerCapacity(props.player);
+ updateHashManagerCapacity();
}
return (
diff --git a/src/Hacknet/ui/HacknetUpgradeElem.tsx b/src/Hacknet/ui/HacknetUpgradeElem.tsx
index 2bfb8ac03..7c4e3053f 100644
--- a/src/Hacknet/ui/HacknetUpgradeElem.tsx
+++ b/src/Hacknet/ui/HacknetUpgradeElem.tsx
@@ -4,8 +4,6 @@ import { purchaseHashUpgrade } from "../HacknetHelpers";
import { HashManager } from "../HashManager";
import { HashUpgrade } from "../HashUpgrade";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-
import { ServerDropdown, ServerType } from "../../ui/React/ServerDropdown";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
@@ -19,7 +17,6 @@ import { SelectChangeEvent } from "@mui/material/Select";
import { FactionNames } from "../../Faction/data/FactionNames";
interface IProps {
- player: IPlayer;
hashManager: HashManager;
upg: HashUpgrade;
rerender: () => void;
@@ -39,7 +36,7 @@ export function HacknetUpgradeElem(props: IProps): React.ReactElement {
function purchase(): void {
const canPurchase = props.hashManager.hashes >= props.hashManager.getUpgradeCost(props.upg.name);
if (canPurchase) {
- const res = purchaseHashUpgrade(props.player, props.upg.name, selectedServer);
+ const res = purchaseHashUpgrade(props.upg.name, selectedServer);
if (!res) {
dialogBoxCreate(
"Failed to purchase upgrade. This may be because you do not have enough hashes, " +
diff --git a/src/Hacknet/ui/HashUpgradeModal.tsx b/src/Hacknet/ui/HashUpgradeModal.tsx
index 28ededb74..e62d10e9f 100644
--- a/src/Hacknet/ui/HashUpgradeModal.tsx
+++ b/src/Hacknet/ui/HashUpgradeModal.tsx
@@ -9,7 +9,7 @@ import { HashUpgrades } from "../HashUpgrades";
import { Hashes } from "../../ui/React/Hashes";
import { HacknetUpgradeElem } from "./HacknetUpgradeElem";
import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import Typography from "@mui/material/Typography";
interface IProps {
@@ -18,7 +18,6 @@ interface IProps {
}
export function HashUpgradeModal(props: IProps): React.ReactElement {
- const player = use.Player();
const setRerender = useState(false)[1];
function rerender(): void {
setRerender((old) => !old);
@@ -29,7 +28,7 @@ export function HashUpgradeModal(props: IProps): React.ReactElement {
return () => clearInterval(id);
}, []);
- const hashManager = player.hashManager;
+ const hashManager = Player.hashManager;
if (!(hashManager instanceof HashManager)) {
throw new Error(`Player does not have a HashManager)`);
}
@@ -39,19 +38,11 @@ export function HashUpgradeModal(props: IProps): React.ReactElement {
<>
Spend your hashes on a variety of different upgrades
- Hashes:
{Object.keys(HashUpgrades).map((upgName) => {
const upg = HashUpgrades[upgName];
- return (
-
Money:
-
{hasServers && (
<>
- Hashes:
)}
diff --git a/src/Hacknet/ui/PurchaseButton.tsx b/src/Hacknet/ui/PurchaseButton.tsx
index 4b1301a3a..7d4c4a5f4 100644
--- a/src/Hacknet/ui/PurchaseButton.tsx
+++ b/src/Hacknet/ui/PurchaseButton.tsx
@@ -18,14 +18,14 @@ interface IProps {
export function PurchaseButton(props: IProps): React.ReactElement {
const cost = props.cost;
let text;
- if (hasHacknetServers(Player)) {
- if (hasMaxNumberHacknetServers(Player)) {
+ if (hasHacknetServers()) {
+ if (hasMaxNumberHacknetServers()) {
text = <>Hacknet Server limit reached;
} else {
text = (
<>
Purchase Hacknet Server -
- updateGame(GameType.None)}>Stop playing
- {game === GameType.Coin && Upgrade 'home' cores - MAX ;
}
- const cost = props.p.getUpgradeHomeCoresCost();
+ const cost = Player.getUpgradeHomeCoresCost();
function buy(): void {
if (maxCores) return;
- if (!props.p.canAfford(cost)) return;
- props.p.loseMoney(cost, "servers");
+ if (!Player.canAfford(cost)) return;
+ Player.loseMoney(cost, "servers");
homeComputer.cpuCores++;
props.rerender();
}
@@ -38,9 +37,9 @@ export function CoresButton(props: IProps): React.ReactElement {
"Cores increase the effectiveness of grow() and weaken() on 'home'"
+
Upgrade 'home' cores ({homeComputer.cpuCores} -> {homeComputer.cpuCores + 1}) -
-
diff --git a/src/Locations/ui/GenericLocation.tsx b/src/Locations/ui/GenericLocation.tsx
index 3b130daa5..956dda058 100644
--- a/src/Locations/ui/GenericLocation.tsx
+++ b/src/Locations/ui/GenericLocation.tsx
@@ -27,7 +27,7 @@ import { isBackdoorInstalled } from "../../Server/ServerHelpers";
import { GetServer } from "../../Server/AllServers";
import { CorruptableText } from "../../ui/React/CorruptableText";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
import { serverMetadata } from "../../Server/data/servers";
import { Tooltip } from "@mui/material";
@@ -36,8 +36,6 @@ type IProps = {
};
export function GenericLocation({ loc }: IProps): React.ReactElement {
- const router = use.Router();
- const player = use.Player();
/**
* Determine what needs to be rendered for this location based on the locations
* type. Returns an array of React components that should be rendered
@@ -50,11 +48,11 @@ export function GenericLocation({ loc }: IProps): React.ReactElement {
}
if (loc.types.includes(LocationType.Gym)) {
- content.push( router.toCity()}>Return to World
+ Router.toCity()}>Return to World
{backdoorInstalled && !Settings.DisableTextEffects ? (
diff --git a/src/Locations/ui/GymLocation.tsx b/src/Locations/ui/GymLocation.tsx
index d9ed2b032..1bc6c0db0 100644
--- a/src/Locations/ui/GymLocation.tsx
+++ b/src/Locations/ui/GymLocation.tsx
@@ -8,31 +8,29 @@ import Button from "@mui/material/Button";
import { Location } from "../Location";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Money } from "../../ui/React/Money";
-import { IRouter } from "../../ui/Router";
+import { Router } from "../../ui/GameRoot";
import { Box } from "@mui/material";
import { ClassWork, ClassType, Classes } from "../../Work/ClassWork";
import { calculateCost } from "../../Work/formulas/Class";
type IProps = {
loc: Location;
- p: IPlayer;
- router: IRouter;
};
export function GymLocation(props: IProps): React.ReactElement {
function train(stat: ClassType): void {
- props.p.startWork(
+ Player.startWork(
new ClassWork({
classType: stat,
location: props.loc.name,
singularity: false,
}),
);
- props.p.startFocusing();
- props.router.toWork();
+ Player.startFocusing();
+ Router.toWork();
}
const cost = calculateCost(Classes[ClassType.GymStrength], props.loc);
@@ -40,16 +38,16 @@ export function GymLocation(props: IProps): React.ReactElement {
return (
train(ClassType.GymStrength)}>
- Train Strength (
train(ClassType.GymDefense)}>
- Train Defense (
train(ClassType.GymDexterity)}>
- Train Dexterity (
train(ClassType.GymAgility)}>
- Train Agility (
);
diff --git a/src/Locations/ui/HospitalLocation.tsx b/src/Locations/ui/HospitalLocation.tsx
index bdc002a93..aabf4ae49 100644
--- a/src/Locations/ui/HospitalLocation.tsx
+++ b/src/Locations/ui/HospitalLocation.tsx
@@ -6,16 +6,14 @@
import * as React from "react";
import Button from "@mui/material/Button";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { getHospitalizationCost } from "../../Hospital/Hospital";
import { Money } from "../../ui/React/Money";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
-type IProps = {
- p: IPlayer;
-};
+type IProps = {};
type IState = {
currHp: number;
@@ -34,12 +32,12 @@ export class HospitalLocation extends React.Component {
this.getHealed = this.getHealed.bind(this);
this.state = {
- currHp: this.props.p.hp.current,
+ currHp: Player.hp.current,
};
}
getCost(): number {
- return getHospitalizationCost(this.props.p);
+ return getHospitalizationCost();
}
getHealed(e: React.MouseEvent): void {
@@ -47,20 +45,20 @@ export class HospitalLocation extends React.Component {
return;
}
- if (this.props.p.hp.current < 0) {
- this.props.p.hp.current = 0;
+ if (Player.hp.current < 0) {
+ Player.hp.current = 0;
}
- if (this.props.p.hp.current >= this.props.p.hp.max) {
+ if (Player.hp.current >= Player.hp.max) {
return;
}
const cost = this.getCost();
- this.props.p.loseMoney(cost, "hospitalization");
- this.props.p.hp.current = this.props.p.hp.max;
+ Player.loseMoney(cost, "hospitalization");
+ Player.hp.current = Player.hp.max;
// This just forces a re-render to update the cost
this.setState({
- currHp: this.props.p.hp.current,
+ currHp: Player.hp.current,
});
dialogBoxCreate(
@@ -75,7 +73,7 @@ export class HospitalLocation extends React.Component {
return (
- Get treatment for wounds -
);
}
diff --git a/src/Locations/ui/PurchaseServerModal.tsx b/src/Locations/ui/PurchaseServerModal.tsx
index ed54a7faa..7faa8537d 100644
--- a/src/Locations/ui/PurchaseServerModal.tsx
+++ b/src/Locations/ui/PurchaseServerModal.tsx
@@ -25,7 +25,7 @@ export function PurchaseServerModal(props: IProps): React.ReactElement {
const [hostname, setHostname] = useState("");
function tryToPurchaseServer(): void {
- purchaseServer(hostname, props.ram, props.cost, player);
+ purchaseServer(hostname, props.ram, props.cost);
props.onClose();
}
@@ -41,7 +41,7 @@ export function PurchaseServerModal(props: IProps): React.ReactElement {
Would you like to purchase a new server with {numeralWrapper.formatRAM(props.ram)} of RAM for{" "}
-
Upgrade 'home' RAM - MAX ;
}
- const cost = props.p.getUpgradeHomeRamCost();
+ const cost = Player.getUpgradeHomeRamCost();
function buy(): void {
- purchaseRamForHomeComputer(props.p);
+ purchaseRamForHomeComputer();
props.rerender();
}
@@ -45,10 +44,10 @@ export function RamButton(props: IProps): React.ReactElement {
"More RAM means more scripts on 'home'"
+
Upgrade 'home' RAM ({numeralWrapper.formatRAM(homeComputer.maxRam)} ->
{numeralWrapper.formatRAM(homeComputer.maxRam * 2)}) -
-
diff --git a/src/Locations/ui/TechVendorLocation.tsx b/src/Locations/ui/TechVendorLocation.tsx
index 88ee0638b..f1cf431c7 100644
--- a/src/Locations/ui/TechVendorLocation.tsx
+++ b/src/Locations/ui/TechVendorLocation.tsx
@@ -15,7 +15,7 @@ import { CoresButton } from "./CoresButton";
import { getPurchaseServerCost } from "../../Server/ServerPurchases";
import { Money } from "../../ui/React/Money";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { PurchaseServerModal } from "./PurchaseServerModal";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Box } from "@mui/material";
@@ -27,13 +27,12 @@ interface IServerProps {
function ServerButton(props: IServerProps): React.ReactElement {
const [open, setOpen] = useState(false);
- const player = use.Player();
const cost = getPurchaseServerCost(props.ram);
return (
<>
- setOpen(true)} disabled={!player.canAfford(cost)}>
+ setOpen(true)} disabled={!Player.canAfford(cost)}>
Purchase {numeralWrapper.formatRAM(props.ram)} Server -
-
!old);
@@ -76,11 +74,11 @@ export function TechVendorLocation(props: IProps): React.ReactElement {
"You can order bigger servers via scripts. We don't take custom orders in person."
TOR Router - Purchased ;
}
return (
-
+
Purchase TOR router -
-
);
}
diff --git a/src/Locations/ui/TravelAgencyRoot.tsx b/src/Locations/ui/TravelAgencyRoot.tsx
index 6711b8857..e9b726460 100644
--- a/src/Locations/ui/TravelAgencyRoot.tsx
+++ b/src/Locations/ui/TravelAgencyRoot.tsx
@@ -9,11 +9,10 @@ import { CityName } from "../data/CityNames";
import { TravelConfirmationModal } from "./TravelConfirmationModal";
import { CONSTANTS } from "../../Constants";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { IRouter } from "../../ui/Router";
+import { Player } from "../../Player";
+import { Router } from "../../ui/GameRoot";
import { Settings } from "../../Settings/Settings";
-import { use } from "../../ui/Context";
import { Money } from "../../ui/React/Money";
import { WorldMap } from "../../ui/React/WorldMap";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
@@ -22,26 +21,19 @@ import Typography from "@mui/material/Typography";
import Box from "@mui/material/Box";
import Button from "@mui/material/Button";
-type IProps = {
- p: IPlayer;
- router: IRouter;
-};
-
-function travel(p: IPlayer, router: IRouter, to: CityName): void {
+function travel(to: CityName): void {
const cost = CONSTANTS.TravelCost;
- if (!p.canAfford(cost)) {
+ if (!Player.canAfford(cost)) {
return;
}
- p.loseMoney(cost, "other");
- p.travel(to);
+ Player.loseMoney(cost, "other");
+ Player.travel(to);
dialogBoxCreate(`You are now in ${to}!`);
- router.toCity();
+ Router.toCity();
}
-export function TravelAgencyRoot(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
+export function TravelAgencyRoot(): React.ReactElement {
const setRerender = useState(false)[1];
const [open, setOpen] = useState(false);
const [destination, setDestination] = useState(CityName.Sector12);
@@ -56,11 +48,11 @@ export function TravelAgencyRoot(props: IProps): React.ReactElement {
function startTravel(city: CityName): void {
const cost = CONSTANTS.TravelCost;
- if (!player.canAfford(cost)) {
+ if (!Player.canAfford(cost)) {
return;
}
if (Settings.SuppressTravelConfirmation) {
- travel(player, router, city);
+ travel(city);
return;
}
setOpen(true);
@@ -73,12 +65,12 @@ export function TravelAgencyRoot(props: IProps): React.ReactElement {
From here, you can travel to any other city! A ticket costs{" "}
-
{Settings.DisableASCIIArt ? (
<>
{Object.values(CityName)
- .filter((city: string) => city != props.p.city)
+ .filter((city: string) => city != Player.city)
.map((city: string) => {
const match = Object.entries(CityName).find((entry) => entry[1] === city);
if (match === undefined) throw new Error(`could not find key for city '${city}'`);
@@ -93,12 +85,12 @@ export function TravelAgencyRoot(props: IProps): React.ReactElement {
})}
) : (
- startTravel(city)} />
+ startTravel(city)} />
)}
travel(player, router, destination)}
+ travel={() => travel(destination)}
open={open}
onClose={() => setOpen(false)}
/>
diff --git a/src/Locations/ui/TravelConfirmationModal.tsx b/src/Locations/ui/TravelConfirmationModal.tsx
index 5459c3efe..b6a0510a4 100644
--- a/src/Locations/ui/TravelConfirmationModal.tsx
+++ b/src/Locations/ui/TravelConfirmationModal.tsx
@@ -24,7 +24,7 @@ export function TravelConfirmationModal(props: IProps): React.ReactElement {
return (
- Would you like to travel to {props.city}? The trip will cost
take(ClassType.DataStructures)}>
Take Data Structures course (
-
take(ClassType.Networks)}>
Take Networks course (
-
take(ClassType.Algorithms)}>
Take Algorithms course (
-
take(ClassType.Management)}>
Take Management course (
-
take(ClassType.Leadership)}>
Take Leadership course (
-
diff --git a/src/Milestones/ui/MilestonesRoot.tsx b/src/Milestones/ui/MilestonesRoot.tsx
index 9a974ed6d..7f12d24ea 100644
--- a/src/Milestones/ui/MilestonesRoot.tsx
+++ b/src/Milestones/ui/MilestonesRoot.tsx
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Milestones } from "../Milestones";
import { Milestone } from "../Milestone";
import * as React from "react";
@@ -6,26 +6,22 @@ import * as React from "react";
import Typography from "@mui/material/Typography";
import Box from "@mui/material/Box";
-interface IProps {
- player: IPlayer;
-}
-
-function highestMilestone(p: IPlayer, milestones: Milestone[]): number {
+function highestMilestone(milestones: Milestone[]): number {
let n = -1;
for (let i = 0; i < milestones.length; i++) {
- if (milestones[i].fulfilled(p)) n = i;
+ if (milestones[i].fulfilled(Player)) n = i;
}
return n;
}
-export function MilestonesRoot(props: IProps): JSX.Element {
- const n = highestMilestone(props.player, Milestones);
+export function MilestonesRoot(): JSX.Element {
+ const n = highestMilestone(Milestones);
const milestones = Milestones.map((milestone: Milestone, i: number) => {
if (i <= n + 1) {
return (
- [{milestone.fulfilled(props.player) ? "x" : " "}] {milestone.title}
+ [{milestone.fulfilled(Player) ? "x" : " "}] {milestone.title}
);
}
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 4657cd81c..3a8c76282 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -390,7 +390,7 @@ function hack(
const hackingTime = calculateHackingTime(server, Player); // This is in seconds
// No root access or skill level too low
- const canHack = netscriptCanHack(server, Player);
+ const canHack = netscriptCanHack(server);
if (!canHack.res) {
throw makeRuntimeErrorMsg(ctx, canHack.msg || "");
}
diff --git a/src/NetscriptFunctions/Bladeburner.ts b/src/NetscriptFunctions/Bladeburner.ts
index 1e53919bf..54e379700 100644
--- a/src/NetscriptFunctions/Bladeburner.ts
+++ b/src/NetscriptFunctions/Bladeburner.ts
@@ -1,4 +1,4 @@
-import { Player as player } from "../Player";
+import { Player } from "../Player";
import { Bladeburner } from "../Bladeburner/Bladeburner";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { Bladeburner as INetscriptBladeburner, BladeburnerCurAction } from "../ScriptEditor/NetscriptDefinitions";
@@ -8,29 +8,23 @@ import { BlackOperation } from "../Bladeburner/BlackOperation";
import { helpers } from "../Netscript/NetscriptHelpers";
export function NetscriptBladeburner(): InternalAPI {
- const checkBladeburnerAccess = function (ctx: NetscriptContext, skipjoined = false): void {
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Must have joined bladeburner");
- const apiAccess =
- player.bitNodeN === 7 ||
- player.sourceFiles.some((a) => {
- return a.n === 7;
- });
+ const checkBladeburnerAccess = function (ctx: NetscriptContext): void {
+ getBladeburner(ctx);
+ return;
+ };
+ const getBladeburner = function (ctx: NetscriptContext): Bladeburner {
+ const apiAccess = Player.bitNodeN === 7 || Player.sourceFiles.some((a) => a.n === 7);
if (!apiAccess) {
- const apiDenied = `You do not currently have access to the Bladeburner API. You must either be in BitNode-7 or have Source-File 7.`;
- throw helpers.makeRuntimeErrorMsg(ctx, apiDenied);
- }
- if (!skipjoined) {
- const bladeburnerAccess = bladeburner instanceof Bladeburner;
- if (!bladeburnerAccess) {
- const bladeburnerDenied = `You must be a member of the Bladeburner division to use this API.`;
- throw helpers.makeRuntimeErrorMsg(ctx, bladeburnerDenied);
- }
+ throw helpers.makeRuntimeErrorMsg(ctx, "You have not unlocked the bladeburner API.", "API ACCESS");
}
+ const bladeburner = Player.bladeburner;
+ if (!bladeburner)
+ throw helpers.makeRuntimeErrorMsg(ctx, "You must be a member of the Bladeburner division to use this API.");
+ return bladeburner;
};
const checkBladeburnerCity = function (ctx: NetscriptContext, city: string): void {
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Must have joined bladeburner");
if (!bladeburner.cities.hasOwnProperty(city)) {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid city: ${city}`);
@@ -38,7 +32,7 @@ export function NetscriptBladeburner(): InternalAPI {
};
const getBladeburnerActionObject = function (ctx: NetscriptContext, type: string, name: string): IAction {
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Must have joined bladeburner");
const actionId = bladeburner.getActionIdFromTypeAndName(type, name);
if (!actionId) {
@@ -54,21 +48,15 @@ export function NetscriptBladeburner(): InternalAPI {
return {
getContractNames: (ctx: NetscriptContext) => (): string[] => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.getContractNamesNetscriptFn();
},
getOperationNames: (ctx: NetscriptContext) => (): string[] => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.getOperationNamesNetscriptFn();
},
getBlackOpNames: (ctx: NetscriptContext) => (): string[] => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.getBlackOpNamesNetscriptFn();
},
getBlackOpRank:
@@ -81,15 +69,11 @@ export function NetscriptBladeburner(): InternalAPI {
return action.reqdRank;
},
getGeneralActionNames: (ctx: NetscriptContext) => (): string[] => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.getGeneralActionNamesNetscriptFn();
},
getSkillNames: (ctx: NetscriptContext) => (): string[] => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.getSkillNamesNetscriptFn();
},
startAction:
@@ -97,25 +81,19 @@ export function NetscriptBladeburner(): InternalAPI {
(_type: unknown, _name: unknown): boolean => {
const type = helpers.string(ctx, "type", _type);
const name = helpers.string(ctx, "name", _name);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
- return bladeburner.startActionNetscriptFn(player, type, name, ctx.workerScript);
+ return bladeburner.startActionNetscriptFn(type, name, ctx.workerScript);
} catch (e: unknown) {
throw helpers.makeRuntimeErrorMsg(ctx, String(e));
}
},
stopBladeburnerAction: (ctx: NetscriptContext) => (): void => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.resetAction();
},
getCurrentAction: (ctx: NetscriptContext) => (): BladeburnerCurAction => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.getTypeAndNameFromActionId(bladeburner.action);
},
getActionTime:
@@ -123,11 +101,9 @@ export function NetscriptBladeburner(): InternalAPI {
(_type: unknown, _name: unknown): number => {
const type = helpers.string(ctx, "type", _type);
const name = helpers.string(ctx, "name", _name);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
- const time = bladeburner.getActionTimeNetscriptFn(player, type, name);
+ const time = bladeburner.getActionTimeNetscriptFn(Player, type, name);
if (typeof time === "string") {
const errorLogText = `Invalid action: type='${type}' name='${name}'`;
helpers.log(ctx, () => errorLogText);
@@ -140,9 +116,7 @@ export function NetscriptBladeburner(): InternalAPI {
}
},
getActionCurrentTime: (ctx: NetscriptContext) => (): number => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
const timecomputed =
Math.min(bladeburner.actionTimeCurrent + bladeburner.actionTimeOverflow, bladeburner.actionTimeToComplete) *
@@ -157,11 +131,9 @@ export function NetscriptBladeburner(): InternalAPI {
(_type: unknown, _name: unknown): [number, number] => {
const type = helpers.string(ctx, "type", _type);
const name = helpers.string(ctx, "name", _name);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
- const chance = bladeburner.getActionEstimatedSuccessChanceNetscriptFn(player, type, name);
+ const chance = bladeburner.getActionEstimatedSuccessChanceNetscriptFn(Player, type, name);
if (typeof chance === "string") {
const errorLogText = `Invalid action: type='${type}' name='${name}'`;
helpers.log(ctx, () => errorLogText);
@@ -195,9 +167,7 @@ export function NetscriptBladeburner(): InternalAPI {
(_type: unknown, _name: unknown): number => {
const type = helpers.string(ctx, "type", _type);
const name = helpers.string(ctx, "name", _name);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
return bladeburner.getActionCountRemainingNetscriptFn(type, name, ctx.workerScript);
} catch (e: unknown) {
@@ -255,24 +225,18 @@ export function NetscriptBladeburner(): InternalAPI {
action.level = level;
},
getRank: (ctx: NetscriptContext) => (): number => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.rank;
},
getSkillPoints: (ctx: NetscriptContext) => (): number => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.skillPoints;
},
getSkillLevel:
(ctx: NetscriptContext) =>
(_skillName: unknown): number => {
const skillName = helpers.string(ctx, "skillName", _skillName);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
return bladeburner.getSkillLevelNetscriptFn(skillName, ctx.workerScript);
} catch (e: unknown) {
@@ -284,9 +248,7 @@ export function NetscriptBladeburner(): InternalAPI {
(_skillName: unknown, _count: unknown = 1): number => {
const skillName = helpers.string(ctx, "skillName", _skillName);
const count = helpers.number(ctx, "count", _count);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
return bladeburner.getSkillUpgradeCostNetscriptFn(skillName, count, ctx.workerScript);
} catch (e: unknown) {
@@ -298,9 +260,7 @@ export function NetscriptBladeburner(): InternalAPI {
(_skillName: unknown, _count: unknown = 1): boolean => {
const skillName = helpers.string(ctx, "skillName", _skillName);
const count = helpers.number(ctx, "count", _count);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
return bladeburner.upgradeSkillNetscriptFn(skillName, count, ctx.workerScript);
} catch (e: unknown) {
@@ -312,9 +272,7 @@ export function NetscriptBladeburner(): InternalAPI {
(_type: unknown, _name: unknown): number => {
const type = helpers.string(ctx, "type", _type);
const name = helpers.string(ctx, "name", _name);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
return bladeburner.getTeamSizeNetscriptFn(type, name, ctx.workerScript);
} catch (e: unknown) {
@@ -327,9 +285,7 @@ export function NetscriptBladeburner(): InternalAPI {
const type = helpers.string(ctx, "type", _type);
const name = helpers.string(ctx, "name", _name);
const size = helpers.number(ctx, "size", _size);
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
try {
return bladeburner.setTeamSizeNetscriptFn(type, name, size, ctx.workerScript);
} catch (e: unknown) {
@@ -342,7 +298,7 @@ export function NetscriptBladeburner(): InternalAPI {
const cityName = helpers.string(ctx, "cityName", _cityName);
checkBladeburnerAccess(ctx);
checkBladeburnerCity(ctx, cityName);
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
return bladeburner.cities[cityName].popEst;
},
@@ -352,7 +308,7 @@ export function NetscriptBladeburner(): InternalAPI {
const cityName = helpers.string(ctx, "cityName", _cityName);
checkBladeburnerAccess(ctx);
checkBladeburnerCity(ctx, cityName);
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
return bladeburner.cities[cityName].comms;
},
@@ -362,14 +318,12 @@ export function NetscriptBladeburner(): InternalAPI {
const cityName = helpers.string(ctx, "cityName", _cityName);
checkBladeburnerAccess(ctx);
checkBladeburnerCity(ctx, cityName);
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
return bladeburner.cities[cityName].chaos;
},
getCity: (ctx: NetscriptContext) => (): string => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.city;
},
switchCity:
@@ -378,37 +332,33 @@ export function NetscriptBladeburner(): InternalAPI {
const cityName = helpers.string(ctx, "cityName", _cityName);
checkBladeburnerAccess(ctx);
checkBladeburnerCity(ctx, cityName);
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
bladeburner.city = cityName;
return true;
},
getStamina: (ctx: NetscriptContext) => (): [number, number] => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return [bladeburner.stamina, bladeburner.maxStamina];
},
joinBladeburnerFaction: (ctx: NetscriptContext) => (): boolean => {
- checkBladeburnerAccess(ctx, true);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return bladeburner.joinBladeburnerFactionNetscriptFn(ctx.workerScript);
},
joinBladeburnerDivision: (ctx: NetscriptContext) => (): boolean => {
- if (player.bitNodeN === 7 || player.sourceFileLvl(7) > 0) {
+ if (Player.bitNodeN === 7 || Player.sourceFileLvl(7) > 0) {
if (BitNodeMultipliers.BladeburnerRank === 0) {
return false; // Disabled in this bitnode
}
- if (player.bladeburner instanceof Bladeburner) {
+ if (Player.bladeburner instanceof Bladeburner) {
return true; // Already member
} else if (
- player.skills.strength >= 100 &&
- player.skills.defense >= 100 &&
- player.skills.dexterity >= 100 &&
- player.skills.agility >= 100
+ Player.skills.strength >= 100 &&
+ Player.skills.defense >= 100 &&
+ Player.skills.dexterity >= 100 &&
+ Player.skills.agility >= 100
) {
- player.bladeburner = new Bladeburner(player);
+ Player.bladeburner = new Bladeburner();
helpers.log(ctx, () => "You have been accepted into the Bladeburner division");
return true;
@@ -420,9 +370,7 @@ export function NetscriptBladeburner(): InternalAPI {
return false;
},
getBonusTime: (ctx: NetscriptContext) => (): number => {
- checkBladeburnerAccess(ctx);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
+ const bladeburner = getBladeburner(ctx);
return Math.round(bladeburner.storedCycles / 5) * 1000;
},
};
diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts
index e2d0d5da1..0a8e3c0a9 100644
--- a/src/NetscriptFunctions/Corporation.ts
+++ b/src/NetscriptFunctions/Corporation.ts
@@ -1047,14 +1047,14 @@ export function NetscriptCorporation(): InternalAPI {
(_numShares: unknown): number => {
checkAccess(ctx);
const numShares = helpers.number(ctx, "numShares", _numShares);
- return SellShares(getCorporation(), player, numShares);
+ return SellShares(getCorporation(), numShares);
},
buyBackShares:
(ctx: NetscriptContext) =>
(_numShares: unknown): boolean => {
checkAccess(ctx);
const numShares = helpers.number(ctx, "numShares", _numShares);
- return BuyBackShares(getCorporation(), player, numShares);
+ return BuyBackShares(getCorporation(), numShares);
},
bribe:
(ctx: NetscriptContext) =>
diff --git a/src/NetscriptFunctions/Formulas.ts b/src/NetscriptFunctions/Formulas.ts
index c5ff32440..16164e97c 100644
--- a/src/NetscriptFunctions/Formulas.ts
+++ b/src/NetscriptFunctions/Formulas.ts
@@ -410,11 +410,11 @@ export function NetscriptFormulas(): InternalAPI {
},
classGains:
(ctx: NetscriptContext) =>
- (_player: unknown, _classType: unknown, _locationName: unknown): WorkStats => {
- const target = helpers.player(ctx, _player);
+ (_person: unknown, _classType: unknown, _locationName: unknown): WorkStats => {
+ const person = helpers.player(ctx, _person);
const classType = helpers.string(ctx, "classType", _classType);
const locationName = helpers.string(ctx, "locationName", _locationName);
- return calculateClassEarnings(player, target, classType as ClassType, locationName as LocationName);
+ return calculateClassEarnings(person, classType as ClassType, locationName as LocationName);
},
factionGains:
(ctx: NetscriptContext) =>
diff --git a/src/NetscriptFunctions/Grafting.ts b/src/NetscriptFunctions/Grafting.ts
index 1b1623b52..233a9bae8 100644
--- a/src/NetscriptFunctions/Grafting.ts
+++ b/src/NetscriptFunctions/Grafting.ts
@@ -26,7 +26,7 @@ export function NetscriptGrafting(): InternalAPI {
(_augName: unknown): number => {
const augName = helpers.string(ctx, "augName", _augName);
checkGraftingAPIAccess(ctx);
- if (!getGraftingAvailableAugs(player).includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
+ if (!getGraftingAvailableAugs().includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid aug: ${augName}`);
}
const graftableAug = new GraftableAugmentation(StaticAugmentations[augName]);
@@ -38,16 +38,16 @@ export function NetscriptGrafting(): InternalAPI {
(_augName: string): number => {
const augName = helpers.string(ctx, "augName", _augName);
checkGraftingAPIAccess(ctx);
- if (!getGraftingAvailableAugs(player).includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
+ if (!getGraftingAvailableAugs().includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid aug: ${augName}`);
}
const graftableAug = new GraftableAugmentation(StaticAugmentations[augName]);
- return calculateGraftingTimeWithBonus(player, graftableAug);
+ return calculateGraftingTimeWithBonus(graftableAug);
},
getGraftableAugmentations: (ctx: NetscriptContext) => (): string[] => {
checkGraftingAPIAccess(ctx);
- const graftableAugs = getGraftingAvailableAugs(player);
+ const graftableAugs = getGraftingAvailableAugs();
return graftableAugs;
},
@@ -60,7 +60,7 @@ export function NetscriptGrafting(): InternalAPI {
if (player.city !== CityName.NewTokyo) {
throw helpers.makeRuntimeErrorMsg(ctx, "You must be in New Tokyo to begin grafting an Augmentation.");
}
- if (!getGraftingAvailableAugs(player).includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
+ if (!getGraftingAvailableAugs().includes(augName) || !StaticAugmentations.hasOwnProperty(augName)) {
helpers.log(ctx, () => `Invalid aug: ${augName}`);
return false;
}
@@ -82,7 +82,6 @@ export function NetscriptGrafting(): InternalAPI {
new GraftingWork({
singularity: true,
augmentation: augName,
- player: player,
}),
);
diff --git a/src/NetscriptFunctions/Hacknet.ts b/src/NetscriptFunctions/Hacknet.ts
index 7e173ae71..fffa887c2 100644
--- a/src/NetscriptFunctions/Hacknet.ts
+++ b/src/NetscriptFunctions/Hacknet.ts
@@ -29,7 +29,7 @@ export function NetscriptHacknet(): InternalAPI {
throw helpers.makeRuntimeErrorMsg(ctx, "Index specified for Hacknet Node is out-of-bounds: " + i);
}
- if (hasHacknetServers(player)) {
+ if (hasHacknetServers()) {
const hi = player.hacknetNodes[i];
if (typeof hi !== "string") throw new Error("hacknet node was not a string");
const hserver = GetServer(hi);
@@ -54,19 +54,19 @@ export function NetscriptHacknet(): InternalAPI {
return player.hacknetNodes.length;
},
maxNumNodes: () => (): number => {
- if (hasHacknetServers(player)) {
+ if (hasHacknetServers()) {
return HacknetServerConstants.MaxServers;
}
return Infinity;
},
purchaseNode: () => (): number => {
- return purchaseHacknet(player);
+ return purchaseHacknet();
},
getPurchaseNodeCost: () => (): number => {
- if (hasHacknetServers(player)) {
- return getCostOfNextHacknetServer(player);
+ if (hasHacknetServers()) {
+ return getCostOfNextHacknetServer();
} else {
- return getCostOfNextHacknetNode(player);
+ return getCostOfNextHacknetNode();
}
},
getNodeStats:
@@ -74,7 +74,7 @@ export function NetscriptHacknet(): InternalAPI {
(_i: unknown): NodeStats => {
const i = helpers.number(ctx, "i", _i);
const node = getHacknetNode(ctx, i);
- const hasUpgraded = hasHacknetServers(player);
+ const hasUpgraded = hasHacknetServers();
const res: NodeStats = {
name: node instanceof HacknetServer ? node.hostname : node.name,
level: node.level,
@@ -99,7 +99,7 @@ export function NetscriptHacknet(): InternalAPI {
const i = helpers.number(ctx, "i", _i);
const n = helpers.number(ctx, "n", _n);
const node = getHacknetNode(ctx, i);
- return purchaseLevelUpgrade(player, node, n);
+ return purchaseLevelUpgrade(node, n);
},
upgradeRam:
(ctx: NetscriptContext) =>
@@ -107,7 +107,7 @@ export function NetscriptHacknet(): InternalAPI {
const i = helpers.number(ctx, "i", _i);
const n = helpers.number(ctx, "n", _n);
const node = getHacknetNode(ctx, i);
- return purchaseRamUpgrade(player, node, n);
+ return purchaseRamUpgrade(node, n);
},
upgradeCore:
(ctx: NetscriptContext) =>
@@ -115,14 +115,14 @@ export function NetscriptHacknet(): InternalAPI {
const i = helpers.number(ctx, "i", _i);
const n = helpers.number(ctx, "n", _n);
const node = getHacknetNode(ctx, i);
- return purchaseCoreUpgrade(player, node, n);
+ return purchaseCoreUpgrade(node, n);
},
upgradeCache:
(ctx: NetscriptContext) =>
(_i: unknown, _n: unknown = 1): boolean => {
const i = helpers.number(ctx, "i", _i);
const n = helpers.number(ctx, "n", _n);
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return false;
}
const node = getHacknetNode(ctx, i);
@@ -130,9 +130,9 @@ export function NetscriptHacknet(): InternalAPI {
helpers.log(ctx, () => "Can only be called on hacknet servers");
return false;
}
- const res = purchaseCacheUpgrade(player, node, n);
+ const res = purchaseCacheUpgrade(node, n);
if (res) {
- updateHashManagerCapacity(player);
+ updateHashManagerCapacity();
}
return res;
},
@@ -165,7 +165,7 @@ export function NetscriptHacknet(): InternalAPI {
(_i: unknown, _n: unknown = 1): number => {
const i = helpers.number(ctx, "i", _i);
const n = helpers.number(ctx, "n", _n);
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return Infinity;
}
const node = getHacknetNode(ctx, i);
@@ -176,13 +176,13 @@ export function NetscriptHacknet(): InternalAPI {
return node.calculateCacheUpgradeCost(n);
},
numHashes: () => (): number => {
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return 0;
}
return player.hashManager.hashes;
},
hashCapacity: () => (): number => {
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return 0;
}
return player.hashManager.capacity;
@@ -192,7 +192,7 @@ export function NetscriptHacknet(): InternalAPI {
(_upgName: unknown, _count: unknown = 1): number => {
const upgName = helpers.string(ctx, "upgName", _upgName);
const count = helpers.number(ctx, "count", _count);
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return Infinity;
}
@@ -204,13 +204,13 @@ export function NetscriptHacknet(): InternalAPI {
const upgName = helpers.string(ctx, "upgName", _upgName);
const upgTarget = helpers.string(ctx, "upgTarget", _upgTarget);
const count = helpers.number(ctx, "count", _count);
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return false;
}
- return purchaseHashUpgrade(player, upgName, upgTarget, count);
+ return purchaseHashUpgrade(upgName, upgTarget, count);
},
getHashUpgrades: () => (): string[] => {
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return [];
}
return Object.values(HashUpgrades).map((upgrade: HashUpgrade) => upgrade.name);
@@ -226,13 +226,13 @@ export function NetscriptHacknet(): InternalAPI {
return level;
},
getStudyMult: () => (): number => {
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return 1;
}
return player.hashManager.getStudyMult();
},
getTrainingMult: () => (): number => {
- if (!hasHacknetServers(player)) {
+ if (!hasHacknetServers()) {
return 1;
}
return player.hashManager.getTrainingMult();
diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts
index c3b1adf16..f6e35648b 100644
--- a/src/NetscriptFunctions/Singularity.ts
+++ b/src/NetscriptFunctions/Singularity.ts
@@ -1,4 +1,4 @@
-import { Player as player } from "../Player";
+import { Player } from "../Player";
import { purchaseAugmentation, joinFaction, getFactionAugmentationsFiltered } from "../Faction/FactionHelpers";
import { startWorkerScript } from "../NetscriptWorker";
import { Augmentation } from "../Augmentation/Augmentation";
@@ -85,7 +85,7 @@ export function NetscriptSingularity(): InternalAPI {
const runAfterReset = function (cbScript: string | null = null): void {
//Run a script after reset
if (!cbScript) return;
- const home = player.getHomeComputer();
+ const home = Player.getHomeComputer();
for (const script of home.scripts) {
if (script.filename === cbScript) {
const ramUsage = script.ramUsage;
@@ -106,22 +106,22 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
const purchased = !!_purchased;
const res = [];
- for (let i = 0; i < player.augmentations.length; ++i) {
- res.push(player.augmentations[i].name);
+ for (let i = 0; i < Player.augmentations.length; ++i) {
+ res.push(Player.augmentations[i].name);
}
if (purchased) {
- for (let i = 0; i < player.queuedAugmentations.length; ++i) {
- res.push(player.queuedAugmentations[i].name);
+ for (let i = 0; i < Player.queuedAugmentations.length; ++i) {
+ res.push(Player.queuedAugmentations[i].name);
}
}
return res;
},
getOwnedSourceFiles: () => (): SourceFileLvl[] => {
const res: SourceFileLvl[] = [];
- for (let i = 0; i < player.sourceFiles.length; ++i) {
+ for (let i = 0; i < Player.sourceFiles.length; ++i) {
res.push({
- n: player.sourceFiles[i].n,
- lvl: player.sourceFiles[i].lvl,
+ n: Player.sourceFiles[i].n,
+ lvl: Player.sourceFiles[i].lvl,
});
}
return res;
@@ -132,14 +132,14 @@ export function NetscriptSingularity(): InternalAPI {
const facName = helpers.string(ctx, "facName", _facName);
const faction = getFaction(ctx, facName);
- return getFactionAugmentationsFiltered(player, faction);
+ return getFactionAugmentationsFiltered(faction);
},
getAugmentationCost: (ctx: NetscriptContext) =>
function (_augName: unknown): [number, number] {
helpers.checkSingularityAccess(ctx);
const augName = helpers.string(ctx, "augName", _augName);
const aug = getAugmentation(ctx, augName);
- const costs = aug.getCost(player);
+ const costs = aug.getCost();
return [costs.repCost, costs.moneyCost];
},
getAugmentationPrereq: (ctx: NetscriptContext) =>
@@ -161,14 +161,14 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
const augName = helpers.string(ctx, "augName", _augName);
const aug = getAugmentation(ctx, augName);
- return aug.getCost(player).moneyCost;
+ return aug.getCost().moneyCost;
},
getAugmentationRepReq: (ctx: NetscriptContext) =>
function (_augName: unknown): number {
helpers.checkSingularityAccess(ctx);
const augName = helpers.string(ctx, "augName", _augName);
const aug = getAugmentation(ctx, augName);
- return aug.getCost(player).repCost;
+ return aug.getCost().repCost;
},
getAugmentationStats: (ctx: NetscriptContext) =>
function (_augName: unknown): AugmentationStats {
@@ -185,9 +185,9 @@ export function NetscriptSingularity(): InternalAPI {
const fac = getFaction(ctx, facName);
const aug = getAugmentation(ctx, augName);
- const augs = getFactionAugmentationsFiltered(player, fac);
+ const augs = getFactionAugmentationsFiltered(fac);
- if (!player.factions.includes(fac.name)) {
+ if (!Player.factions.includes(fac.name)) {
helpers.log(ctx, () => `You can't purchase augmentations from '${facName}' because you aren't a member`);
return false;
}
@@ -199,21 +199,21 @@ export function NetscriptSingularity(): InternalAPI {
const isNeuroflux = aug.name === AugmentationNames.NeuroFluxGovernor;
if (!isNeuroflux) {
- for (let j = 0; j < player.queuedAugmentations.length; ++j) {
- if (player.queuedAugmentations[j].name === aug.name) {
+ for (let j = 0; j < Player.queuedAugmentations.length; ++j) {
+ if (Player.queuedAugmentations[j].name === aug.name) {
helpers.log(ctx, () => `You already have the '${augName}' augmentation.`);
return false;
}
}
- for (let j = 0; j < player.augmentations.length; ++j) {
- if (player.augmentations[j].name === aug.name) {
+ for (let j = 0; j < Player.augmentations.length; ++j) {
+ if (Player.augmentations[j].name === aug.name) {
helpers.log(ctx, () => `You already have the '${augName}' augmentation.`);
return false;
}
}
}
- if (fac.playerReputation < aug.getCost(player).repCost) {
+ if (fac.playerReputation < aug.getCost().repCost) {
helpers.log(ctx, () => `You do not have enough reputation with '${fac.name}'.`);
return false;
}
@@ -221,7 +221,7 @@ export function NetscriptSingularity(): InternalAPI {
const res = purchaseAugmentation(aug, fac, true);
helpers.log(ctx, () => res);
if (isString(res) && res.startsWith("You purchased")) {
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
return true;
} else {
return false;
@@ -245,11 +245,11 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
const cbScript = helpers.string(ctx, "cbScript", _cbScript);
- if (player.queuedAugmentations.length === 0) {
+ if (Player.queuedAugmentations.length === 0) {
helpers.log(ctx, () => "You do not have any Augmentations to be installed.");
return false;
}
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 10);
helpers.log(ctx, () => "Installing Augmentations. This will cause this script to be killed");
setTimeout(() => {
installAugmentations();
@@ -269,8 +269,8 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `No location named ${locationName}`);
return false;
}
- if (location.city && player.city !== location.city) {
- helpers.log(ctx, () => `No location named ${locationName} in ${player.city}`);
+ if (location.city && Player.city !== location.city) {
+ helpers.log(ctx, () => `No location named ${locationName} in ${Player.city}`);
return false;
}
if (location.name === LocationName.TravelAgency) {
@@ -280,7 +280,7 @@ export function NetscriptSingularity(): InternalAPI {
} else {
Router.toLocation(location);
}
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000);
return true;
},
universityCourse: (ctx: NetscriptContext) =>
@@ -289,38 +289,38 @@ export function NetscriptSingularity(): InternalAPI {
const universityName = helpers.string(ctx, "universityName", _universityName);
const className = helpers.string(ctx, "className", _className);
const focus = !!_focus;
- const wasFocusing = player.focus;
+ const wasFocusing = Player.focus;
switch (universityName.toLowerCase()) {
case LocationName.AevumSummitUniversity.toLowerCase():
- if (player.city != CityName.Aevum) {
+ if (Player.city != CityName.Aevum) {
helpers.log(
ctx,
() => `You cannot study at 'Summit University' because you are not in '${CityName.Aevum}'.`,
);
return false;
}
- player.gotoLocation(LocationName.AevumSummitUniversity);
+ Player.gotoLocation(LocationName.AevumSummitUniversity);
break;
case LocationName.Sector12RothmanUniversity.toLowerCase():
- if (player.city != CityName.Sector12) {
+ if (Player.city != CityName.Sector12) {
helpers.log(
ctx,
() => `You cannot study at 'Rothman University' because you are not in '${CityName.Sector12}'.`,
);
return false;
}
- player.location = LocationName.Sector12RothmanUniversity;
+ Player.location = LocationName.Sector12RothmanUniversity;
break;
case LocationName.VolhavenZBInstituteOfTechnology.toLowerCase():
- if (player.city != CityName.Volhaven) {
+ if (Player.city != CityName.Volhaven) {
helpers.log(
ctx,
() => `You cannot study at 'ZB Institute of Technology' because you are not in '${CityName.Volhaven}'.`,
);
return false;
}
- player.location = LocationName.VolhavenZBInstituteOfTechnology;
+ Player.location = LocationName.VolhavenZBInstituteOfTechnology;
break;
default:
helpers.log(ctx, () => `Invalid university name: '${universityName}'.`);
@@ -351,18 +351,18 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `Invalid class name: ${className}.`);
return false;
}
- player.startWork(
+ Player.startWork(
new ClassWork({
classType: task,
- location: player.location,
+ location: Player.location,
singularity: true,
}),
);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Started ${task} at ${universityName}`);
@@ -375,11 +375,11 @@ export function NetscriptSingularity(): InternalAPI {
const gymName = helpers.string(ctx, "gymName", _gymName);
const stat = helpers.string(ctx, "stat", _stat);
const focus = !!_focus;
- const wasFocusing = player.focus;
+ const wasFocusing = Player.focus;
switch (gymName.toLowerCase()) {
case LocationName.AevumCrushFitnessGym.toLowerCase():
- if (player.city != CityName.Aevum) {
+ if (Player.city != CityName.Aevum) {
helpers.log(
ctx,
() =>
@@ -387,10 +387,10 @@ export function NetscriptSingularity(): InternalAPI {
);
return false;
}
- player.location = LocationName.AevumCrushFitnessGym;
+ Player.location = LocationName.AevumCrushFitnessGym;
break;
case LocationName.AevumSnapFitnessGym.toLowerCase():
- if (player.city != CityName.Aevum) {
+ if (Player.city != CityName.Aevum) {
helpers.log(
ctx,
() =>
@@ -398,10 +398,10 @@ export function NetscriptSingularity(): InternalAPI {
);
return false;
}
- player.location = LocationName.AevumSnapFitnessGym;
+ Player.location = LocationName.AevumSnapFitnessGym;
break;
case LocationName.Sector12IronGym.toLowerCase():
- if (player.city != CityName.Sector12) {
+ if (Player.city != CityName.Sector12) {
helpers.log(
ctx,
() =>
@@ -409,10 +409,10 @@ export function NetscriptSingularity(): InternalAPI {
);
return false;
}
- player.location = LocationName.Sector12IronGym;
+ Player.location = LocationName.Sector12IronGym;
break;
case LocationName.Sector12PowerhouseGym.toLowerCase():
- if (player.city != CityName.Sector12) {
+ if (Player.city != CityName.Sector12) {
helpers.log(
ctx,
() =>
@@ -420,10 +420,10 @@ export function NetscriptSingularity(): InternalAPI {
);
return false;
}
- player.location = LocationName.Sector12PowerhouseGym;
+ Player.location = LocationName.Sector12PowerhouseGym;
break;
case LocationName.VolhavenMilleniumFitnessGym.toLowerCase():
- if (player.city != CityName.Volhaven) {
+ if (Player.city != CityName.Volhaven) {
helpers.log(
ctx,
() =>
@@ -431,7 +431,7 @@ export function NetscriptSingularity(): InternalAPI {
);
return false;
}
- player.location = LocationName.VolhavenMilleniumFitnessGym;
+ Player.location = LocationName.VolhavenMilleniumFitnessGym;
break;
default:
helpers.log(ctx, () => `Invalid gym name: ${gymName}. gymWorkout() failed`);
@@ -441,26 +441,26 @@ export function NetscriptSingularity(): InternalAPI {
switch (stat.toLowerCase()) {
case "strength".toLowerCase():
case "str".toLowerCase():
- player.startWork(
- new ClassWork({ classType: ClassType.GymStrength, location: player.location, singularity: true }),
+ Player.startWork(
+ new ClassWork({ classType: ClassType.GymStrength, location: Player.location, singularity: true }),
);
break;
case "defense".toLowerCase():
case "def".toLowerCase():
- player.startWork(
- new ClassWork({ classType: ClassType.GymDefense, location: player.location, singularity: true }),
+ Player.startWork(
+ new ClassWork({ classType: ClassType.GymDefense, location: Player.location, singularity: true }),
);
break;
case "dexterity".toLowerCase():
case "dex".toLowerCase():
- player.startWork(
- new ClassWork({ classType: ClassType.GymDexterity, location: player.location, singularity: true }),
+ Player.startWork(
+ new ClassWork({ classType: ClassType.GymDexterity, location: Player.location, singularity: true }),
);
break;
case "agility".toLowerCase():
case "agi".toLowerCase():
- player.startWork(
- new ClassWork({ classType: ClassType.GymAgility, location: player.location, singularity: true }),
+ Player.startWork(
+ new ClassWork({ classType: ClassType.GymAgility, location: Player.location, singularity: true }),
);
break;
default:
@@ -468,10 +468,10 @@ export function NetscriptSingularity(): InternalAPI {
return false;
}
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Started training ${stat} at ${gymName}`);
@@ -490,14 +490,14 @@ export function NetscriptSingularity(): InternalAPI {
case CityName.NewTokyo:
case CityName.Ishima:
case CityName.Volhaven:
- if (player.money < CONSTANTS.TravelCost) {
+ if (Player.money < CONSTANTS.TravelCost) {
helpers.log(ctx, () => "Not enough money to travel.");
return false;
}
- player.loseMoney(CONSTANTS.TravelCost, "other");
- player.city = cityName;
+ Player.loseMoney(CONSTANTS.TravelCost, "other");
+ Player.city = cityName;
helpers.log(ctx, () => `Traveled to ${cityName}`);
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000);
return true;
default:
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid city name: '${cityName}'.`);
@@ -508,23 +508,23 @@ export function NetscriptSingularity(): InternalAPI {
function (): boolean {
helpers.checkSingularityAccess(ctx);
- if (player.hasTorRouter()) {
+ if (Player.hasTorRouter()) {
helpers.log(ctx, () => "You already have a TOR router!");
return true;
}
- if (player.money < CONSTANTS.TorRouterCost) {
+ if (Player.money < CONSTANTS.TorRouterCost) {
helpers.log(ctx, () => "You cannot afford to purchase a Tor router.");
return false;
}
- player.loseMoney(CONSTANTS.TorRouterCost, "other");
+ Player.loseMoney(CONSTANTS.TorRouterCost, "other");
const darkweb = GetServer(SpecialServers.DarkWeb);
if (!darkweb) throw helpers.makeRuntimeErrorMsg(ctx, "DarkWeb was not a server but should have been");
- player.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
- darkweb.serversOnNetwork.push(player.getHomeComputer().hostname);
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 500);
+ Player.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
+ darkweb.serversOnNetwork.push(Player.getHomeComputer().hostname);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 500);
helpers.log(ctx, () => "You have purchased a Tor router!");
return true;
},
@@ -533,7 +533,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
const programName = helpers.string(ctx, "programName", _programName).toLowerCase();
- if (!player.hasTorRouter()) {
+ if (!Player.hasTorRouter()) {
helpers.log(ctx, () => "You do not have the TOR router.");
return false;
}
@@ -544,7 +544,7 @@ export function NetscriptSingularity(): InternalAPI {
return false;
}
- if (player.money < item.price) {
+ if (Player.money < item.price) {
helpers.log(
ctx,
() => `Not enough money to purchase '${item.program}'. Need ${numeralWrapper.formatMoney(item.price)}`,
@@ -552,29 +552,29 @@ export function NetscriptSingularity(): InternalAPI {
return false;
}
- if (player.hasProgram(item.program)) {
+ if (Player.hasProgram(item.program)) {
helpers.log(ctx, () => `You already have the '${item.program}' program`);
return true;
}
- player.getHomeComputer().pushProgram(item.program);
+ Player.getHomeComputer().pushProgram(item.program);
// Cancel if the program is in progress of writing
- if (isCreateProgramWork(player.currentWork) && player.currentWork.programName === item.program) {
- player.finishWork(true);
+ if (isCreateProgramWork(Player.currentWork) && Player.currentWork.programName === item.program) {
+ Player.finishWork(true);
}
- player.loseMoney(item.price, "other");
+ Player.loseMoney(item.price, "other");
helpers.log(
ctx,
() => `You have purchased the '${item.program}' program. The new program can be found on your home computer.`,
);
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 5000);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 5000);
return true;
},
getCurrentServer: (ctx: NetscriptContext) =>
function (): string {
helpers.checkSingularityAccess(ctx);
- return player.getCurrentServer().hostname;
+ return Player.getCurrentServer().hostname;
},
connect: (ctx: NetscriptContext) =>
function (_hostname: unknown): boolean {
@@ -591,22 +591,22 @@ export function NetscriptSingularity(): InternalAPI {
//Home case
if (hostname === "home") {
- player.getCurrentServer().isConnectedTo = false;
- player.currentServer = player.getHomeComputer().hostname;
- player.getCurrentServer().isConnectedTo = true;
+ Player.getCurrentServer().isConnectedTo = false;
+ Player.currentServer = Player.getHomeComputer().hostname;
+ Player.getCurrentServer().isConnectedTo = true;
Terminal.setcwd("/");
return true;
}
//Adjacent server case
- const server = player.getCurrentServer();
+ const server = Player.getCurrentServer();
for (let i = 0; i < server.serversOnNetwork.length; i++) {
const other = getServerOnNetwork(server, i);
if (other === null) continue;
if (other.hostname == hostname) {
- player.getCurrentServer().isConnectedTo = false;
- player.currentServer = target.hostname;
- player.getCurrentServer().isConnectedTo = true;
+ Player.getCurrentServer().isConnectedTo = false;
+ Player.currentServer = target.hostname;
+ Player.getCurrentServer().isConnectedTo = true;
Terminal.setcwd("/");
return true;
}
@@ -615,9 +615,9 @@ export function NetscriptSingularity(): InternalAPI {
//Backdoor case
const other = GetServer(hostname);
if (other !== null && other instanceof Server && other.backdoorInstalled) {
- player.getCurrentServer().isConnectedTo = false;
- player.currentServer = target.hostname;
- player.getCurrentServer().isConnectedTo = true;
+ Player.getCurrentServer().isConnectedTo = false;
+ Player.currentServer = target.hostname;
+ Player.getCurrentServer().isConnectedTo = true;
Terminal.setcwd("/");
return true;
}
@@ -628,21 +628,21 @@ export function NetscriptSingularity(): InternalAPI {
manualHack: (ctx: NetscriptContext) =>
function (): Promise {
helpers.checkSingularityAccess(ctx);
- const server = player.getCurrentServer();
+ const server = Player.getCurrentServer();
return helpers.hack(ctx, server.hostname, true);
},
installBackdoor: (ctx: NetscriptContext) => async (): Promise => {
helpers.checkSingularityAccess(ctx);
- const baseserver = player.getCurrentServer();
+ const baseserver = Player.getCurrentServer();
if (!(baseserver instanceof Server)) {
helpers.log(ctx, () => "cannot backdoor this kind of server");
return Promise.resolve();
}
const server = baseserver;
- const installTime = (calculateHackingTime(server, player) / 4) * 1000;
+ const installTime = (calculateHackingTime(server, Player) / 4) * 1000;
// No root access or skill level too low
- const canHack = netscriptCanHack(server, player);
+ const canHack = netscriptCanHack(server);
if (!canHack.res) {
throw helpers.makeRuntimeErrorMsg(ctx, canHack.msg || "");
}
@@ -666,22 +666,22 @@ export function NetscriptSingularity(): InternalAPI {
isFocused: (ctx: NetscriptContext) =>
function (): boolean {
helpers.checkSingularityAccess(ctx);
- return player.focus;
+ return Player.focus;
},
setFocus: (ctx: NetscriptContext) =>
function (_focus: unknown): boolean {
helpers.checkSingularityAccess(ctx);
const focus = !!_focus;
- if (player.currentWork === null) {
+ if (Player.currentWork === null) {
throw helpers.makeRuntimeErrorMsg(ctx, "Not currently working");
}
- if (!player.focus && focus) {
- player.startFocusing();
+ if (!Player.focus && focus) {
+ Player.startFocusing();
Router.toWork();
return true;
- } else if (player.focus && !focus) {
- player.stopFocusing();
+ } else if (Player.focus && !focus) {
+ Player.stopFocusing();
Router.toTerminal();
return true;
}
@@ -690,22 +690,22 @@ export function NetscriptSingularity(): InternalAPI {
hospitalize: (ctx: NetscriptContext) =>
function (): void {
helpers.checkSingularityAccess(ctx);
- if (player.currentWork || Router.page() === Page.Infiltration || Router.page() === Page.BitVerse) {
+ if (Player.currentWork || Router.page() === Page.Infiltration || Router.page() === Page.BitVerse) {
helpers.log(ctx, () => "Cannot go to the hospital because the player is busy.");
return;
}
- player.hospitalize();
+ Player.hospitalize();
},
isBusy: (ctx: NetscriptContext) =>
function (): boolean {
helpers.checkSingularityAccess(ctx);
- return player.currentWork !== null || Router.page() === Page.Infiltration || Router.page() === Page.BitVerse;
+ return Player.currentWork !== null || Router.page() === Page.Infiltration || Router.page() === Page.BitVerse;
},
stopAction: (ctx: NetscriptContext) =>
function (): boolean {
helpers.checkSingularityAccess(ctx);
- const wasWorking = player.currentWork !== null;
- player.finishWork(true);
+ const wasWorking = Player.currentWork !== null;
+ Player.finishWork(true);
return wasWorking;
},
upgradeHomeCores: (ctx: NetscriptContext) =>
@@ -713,22 +713,22 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
// Check if we're at max cores
- const homeComputer = player.getHomeComputer();
+ const homeComputer = Player.getHomeComputer();
if (homeComputer.cpuCores >= 8) {
helpers.log(ctx, () => `Your home computer is at max cores.`);
return false;
}
- const cost = player.getUpgradeHomeCoresCost();
- if (player.money < cost) {
+ const cost = Player.getUpgradeHomeCoresCost();
+ if (Player.money < cost) {
helpers.log(ctx, () => `You don't have enough money. Need ${numeralWrapper.formatMoney(cost)}`);
return false;
}
homeComputer.cpuCores += 1;
- player.loseMoney(cost, "servers");
+ Player.loseMoney(cost, "servers");
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 2);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 2);
helpers.log(
ctx,
() => `Purchased an additional core for home computer! It now has ${homeComputer.cpuCores} cores.`,
@@ -739,29 +739,29 @@ export function NetscriptSingularity(): InternalAPI {
function (): number {
helpers.checkSingularityAccess(ctx);
- return player.getUpgradeHomeCoresCost();
+ return Player.getUpgradeHomeCoresCost();
},
upgradeHomeRam: (ctx: NetscriptContext) =>
function (): boolean {
helpers.checkSingularityAccess(ctx);
// Check if we're at max RAM
- const homeComputer = player.getHomeComputer();
+ const homeComputer = Player.getHomeComputer();
if (homeComputer.maxRam >= CONSTANTS.HomeComputerMaxRam) {
helpers.log(ctx, () => `Your home computer is at max RAM.`);
return false;
}
- const cost = player.getUpgradeHomeRamCost();
- if (player.money < cost) {
+ const cost = Player.getUpgradeHomeRamCost();
+ if (Player.money < cost) {
helpers.log(ctx, () => `You don't have enough money. Need ${numeralWrapper.formatMoney(cost)}`);
return false;
}
homeComputer.maxRam *= 2;
- player.loseMoney(cost, "servers");
+ Player.loseMoney(cost, "servers");
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 2);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 2);
helpers.log(
ctx,
() =>
@@ -775,7 +775,7 @@ export function NetscriptSingularity(): InternalAPI {
function (): number {
helpers.checkSingularityAccess(ctx);
- return player.getUpgradeHomeRamCost();
+ return Player.getUpgradeHomeRamCost();
},
workForCompany: (ctx: NetscriptContext) =>
function (_companyName: unknown, _focus: unknown = true): boolean {
@@ -790,32 +790,32 @@ export function NetscriptSingularity(): InternalAPI {
}
// Make sure player is actually employed at the comapny
- if (!Object.keys(player.jobs).includes(companyName)) {
+ if (!Object.keys(Player.jobs).includes(companyName)) {
helpers.log(ctx, () => `You do not have a job at '${companyName}'`);
return false;
}
// Check to make sure company position data is valid
- const companyPositionName = player.jobs[companyName];
+ const companyPositionName = Player.jobs[companyName];
const companyPosition = CompanyPositions[companyPositionName];
if (companyPositionName === "" || !(companyPosition instanceof CompanyPosition)) {
helpers.log(ctx, () => "You do not have a job");
return false;
}
- const wasFocused = player.focus;
+ const wasFocused = Player.focus;
- player.startWork(
+ Player.startWork(
new CompanyWork({
singularity: true,
companyName: companyName,
}),
);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocused) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Began working at '${companyName}' as a '${companyPositionName}'`);
@@ -828,47 +828,47 @@ export function NetscriptSingularity(): InternalAPI {
const field = helpers.string(ctx, "field", _field);
getCompany(ctx, companyName);
- player.location = companyName as LocationName;
+ Player.location = companyName as LocationName;
let res;
switch (field.toLowerCase()) {
case "software":
- res = player.applyForSoftwareJob(true);
+ res = Player.applyForSoftwareJob(true);
break;
case "software consultant":
- res = player.applyForSoftwareConsultantJob(true);
+ res = Player.applyForSoftwareConsultantJob(true);
break;
case "it":
- res = player.applyForItJob(true);
+ res = Player.applyForItJob(true);
break;
case "security engineer":
- res = player.applyForSecurityEngineerJob(true);
+ res = Player.applyForSecurityEngineerJob(true);
break;
case "network engineer":
- res = player.applyForNetworkEngineerJob(true);
+ res = Player.applyForNetworkEngineerJob(true);
break;
case "business":
- res = player.applyForBusinessJob(true);
+ res = Player.applyForBusinessJob(true);
break;
case "business consultant":
- res = player.applyForBusinessConsultantJob(true);
+ res = Player.applyForBusinessConsultantJob(true);
break;
case "security":
- res = player.applyForSecurityJob(true);
+ res = Player.applyForSecurityJob(true);
break;
case "agent":
- res = player.applyForAgentJob(true);
+ res = Player.applyForAgentJob(true);
break;
case "employee":
- res = player.applyForEmployeeJob(true);
+ res = Player.applyForEmployeeJob(true);
break;
case "part-time employee":
- res = player.applyForPartTimeEmployeeJob(true);
+ res = Player.applyForPartTimeEmployeeJob(true);
break;
case "waiter":
- res = player.applyForWaiterJob(true);
+ res = Player.applyForWaiterJob(true);
break;
case "part-time waiter":
- res = player.applyForPartTimeWaiterJob(true);
+ res = Player.applyForPartTimeWaiterJob(true);
break;
default:
helpers.log(ctx, () => `Invalid job: '${field}'.`);
@@ -881,7 +881,7 @@ export function NetscriptSingularity(): InternalAPI {
// return false;
// }
if (res) {
- helpers.log(ctx, () => `You were offered a new job at '${companyName}' as a '${player.jobs[companyName]}'`);
+ helpers.log(ctx, () => `You were offered a new job at '${companyName}' as a '${Player.jobs[companyName]}'`);
} else {
helpers.log(ctx, () => `You failed to get a new job/promotion at '${companyName}' in the '${field}' field.`);
}
@@ -891,7 +891,7 @@ export function NetscriptSingularity(): InternalAPI {
function (_companyName: unknown): void {
helpers.checkSingularityAccess(ctx);
const companyName = helpers.string(ctx, "companyName", _companyName);
- player.quitJob(companyName);
+ Player.quitJob(companyName);
},
getCompanyRep: (ctx: NetscriptContext) =>
function (_companyName: unknown): number {
@@ -918,7 +918,7 @@ export function NetscriptSingularity(): InternalAPI {
function (): string[] {
helpers.checkSingularityAccess(ctx);
// Make a copy of player.factionInvitations
- return player.factionInvitations.slice();
+ return Player.factionInvitations.slice();
},
joinFaction: (ctx: NetscriptContext) =>
function (_facName: unknown): boolean {
@@ -926,7 +926,7 @@ export function NetscriptSingularity(): InternalAPI {
const facName = helpers.string(ctx, "facName", _facName);
getFaction(ctx, facName);
- if (!player.factionInvitations.includes(facName)) {
+ if (!Player.factionInvitations.includes(facName)) {
helpers.log(ctx, () => `You have not been invited by faction '${facName}'`);
return false;
}
@@ -934,13 +934,13 @@ export function NetscriptSingularity(): InternalAPI {
joinFaction(fac);
// Update Faction Invitation list to account for joined + banned factions
- for (let i = 0; i < player.factionInvitations.length; ++i) {
- if (player.factionInvitations[i] == facName || Factions[player.factionInvitations[i]].isBanned) {
- player.factionInvitations.splice(i, 1);
+ for (let i = 0; i < Player.factionInvitations.length; ++i) {
+ if (Player.factionInvitations[i] == facName || Factions[Player.factionInvitations[i]].isBanned) {
+ Player.factionInvitations.splice(i, 1);
i--;
}
}
- player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 5);
+ Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain * 5);
helpers.log(ctx, () => `Joined the '${facName}' faction.`);
return true;
},
@@ -953,17 +953,17 @@ export function NetscriptSingularity(): InternalAPI {
const faction = getFaction(ctx, facName);
// if the player is in a gang and the target faction is any of the gang faction, fail
- if (player.inGang() && faction.name === player.getGangFaction().name) {
- helpers.log(ctx, () => `You can't work for '${facName}' because you're managing a gang for it.`);
+ if (Player.inGang() && faction.name === Player.getGangFaction().name) {
+ helpers.log(ctx, () => `You can't work for '${facName}' because youre managing a gang for it`);
return false;
}
- if (!player.factions.includes(facName)) {
+ if (!Player.factions.includes(facName)) {
helpers.log(ctx, () => `You are not a member of '${facName}'`);
return false;
}
- const wasFocusing = player.focus;
+ const wasFocusing = Player.focus;
switch (type.toLowerCase()) {
case "hacking":
@@ -973,7 +973,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `Faction '${faction.name}' do not need help with hacking contracts.`);
return false;
}
- player.startWork(
+ Player.startWork(
new FactionWork({
singularity: true,
factionWorkType: FactionWorkType.HACKING,
@@ -981,10 +981,10 @@ export function NetscriptSingularity(): InternalAPI {
}),
);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Started carrying out hacking contracts for '${faction.name}'`);
@@ -996,7 +996,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `Faction '${faction.name}' do not need help with field missions.`);
return false;
}
- player.startWork(
+ Player.startWork(
new FactionWork({
singularity: true,
factionWorkType: FactionWorkType.FIELD,
@@ -1004,10 +1004,10 @@ export function NetscriptSingularity(): InternalAPI {
}),
);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Started carrying out field missions for '${faction.name}'`);
@@ -1019,7 +1019,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `Faction '${faction.name}' do not need help with security work.`);
return false;
}
- player.startWork(
+ Player.startWork(
new FactionWork({
singularity: true,
factionWorkType: FactionWorkType.SECURITY,
@@ -1027,10 +1027,10 @@ export function NetscriptSingularity(): InternalAPI {
}),
);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Started carrying out security work for '${faction.name}'`);
@@ -1067,11 +1067,11 @@ export function NetscriptSingularity(): InternalAPI {
const facName = helpers.string(ctx, "facName", _facName);
const amt = helpers.number(ctx, "amt", _amt);
const faction = getFaction(ctx, facName);
- if (!player.factions.includes(faction.name)) {
+ if (!Player.factions.includes(faction.name)) {
helpers.log(ctx, () => `You can't donate to '${facName}' because you aren't a member`);
return false;
}
- if (player.inGang() && faction.name === player.getGangFaction().name) {
+ if (Player.inGang() && faction.name === Player.getGangFaction().name) {
helpers.log(ctx, () => `You can't donate to '${facName}' because youre managing a gang for it`);
return false;
}
@@ -1083,7 +1083,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `Invalid donation amount: '${amt}'.`);
return false;
}
- if (player.money < amt) {
+ if (Player.money < amt) {
helpers.log(
ctx,
() => `You do not have enough money to donate ${numeralWrapper.formatMoney(amt)} to '${facName}'`,
@@ -1099,9 +1099,9 @@ export function NetscriptSingularity(): InternalAPI {
);
return false;
}
- const repGain = (amt / CONSTANTS.DonateMoneyToRepDivisor) * player.mults.faction_rep;
+ const repGain = (amt / CONSTANTS.DonateMoneyToRepDivisor) * Player.mults.faction_rep;
faction.playerReputation += repGain;
- player.loseMoney(amt, "other");
+ Player.loseMoney(amt, "other");
helpers.log(
ctx,
() =>
@@ -1117,7 +1117,7 @@ export function NetscriptSingularity(): InternalAPI {
const programName = helpers.string(ctx, "programName", _programName).toLowerCase();
const focus = !!_focus;
- const wasFocusing = player.focus;
+ const wasFocusing = Player.focus;
const p = Object.values(Programs).find((p) => p.name.toLowerCase() === programName);
@@ -1126,7 +1126,7 @@ export function NetscriptSingularity(): InternalAPI {
return false;
}
- if (player.hasProgram(p.name)) {
+ if (Player.hasProgram(p.name)) {
helpers.log(ctx, () => `You already have the '${p.name}' program`);
return false;
}
@@ -1137,23 +1137,22 @@ export function NetscriptSingularity(): InternalAPI {
return false;
}
- if (!create.req(player)) {
+ if (!create.req()) {
helpers.log(ctx, () => `Hacking level is too low to create '${p.name}' (level ${create.level} req)`);
return false;
}
- player.startWork(
+ Player.startWork(
new CreateProgramWork({
programName: p.name,
singularity: true,
- player: player,
}),
);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
helpers.log(ctx, () => `Began creating program: '${programName}'`);
@@ -1164,14 +1163,14 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
const crimeRoughName = helpers.string(ctx, "crimeRoughName", _crimeRoughName);
const focus = !!_focus;
- const wasFocusing = player.focus;
+ const wasFocusing = Player.focus;
- if (player.currentWork !== null) {
- player.finishWork(true);
+ if (Player.currentWork !== null) {
+ Player.finishWork(true);
}
// Set Location to slums
- player.gotoLocation(LocationName.Slums);
+ Player.gotoLocation(LocationName.Slums);
const crime = findCrime(crimeRoughName.toLowerCase());
if (crime == null) {
@@ -1179,12 +1178,12 @@ export function NetscriptSingularity(): InternalAPI {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: '${crimeRoughName}'`);
}
helpers.log(ctx, () => `Attempting to commit ${crime.name}...`);
- const crimeTime = crime.commit(player, 1, ctx.workerScript);
+ const crimeTime = crime.commit(Player, 1, ctx.workerScript);
if (focus) {
- player.startFocusing();
+ Player.startFocusing();
Router.toWork();
} else if (wasFocusing) {
- player.stopFocusing();
+ Player.stopFocusing();
Router.toTerminal();
}
return crimeTime;
@@ -1199,7 +1198,7 @@ export function NetscriptSingularity(): InternalAPI {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: ${crimeRoughName}`);
}
- return crime.successRate(player);
+ return crime.successRate(Player);
},
getCrimeStats: (ctx: NetscriptContext) =>
function (_crimeRoughName: unknown): CrimeStats {
@@ -1230,7 +1229,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.checkSingularityAccess(ctx);
// If we don't have Tor, log it and return [] (empty list)
- if (!player.hasTorRouter()) {
+ if (!Player.hasTorRouter()) {
helpers.log(ctx, () => "You do not have the TOR router.");
return [];
}
@@ -1242,7 +1241,7 @@ export function NetscriptSingularity(): InternalAPI {
const programName = helpers.string(ctx, "programName", _programName).toLowerCase();
// If we don't have Tor, log it and return -1
- if (!player.hasTorRouter()) {
+ if (!Player.hasTorRouter()) {
helpers.log(ctx, () => "You do not have the TOR router.");
// returning -1 rather than throwing an error to be consistent with purchaseProgram
// which returns false if tor has
@@ -1263,7 +1262,7 @@ export function NetscriptSingularity(): InternalAPI {
);
}
- if (player.hasProgram(item.program)) {
+ if (Player.hasProgram(item.program)) {
helpers.log(ctx, () => `You already have the '${item.program}' program`);
return 0;
}
@@ -1276,7 +1275,7 @@ export function NetscriptSingularity(): InternalAPI {
const nextBN = helpers.number(ctx, "nextBN", _nextBN);
const callbackScript = helpers.string(ctx, "callbackScript", _callbackScript);
helpers.checkSingularityAccess(ctx);
- enterBitNode(Router, true, player.bitNodeN, nextBN);
+ enterBitNode(Router, true, Player.bitNodeN, nextBN);
if (callbackScript)
setTimeout(() => {
runAfterReset(callbackScript);
@@ -1292,14 +1291,14 @@ export function NetscriptSingularity(): InternalAPI {
const wd = GetServer(SpecialServers.WorldDaemon);
if (!(wd instanceof Server)) throw new Error("WorldDaemon was not a normal server. This is a bug contact dev.");
const hackingRequirements = (): boolean => {
- if (player.skills.hacking < wd.requiredHackingSkill) return false;
+ if (Player.skills.hacking < wd.requiredHackingSkill) return false;
if (!wd.hasAdminRights) return false;
return true;
};
const bladeburnerRequirements = (): boolean => {
- if (!player.inBladeburner()) return false;
- if (!player.bladeburner) return false;
- return player.bladeburner.blackops[BlackOperationNames.OperationDaedalus];
+ if (!Player.inBladeburner()) return false;
+ if (!Player.bladeburner) return false;
+ return Player.bladeburner.blackops[BlackOperationNames.OperationDaedalus];
};
if (!hackingRequirements() && !bladeburnerRequirements()) {
@@ -1309,15 +1308,15 @@ export function NetscriptSingularity(): InternalAPI {
wd.backdoorInstalled = true;
calculateAchievements();
- enterBitNode(Router, false, player.bitNodeN, nextBN);
+ enterBitNode(Router, false, Player.bitNodeN, nextBN);
if (callbackScript)
setTimeout(() => {
runAfterReset(callbackScript);
}, 0);
},
getCurrentWork: () => (): any | null => {
- if (!player.currentWork) return null;
- return player.currentWork.APICopy();
+ if (!Player.currentWork) return null;
+ return Player.currentWork.APICopy();
},
exportGame: (ctx: NetscriptContext) => (): void => {
helpers.checkSingularityAccess(ctx);
diff --git a/src/NetscriptFunctions/Sleeve.ts b/src/NetscriptFunctions/Sleeve.ts
index 16b076926..d523ccaf3 100644
--- a/src/NetscriptFunctions/Sleeve.ts
+++ b/src/NetscriptFunctions/Sleeve.ts
@@ -1,4 +1,4 @@
-import { Player as player } from "../Player";
+import { Player } from "../Player";
import { findSleevePurchasableAugs } from "../PersonObjects/Sleeve/SleeveHelpers";
import { StaticAugmentations } from "../Augmentation/StaticAugmentations";
import { CityName } from "../Locations/data/CityNames";
@@ -21,7 +21,7 @@ import { helpers } from "../Netscript/NetscriptHelpers";
export function NetscriptSleeve(): InternalAPI {
const checkSleeveAPIAccess = function (ctx: NetscriptContext): void {
- if (player.bitNodeN !== 10 && !player.sourceFileLvl(10)) {
+ if (Player.bitNodeN !== 10 && !Player.sourceFileLvl(10)) {
throw helpers.makeRuntimeErrorMsg(
ctx,
"You do not currently have access to the Sleeve API. This is either because you are not in BitNode-10 or because you do not have Source-File 10",
@@ -30,7 +30,7 @@ export function NetscriptSleeve(): InternalAPI {
};
const checkSleeveNumber = function (ctx: NetscriptContext, sleeveNumber: number): void {
- if (sleeveNumber >= player.sleeves.length || sleeveNumber < 0) {
+ if (sleeveNumber >= Player.sleeves.length || sleeveNumber < 0) {
const msg = `Invalid sleeve number: ${sleeveNumber}`;
helpers.log(ctx, () => msg);
throw helpers.makeRuntimeErrorMsg(ctx, msg);
@@ -38,7 +38,7 @@ export function NetscriptSleeve(): InternalAPI {
};
const getSleeveStats = function (sleeveNumber: number): SleeveSkills {
- const sl = player.sleeves[sleeveNumber];
+ const sl = Player.sleeves[sleeveNumber];
return {
shock: 100 - sl.shock,
sync: sl.sync,
@@ -55,7 +55,7 @@ export function NetscriptSleeve(): InternalAPI {
return {
getNumSleeves: (ctx: NetscriptContext) => (): number => {
checkSleeveAPIAccess(ctx);
- return player.sleeves.length;
+ return Player.sleeves.length;
},
setToShockRecovery:
(ctx: NetscriptContext) =>
@@ -63,7 +63,7 @@ export function NetscriptSleeve(): InternalAPI {
const sleeveNumber = helpers.number(ctx, "sleeveNumber", _sleeveNumber);
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- return player.sleeves[sleeveNumber].shockRecovery(player);
+ return Player.sleeves[sleeveNumber].shockRecovery();
},
setToSynchronize:
(ctx: NetscriptContext) =>
@@ -71,7 +71,7 @@ export function NetscriptSleeve(): InternalAPI {
const sleeveNumber = helpers.number(ctx, "sleeveNumber", _sleeveNumber);
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- return player.sleeves[sleeveNumber].synchronize(player);
+ return Player.sleeves[sleeveNumber].synchronize();
},
setToCommitCrime:
(ctx: NetscriptContext) =>
@@ -84,7 +84,7 @@ export function NetscriptSleeve(): InternalAPI {
if (crime === null) {
return false;
}
- return player.sleeves[sleeveNumber].commitCrime(player, crime.name);
+ return Player.sleeves[sleeveNumber].commitCrime(crime.name);
},
setToUniversityCourse:
(ctx: NetscriptContext) =>
@@ -94,7 +94,7 @@ export function NetscriptSleeve(): InternalAPI {
const className = helpers.string(ctx, "className", _className);
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- return player.sleeves[sleeveNumber].takeUniversityCourse(player, universityName, className);
+ return Player.sleeves[sleeveNumber].takeUniversityCourse(universityName, className);
},
travel:
(ctx: NetscriptContext) =>
@@ -104,7 +104,7 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
if (checkEnum(CityName, cityName)) {
- return player.sleeves[sleeveNumber].travel(player, cityName);
+ return Player.sleeves[sleeveNumber].travel(cityName);
} else {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid city name: '${cityName}'.`);
}
@@ -118,11 +118,11 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveNumber(ctx, sleeveNumber);
// Cannot work at the same company that another sleeve is working at
- for (let i = 0; i < player.sleeves.length; ++i) {
+ for (let i = 0; i < Player.sleeves.length; ++i) {
if (i === sleeveNumber) {
continue;
}
- const other = player.sleeves[i];
+ const other = Player.sleeves[i];
if (isSleeveCompanyWork(other.currentWork) && other.currentWork.companyName === companyName) {
throw helpers.makeRuntimeErrorMsg(
ctx,
@@ -131,7 +131,7 @@ export function NetscriptSleeve(): InternalAPI {
}
}
- return player.sleeves[sleeveNumber].workForCompany(player, companyName);
+ return Player.sleeves[sleeveNumber].workForCompany(companyName);
},
setToFactionWork:
(ctx: NetscriptContext) =>
@@ -143,11 +143,11 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveNumber(ctx, sleeveNumber);
// Cannot work at the same faction that another sleeve is working at
- for (let i = 0; i < player.sleeves.length; ++i) {
+ for (let i = 0; i < Player.sleeves.length; ++i) {
if (i === sleeveNumber) {
continue;
}
- const other = player.sleeves[i];
+ const other = Player.sleeves[i];
if (isSleeveFactionWork(other.currentWork) && other.currentWork.factionName === factionName) {
throw helpers.makeRuntimeErrorMsg(
ctx,
@@ -156,14 +156,14 @@ export function NetscriptSleeve(): InternalAPI {
}
}
- if (player.gang && player.gang.facName == factionName) {
+ if (Player.gang && Player.gang.facName == factionName) {
throw helpers.makeRuntimeErrorMsg(
ctx,
`Sleeve ${sleeveNumber} cannot work for faction ${factionName} because you have started a gang with them.`,
);
}
- return player.sleeves[sleeveNumber].workForFaction(player, factionName, workType);
+ return Player.sleeves[sleeveNumber].workForFaction(factionName, workType);
},
setToGymWorkout:
(ctx: NetscriptContext) =>
@@ -174,7 +174,7 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- return player.sleeves[sleeveNumber].workoutAtGym(player, gymName, stat);
+ return Player.sleeves[sleeveNumber].workoutAtGym(gymName, stat);
},
getSleeveStats:
(ctx: NetscriptContext) =>
@@ -191,7 +191,7 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- const sl = player.sleeves[sleeveNumber];
+ const sl = Player.sleeves[sleeveNumber];
if (sl.currentWork === null) return null;
return sl.currentWork.APICopy();
},
@@ -202,13 +202,13 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- const sl = player.sleeves[sleeveNumber];
+ const sl = Player.sleeves[sleeveNumber];
return {
tor: false,
city: sl.city,
hp: sl.hp,
- jobs: Object.keys(player.jobs), // technically sleeves have the same jobs as the player.
- jobTitle: Object.values(player.jobs),
+ jobs: Object.keys(Player.jobs), // technically sleeves have the same jobs as the player.
+ jobTitle: Object.values(Player.jobs),
mult: {
agility: sl.mults.agility,
@@ -239,8 +239,8 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveNumber(ctx, sleeveNumber);
const augs = [];
- for (let i = 0; i < player.sleeves[sleeveNumber].augmentations.length; i++) {
- augs.push(player.sleeves[sleeveNumber].augmentations[i].name);
+ for (let i = 0; i < Player.sleeves[sleeveNumber].augmentations.length; i++) {
+ augs.push(Player.sleeves[sleeveNumber].augmentations[i].name);
}
return augs;
},
@@ -251,7 +251,7 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- const purchasableAugs = findSleevePurchasableAugs(player.sleeves[sleeveNumber], player);
+ const purchasableAugs = findSleevePurchasableAugs(Player.sleeves[sleeveNumber]);
const augs = [];
for (let i = 0; i < purchasableAugs.length; i++) {
const aug = purchasableAugs[i];
@@ -280,7 +280,7 @@ export function NetscriptSleeve(): InternalAPI {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid aug: ${augName}`);
}
- return player.sleeves[sleeveNumber].tryBuyAugmentation(player, aug);
+ return Player.sleeves[sleeveNumber].tryBuyAugmentation(aug);
},
getSleeveAugmentationPrice:
(ctx: NetscriptContext) =>
@@ -296,7 +296,7 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
const augName = helpers.string(ctx, "augName", _augName);
const aug: Augmentation = StaticAugmentations[augName];
- return aug.getCost(player).repCost;
+ return aug.getCost().repCost;
},
setToBladeburnerAction:
(ctx: NetscriptContext) =>
@@ -314,11 +314,11 @@ export function NetscriptSleeve(): InternalAPI {
// Cannot Take on Contracts if another sleeve is performing that action
if (action === "Take on contracts") {
- for (let i = 0; i < player.sleeves.length; ++i) {
+ for (let i = 0; i < Player.sleeves.length; ++i) {
if (i === sleeveNumber) {
continue;
}
- const other = player.sleeves[i];
+ const other = Player.sleeves[i];
if (isSleeveBladeburnerWork(other.currentWork) && other.currentWork.actionName === contract) {
throw helpers.makeRuntimeErrorMsg(
ctx,
@@ -328,7 +328,7 @@ export function NetscriptSleeve(): InternalAPI {
}
}
- return player.sleeves[sleeveNumber].bladeburner(player, action, contract);
+ return Player.sleeves[sleeveNumber].bladeburner(action, contract);
},
};
}
diff --git a/src/PersonObjects/Grafting/EntropyAccumulation.ts b/src/PersonObjects/Grafting/EntropyAccumulation.ts
index 08c5855ca..097c84a0a 100644
--- a/src/PersonObjects/Grafting/EntropyAccumulation.ts
+++ b/src/PersonObjects/Grafting/EntropyAccumulation.ts
@@ -1,47 +1,47 @@
import { CONSTANTS } from "../../Constants";
-import { IPlayer } from "../IPlayer";
+import { Player } from "../../Player";
import { Multipliers } from "../Multipliers";
-export const calculateEntropy = (player: IPlayer, stacks = 1): Multipliers => {
+export const calculateEntropy = (stacks = 1): Multipliers => {
const nerf = CONSTANTS.EntropyEffect ** stacks;
return {
- hacking_chance: player.mults.hacking_chance * nerf,
- hacking_speed: player.mults.hacking_speed * nerf,
- hacking_money: player.mults.hacking_money * nerf,
- hacking_grow: player.mults.hacking_grow * nerf,
+ hacking_chance: Player.mults.hacking_chance * nerf,
+ hacking_speed: Player.mults.hacking_speed * nerf,
+ hacking_money: Player.mults.hacking_money * nerf,
+ hacking_grow: Player.mults.hacking_grow * nerf,
- hacking: player.mults.hacking * nerf,
- strength: player.mults.strength * nerf,
- defense: player.mults.defense * nerf,
- dexterity: player.mults.dexterity * nerf,
- agility: player.mults.agility * nerf,
- charisma: player.mults.charisma * nerf,
+ hacking: Player.mults.hacking * nerf,
+ strength: Player.mults.strength * nerf,
+ defense: Player.mults.defense * nerf,
+ dexterity: Player.mults.dexterity * nerf,
+ agility: Player.mults.agility * nerf,
+ charisma: Player.mults.charisma * nerf,
- hacking_exp: player.mults.hacking_exp * nerf,
- strength_exp: player.mults.strength_exp * nerf,
- defense_exp: player.mults.defense_exp * nerf,
- dexterity_exp: player.mults.dexterity_exp * nerf,
- agility_exp: player.mults.agility_exp * nerf,
- charisma_exp: player.mults.charisma_exp * nerf,
+ hacking_exp: Player.mults.hacking_exp * nerf,
+ strength_exp: Player.mults.strength_exp * nerf,
+ defense_exp: Player.mults.defense_exp * nerf,
+ dexterity_exp: Player.mults.dexterity_exp * nerf,
+ agility_exp: Player.mults.agility_exp * nerf,
+ charisma_exp: Player.mults.charisma_exp * nerf,
- company_rep: player.mults.company_rep * nerf,
- faction_rep: player.mults.faction_rep * nerf,
+ company_rep: Player.mults.company_rep * nerf,
+ faction_rep: Player.mults.faction_rep * nerf,
- crime_money: player.mults.crime_money * nerf,
- crime_success: player.mults.crime_success * nerf,
+ crime_money: Player.mults.crime_money * nerf,
+ crime_success: Player.mults.crime_success * nerf,
- hacknet_node_money: player.mults.hacknet_node_money * nerf,
- hacknet_node_purchase_cost: player.mults.hacknet_node_purchase_cost * nerf,
- hacknet_node_ram_cost: player.mults.hacknet_node_ram_cost * nerf,
- hacknet_node_core_cost: player.mults.hacknet_node_core_cost * nerf,
- hacknet_node_level_cost: player.mults.hacknet_node_level_cost * nerf,
+ hacknet_node_money: Player.mults.hacknet_node_money * nerf,
+ hacknet_node_purchase_cost: Player.mults.hacknet_node_purchase_cost * nerf,
+ hacknet_node_ram_cost: Player.mults.hacknet_node_ram_cost * nerf,
+ hacknet_node_core_cost: Player.mults.hacknet_node_core_cost * nerf,
+ hacknet_node_level_cost: Player.mults.hacknet_node_level_cost * nerf,
- work_money: player.mults.work_money * nerf,
+ work_money: Player.mults.work_money * nerf,
- bladeburner_max_stamina: player.mults.bladeburner_max_stamina * nerf,
- bladeburner_stamina_gain: player.mults.bladeburner_stamina_gain * nerf,
- bladeburner_analysis: player.mults.bladeburner_analysis * nerf,
- bladeburner_success_chance: player.mults.bladeburner_success_chance * nerf,
+ bladeburner_max_stamina: Player.mults.bladeburner_max_stamina * nerf,
+ bladeburner_stamina_gain: Player.mults.bladeburner_stamina_gain * nerf,
+ bladeburner_analysis: Player.mults.bladeburner_analysis * nerf,
+ bladeburner_success_chance: Player.mults.bladeburner_success_chance * nerf,
};
};
diff --git a/src/PersonObjects/Grafting/GraftingHelpers.ts b/src/PersonObjects/Grafting/GraftingHelpers.ts
index 5b9276e0e..0b1dcfb09 100644
--- a/src/PersonObjects/Grafting/GraftingHelpers.ts
+++ b/src/PersonObjects/Grafting/GraftingHelpers.ts
@@ -1,8 +1,8 @@
import { StaticAugmentations } from "../../Augmentation/StaticAugmentations";
import { GraftableAugmentation } from "./GraftableAugmentation";
-import { IPlayer } from "../IPlayer";
+import { Player } from "../../Player";
-export const getGraftingAvailableAugs = (player: IPlayer): string[] => {
+export const getGraftingAvailableAugs = (): string[] => {
const augs: string[] = [];
for (const [augName, aug] of Object.entries(StaticAugmentations)) {
@@ -10,14 +10,14 @@ export const getGraftingAvailableAugs = (player: IPlayer): string[] => {
augs.push(augName);
}
- return augs.filter((augmentation: string) => !player.hasAugmentation(augmentation));
+ return augs.filter((augmentation: string) => !Player.hasAugmentation(augmentation));
};
-export const graftingIntBonus = (player: IPlayer): number => {
- return 1 + (player.getIntelligenceBonus(3) - 1) / 3;
+export const graftingIntBonus = (): number => {
+ return 1 + (Player.getIntelligenceBonus(3) - 1) / 3;
};
-export const calculateGraftingTimeWithBonus = (player: IPlayer, aug: GraftableAugmentation): number => {
+export const calculateGraftingTimeWithBonus = (aug: GraftableAugmentation): number => {
const baseTime = aug.time;
- return baseTime / graftingIntBonus(player);
+ return baseTime / graftingIntBonus();
};
diff --git a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
index 3619d80a5..b2d106eef 100644
--- a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
+++ b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
@@ -11,11 +11,11 @@ import { LocationName } from "../../../Locations/data/LocationNames";
import { Locations } from "../../../Locations/Locations";
import { PurchaseAugmentationsOrderSetting } from "../../../Settings/SettingEnums";
import { Settings } from "../../../Settings/Settings";
-import { use } from "../../../ui/Context";
+import { Router } from "../../../ui/GameRoot";
import { ConfirmationModal } from "../../../ui/React/ConfirmationModal";
import { Money } from "../../../ui/React/Money";
import { convertTimeMsToTimeElapsedString, formatNumber } from "../../../utils/StringHelperFunctions";
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { GraftableAugmentation } from "../GraftableAugmentation";
import { calculateGraftingTimeWithBonus, getGraftingAvailableAugs } from "../GraftingHelpers";
@@ -29,21 +29,19 @@ export const GraftableAugmentations = (): Record
return gAugs;
};
-const canGraft = (player: IPlayer, aug: GraftableAugmentation): boolean => {
- if (player.money < aug.cost) {
+const canGraft = (aug: GraftableAugmentation): boolean => {
+ if (Player.money < aug.cost) {
return false;
}
return hasAugmentationPrereqs(aug.augmentation);
};
interface IProps {
- player: IPlayer;
aug: Augmentation;
}
const AugPreReqsChecklist = (props: IProps): React.ReactElement => {
- const aug = props.aug,
- player = props.player;
+ const aug = props.aug;
return (
@@ -51,7 +49,7 @@ const AugPreReqsChecklist = (props: IProps): React.ReactElement => {
- {player.hasAugmentation(preAug) ?
))}
@@ -60,12 +58,9 @@ const AugPreReqsChecklist = (props: IProps): React.ReactElement => {
};
export const GraftingRoot = (): React.ReactElement => {
- const player = use.Player();
- const router = use.Router();
-
const graftableAugmentations = useState(GraftableAugmentations())[0];
- const [selectedAug, setSelectedAug] = useState(getGraftingAvailableAugs(player)[0]);
+ const [selectedAug, setSelectedAug] = useState(getGraftingAvailableAugs()[0]);
const [graftOpen, setGraftOpen] = useState(false);
const selectedAugmentation = StaticAugmentations[selectedAug];
@@ -75,7 +70,7 @@ export const GraftingRoot = (): React.ReactElement => {
}
const getAugsSorted = (): string[] => {
- const augs = getGraftingAvailableAugs(player);
+ const augs = getGraftingAvailableAugs();
switch (Settings.PurchaseAugmentationsOrder) {
case PurchaseAugmentationsOrderSetting.Cost:
return augs.sort((a, b) => graftableAugmentations[a].cost - graftableAugmentations[b].cost);
@@ -96,7 +91,7 @@ export const GraftingRoot = (): React.ReactElement => {
return (
- router.toLocation(Locations[LocationName.NewTokyoVitaLife])}>Back
+ Router.toLocation(Locations[LocationName.NewTokyoVitaLife])}>Back
Grafting Laboratory
You find yourself in a secret laboratory, owned by a mysterious researcher.
@@ -122,14 +117,14 @@ export const GraftingRoot = (): React.ReactElement => {
- {getGraftingAvailableAugs(player).length > 0 ? (
+ {getGraftingAvailableAugs().length > 0 ? (
{getAugsSorted().map((k, i) => (
setSelectedAug(k)} selected={selectedAug === k}>
{
setGraftOpen(true)}
sx={{ width: "100%" }}
- disabled={!canGraft(player, graftableAugmentations[selectedAug])}
+ disabled={!canGraft(graftableAugmentations[selectedAug])}
>
Graft Augmentation (
-
)
@@ -158,21 +153,20 @@ export const GraftingRoot = (): React.ReactElement => {
open={graftOpen}
onClose={() => setGraftOpen(false)}
onConfirm={() => {
- player.startWork(
+ Player.startWork(
new GraftingWork({
augmentation: selectedAug,
singularity: false,
- player: player,
}),
);
- player.startFocusing();
- router.toWork();
+ Player.startFocusing();
+ Router.toWork();
}}
confirmationText={
<>
Cancelling grafting will not save grafting progress, and the money you spend will not {" "}
be returned.
- {!player.hasAugmentation(AugmentationNames.CongruityImplant) && (
+ {!Player.hasAugmentation(AugmentationNames.CongruityImplant) && (
<>
Time to Graft: {" "}
{convertTimeMsToTimeElapsedString(
- calculateGraftingTimeWithBonus(player, graftableAugmentations[selectedAug]),
+ calculateGraftingTimeWithBonus(graftableAugmentations[selectedAug]),
)}
{/* Use formula so the displayed creation time is accurate to player bonus */}
- {selectedAugmentation.prereqs.length > 0 && (
-
- Entropy strength: {player.entropy}
+ Entropy strength: {Player.entropy}
All multipliers decreased by: {" "}
- {formatNumber((1 - CONSTANTS.EntropyEffect ** player.entropy) * 100, 3)}% (multiplicative)
+ {formatNumber((1 - CONSTANTS.EntropyEffect ** Player.entropy) * 100, 3)}% (multiplicative)
diff --git a/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts b/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
index 58accbe73..d7cd35177 100644
--- a/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
@@ -32,5 +32,5 @@ export function applyEntropy(this: IPlayer, stacks = 1): void {
this.reapplyAllAugmentations();
this.reapplyAllSourceFiles();
- this.mults = calculateEntropy(this, stacks);
+ this.mults = calculateEntropy(stacks);
}
diff --git a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
index ee0d9e8e9..cf8d9e2ce 100644
--- a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
@@ -13,5 +13,5 @@ export function inBladeburner(this: IPlayer): boolean {
}
export function startBladeburner(this: IPlayer): void {
- this.bladeburner = new Bladeburner(this);
+ this.bladeburner = new Bladeburner();
}
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
index fed24e61d..dc13eb4d7 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
@@ -112,15 +112,15 @@ export function prestigeAugmentation(this: PlayerObject): void {
const numSleeves = Math.min(3, this.sourceFileLvl(10) + (this.bitNodeN === 10 ? 1 : 0)) + this.sleevesFromCovenant;
if (this.sleeves.length > numSleeves) this.sleeves.length = numSleeves;
for (let i = this.sleeves.length; i < numSleeves; i++) {
- this.sleeves.push(new Sleeve(this));
+ this.sleeves.push(new Sleeve());
}
for (let i = 0; i < this.sleeves.length; ++i) {
if (this.sleeves[i] instanceof Sleeve) {
if (this.sleeves[i].shock >= 100) {
- this.sleeves[i].synchronize(this);
+ this.sleeves[i].synchronize();
} else {
- this.sleeves[i].shockRecovery(this);
+ this.sleeves[i].shockRecovery();
}
}
}
@@ -149,9 +149,9 @@ export function prestigeSourceFile(this: IPlayer): void {
// Duplicate sleeves are reset to level 1 every Bit Node (but the number of sleeves you have persists)
for (let i = 0; i < this.sleeves.length; ++i) {
if (this.sleeves[i] instanceof Sleeve) {
- this.sleeves[i].prestige(this);
+ this.sleeves[i].prestige();
} else {
- this.sleeves[i] = new Sleeve(this);
+ this.sleeves[i] = new Sleeve();
}
}
@@ -490,7 +490,7 @@ export function regenerateHp(this: IPerson, amt: number): void {
}
export function hospitalize(this: IPlayer): number {
- const cost = getHospitalizationCost(this);
+ const cost = getHospitalizationCost();
SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, ToastVariant.WARNING, 2000);
this.loseMoney(cost, "hospitalization");
@@ -596,7 +596,7 @@ export function quitJob(this: IPlayer, company: string): void {
}
for (const sleeve of this.sleeves) {
if (isSleeveCompanyWork(sleeve.currentWork) && sleeve.currentWork.companyName === company) {
- sleeve.stopWork(this);
+ sleeve.stopWork();
dialogBoxCreate(`You quit ${company} while one of your sleeves was working there. The sleeve is now idle.`);
}
}
diff --git a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
index 949e1774f..c2c306db5 100644
--- a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
@@ -3,20 +3,20 @@ import { IPlayer } from "../IPlayer";
export function start(this: IPlayer, w: Work): void {
if (this.currentWork !== null) {
- this.currentWork.finish(this, true);
+ this.currentWork.finish(true);
}
this.currentWork = w;
}
export function process(this: IPlayer, cycles = 1): void {
if (this.currentWork === null) return;
- const finished = this.currentWork.process(this, cycles);
+ const finished = this.currentWork.process(cycles);
if (finished) {
this.finishWork(false);
}
}
export function finish(this: IPlayer, cancelled: boolean): void {
if (this.currentWork === null) return;
- this.currentWork.finish(this, cancelled);
+ this.currentWork.finish(cancelled);
this.currentWork = null;
this.focus = false;
}
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 693aa0d20..189496e75 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -7,7 +7,7 @@
* Sleeves are unlocked in BitNode-10.
*/
-import { IPlayer } from "../IPlayer";
+import { Player } from "../../Player";
import { Person } from "../Person";
import { Augmentation } from "../../Augmentation/Augmentation";
@@ -74,11 +74,9 @@ export class Sleeve extends Person {
*/
sync = 1;
- constructor(p: IPlayer | null = null) {
+ constructor() {
super();
- if (p != null) {
- this.shockRecovery(p);
- }
+ this.shockRecovery();
}
shockBonus(): number {
@@ -89,26 +87,26 @@ export class Sleeve extends Person {
return this.sync / 100;
}
- startWork(player: IPlayer, w: Work): void {
- if (this.currentWork) this.currentWork.finish(player);
+ startWork(w: Work): void {
+ if (this.currentWork) this.currentWork.finish();
this.currentWork = w;
}
- stopWork(player: IPlayer): void {
- if (this.currentWork) this.currentWork.finish(player);
+ stopWork(): void {
+ if (this.currentWork) this.currentWork.finish();
this.currentWork = null;
}
/**
* Commit crimes
*/
- commitCrime(p: IPlayer, crimeKey: string): boolean {
+ commitCrime(crimeKey: string): boolean {
const crime: Crime | null = Crimes[crimeKey] || Object.values(Crimes).find((crime) => crime.name === crimeKey);
if (!crime) {
return false;
}
- this.startWork(p, new SleeveCrimeWork(crime.type));
+ this.startWork(new SleeveCrimeWork(crime.type));
return true;
}
@@ -152,7 +150,7 @@ export class Sleeve extends Person {
/**
* Called on every sleeve for a Source File Prestige
*/
- prestige(p: IPlayer): void {
+ prestige(): void {
// Reset exp
this.exp.hacking = 0;
this.exp.strength = 0;
@@ -164,8 +162,8 @@ export class Sleeve extends Person {
this.hp.current = this.hp.max;
// Reset task-related stuff
- this.stopWork(p);
- this.shockRecovery(p);
+ this.stopWork();
+ this.shockRecovery();
// Reset augs and multipliers
this.augmentations = [];
@@ -186,7 +184,7 @@ export class Sleeve extends Person {
* Returns an object containing the amount of experience that should be
* transferred to all other sleeves
*/
- process(p: IPlayer, numCycles = 1): void {
+ process(numCycles = 1): void {
// Only process once every second (5 cycles)
const CyclesPerSecond = 1000 / CONSTANTS.MilliPerCycle;
this.storedCycles += numCycles;
@@ -196,24 +194,24 @@ export class Sleeve extends Person {
cyclesUsed = Math.min(cyclesUsed, 15);
this.shock = Math.min(100, this.shock + 0.0001 * cyclesUsed);
if (!this.currentWork) return;
- this.currentWork.process(p, this, cyclesUsed);
+ this.currentWork.process(this, cyclesUsed);
this.storedCycles -= cyclesUsed;
}
- shockRecovery(p: IPlayer): boolean {
- this.startWork(p, new SleeveRecoveryWork());
+ shockRecovery(): boolean {
+ this.startWork(new SleeveRecoveryWork());
return true;
}
- synchronize(p: IPlayer): boolean {
- this.startWork(p, new SleeveSynchroWork());
+ synchronize(): boolean {
+ this.startWork(new SleeveSynchroWork());
return true;
}
/**
* Take a course at a university
*/
- takeUniversityCourse(p: IPlayer, universityName: string, className: string): boolean {
+ takeUniversityCourse(universityName: string, className: string): boolean {
// Set exp/money multipliers based on which university.
// Also check that the sleeve is in the right city
let loc: LocationName | undefined;
@@ -261,7 +259,6 @@ export class Sleeve extends Person {
if (!classType) return false;
this.startWork(
- p,
new SleeveClassWork({
classType: classType,
location: loc,
@@ -273,8 +270,8 @@ export class Sleeve extends Person {
/**
* Travel to another City. Costs money from player
*/
- travel(p: IPlayer, newCity: CityName): boolean {
- p.loseMoney(CONSTANTS.TravelCost, "sleeves");
+ travel(newCity: CityName): boolean {
+ Player.loseMoney(CONSTANTS.TravelCost, "sleeves");
this.city = newCity;
return true;
@@ -284,13 +281,15 @@ export class Sleeve extends Person {
return this.augmentations.some((a) => a.name === aug);
}
- tryBuyAugmentation(p: IPlayer, aug: Augmentation): boolean {
- if (!p.canAfford(aug.baseCost)) return false;
+ tryBuyAugmentation(aug: Augmentation): boolean {
+ if (!Player.canAfford(aug.baseCost)) {
+ return false;
+ }
// Verify that this sleeve does not already have that augmentation.
if (this.hasAugmentation(aug.name)) return false;
- p.loseMoney(aug.baseCost, "sleeves");
+ Player.loseMoney(aug.baseCost, "sleeves");
this.installAugmentation(aug);
return true;
}
@@ -303,17 +302,17 @@ export class Sleeve extends Person {
* Start work for one of the player's companies
* Returns boolean indicating success
*/
- workForCompany(p: IPlayer, companyName: string): boolean {
- if (!(Companies[companyName] instanceof Company) || p.jobs[companyName] == null) {
+ workForCompany(companyName: string): boolean {
+ if (!(Companies[companyName] instanceof Company) || Player.jobs[companyName] == null) {
return false;
}
const company: Company | null = Companies[companyName];
- const companyPosition: CompanyPosition | null = CompanyPositions[p.jobs[companyName]];
+ const companyPosition: CompanyPosition | null = CompanyPositions[Player.jobs[companyName]];
if (company == null) return false;
if (companyPosition == null) return false;
- this.startWork(p, new SleeveCompanyWork({ companyName: companyName }));
+ this.startWork(new SleeveCompanyWork({ companyName: companyName }));
return true;
}
@@ -322,9 +321,9 @@ export class Sleeve extends Person {
* Start work for one of the player's factions
* Returns boolean indicating success
*/
- workForFaction(p: IPlayer, factionName: string, workType: string): boolean {
+ workForFaction(factionName: string, workType: string): boolean {
const faction = Factions[factionName];
- if (factionName === "" || !faction || !(faction instanceof Faction) || !p.factions.includes(factionName)) {
+ if (factionName === "" || !faction || !(faction instanceof Faction) || !Player.factions.includes(factionName)) {
return false;
}
@@ -347,7 +346,6 @@ export class Sleeve extends Person {
}
this.startWork(
- p,
new SleeveFactionWork({
factionWorkType: factionWorkType,
factionName: faction.name,
@@ -360,7 +358,7 @@ export class Sleeve extends Person {
/**
* Begin a gym workout task
*/
- workoutAtGym(p: IPlayer, gymName: string, stat: string): boolean {
+ workoutAtGym(gymName: string, stat: string): boolean {
// Set exp/money multipliers based on which university.
// Also check that the sleeve is in the right city
let loc: LocationName | undefined;
@@ -414,7 +412,6 @@ export class Sleeve extends Person {
if (!classType) return false;
this.startWork(
- p,
new SleeveClassWork({
classType: classType,
location: loc,
@@ -427,41 +424,41 @@ export class Sleeve extends Person {
/**
* Begin a bladeburner task
*/
- bladeburner(p: IPlayer, action: string, contract: string): boolean {
+ bladeburner(action: string, contract: string): boolean {
switch (action) {
case "Field analysis":
- this.startWork(p, new SleeveBladeburnerWork({ type: "General", name: "Field Analysis" }));
+ this.startWork(new SleeveBladeburnerWork({ type: "General", name: "Field Analysis" }));
return true;
case "Recruitment":
- this.startWork(p, new SleeveBladeburnerWork({ type: "General", name: "Recruitment" }));
+ this.startWork(new SleeveBladeburnerWork({ type: "General", name: "Recruitment" }));
return true;
case "Diplomacy":
- this.startWork(p, new SleeveBladeburnerWork({ type: "General", name: "Diplomacy" }));
+ this.startWork(new SleeveBladeburnerWork({ type: "General", name: "Diplomacy" }));
return true;
case "Hyperbolic Regeneration Chamber":
- this.startWork(p, new SleeveBladeburnerWork({ type: "General", name: "Hyperbolic Regeneration Chamber" }));
+ this.startWork(new SleeveBladeburnerWork({ type: "General", name: "Hyperbolic Regeneration Chamber" }));
return true;
case "Infiltrate synthoids":
- this.startWork(p, new SleeveInfiltrateWork());
+ this.startWork(new SleeveInfiltrateWork());
return true;
case "Support main sleeve":
- this.startWork(p, new SleeveSupportWork(p));
+ this.startWork(new SleeveSupportWork());
return true;
case "Take on contracts":
if (!Contracts[contract]) return false;
- this.startWork(p, new SleeveBladeburnerWork({ type: "Contracts", name: contract }));
+ this.startWork(new SleeveBladeburnerWork({ type: "Contracts", name: contract }));
return true;
}
return false;
}
- recruitmentSuccessChance(p: IPlayer): number {
- return Math.max(0, Math.min(1, p.bladeburner?.getRecruitmentSuccessChance(this) ?? 0));
+ recruitmentSuccessChance(): number {
+ return Math.max(0, Math.min(1, Player.bladeburner?.getRecruitmentSuccessChance(this) ?? 0));
}
- contractSuccessChance(p: IPlayer, type: string, name: string): string {
- const bb = p.bladeburner;
+ contractSuccessChance(type: string, name: string): string {
+ const bb = Player.bladeburner;
if (bb === null) {
const errorLogText = `bladeburner is null`;
console.error(`Function: sleeves.contractSuccessChance; Message: '${errorLogText}'`);
diff --git a/src/PersonObjects/Sleeve/SleeveHelpers.ts b/src/PersonObjects/Sleeve/SleeveHelpers.ts
index 3aa4aefc8..87460fe4c 100644
--- a/src/PersonObjects/Sleeve/SleeveHelpers.ts
+++ b/src/PersonObjects/Sleeve/SleeveHelpers.ts
@@ -1,7 +1,6 @@
import { FactionNames } from "../../Faction/data/FactionNames";
import { Sleeve } from "./Sleeve";
-import { IPlayer } from "../IPlayer";
import { Player } from "../../Player";
import { Augmentation } from "../../Augmentation/Augmentation";
@@ -11,7 +10,7 @@ import { Multipliers } from "../Multipliers";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { getFactionAugmentationsFiltered } from "../../Faction/FactionHelpers";
-export function findSleevePurchasableAugs(sleeve: Sleeve, p: IPlayer): Augmentation[] {
+export function findSleevePurchasableAugs(sleeve: Sleeve): Augmentation[] {
// You can only purchase Augmentations that are actually available from
// your factions. I.e. you must be in a faction that has the Augmentation
// and you must also have enough rep in that faction in order to purchase it.
@@ -55,21 +54,21 @@ export function findSleevePurchasableAugs(sleeve: Sleeve, p: IPlayer): Augmentat
// If player is in a gang, then we return all augs that the player
// has enough reputation for (since that gang offers all augs)
- if (p.inGang()) {
- const fac = p.getGangFaction();
- const gangAugs = getFactionAugmentationsFiltered(Player, fac);
+ if (Player.inGang()) {
+ const fac = Player.getGangFaction();
+ const gangAugs = getFactionAugmentationsFiltered(fac);
for (const augName of gangAugs) {
const aug = StaticAugmentations[augName];
if (!isAvailableForSleeve(aug)) continue;
- if (fac.playerReputation > aug.getCost(p).repCost) {
+ if (fac.playerReputation > aug.getCost().repCost) {
availableAugs.push(aug);
}
}
}
- for (const facName of p.factions) {
+ for (const facName of Player.factions) {
if (facName === FactionNames.Bladeburners) continue;
if (facName === FactionNames.Netburners) continue;
const fac = Factions[facName];
@@ -79,7 +78,7 @@ export function findSleevePurchasableAugs(sleeve: Sleeve, p: IPlayer): Augmentat
const aug = StaticAugmentations[augName];
if (!isAvailableForSleeve(aug)) continue;
- if (fac.playerReputation > aug.getCost(p).repCost) {
+ if (fac.playerReputation > aug.getCost().repCost) {
availableAugs.push(aug);
}
}
diff --git a/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts b/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts
index 198357a98..cd4de69de 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { applySleeveGains, Work, WorkType } from "./Work";
@@ -25,45 +25,45 @@ export class SleeveBladeburnerWork extends Work {
this.actionName = params?.name ?? "Field analysis";
}
- cyclesNeeded(player: IPlayer, sleeve: Sleeve): number {
- const ret = player.bladeburner?.getActionTimeNetscriptFn(sleeve, this.actionType, this.actionName);
+ cyclesNeeded(sleeve: Sleeve): number {
+ const ret = Player.bladeburner?.getActionTimeNetscriptFn(sleeve, this.actionType, this.actionName);
if (!ret || typeof ret === "string") throw new Error(`Error querying ${this.actionName} time`);
return ret / CONSTANTS._idleSpeed;
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
- if (!player.bladeburner) throw new Error("sleeve doing blade work without being a member");
+ process(sleeve: Sleeve, cycles: number): number {
+ if (!Player.bladeburner) throw new Error("sleeve doing blade work without being a member");
this.cyclesWorked += cycles;
- const actionIdent = player.bladeburner.getActionIdFromTypeAndName(this.actionType, this.actionName);
+ const actionIdent = Player.bladeburner.getActionIdFromTypeAndName(this.actionType, this.actionName);
if (!actionIdent) throw new Error(`Error getting ${this.actionName} action`);
if (this.actionType === "Contracts") {
- const action = player.bladeburner.getActionObject(actionIdent);
+ const action = Player.bladeburner.getActionObject(actionIdent);
if (!action) throw new Error(`Error getting ${this.actionName} action object`);
if (action.count <= 0) {
- sleeve.stopWork(player);
+ sleeve.stopWork();
return 0;
}
}
- while (this.cyclesWorked > this.cyclesNeeded(player, sleeve)) {
+ while (this.cyclesWorked > this.cyclesNeeded(sleeve)) {
if (this.actionType === "Contracts") {
- const action = player.bladeburner.getActionObject(actionIdent);
+ const action = Player.bladeburner.getActionObject(actionIdent);
if (!action) throw new Error(`Error getting ${this.actionName} action object`);
if (action.count <= 0) {
- sleeve.stopWork(player);
+ sleeve.stopWork();
return 0;
}
}
- const retValue = player.bladeburner.completeAction(player, sleeve, actionIdent, false);
+ const retValue = Player.bladeburner.completeAction(sleeve, actionIdent, false);
let exp: WorkStats | undefined;
if (this.actionType === "General") {
exp = GeneralActions[this.actionName]?.exp;
if (!exp) throw new Error(`Somehow there was no exp for action ${this.actionType} ${this.actionName}`);
- applySleeveGains(player, sleeve, exp, 1);
+ applySleeveGains(sleeve, exp, 1);
}
- player.gainMoney(retValue.money, "sleeves");
- player.gainStats(retValue);
- this.cyclesWorked -= this.cyclesNeeded(player, sleeve);
+ Player.gainMoney(retValue.money, "sleeves");
+ Player.gainStats(retValue);
+ this.cyclesWorked -= this.cyclesNeeded(sleeve);
}
return 0;
}
diff --git a/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts b/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
index ee498fd49..8d8213c6f 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
@@ -24,9 +24,9 @@ export class SleeveClassWork extends Work {
this.location = params?.location ?? LocationName.Sector12RothmanUniversity;
}
- calculateRates(player: IPlayer, sleeve: Sleeve): WorkStats {
+ calculateRates(sleeve: Sleeve): WorkStats {
return scaleWorkStats(
- calculateClassEarnings(player, sleeve, this.classType, this.location),
+ calculateClassEarnings(sleeve, this.classType, this.location),
sleeve.shockBonus(),
false,
);
@@ -38,9 +38,9 @@ export class SleeveClassWork extends Work {
);
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
- const rate = this.calculateRates(player, sleeve);
- applySleeveGains(player, sleeve, rate, cycles);
+ process(sleeve: Sleeve, cycles: number): number {
+ const rate = this.calculateRates(sleeve);
+ applySleeveGains(sleeve, rate, cycles);
return 0;
}
APICopy(): Record {
diff --git a/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
index 70a80216f..795f3d451 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
@@ -30,14 +30,14 @@ export class SleeveCompanyWork extends Work {
return c;
}
- getGainRates(player: IPlayer, sleeve: Sleeve): WorkStats {
- return calculateCompanyWorkStats(player, sleeve, this.getCompany());
+ getGainRates(sleeve: Sleeve): WorkStats {
+ return calculateCompanyWorkStats(sleeve, this.getCompany());
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
+ process(sleeve: Sleeve, cycles: number): number {
const company = this.getCompany();
- const gains = this.getGainRates(player, sleeve);
- applySleeveGains(player, sleeve, gains, cycles);
+ const gains = this.getGainRates(sleeve);
+ applySleeveGains(sleeve, gains, cycles);
company.playerReputation += gains.reputation * cycles;
influenceStockThroughCompanyWork(company, gains.reputation, cycles);
return 0;
diff --git a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts
index 30aa8c847..75d315452 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { applySleeveGains, Work, WorkType } from "./Work";
@@ -43,19 +43,19 @@ export class SleeveCrimeWork extends Work {
return this.getCrime().time / CONSTANTS._idleSpeed;
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
+ process(sleeve: Sleeve, cycles: number): number {
this.cyclesWorked += cycles;
const crime = this.getCrime();
let gains = this.getExp();
if (this.cyclesWorked >= this.cyclesNeeded()) {
if (Math.random() < crime.successRate(sleeve)) {
- player.karma -= crime.karma * sleeve.syncBonus();
+ Player.karma -= crime.karma * sleeve.syncBonus();
} else {
gains.money = 0;
gains = scaleWorkStats(gains, 0.25);
}
- applySleeveGains(player, sleeve, gains, cycles);
+ applySleeveGains(sleeve, gains, cycles);
this.cyclesWorked -= this.cyclesNeeded();
}
return 0;
diff --git a/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts b/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts
index 398374f37..d4df44ba5 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { applySleeveGains, Work, WorkType } from "./Work";
@@ -57,16 +57,14 @@ export class SleeveFactionWork extends Work {
return f;
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
- if (player.gang) {
- if (this.factionName === player.gang.facName) {
- sleeve.stopWork(player);
- return 0;
- }
+ process(sleeve: Sleeve, cycles: number): number {
+ if (this.factionName === Player.gang?.facName) {
+ sleeve.stopWork();
+ return 0;
}
const exp = this.getExpRates(sleeve);
- applySleeveGains(player, sleeve, exp, cycles);
+ applySleeveGains(sleeve, exp, cycles);
const rep = this.getReputationRate(sleeve);
this.getFaction().playerReputation += rep;
return 0;
diff --git a/src/PersonObjects/Sleeve/Work/SleeveInfiltrateWork.ts b/src/PersonObjects/Sleeve/Work/SleeveInfiltrateWork.ts
index 1ad321e92..d0cf4f217 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveInfiltrateWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveInfiltrateWork.ts
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { Work, WorkType } from "./Work";
@@ -20,12 +20,12 @@ export class SleeveInfiltrateWork extends Work {
return infiltrateCycles;
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
- if (!player.bladeburner) throw new Error("sleeve doing blade work without being a member");
+ process(_sleeve: Sleeve, cycles: number): number {
+ if (!Player.bladeburner) throw new Error("sleeve doing blade work without being a member");
this.cyclesWorked += cycles;
if (this.cyclesWorked > this.cyclesNeeded()) {
this.cyclesWorked -= this.cyclesNeeded();
- player.bladeburner.infiltrateSynthoidCommunities(player);
+ Player.bladeburner.infiltrateSynthoidCommunities();
}
return 0;
}
diff --git a/src/PersonObjects/Sleeve/Work/SleeveRecoveryWork.ts b/src/PersonObjects/Sleeve/Work/SleeveRecoveryWork.ts
index 5f0de0a5d..98707b6fc 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveRecoveryWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveRecoveryWork.ts
@@ -1,4 +1,3 @@
-import { IPlayer } from "../../IPlayer";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { Work, WorkType } from "./Work";
@@ -11,9 +10,9 @@ export class SleeveRecoveryWork extends Work {
super(WorkType.RECOVERY);
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
+ process(sleeve: Sleeve, cycles: number): number {
sleeve.shock = Math.min(100, sleeve.shock + 0.0002 * cycles);
- if (sleeve.shock >= 100) sleeve.stopWork(player);
+ if (sleeve.shock >= 100) sleeve.stopWork();
return 0;
}
diff --git a/src/PersonObjects/Sleeve/Work/SleeveSupportWork.ts b/src/PersonObjects/Sleeve/Work/SleeveSupportWork.ts
index 5dfa02b7c..86d34184a 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveSupportWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveSupportWork.ts
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../../PersonObjects/IPlayer";
+import { Player } from "../../../Player";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Work, WorkType } from "./Work";
@@ -6,17 +6,17 @@ export const isSleeveSupportWork = (w: Work | null): w is SleeveSupportWork =>
w !== null && w.type === WorkType.SUPPORT;
export class SleeveSupportWork extends Work {
- constructor(player?: IPlayer) {
+ constructor() {
super(WorkType.SUPPORT);
- if (player) player.bladeburner?.sleeveSupport(true);
+ Player.bladeburner?.sleeveSupport(true);
}
process(): number {
return 0;
}
- finish(player: IPlayer): void {
- player.bladeburner?.sleeveSupport(false);
+ finish(): void {
+ Player.bladeburner?.sleeveSupport(false);
}
APICopy(): Record {
diff --git a/src/PersonObjects/Sleeve/Work/SleeveSynchroWork.ts b/src/PersonObjects/Sleeve/Work/SleeveSynchroWork.ts
index 09b5584d3..54d52fe56 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveSynchroWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveSynchroWork.ts
@@ -1,4 +1,4 @@
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { Work, WorkType } from "./Work";
@@ -11,9 +11,9 @@ export class SleeveSynchroWork extends Work {
super(WorkType.SYNCHRO);
}
- process(player: IPlayer, sleeve: Sleeve, cycles: number): number {
- sleeve.sync = Math.min(100, sleeve.sync + player.getIntelligenceBonus(0.5) * 0.0002 * cycles);
- if (sleeve.sync >= 100) sleeve.stopWork(player);
+ process(sleeve: Sleeve, cycles: number): number {
+ sleeve.sync = Math.min(100, sleeve.sync + Player.getIntelligenceBonus(0.5) * 0.0002 * cycles);
+ if (sleeve.sync >= 100) sleeve.stopWork();
return 0;
}
diff --git a/src/PersonObjects/Sleeve/Work/Work.ts b/src/PersonObjects/Sleeve/Work/Work.ts
index 201b73015..b588a99bd 100644
--- a/src/PersonObjects/Sleeve/Work/Work.ts
+++ b/src/PersonObjects/Sleeve/Work/Work.ts
@@ -1,14 +1,14 @@
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { IReviverValue } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { applyWorkStats, applyWorkStatsExp, scaleWorkStats, WorkStats } from "../../../Work/WorkStats";
-export const applySleeveGains = (player: IPlayer, sleeve: Sleeve, rawStats: WorkStats, cycles = 1): void => {
+export const applySleeveGains = (sleeve: Sleeve, rawStats: WorkStats, cycles = 1): void => {
const shockedStats = scaleWorkStats(rawStats, sleeve.shockBonus(), rawStats.money > 0);
applyWorkStatsExp(sleeve, shockedStats, cycles);
const syncStats = scaleWorkStats(shockedStats, sleeve.syncBonus(), rawStats.money > 0);
- applyWorkStats(player, player, syncStats, cycles, "sleeves");
- player.sleeves.filter((s) => s != sleeve).forEach((s) => applyWorkStatsExp(s, syncStats, cycles));
+ applyWorkStats(Player, syncStats, cycles, "sleeves");
+ Player.sleeves.filter((s) => s !== sleeve).forEach((s) => applyWorkStatsExp(s, syncStats, cycles));
};
export abstract class Work {
@@ -18,10 +18,10 @@ export abstract class Work {
this.type = type;
}
- abstract process(player: IPlayer, sleeve: Sleeve, cycles: number): number;
+ abstract process(sleeve: Sleeve, cycles: number): number;
abstract APICopy(): Record;
abstract toJSON(): IReviverValue;
- finish(__player: IPlayer): void {
+ finish(): void {
/* left for children to implement */
}
}
diff --git a/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx b/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx
index 10278017b..0fb597bc9 100644
--- a/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx
+++ b/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx
@@ -56,7 +56,7 @@ export function CovenantPurchasesRoot(props: IProps): React.ReactElement {
if (player.canAfford(purchaseCost())) {
player.loseMoney(purchaseCost(), "sleeves");
player.sleevesFromCovenant += 1;
- player.sleeves.push(new Sleeve(player));
+ player.sleeves.push(new Sleeve());
rerender();
} else {
dialogBoxCreate(`You cannot afford to purchase a Duplicate Sleeve`);
@@ -67,7 +67,7 @@ export function CovenantPurchasesRoot(props: IProps): React.ReactElement {
const upgradePanels = [];
for (let i = 0; i < player.sleeves.length; ++i) {
const sleeve = player.sleeves[i];
- upgradePanels.push(
Purchase -
-
)}
diff --git a/src/PersonObjects/Sleeve/ui/CovenantSleeveMemoryUpgrade.tsx b/src/PersonObjects/Sleeve/ui/CovenantSleeveMemoryUpgrade.tsx
index ce1d81317..79219d993 100644
--- a/src/PersonObjects/Sleeve/ui/CovenantSleeveMemoryUpgrade.tsx
+++ b/src/PersonObjects/Sleeve/ui/CovenantSleeveMemoryUpgrade.tsx
@@ -5,7 +5,7 @@
import React, { useState } from "react";
import { Sleeve } from "../Sleeve";
-import { IPlayer } from "../../IPlayer";
+import { Player } from "../../../Player";
import { numeralWrapper } from "../../../ui/numeralFormat";
import { Money } from "../../../ui/React/Money";
@@ -18,7 +18,6 @@ import Paper from "@mui/material/Paper";
interface IProps {
index: number;
- p: IPlayer;
rerender: () => void;
sleeve: Sleeve;
}
@@ -52,16 +51,16 @@ export function CovenantSleeveMemoryUpgrade(props: IProps): React.ReactElement {
function purchaseMemory(): void {
const cost = getPurchaseCost();
- if (props.p.canAfford(cost)) {
+ if (Player.canAfford(cost)) {
props.sleeve.upgradeMemory(amt);
- props.p.loseMoney(cost, "sleeves");
+ Player.loseMoney(cost, "sleeves");
props.rerender();
}
}
// Purchase button props
const cost = getPurchaseCost();
- const purchaseBtnDisabled = !props.p.canAfford(cost);
+ const purchaseBtnDisabled = !Player.canAfford(cost);
let purchaseBtnContent = <>;
if (isNaN(amt)) {
purchaseBtnContent = <>Invalid value;
@@ -69,7 +68,7 @@ export function CovenantSleeveMemoryUpgrade(props: IProps): React.ReactElement {
purchaseBtnContent = (
<>
Purchase {amt} memory -
-
@@ -50,12 +49,11 @@ export function SleeveAugmentationsModal(props: IProps): React.ReactElement {
aug.name)}
ownedAugNames={ownedAugNames}
- player={player}
- canPurchase={(player, aug) => {
- return player.money > aug.baseCost;
+ canPurchase={(aug) => {
+ return Player.money > aug.baseCost;
}}
- purchaseAugmentation={(player, aug) => {
- props.sleeve.tryBuyAugmentation(player, aug);
+ purchaseAugmentation={(aug) => {
+ props.sleeve.tryBuyAugmentation(aug);
rerender();
}}
sleeveAugs
diff --git a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
index 93aaf55d0..4d76044c9 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
@@ -2,7 +2,7 @@ import { Box, Button, Paper, Tooltip, Typography } from "@mui/material";
import React, { useState } from "react";
import { FactionWorkType } from "../../../Work/data/FactionWorkType";
import { CONSTANTS } from "../../../Constants";
-import { use } from "../../../ui/Context";
+import { Player } from "../../../Player";
import { numeralWrapper } from "../../../ui/numeralFormat";
import { ProgressBar } from "../../../ui/React/Progress";
import { Sleeve } from "../Sleeve";
@@ -27,7 +27,6 @@ interface IProps {
}
export function SleeveElem(props: IProps): React.ReactElement {
- const player = use.Player();
const [statsOpen, setStatsOpen] = useState(false);
const [travelOpen, setTravelOpen] = useState(false);
const [augmentationsOpen, setAugmentationsOpen] = useState(false);
@@ -39,28 +38,28 @@ export function SleeveElem(props: IProps): React.ReactElement {
case "------":
break;
case "Work for Company":
- props.sleeve.workForCompany(player, abc[1]);
+ props.sleeve.workForCompany(abc[1]);
break;
case "Work for Faction":
- props.sleeve.workForFaction(player, abc[1], abc[2]);
+ props.sleeve.workForFaction(abc[1], abc[2]);
break;
case "Commit Crime":
- props.sleeve.commitCrime(player, abc[1]);
+ props.sleeve.commitCrime(abc[1]);
break;
case "Take University Course":
- props.sleeve.takeUniversityCourse(player, abc[2], abc[1]);
+ props.sleeve.takeUniversityCourse(abc[2], abc[1]);
break;
case "Workout at Gym":
- props.sleeve.workoutAtGym(player, abc[2], abc[1]);
+ props.sleeve.workoutAtGym(abc[2], abc[1]);
break;
case "Perform Bladeburner Actions":
- props.sleeve.bladeburner(player, abc[1], abc[2]);
+ props.sleeve.bladeburner(abc[1], abc[2]);
break;
case "Shock Recovery":
- props.sleeve.shockRecovery(player);
+ props.sleeve.shockRecovery();
break;
case "Synchronize":
- props.sleeve.synchronize(player);
+ props.sleeve.synchronize();
break;
default:
console.error(`Invalid/Unrecognized taskValue in setSleeveTask(): ${abc[0]}`);
@@ -130,7 +129,7 @@ export function SleeveElem(props: IProps): React.ReactElement {
desc = (
<>
This sleeve is currently attempting to perform {w.actionName}. (
- {((100 * w.cyclesWorked) / w.cyclesNeeded(player, props.sleeve)).toFixed(2)}%)
+ {((100 * w.cyclesWorked) / w.cyclesNeeded(props.sleeve)).toFixed(2)}%)
);
}
@@ -156,11 +155,11 @@ export function SleeveElem(props: IProps): React.ReactElement {
setStatsOpen(true)}>More Stats
- Insufficient funds : ""}>
+ Insufficient funds : ""}>
setTravelOpen(true)}
- disabled={player.money < CONSTANTS.TravelCost}
+ disabled={Player.money < CONSTANTS.TravelCost}
sx={{ width: "100%", height: "100%" }}
>
Travel
@@ -184,7 +183,7 @@ export function SleeveElem(props: IProps): React.ReactElement {
Set Task
@@ -202,7 +201,7 @@ export function SleeveElem(props: IProps): React.ReactElement {
variant="determinate"
value={
(props.sleeve.currentWork.cyclesWorked /
- props.sleeve.currentWork.cyclesNeeded(player, props.sleeve)) *
+ props.sleeve.currentWork.cyclesNeeded(props.sleeve)) *
100
}
color="primary"
diff --git a/src/PersonObjects/Sleeve/ui/StatsElement.tsx b/src/PersonObjects/Sleeve/ui/StatsElement.tsx
index 542988092..b257491fc 100644
--- a/src/PersonObjects/Sleeve/ui/StatsElement.tsx
+++ b/src/PersonObjects/Sleeve/ui/StatsElement.tsx
@@ -9,7 +9,6 @@ import { characterOverviewStyles as useStyles } from "../../../ui/React/Characte
import { Money } from "../../../ui/React/Money";
import { MoneyRate } from "../../../ui/React/MoneyRate";
import { ReputationRate } from "../../../ui/React/ReputationRate";
-import { use } from "../../../ui/Context";
import { Sleeve } from "../Sleeve";
import { isSleeveClassWork } from "../Work/SleeveClassWork";
@@ -95,7 +94,6 @@ export function StatsElement(props: IProps): React.ReactElement {
export function EarningsElement(props: IProps): React.ReactElement {
const classes = useStyles();
- const player = use.Player();
let data: (string | JSX.Element)[][] = [];
if (isSleeveCrimeWork(props.sleeve.currentWork)) {
@@ -111,7 +109,7 @@ export function EarningsElement(props: IProps): React.ReactElement {
];
}
if (isSleeveClassWork(props.sleeve.currentWork)) {
- const rates = props.sleeve.currentWork.calculateRates(player, props.sleeve);
+ const rates = props.sleeve.currentWork.calculateRates(props.sleeve);
data = [
[`Money:`,
Have this sleeve travel to a different city. This affects the gyms and universities at which this sleeve can
- study. Traveling to a different city costs
{Settings.DisableASCIIArt ? (
diff --git a/src/Prestige.ts b/src/Prestige.ts
index b526946fe..1c919d549 100755
--- a/src/Prestige.ts
+++ b/src/Prestige.ts
@@ -37,7 +37,7 @@ const BitNode8StartingMoney = 250e6;
// Prestige by purchasing augmentation
export function prestigeAugmentation(): void {
- initBitNodeMultipliers(Player);
+ initBitNodeMultipliers();
const maintainMembership = Player.factions.concat(Player.factionInvitations).filter(function (faction) {
return Factions[faction].getInfo().keep;
@@ -91,7 +91,7 @@ export function prestigeAugmentation(): void {
// Stop a Terminal action if there is one.
if (Terminal.action !== null) {
- Terminal.finishAction(Router, Player, true);
+ Terminal.finishAction(true);
}
Terminal.clear();
LogBoxClearEvents.emit();
@@ -176,7 +176,7 @@ export function prestigeAugmentation(): void {
// Prestige by destroying Bit Node and gaining a Source File
export function prestigeSourceFile(flume: boolean): void {
- initBitNodeMultipliers(Player);
+ initBitNodeMultipliers();
Player.prestigeSourceFile();
prestigeWorkerScripts(); // Delete all Worker Scripts objects
@@ -185,7 +185,7 @@ export function prestigeSourceFile(flume: boolean): void {
// Stop a Terminal action if there is one.
if (Terminal.action !== null) {
- Terminal.finishAction(Router, Player, true);
+ Terminal.finishAction(true);
}
Terminal.clear();
LogBoxClearEvents.emit();
@@ -225,7 +225,7 @@ export function prestigeSourceFile(flume: boolean): void {
// Stop a Terminal action if there is one
if (Terminal.action !== null) {
- Terminal.finishAction(Router, Player, true);
+ Terminal.finishAction(true);
}
// Delete all Augmentations
@@ -302,7 +302,7 @@ export function prestigeSourceFile(flume: boolean): void {
hserver.cache = 5;
hserver.updateHashRate(Player.mults.hacknet_node_money);
hserver.updateHashCapacity();
- updateHashManagerCapacity(Player);
+ updateHashManagerCapacity();
}
if (Player.bitNodeN === 13) {
diff --git a/src/Programs/Program.ts b/src/Programs/Program.ts
index 1b63e27ec..e05ecff3a 100644
--- a/src/Programs/Program.ts
+++ b/src/Programs/Program.ts
@@ -1,11 +1,8 @@
import { BaseServer } from "../Server/BaseServer";
-import { ITerminal } from "../Terminal/ITerminal";
-import { IPlayer } from "../PersonObjects/IPlayer";
-import { IRouter } from "../ui/Router";
export interface IProgramCreate {
level: number;
- req(p: IPlayer): boolean; // Function that indicates whether player meets requirements
+ req(): boolean; // Function that indicates whether player meets requirements
time: number;
tooltip: string;
}
@@ -13,12 +10,12 @@ export interface IProgramCreate {
export class Program {
name = "";
create: IProgramCreate | null;
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer, args: string[]) => void;
+ run: (args: string[], server: BaseServer) => void;
constructor(
name: string,
create: IProgramCreate | null,
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer, args: string[]) => void,
+ run: (args: string[], server: BaseServer) => void,
) {
this.name = name;
this.create = create;
diff --git a/src/Programs/ProgramHelpers.ts b/src/Programs/ProgramHelpers.ts
index abb8b5049..ce0433c4b 100644
--- a/src/Programs/ProgramHelpers.ts
+++ b/src/Programs/ProgramHelpers.ts
@@ -1,10 +1,10 @@
import { Programs } from "./Programs";
import { Program } from "./Program";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
//Returns the programs this player can create.
-export function getAvailableCreatePrograms(player: IPlayer): Program[] {
+export function getAvailableCreatePrograms(): Program[] {
const programs: Program[] = [];
for (const key of Object.keys(Programs)) {
// Non-creatable program
@@ -12,10 +12,10 @@ export function getAvailableCreatePrograms(player: IPlayer): Program[] {
if (create == null) continue;
// Already has program
- if (player.hasProgram(Programs[key].name)) continue;
+ if (Player.hasProgram(Programs[key].name)) continue;
// Does not meet requirements
- if (!create.req(player)) continue;
+ if (!create.req()) continue;
programs.push(Programs[key]);
}
diff --git a/src/Programs/data/ProgramsMetadata.ts b/src/Programs/data/ProgramsMetadata.ts
index 28c700c5f..a0369c569 100644
--- a/src/Programs/data/ProgramsMetadata.ts
+++ b/src/Programs/data/ProgramsMetadata.ts
@@ -2,9 +2,8 @@ import { IProgramCreate } from "../Program";
import { CONSTANTS } from "../../Constants";
import { BaseServer } from "../../Server/BaseServer";
import { Server } from "../../Server/Server";
-import { ITerminal } from "../../Terminal/ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Terminal } from "../../Terminal";
+import { Player } from "../../Player";
import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
import { GetServer } from "../../Server/AllServers";
import { numeralWrapper } from "../../ui/numeralFormat";
@@ -14,14 +13,14 @@ import { calculateHackingTime, calculateGrowTime, calculateWeakenTime } from "..
import { FactionNames } from "../../Faction/data/FactionNames";
function requireHackingLevel(lvl: number) {
- return function (p: IPlayer) {
- return p.skills.hacking + p.skills.intelligence / 2 >= lvl;
+ return function () {
+ return Player.skills.hacking + Player.skills.intelligence / 2 >= lvl;
};
}
function bitFlumeRequirements() {
- return function (p: IPlayer) {
- return p.sourceFiles.length > 0 && p.skills.hacking >= 1;
+ return function () {
+ return Player.sourceFiles.length > 0 && Player.skills.hacking >= 1;
};
}
@@ -29,7 +28,7 @@ interface IProgramCreationParams {
key: string;
name: string;
create: IProgramCreate | null;
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer, args: string[]) => void;
+ run: (args: string[], server: BaseServer) => void;
}
export const programsMetadata: IProgramCreationParams[] = [
@@ -42,24 +41,24 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(1),
time: CONSTANTS.MillisecondsPerFiveMinutes,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer): void => {
+ run: (_args:string[], server: BaseServer): void => {
if (!(server instanceof Server)) {
- terminal.error("Cannot nuke this kind of server.");
+ Terminal.error("Cannot nuke this kind of server.");
return;
}
if (server.hasAdminRights) {
- terminal.print("You already have root access to this computer. There is no reason to run NUKE.exe");
- terminal.print("You can now run scripts on this server.");
+ Terminal.print("You already have root access to this computer. There is no reason to run NUKE.exe");
+ Terminal.print("You can now run scripts on this server.");
return;
}
if (server.openPortCount >= server.numOpenPortsRequired) {
server.hasAdminRights = true;
- terminal.print("NUKE successful! Gained root access to " + server.hostname);
- terminal.print("You can now run scripts on this server.");
+ Terminal.print("NUKE successful! Gained root access to " + server.hostname);
+ Terminal.print("You can now run scripts on this server.");
return;
}
- terminal.print("NUKE unsuccessful. Not enough ports have been opened");
+ Terminal.print("NUKE unsuccessful. Not enough ports have been opened");
},
},
{
@@ -71,18 +70,18 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(50),
time: CONSTANTS.MillisecondsPerFiveMinutes * 2,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer): void => {
+ run: (_args:string[], server: BaseServer): void => {
if (!(server instanceof Server)) {
- terminal.error("Cannot run BruteSSH.exe on this kind of server.");
+ Terminal.error("Cannot run BruteSSH.exe on this kind of server.");
return;
}
if (server.sshPortOpen) {
- terminal.print("SSH Port (22) is already open!");
+ Terminal.print("SSH Port (22) is already open!");
return;
}
server.sshPortOpen = true;
- terminal.print("Opened SSH Port(22)!");
+ Terminal.print("Opened SSH Port(22)!");
server.openPortCount++;
},
},
@@ -95,18 +94,18 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(100),
time: CONSTANTS.MillisecondsPerHalfHour,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer): void => {
+ run: (_args:string[], server: BaseServer): void => {
if (!(server instanceof Server)) {
- terminal.error("Cannot run FTPCrack.exe on this kind of server.");
+ Terminal.error("Cannot run FTPCrack.exe on this kind of server.");
return;
}
if (server.ftpPortOpen) {
- terminal.print("FTP Port (21) is already open!");
+ Terminal.print("FTP Port (21) is already open!");
return;
}
server.ftpPortOpen = true;
- terminal.print("Opened FTP Port (21)!");
+ Terminal.print("Opened FTP Port (21)!");
server.openPortCount++;
},
},
@@ -119,18 +118,18 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(250),
time: CONSTANTS.MillisecondsPer2Hours,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer): void => {
+ run: (_args:string[], server: BaseServer): void => {
if (!(server instanceof Server)) {
- terminal.error("Cannot run relaySMTP.exe on this kind of server.");
+ Terminal.error("Cannot run relaySMTP.exe on this kind of server.");
return;
}
if (server.smtpPortOpen) {
- terminal.print("SMTP Port (25) is already open!");
+ Terminal.print("SMTP Port (25) is already open!");
return;
}
server.smtpPortOpen = true;
- terminal.print("Opened SMTP Port (25)!");
+ Terminal.print("Opened SMTP Port (25)!");
server.openPortCount++;
},
},
@@ -143,18 +142,18 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(500),
time: CONSTANTS.MillisecondsPer4Hours,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer): void => {
+ run: (_args:string[], server: BaseServer): void => {
if (!(server instanceof Server)) {
- terminal.error("Cannot run HTTPWorm.exe on this kind of server.");
+ Terminal.error("Cannot run HTTPWorm.exe on this kind of server.");
return;
}
if (server.httpPortOpen) {
- terminal.print("HTTP Port (80) is already open!");
+ Terminal.print("HTTP Port (80) is already open!");
return;
}
server.httpPortOpen = true;
- terminal.print("Opened HTTP Port (80)!");
+ Terminal.print("Opened HTTP Port (80)!");
server.openPortCount++;
},
},
@@ -167,18 +166,18 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(750),
time: CONSTANTS.MillisecondsPer8Hours,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer): void => {
+ run: (_args:string[], server: BaseServer): void => {
if (!(server instanceof Server)) {
- terminal.error("Cannot run SQLInject.exe on this kind of server.");
+ Terminal.error("Cannot run SQLInject.exe on this kind of server.");
return;
}
if (server.sqlPortOpen) {
- terminal.print("SQL Port (1433) is already open!");
+ Terminal.print("SQL Port (1433) is already open!");
return;
}
server.sqlPortOpen = true;
- terminal.print("Opened SQL Port (1433)!");
+ Terminal.print("Opened SQL Port (1433)!");
server.openPortCount++;
},
},
@@ -191,9 +190,9 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(75),
time: CONSTANTS.MillisecondsPerQuarterHour,
},
- run: (router: IRouter, terminal: ITerminal): void => {
- terminal.print("This executable cannot be run.");
- terminal.print("DeepscanV1.exe lets you run 'scan-analyze' with a depth up to 5.");
+ run: (): void => {
+ Terminal.print("This executable cannot be run.");
+ Terminal.print("DeepscanV1.exe lets you run 'scan-analyze' with a depth up to 5.");
},
},
{
@@ -205,9 +204,9 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(400),
time: CONSTANTS.MillisecondsPer2Hours,
},
- run: (router: IRouter, terminal: ITerminal): void => {
- terminal.print("This executable cannot be run.");
- terminal.print("DeepscanV2.exe lets you run 'scan-analyze' with a depth up to 10.");
+ run: (): void => {
+ Terminal.print("This executable cannot be run.");
+ Terminal.print("DeepscanV2.exe lets you run 'scan-analyze' with a depth up to 10.");
},
},
{
@@ -219,42 +218,42 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(75),
time: CONSTANTS.MillisecondsPerHalfHour,
},
- run: (router: IRouter, terminal: ITerminal, player: IPlayer, server: BaseServer, args: string[]): void => {
+ run: (args: string[]): void => {
if (args.length !== 1) {
- terminal.error("Must pass a server hostname or IP as an argument for ServerProfiler.exe");
+ Terminal.error("Must pass a server hostname or IP as an argument for ServerProfiler.exe");
return;
}
const targetServer = GetServer(args[0]);
if (targetServer == null) {
- terminal.error("Invalid server IP/hostname");
+ Terminal.error("Invalid server IP/hostname");
return;
}
if (!(targetServer instanceof Server)) {
- terminal.error(`ServerProfiler.exe can only be run on normal servers.`);
+ Terminal.error(`ServerProfiler.exe can only be run on normal servers.`);
return;
}
- terminal.print(targetServer.hostname + ":");
- terminal.print("Server base security level: " + targetServer.baseDifficulty);
- terminal.print("Server current security level: " + targetServer.hackDifficulty);
- terminal.print("Server growth rate: " + targetServer.serverGrowth);
- terminal.print(
+ Terminal.print(targetServer.hostname + ":");
+ Terminal.print("Server base security level: " + targetServer.baseDifficulty);
+ Terminal.print("Server current security level: " + targetServer.hackDifficulty);
+ Terminal.print("Server growth rate: " + targetServer.serverGrowth);
+ Terminal.print(
`Netscript hack() execution time: ${convertTimeMsToTimeElapsedString(
- calculateHackingTime(targetServer, player) * 1000,
+ calculateHackingTime(targetServer, Player) * 1000,
true,
)}`,
);
- terminal.print(
+ Terminal.print(
`Netscript grow() execution time: ${convertTimeMsToTimeElapsedString(
- calculateGrowTime(targetServer, player) * 1000,
+ calculateGrowTime(targetServer, Player) * 1000,
true,
)}`,
);
- terminal.print(
+ Terminal.print(
`Netscript weaken() execution time: ${convertTimeMsToTimeElapsedString(
- calculateWeakenTime(targetServer, player) * 1000,
+ calculateWeakenTime(targetServer, Player) * 1000,
true,
)}`,
);
@@ -269,10 +268,10 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(25),
time: CONSTANTS.MillisecondsPerQuarterHour,
},
- run: (router: IRouter, terminal: ITerminal): void => {
- terminal.print("This executable cannot be run.");
- terminal.print("AutoLink.exe lets you automatically connect to other servers when using 'scan-analyze'.");
- terminal.print("When using scan-analyze, click on a server's hostname to connect to it.");
+ run: (): void => {
+ Terminal.print("This executable cannot be run.");
+ Terminal.print("AutoLink.exe lets you automatically connect to other servers when using 'scan-analyze'.");
+ Terminal.print("When using scan-analyze, click on a server's hostname to connect to it.");
},
},
{
@@ -284,9 +283,9 @@ export const programsMetadata: IProgramCreationParams[] = [
req: requireHackingLevel(1000),
time: CONSTANTS.MillisecondsPer4Hours,
},
- run: (router: IRouter, terminal: ITerminal): void => {
- terminal.print("This executable cannot be run.");
- terminal.print("Formulas.exe lets you use the formulas API.");
+ run: (): void => {
+ Terminal.print("This executable cannot be run.");
+ Terminal.print("Formulas.exe lets you use the formulas API.");
},
},
{
@@ -306,19 +305,19 @@ export const programsMetadata: IProgramCreationParams[] = [
key: "Flight",
name: "fl1ght.exe",
create: null,
- run: (router: IRouter, terminal: ITerminal, player: IPlayer): void => {
+ run: (): void => {
const numAugReq = BitNodeMultipliers.DaedalusAugsRequirement;
const fulfilled =
- player.augmentations.length >= numAugReq && player.money > 1e11 && player.skills.hacking >= 2500;
+ Player.augmentations.length >= numAugReq && Player.money > 1e11 && Player.skills.hacking >= 2500;
if (!fulfilled) {
- terminal.print(`Augmentations: ${player.augmentations.length} / ${numAugReq}`);
- terminal.print(`Money: ${numeralWrapper.formatMoney(player.money)} / $100b`);
- terminal.print(`Hacking skill: ${player.skills.hacking} / 2500`);
+ Terminal.print(`Augmentations: ${Player.augmentations.length} / ${numAugReq}`);
+ Terminal.print(`Money: ${numeralWrapper.formatMoney(Player.money)} / $100b`);
+ Terminal.print(`Hacking skill: ${Player.skills.hacking} / 2500`);
return;
}
- terminal.print("We will contact you.");
- terminal.print(`-- ${FactionNames.Daedalus} --`);
+ Terminal.print("We will contact you.");
+ Terminal.print(`-- ${FactionNames.Daedalus} --`);
},
},
];
diff --git a/src/Programs/ui/ProgramsRoot.tsx b/src/Programs/ui/ProgramsRoot.tsx
index a8638ab4a..767d6dda5 100644
--- a/src/Programs/ui/ProgramsRoot.tsx
+++ b/src/Programs/ui/ProgramsRoot.tsx
@@ -4,7 +4,8 @@ import { find } from "lodash";
import { Box, Typography, Button, Container, Paper } from "@mui/material";
import { Check, Lock, Create } from "@mui/icons-material";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { Settings } from "../../Settings/Settings";
import { Programs } from "../Programs";
@@ -13,8 +14,6 @@ import { CreateProgramWork } from "../../Work/CreateProgramWork";
export const ProgramsSeen: string[] = [];
export function ProgramsRoot(): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const setRerender = useState(false)[1];
function rerender(): void {
setRerender((old) => !old);
@@ -25,13 +24,13 @@ export function ProgramsRoot(): React.ReactElement {
const create = prog.create;
if (create === null) return false;
if (prog.name === "b1t_flum3.exe") {
- return create.req(player);
+ return create.req();
}
return true;
})
.sort((a, b) => {
- if (player.hasProgram(a.name)) return 1;
- if (player.hasProgram(b.name)) return -1;
+ if (Player.hasProgram(a.name)) return 1;
+ if (Player.hasProgram(b.name)) return -1;
return (a.create?.level ?? 0) - (b.create?.level ?? 0);
});
@@ -48,11 +47,11 @@ export function ProgramsRoot(): React.ReactElement {
}, []);
const getHackingLevelRemaining = (lvl: number): number => {
- return Math.ceil(Math.max(lvl - (player.skills.hacking + player.skills.intelligence / 2), 0));
+ return Math.ceil(Math.max(lvl - (Player.skills.hacking + Player.skills.intelligence / 2), 0));
};
const getProgCompletion = (name: string): number => {
- const programFile = find(player.getHomeComputer().programs, (p) => {
+ const programFile = find(Player.getHomeComputer().programs, (p) => {
return p.startsWith(name) && p.endsWith("%-INC");
});
if (!programFile) return -1;
@@ -84,31 +83,31 @@ export function ProgramsRoot(): React.ReactElement {
return (
<>
- {(player.hasProgram(program.name) &&
- {!player.hasProgram(program.name) && create.req(player) && (
+ {!Player.hasProgram(program.name) && create.req() && (
{
if (!event.isTrusted) return;
- player.startWork(
- new CreateProgramWork({ player: player, singularity: false, programName: program.name }),
+ Player.startWork(
+ new CreateProgramWork({singularity: false, programName: program.name }),
);
- player.startFocusing();
- router.toWork();
+ Player.startFocusing();
+ Router.toWork();
}}
>
Create program
)}
- {player.hasProgram(program.name) || getHackingLevelRemaining(create.level) === 0 || (
+ {Player.hasProgram(program.name) || getHackingLevelRemaining(create.level) === 0 || (
Unlocks in: {getHackingLevelRemaining(create.level)} hacking levels
diff --git a/src/ScriptEditor/ui/ScriptEditorRoot.tsx b/src/ScriptEditor/ui/ScriptEditorRoot.tsx
index f6f46f21e..fc9367b63 100644
--- a/src/ScriptEditor/ui/ScriptEditorRoot.tsx
+++ b/src/ScriptEditor/ui/ScriptEditorRoot.tsx
@@ -7,8 +7,8 @@ type ITextModel = monaco.editor.ITextModel;
import { OptionsModal } from "./OptionsModal";
import { Options } from "./Options";
import { isValidFilePath } from "../../Terminal/DirectoryHelpers";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { IRouter } from "../../ui/Router";
+import { Player } from "../../Player";
+import { Router } from "../../ui/GameRoot";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { isScriptFilename } from "../../Script/isScriptFilename";
import { Script } from "../../Script/Script";
@@ -49,8 +49,6 @@ interface IProps {
// Map of filename -> code
files: Record;
hostname: string;
- player: IPlayer;
- router: IRouter;
vim: boolean;
}
@@ -156,7 +154,7 @@ export function Root(props: IProps): React.ReactElement {
//Ctrl + b
if (event.code == "KeyB" && (event.ctrlKey || event.metaKey)) {
event.preventDefault();
- props.router.toTerminal();
+ Router.toTerminal();
}
// CTRL/CMD + S
@@ -183,12 +181,12 @@ export function Root(props: IProps): React.ReactElement {
save();
});
MonacoVim.VimMode.Vim.defineEx("quit", "q", function () {
- props.router.toTerminal();
+ Router.toTerminal();
});
const saveNQuit = (): void => {
save();
- props.router.toTerminal();
+ Router.toTerminal();
};
// "wqriteandquit" & "xriteandquit" are not typos, prefix must be found in full string
MonacoVim.VimMode.Vim.defineEx("wqriteandquit", "wq", saveNQuit);
@@ -252,7 +250,7 @@ export function Root(props: IProps): React.ReactElement {
return;
}
const codeCopy = newCode + "";
- const ramUsage = calculateRamUsage(codeCopy, props.player.getCurrentServer().scripts);
+ const ramUsage = calculateRamUsage(codeCopy, Player.getCurrentServer().scripts);
if (ramUsage.cost > 0) {
const entries = ramUsage.entries?.sort((a, b) => b.cost - a.cost) ?? [];
const entriesDisp = [];
@@ -468,25 +466,25 @@ export function Root(props: IProps): React.ReactElement {
server.scripts[i].saveScript(
scriptToSave.fileName,
scriptToSave.code,
- props.player.currentServer,
+ Player.currentServer,
server.scripts,
);
if (Settings.SaveGameOnFileSave) saveObject.saveGame();
- props.router.toTerminal();
+ Router.toTerminal();
return;
}
}
//If the current script does NOT exist, create a new one
const script = new Script();
- script.saveScript(scriptToSave.fileName, scriptToSave.code, props.player.currentServer, server.scripts);
+ script.saveScript(scriptToSave.fileName, scriptToSave.code, Player.currentServer, server.scripts);
server.scripts.push(script);
} else if (scriptToSave.isTxt) {
for (let i = 0; i < server.textFiles.length; ++i) {
if (server.textFiles[i].fn === scriptToSave.fileName) {
server.textFiles[i].write(scriptToSave.code);
if (Settings.SaveGameOnFileSave) saveObject.saveGame();
- props.router.toTerminal();
+ Router.toTerminal();
return;
}
}
@@ -498,7 +496,7 @@ export function Root(props: IProps): React.ReactElement {
}
if (Settings.SaveGameOnFileSave) saveObject.saveGame();
- props.router.toTerminal();
+ Router.toTerminal();
}
function save(): void {
@@ -550,7 +548,7 @@ export function Root(props: IProps): React.ReactElement {
server.scripts[i].saveScript(
currentScript.fileName,
currentScript.code,
- props.player.currentServer,
+ Player.currentServer,
server.scripts,
);
if (Settings.SaveGameOnFileSave) saveObject.saveGame();
@@ -561,7 +559,7 @@ export function Root(props: IProps): React.ReactElement {
//If the current script does NOT exist, create a new one
const script = new Script();
- script.saveScript(currentScript.fileName, currentScript.code, props.player.currentServer, server.scripts);
+ script.saveScript(currentScript.fileName, currentScript.code, Player.currentServer, server.scripts);
server.scripts.push(script);
} else if (currentScript.isTxt) {
for (let i = 0; i < server.textFiles.length; ++i) {
@@ -653,7 +651,7 @@ export function Root(props: IProps): React.ReactElement {
openScripts.splice(index, 1);
if (openScripts.length === 0) {
currentScript = null;
- props.router.toTerminal();
+ Router.toTerminal();
return;
}
@@ -905,7 +903,7 @@ export function Root(props: IProps): React.ReactElement {
{ram}
Save (Ctrl/Cmd + s)
-
+
Terminal (Ctrl/Cmd + b)
diff --git a/src/Server/ServerPurchases.ts b/src/Server/ServerPurchases.ts
index 3cf62635d..3811b4f58 100644
--- a/src/Server/ServerPurchases.ts
+++ b/src/Server/ServerPurchases.ts
@@ -7,7 +7,7 @@ import { safetlyCreateUniqueServer } from "./ServerHelpers";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { CONSTANTS } from "../Constants";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { dialogBoxCreate } from "../ui/React/DialogBox";
import { isPowerOfTwo } from "../utils/helpers/isPowerOfTwo";
@@ -50,15 +50,15 @@ export function getPurchaseServerMaxRam(): number {
}
// Manually purchase a server (NOT through Netscript)
-export function purchaseServer(hostname: string, ram: number, cost: number, p: IPlayer): void {
+export function purchaseServer(hostname: string, ram: number, cost: number): void {
//Check if player has enough money
- if (!p.canAfford(cost)) {
+ if (!Player.canAfford(cost)) {
dialogBoxCreate("You don't have enough money to purchase this server!");
return;
}
//Maximum server limit
- if (p.purchasedServers.length >= getPurchaseServerLimit()) {
+ if (Player.purchasedServers.length >= getPurchaseServerLimit()) {
dialogBoxCreate(
"You have reached the maximum limit of " +
getPurchaseServerLimit() +
@@ -87,32 +87,32 @@ export function purchaseServer(hostname: string, ram: number, cost: number, p: I
AddToAllServers(newServ);
// Add to Player's purchasedServers array
- p.purchasedServers.push(newServ.hostname);
+ Player.purchasedServers.push(newServ.hostname);
// Connect new server to home computer
- const homeComputer = p.getHomeComputer();
+ const homeComputer = Player.getHomeComputer();
homeComputer.serversOnNetwork.push(newServ.hostname);
newServ.serversOnNetwork.push(homeComputer.hostname);
- p.loseMoney(cost, "servers");
+ Player.loseMoney(cost, "servers");
dialogBoxCreate("Server successfully purchased with hostname " + newServ.hostname);
}
// Manually upgrade RAM on home computer (NOT through Netscript)
-export function purchaseRamForHomeComputer(p: IPlayer): void {
- const cost = p.getUpgradeHomeRamCost();
- if (!p.canAfford(cost)) {
+export function purchaseRamForHomeComputer(): void {
+ const cost = Player.getUpgradeHomeRamCost();
+ if (!Player.canAfford(cost)) {
dialogBoxCreate("You do not have enough money to purchase additional RAM for your home computer");
return;
}
- const homeComputer = p.getHomeComputer();
+ const homeComputer = Player.getHomeComputer();
if (homeComputer.maxRam >= CONSTANTS.HomeComputerMaxRam) {
dialogBoxCreate(`You cannot upgrade your home computer RAM because it is at its maximum possible value`);
return;
}
homeComputer.maxRam *= 2;
- p.loseMoney(cost, "servers");
+ Player.loseMoney(cost, "servers");
}
diff --git a/src/Sidebar/ui/SidebarRoot.tsx b/src/Sidebar/ui/SidebarRoot.tsx
index 4453d2347..ebef6ceb5 100644
--- a/src/Sidebar/ui/SidebarRoot.tsx
+++ b/src/Sidebar/ui/SidebarRoot.tsx
@@ -45,8 +45,9 @@ import LiveHelpIcon from "@mui/icons-material/LiveHelp";
import ExpandLessIcon from "@mui/icons-material/ExpandLess";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { IRouter, Page } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Router } from "../../ui/GameRoot";
+import { Page } from "../../ui/Router";
+import { Player } from "../../Player";
import { CONSTANTS } from "../../Constants";
import { iTutorialSteps, iTutorialNextStep, ITutorial } from "../../InteractiveTutorial";
import { getAvailableCreatePrograms } from "../../Programs/ProgramHelpers";
@@ -103,8 +104,6 @@ const useStyles = makeStyles((theme: Theme) =>
);
interface IProps {
- player: IPlayer;
- router: IRouter;
page: Page;
opened: boolean;
onToggled: (newValue: boolean) => void;
@@ -140,122 +139,122 @@ export function SidebarRoot(props: IProps): React.ReactElement {
const flashTutorial = ITutorial.currStep === iTutorialSteps.WorldDescription;
- const augmentationCount = props.player.queuedAugmentations.length;
- const invitationsCount = props.player.factionInvitations.filter((f) => !InvitationsSeen.includes(f)).length;
- const programCount = getAvailableCreatePrograms(props.player).length - ProgramsSeen.length;
+ const augmentationCount = Player.queuedAugmentations.length;
+ const invitationsCount = Player.factionInvitations.filter((f) => !InvitationsSeen.includes(f)).length;
+ const programCount = getAvailableCreatePrograms().length - ProgramsSeen.length;
const canOpenFactions =
- props.player.factionInvitations.length > 0 ||
- props.player.factions.length > 0 ||
- props.player.augmentations.length > 0 ||
- props.player.queuedAugmentations.length > 0 ||
- props.player.sourceFiles.length > 0;
+ Player.factionInvitations.length > 0 ||
+ Player.factions.length > 0 ||
+ Player.augmentations.length > 0 ||
+ Player.queuedAugmentations.length > 0 ||
+ Player.sourceFiles.length > 0;
const canOpenAugmentations =
- props.player.augmentations.length > 0 ||
- props.player.queuedAugmentations.length > 0 ||
- props.player.sourceFiles.length > 0;
+ Player.augmentations.length > 0 ||
+ Player.queuedAugmentations.length > 0 ||
+ Player.sourceFiles.length > 0;
- const canOpenSleeves = props.player.sleeves.length > 0;
+ const canOpenSleeves = Player.sleeves.length > 0;
- const canCorporation = !!props.player.corporation;
- const canGang = !!props.player.gang;
- const canJob = Object.values(props.player.jobs).length > 0;
- const canStockMarket = props.player.hasWseAccount;
- const canBladeburner = !!props.player.bladeburner;
- const canStaneksGift = props.player.augmentations.some((aug) => aug.name === AugmentationNames.StaneksGift1);
+ const canCorporation = !!Player.corporation;
+ const canGang = !!Player.gang;
+ const canJob = Object.values(Player.jobs).length > 0;
+ const canStockMarket = Player.hasWseAccount;
+ const canBladeburner = !!Player.bladeburner;
+ const canStaneksGift = Player.augmentations.some((aug) => aug.name === AugmentationNames.StaneksGift1);
function clickTerminal(): void {
- props.router.toTerminal();
+ Router.toTerminal();
if (flashTerminal) iTutorialNextStep();
}
function clickScriptEditor(): void {
- props.router.toScriptEditor();
+ Router.toScriptEditor();
}
function clickStats(): void {
- props.router.toStats();
+ Router.toStats();
if (flashStats) iTutorialNextStep();
}
function clickActiveScripts(): void {
- props.router.toActiveScripts();
+ Router.toActiveScripts();
if (flashActiveScripts) iTutorialNextStep();
}
function clickCreateProgram(): void {
- props.router.toCreateProgram();
+ Router.toCreateProgram();
}
function clickStaneksGift(): void {
- props.router.toStaneksGift();
+ Router.toStaneksGift();
}
function clickFactions(): void {
- props.router.toFactions();
+ Router.toFactions();
}
function clickAugmentations(): void {
- props.router.toAugmentations();
+ Router.toAugmentations();
}
function clickSleeves(): void {
- props.router.toSleeves();
+ Router.toSleeves();
}
function clickHacknet(): void {
- props.router.toHacknetNodes();
+ Router.toHacknetNodes();
if (flashHacknet) iTutorialNextStep();
}
function clickCity(): void {
- props.router.toCity();
+ Router.toCity();
if (flashCity) iTutorialNextStep();
}
function clickTravel(): void {
- props.router.toTravel();
+ Router.toTravel();
}
function clickJob(): void {
- props.router.toJob(Locations[Object.keys(props.player.jobs)[0]]);
+ Router.toJob(Locations[Object.keys(Player.jobs)[0]]);
}
function clickStockMarket(): void {
- props.router.toStockMarket();
+ Router.toStockMarket();
}
function clickBladeburner(): void {
- props.router.toBladeburner();
+ Router.toBladeburner();
}
function clickCorp(): void {
- props.router.toCorporation();
+ Router.toCorporation();
}
function clickGang(): void {
- props.router.toGang();
+ Router.toGang();
}
function clickTutorial(): void {
- props.router.toTutorial();
+ Router.toTutorial();
if (flashTutorial) iTutorialNextStep();
}
function clickMilestones(): void {
- props.router.toMilestones();
+ Router.toMilestones();
}
function clickOptions(): void {
- props.router.toGameOptions();
+ Router.toGameOptions();
}
function clickDev(): void {
- props.router.toDevMenu();
+ Router.toDevMenu();
}
function clickAchievements(): void {
- props.router.toAchievements();
+ Router.toAchievements();
}
useEffect(() => {
@@ -277,7 +276,7 @@ export function SidebarRoot(props: IProps): React.ReactElement {
// Alt-g - Gang
function handleShortcuts(this: Document, event: KeyboardEvent): void {
if (Settings.DisableHotkeys) return;
- if ((props.player.currentWork && props.player.focus) || props.router.page() === Page.BitVerse) return;
+ if ((Player.currentWork && Player.focus) || Router.page() === Page.BitVerse) return;
if (event.code === KEYCODE.T && event.altKey) {
event.preventDefault();
clickTerminal();
@@ -321,10 +320,10 @@ export function SidebarRoot(props: IProps): React.ReactElement {
} else if (event.code === KEYCODE.O && event.altKey) {
event.preventDefault();
clickOptions();
- } else if (event.code === KEYCODE.B && event.altKey && props.player.bladeburner) {
+ } else if (event.code === KEYCODE.B && event.altKey && Player.bladeburner) {
event.preventDefault();
clickBladeburner();
- } else if (event.code === KEYCODE.G && event.altKey && props.player.gang) {
+ } else if (event.code === KEYCODE.G && event.altKey && Player.gang) {
event.preventDefault();
clickGang();
}
diff --git a/src/StockMarket/ui/InfoAndPurchases.tsx b/src/StockMarket/ui/InfoAndPurchases.tsx
index afa3f7293..70749ead5 100644
--- a/src/StockMarket/ui/InfoAndPurchases.tsx
+++ b/src/StockMarket/ui/InfoAndPurchases.tsx
@@ -8,7 +8,7 @@ import React, { useState } from "react";
import { getStockMarket4SDataCost, getStockMarket4STixApiCost } from "../StockMarketCosts";
import { CONSTANTS } from "../../Constants";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Money } from "../../ui/React/Money";
import { initStockMarket } from "../StockMarket";
@@ -23,24 +23,23 @@ import { StaticModal } from "../../ui/React/StaticModal";
import { FactionNames } from "../../Faction/data/FactionNames";
type IProps = {
- p: IPlayer;
rerender: () => void;
};
function Purchase4SMarketDataTixApiAccessButton(props: IProps): React.ReactElement {
function purchase4SMarketDataTixApiAccess(): void {
- if (props.p.has4SDataTixApi) {
+ if (Player.has4SDataTixApi) {
return;
}
- if (!props.p.canAfford(getStockMarket4STixApiCost())) {
+ if (!Player.canAfford(getStockMarket4STixApiCost())) {
return;
}
- props.p.has4SDataTixApi = true;
- props.p.loseMoney(getStockMarket4STixApiCost(), "stock");
+ Player.has4SDataTixApi = true;
+ Player.loseMoney(getStockMarket4STixApiCost(), "stock");
props.rerender();
}
- if (props.p.has4SDataTixApi) {
+ if (Player.has4SDataTixApi) {
return (
Market Data TIX API Access Requires TIX API Access
) : (
Let you access 4S Market Data through Netscript
@@ -60,11 +59,11 @@ function Purchase4SMarketDataTixApiAccessButton(props: IProps): React.ReactEleme
>
Buy 4S Market Data TIX API Access -
-
@@ -73,7 +72,7 @@ function Purchase4SMarketDataTixApiAccessButton(props: IProps): React.ReactEleme
}
function PurchaseWseAccountButton(props: IProps): React.ReactElement {
- if (props.p.hasWseAccount) {
+ if (Player.hasWseAccount) {
return (
WSE Account To begin trading, you must first purchase an account:
-
+
Buy WSE Account -
-
);
@@ -107,18 +106,18 @@ function PurchaseWseAccountButton(props: IProps): React.ReactElement {
function PurchaseTixApiAccessButton(props: IProps): React.ReactElement {
function purchaseTixApiAccess(): void {
- if (props.p.hasTixApiAccess) {
+ if (Player.hasTixApiAccess) {
return;
}
- if (!props.p.canAfford(CONSTANTS.TIXAPICost)) {
+ if (!Player.canAfford(CONSTANTS.TIXAPICost)) {
return;
}
- props.p.hasTixApiAccess = true;
- props.p.loseMoney(CONSTANTS.TIXAPICost, "stock");
+ Player.hasTixApiAccess = true;
+ Player.loseMoney(CONSTANTS.TIXAPICost, "stock");
props.rerender();
}
- if (props.p.hasTixApiAccess) {
+ if (Player.hasTixApiAccess) {
return (
TIX API Access
+
Buy Trade Information eXchange (TIX) API Access -
-
);
}
@@ -137,17 +136,17 @@ function PurchaseTixApiAccessButton(props: IProps): React.ReactElement {
function Purchase4SMarketDataButton(props: IProps): React.ReactElement {
function purchase4SMarketData(): void {
- if (props.p.has4SData) {
+ if (Player.has4SData) {
return;
}
- if (!props.p.canAfford(getStockMarket4SDataCost())) {
+ if (!Player.canAfford(getStockMarket4SDataCost())) {
return;
}
- props.p.has4SData = true;
- props.p.loseMoney(getStockMarket4SDataCost(), "stock");
+ Player.has4SData = true;
+ Player.loseMoney(getStockMarket4SDataCost(), "stock");
props.rerender();
}
- if (props.p.has4SData) {
+ if (Player.has4SData) {
return (
4S Market Data Access Lets you view additional pricing and volatility information about stocks }
>
-
+
Buy 4S Market Data Access -
-
@@ -204,7 +203,7 @@ export function InfoAndPurchases(props: IProps): React.ReactElement {
Commission Fees: Every transaction you make has a{" "}
-
diff --git a/src/StockMarket/ui/StockMarketRoot.tsx b/src/StockMarket/ui/StockMarketRoot.tsx
index 4f3bf7e89..a77e213ac 100644
--- a/src/StockMarket/ui/StockMarketRoot.tsx
+++ b/src/StockMarket/ui/StockMarketRoot.tsx
@@ -8,10 +8,9 @@ import { StockTickers } from "./StockTickers";
import { IStockMarket } from "../IStockMarket";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
type IProps = {
- p: IPlayer;
stockMarket: IStockMarket;
};
@@ -27,8 +26,8 @@ export function StockMarketRoot(props: IProps): React.ReactElement {
}, []);
return (
<>
-
setTicketOpen((old) => !old)}>
-
@@ -311,8 +310,8 @@ export function StockTicker(props: IProps): React.ReactElement {
- = 2) {
+ if (Player.bitNodeN === 8 || Player.sourceFileLvl(8) >= 2) {
return (
<>
diff --git a/src/StockMarket/ui/StockTickers.tsx b/src/StockMarket/ui/StockTickers.tsx
index 12cf52165..a2a89eba7 100644
--- a/src/StockMarket/ui/StockTickers.tsx
+++ b/src/StockMarket/ui/StockTickers.tsx
@@ -11,10 +11,7 @@ import { StockTickersConfig, TickerDisplayMode } from "./StockTickersConfig";
import { IStockMarket } from "../IStockMarket";
import { Stock } from "../Stock";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-
type IProps = {
- p: IPlayer;
stockMarket: IStockMarket;
};
@@ -67,9 +64,7 @@ export function StockTickers(props: IProps): React.ReactElement {
}
}
- tickers.push(
- {
+ async runContract(contractName: string): Promise {
// There's already an opened contract
if (this.contractOpen) {
return this.error("There's already a Coding Contract in Progress");
}
- const serv = player.getCurrentServer();
+ const serv = Player.getCurrentServer();
const contract = serv.getContract(contractName);
if (contract == null) {
return this.error("No such contract");
@@ -473,7 +473,7 @@ export class Terminal implements ITerminal {
switch (res) {
case CodingContractResult.Success:
if (contract.reward !== null) {
- const reward = player.gainCodingContractReward(contract.reward, contract.getDifficulty());
+ const reward = Player.gainCodingContractReward(contract.reward, contract.getDifficulty());
this.print(`Contract SUCCESS - ${reward}`);
}
serv.removeContract(contract);
@@ -495,7 +495,7 @@ export class Terminal implements ITerminal {
this.contractOpen = false;
}
- executeScanAnalyzeCommand(player: IPlayer, depth = 1, all = false): void {
+ executeScanAnalyzeCommand(depth = 1, all = false): void {
// TODO Using array as stack for now, can make more efficient
this.print("~~~~~~~~~~ Beginning scan-analyze ~~~~~~~~~~");
this.print(" ");
@@ -510,7 +510,7 @@ export class Terminal implements ITerminal {
const stack: BaseServer[] = [];
const depthQueue: number[] = [0];
- const currServ = player.getCurrentServer();
+ const currServ = Player.getCurrentServer();
stack.push(currServ);
while (stack.length != 0) {
const s = stack.pop();
@@ -537,7 +537,7 @@ export class Terminal implements ITerminal {
continue;
} // Don't print current server
const titleDashes = Array((d - 1) * 4 + 1).join("-");
- if (player.hasProgram(Programs.AutoLink.name)) {
+ if (Player.hasProgram(Programs.AutoLink.name)) {
this.append(new Link(titleDashes, s.hostname));
} else {
this.print(titleDashes + s.hostname);
@@ -562,23 +562,23 @@ export class Terminal implements ITerminal {
}
}
- connectToServer(player: IPlayer, server: string): void {
+ connectToServer(server: string): void {
const serv = GetServer(server);
if (serv == null) {
this.error("Invalid server. Connection failed.");
return;
}
- player.getCurrentServer().isConnectedTo = false;
- player.currentServer = serv.hostname;
- player.getCurrentServer().isConnectedTo = true;
+ Player.getCurrentServer().isConnectedTo = false;
+ Player.currentServer = serv.hostname;
+ Player.getCurrentServer().isConnectedTo = true;
this.print("Connected to " + serv.hostname);
this.setcwd("/");
- if (player.getCurrentServer().hostname == "darkweb") {
+ if (Player.getCurrentServer().hostname == "darkweb") {
checkIfConnectedToDarkweb(); // Posts a 'help' message if connecting to dark web
}
}
- executeCommands(router: IRouter, player: IPlayer, commands: string): void {
+ executeCommands(commands: string): void {
// Sanitize input
commands = commands.trim();
commands = commands.replace(/\s\s+/g, " "); // Replace all extra whitespace in command with a single space
@@ -589,13 +589,13 @@ export class Terminal implements ITerminal {
if (this.commandHistory.length > 50) {
this.commandHistory.splice(0, 1);
}
- player.terminalCommandHistory = this.commandHistory;
+ Player.terminalCommandHistory = this.commandHistory;
}
this.commandHistoryIndex = this.commandHistory.length;
const allCommands = ParseCommands(commands);
for (let i = 0; i < allCommands.length; i++) {
- this.executeCommand(router, player, allCommands[i]);
+ this.executeCommand(allCommands[i]);
}
}
@@ -610,7 +610,7 @@ export class Terminal implements ITerminal {
this.clear();
}
- executeCommand(router: IRouter, player: IPlayer, command: string): void {
+ executeCommand(command: string): void {
if (this.action !== null) {
this.error(`Cannot execute command (${command}) while an action is in progress`);
return;
@@ -624,7 +624,7 @@ export class Terminal implements ITerminal {
if (commandArray.length == 0) {
return;
}
- const s = player.getCurrentServer();
+ const s = Player.getCurrentServer();
/****************** Interactive Tutorial Terminal Commands ******************/
if (ITutorial.isRunning) {
const n00dlesServ = GetServer("n00dles");
@@ -785,11 +785,8 @@ export class Terminal implements ITerminal {
const commands: {
[key: string]: (
- terminal: ITerminal,
- router: IRouter,
- player: IPlayer,
- server: BaseServer,
args: (string | number | boolean)[],
+ server: BaseServer,
) => void;
} = {
"scan-analyze": scananalyze,
@@ -841,7 +838,7 @@ export class Terminal implements ITerminal {
return;
}
- f(this, router, player, s, commandArray.slice(1));
+ f(commandArray.slice(1), s);
}
getProgressText(): string {
diff --git a/src/Terminal/commands/alias.ts b/src/Terminal/commands/alias.ts
index 1e908baf8..d5c7f8d37 100644
--- a/src/Terminal/commands/alias.ts
+++ b/src/Terminal/commands/alias.ts
@@ -1,33 +1,24 @@
-import { ITerminal } from "../ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { BaseServer } from "../../Server/BaseServer";
+import { Terminal } from "../../Terminal";
import { parseAliasDeclaration, printAliases } from "../../Alias";
-export function alias(
- terminal: ITerminal,
- router: IRouter,
- player: IPlayer,
- server: BaseServer,
- args: (string | number | boolean)[],
-): void {
+export function alias(args: (string | number | boolean)[]): void {
if (args.length === 0) {
printAliases();
return;
}
if (args.length === 1) {
if (parseAliasDeclaration(args[0] + "")) {
- terminal.print(`Set alias ${args[0]}`);
+ Terminal.print(`Set alias ${args[0]}`);
return;
}
}
if (args.length === 2) {
if (args[0] === "-g") {
if (parseAliasDeclaration(args[1] + "", true)) {
- terminal.print(`Set global alias ${args[1]}`);
+ Terminal.print(`Set global alias ${args[1]}`);
return;
}
}
}
- terminal.error('Incorrect usage of alias command. Usage: alias [-g] [aliasname="value"]');
+ Terminal.error('Incorrect usage of alias command. Usage: alias [-g] [aliasname="value"]');
}
diff --git a/src/Terminal/commands/analyze.ts b/src/Terminal/commands/analyze.ts
index 2544d837f..674b1db76 100644
--- a/src/Terminal/commands/analyze.ts
+++ b/src/Terminal/commands/analyze.ts
@@ -1,18 +1,9 @@
-import { ITerminal } from "../ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { BaseServer } from "../../Server/BaseServer";
+import { Terminal } from "../../Terminal";
-export function analyze(
- terminal: ITerminal,
- router: IRouter,
- player: IPlayer,
- server: BaseServer,
- args: (string | number | boolean)[],
-): void {
+export function analyze(args: (string | number | boolean)[]): void {
if (args.length !== 0) {
- terminal.error("Incorrect usage of analyze command. Usage: analyze");
+ Terminal.error("Incorrect usage of analyze command. Usage: analyze");
return;
}
- terminal.startAnalyze(player);
+ Terminal.startAnalyze();
}
diff --git a/src/Terminal/commands/backdoor.ts b/src/Terminal/commands/backdoor.ts
index 2f49745e9..9766ce073 100644
--- a/src/Terminal/commands/backdoor.ts
+++ b/src/Terminal/commands/backdoor.ts
@@ -1,41 +1,34 @@
-import { ITerminal } from "../ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Terminal } from "../../Terminal";
+import { Player } from "../../Player";
import { BaseServer } from "../../Server/BaseServer";
import { Server } from "../../Server/Server";
import { HacknetServer } from "../../Hacknet/HacknetServer";
-export function backdoor(
- terminal: ITerminal,
- router: IRouter,
- player: IPlayer,
- server: BaseServer,
- args: (string | number | boolean)[],
-): void {
+export function backdoor(args: (string | number | boolean)[], server: BaseServer): void {
if (args.length !== 0) {
- terminal.error("Incorrect usage of backdoor command. Usage: backdoor");
+ Terminal.error("Incorrect usage of backdoor command. Usage: backdoor");
return;
}
if (!(server instanceof Server)) {
- terminal.error("Can only backdoor normal servers");
+ Terminal.error("Can only backdoor normal servers");
}
const normalServer = server as Server;
if (normalServer.purchasedByPlayer) {
- terminal.error(
+ Terminal.error(
"Cannot use backdoor on your own machines! You are currently connected to your home PC or one of your purchased servers",
);
} else if (!normalServer.hasAdminRights) {
- terminal.error("You do not have admin rights for this machine! Cannot backdoor");
- } else if (normalServer.requiredHackingSkill > player.skills.hacking) {
- terminal.error(
+ Terminal.error("You do not have admin rights for this machine! Cannot backdoor");
+ } else if (normalServer.requiredHackingSkill > Player.skills.hacking) {
+ Terminal.error(
"Your hacking skill is not high enough to use backdoor on this machine. Try analyzing the machine to determine the required hacking skill",
);
} else if (normalServer instanceof HacknetServer) {
- terminal.error("Cannot use backdoor on this type of Server");
+ Terminal.error("Cannot use backdoor on this type of Server");
} else {
- terminal.startBackdoor(player);
+ Terminal.startBackdoor();
}
}
diff --git a/src/Terminal/commands/buy.ts b/src/Terminal/commands/buy.ts
index 88a6b685c..50a90d169 100644
--- a/src/Terminal/commands/buy.ts
+++ b/src/Terminal/commands/buy.ts
@@ -1,35 +1,23 @@
-import { ITerminal } from "../ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
-import { BaseServer } from "../../Server/BaseServer";
+import { Terminal } from "../../Terminal";
+import { Player } from "../../Player";
import { listAllDarkwebItems, buyAllDarkwebItems, buyDarkwebItem } from "../../DarkWeb/DarkWeb";
-export function buy(
- terminal: ITerminal,
- router: IRouter,
- player: IPlayer,
- server: BaseServer,
- args: (string | number | boolean)[],
-): void {
- if (!player.hasTorRouter()) {
- terminal.error(
+export function buy(args: (string | number | boolean)[]): void {
+ if (!Player.hasTorRouter()) {
+ Terminal.error(
"You need to be able to connect to the Dark Web to use the buy command. (Maybe there's a TOR router you can buy somewhere)",
);
return;
}
if (args.length != 1) {
- terminal.print("Incorrect number of arguments. Usage: ");
- terminal.print("buy -l");
- terminal.print("buy -a");
- terminal.print("buy [item name]");
+ Terminal.print("Incorrect number of arguments. Usage: ");
+ Terminal.print("buy -l");
+ Terminal.print("buy -a");
+ Terminal.print("buy [item name]");
return;
}
const arg = args[0] + "";
- if (arg == "-l" || arg == "-1" || arg == "--list") {
- listAllDarkwebItems();
- } else if (arg == "-a" || arg == "--all") {
- buyAllDarkwebItems();
- } else {
- buyDarkwebItem(arg);
- }
+ if (arg == "-l" || arg == "-1" || arg == "--list") listAllDarkwebItems();
+ else if (arg == "-a" || arg == "--all") buyAllDarkwebItems();
+ else buyDarkwebItem(arg);
}
diff --git a/src/Terminal/commands/cat.ts b/src/Terminal/commands/cat.ts
index 5d9723738..0807e8a84 100644
--- a/src/Terminal/commands/cat.ts
+++ b/src/Terminal/commands/cat.ts
@@ -1,25 +1,17 @@
-import { ITerminal } from "../ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Terminal } from "../../Terminal";
import { BaseServer } from "../../Server/BaseServer";
import { MessageFilenames, showMessage } from "../../Message/MessageHelpers";
import { showLiterature } from "../../Literature/LiteratureHelpers";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { checkEnum } from "../../utils/helpers/checkEnum";
-export function cat(
- terminal: ITerminal,
- router: IRouter,
- player: IPlayer,
- server: BaseServer,
- args: (string | number | boolean)[],
-): void {
+export function cat(args: (string | number | boolean)[], server: BaseServer): void {
if (args.length !== 1) {
- terminal.error("Incorrect usage of cat command. Usage: cat [file]");
+ Terminal.error("Incorrect usage of cat command. Usage: cat [file]");
return;
}
const relative_filename = args[0] + "";
- const filename = terminal.getFilepath(relative_filename);
+ const filename = Terminal.getFilepath(relative_filename);
if (
!filename.endsWith(".msg") &&
!filename.endsWith(".lit") &&
@@ -27,7 +19,7 @@ export function cat(
!filename.endsWith(".script") &&
!filename.endsWith(".js")
) {
- terminal.error(
+ Terminal.error(
"Only .msg, .txt, .lit, .script and .js files are viewable with cat (filename must end with .msg, .txt, .lit, .script or .js)",
);
return;
@@ -49,18 +41,18 @@ export function cat(
}
}
} else if (filename.endsWith(".txt")) {
- const txt = terminal.getTextFile(player, relative_filename);
+ const txt = Terminal.getTextFile(relative_filename);
if (txt != null) {
txt.show();
return;
}
} else if (filename.endsWith(".script") || filename.endsWith(".js")) {
- const script = terminal.getScript(player, relative_filename);
+ const script = Terminal.getScript(relative_filename);
if (script != null) {
dialogBoxCreate(`${script.filename}{row} );
+ Terminal.printRaw({row} );
break;
case FileType.Script:
- terminal.printRaw((null);
const [value, setValue] = useState(command);
@@ -54,9 +49,9 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
const classes = useStyles();
// If we have no data in the current terminal history, let's initialize it from the player save
- if (terminal.commandHistory.length === 0 && player.terminalCommandHistory.length > 0) {
- terminal.commandHistory = player.terminalCommandHistory;
- terminal.commandHistoryIndex = terminal.commandHistory.length;
+ if (Terminal.commandHistory.length === 0 && Player.terminalCommandHistory.length > 0) {
+ Terminal.commandHistory = Player.terminalCommandHistory;
+ Terminal.commandHistoryIndex = Terminal.commandHistory.length;
}
// Need to run after state updates, for example if we need to move cursor
@@ -183,9 +178,9 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
// Catch all key inputs and redirect them to the terminal.
useEffect(() => {
function keyDown(this: Document, event: KeyboardEvent): void {
- if (terminal.contractOpen) return;
- if (terminal.action !== null && event.key === KEY.C && event.ctrlKey) {
- terminal.finishAction(router, player, true);
+ if (Terminal.contractOpen) return;
+ if (Terminal.action !== null && event.key === KEY.C && event.ctrlKey) {
+ Terminal.finishAction(true);
return;
}
const ref = terminalInput.current;
@@ -204,8 +199,8 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
// Run command.
if (event.key === KEY.ENTER && value !== "") {
event.preventDefault();
- terminal.print(`[${player.getCurrentServer().hostname} ~${terminal.cwd()}]> ${value}`);
- terminal.executeCommands(router, player, value);
+ Terminal.print(`[${Player.getCurrentServer().hostname} ~${Terminal.cwd()}]> ${value}`);
+ Terminal.executeCommands(value);
saveValue("");
return;
}
@@ -228,7 +223,7 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
if (index < -1) {
index = 0;
}
- const allPos = await determineAllPossibilitiesForTabCompletion(player, copy, index, terminal.cwd());
+ const allPos = await determineAllPossibilitiesForTabCompletion(Player, copy, index, Terminal.cwd());
if (allPos.length == 0) {
return;
}
@@ -264,7 +259,7 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
// Clear screen.
if (event.key === KEY.L && event.ctrlKey) {
event.preventDefault();
- terminal.clear();
+ Terminal.clear();
}
// Select previous command.
@@ -272,20 +267,20 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
if (Settings.EnableBashHotkeys) {
event.preventDefault();
}
- const i = terminal.commandHistoryIndex;
- const len = terminal.commandHistory.length;
+ const i = Terminal.commandHistoryIndex;
+ const len = Terminal.commandHistory.length;
if (len == 0) {
return;
}
if (i < 0 || i > len) {
- terminal.commandHistoryIndex = len;
+ Terminal.commandHistoryIndex = len;
}
if (i != 0) {
- --terminal.commandHistoryIndex;
+ --Terminal.commandHistoryIndex;
}
- const prevCommand = terminal.commandHistory[terminal.commandHistoryIndex];
+ const prevCommand = Terminal.commandHistory[Terminal.commandHistoryIndex];
saveValue(prevCommand);
if (ref) {
setTimeout(function () {
@@ -299,23 +294,23 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
if (Settings.EnableBashHotkeys) {
event.preventDefault();
}
- const i = terminal.commandHistoryIndex;
- const len = terminal.commandHistory.length;
+ const i = Terminal.commandHistoryIndex;
+ const len = Terminal.commandHistory.length;
if (len == 0) {
return;
}
if (i < 0 || i > len) {
- terminal.commandHistoryIndex = len;
+ Terminal.commandHistoryIndex = len;
}
// Latest command, put nothing
if (i == len || i == len - 1) {
- terminal.commandHistoryIndex = len;
+ Terminal.commandHistoryIndex = len;
saveValue("");
} else {
- ++terminal.commandHistoryIndex;
- const prevCommand = terminal.commandHistory[terminal.commandHistoryIndex];
+ ++Terminal.commandHistoryIndex;
+ const prevCommand = Terminal.commandHistory[Terminal.commandHistoryIndex];
saveValue(prevCommand);
}
}
@@ -324,7 +319,7 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
if (Settings.EnableBashHotkeys) {
if (event.code === KEYCODE.C && event.ctrlKey && ref && ref.selectionStart === ref.selectionEnd) {
event.preventDefault();
- terminal.print(`[${player.getCurrentServer().hostname} ~${terminal.cwd()}]> ${value}`);
+ Terminal.print(`[${Player.getCurrentServer().hostname} ~${Terminal.cwd()}]> ${value}`);
modifyInput("clearall");
}
@@ -389,9 +384,9 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
<>
- [{player.getCurrentServer().hostname} ~{terminal.cwd()}]>
+
+ [{Player.getCurrentServer().hostname} ~{Terminal.cwd()}]>
),
spellCheck: false,
diff --git a/src/Terminal/ui/TerminalRoot.tsx b/src/Terminal/ui/TerminalRoot.tsx
index ef1e99662..6eab48a5a 100644
--- a/src/Terminal/ui/TerminalRoot.tsx
+++ b/src/Terminal/ui/TerminalRoot.tsx
@@ -7,9 +7,8 @@ import { Theme } from "@mui/material/styles";
import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles";
import Box from "@mui/material/Box";
-import { ITerminal, Output, Link, RawOutput } from "../ITerminal";
-import { IRouter } from "../../ui/Router";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Output, Link, RawOutput } from "../ITerminal";
+import { Terminal } from "../../Terminal";
import { TerminalInput } from "./TerminalInput";
import { TerminalEvents, TerminalClearEvents } from "../TerminalEvents";
import { BitFlumeModal } from "../../BitNode/ui/BitFlumeModal";
@@ -18,14 +17,10 @@ import { CodingContractModal } from "../../ui/React/CodingContractModal";
import _ from "lodash";
import { ANSIITypography } from "../../ui/React/ANSIITypography";
-interface IActionTimerProps {
- terminal: ITerminal;
-}
-
-function ActionTimer({ terminal }: IActionTimerProps): React.ReactElement {
+function ActionTimer(): React.ReactElement {
return (
- {terminal.getProgressText()}
+ {Terminal.getProgressText()}
);
}
@@ -47,13 +42,7 @@ const useStyles = makeStyles((theme: Theme) =>
}),
);
-interface IProps {
- terminal: ITerminal;
- router: IRouter;
- player: IPlayer;
-}
-
-export function TerminalRoot({ terminal, router, player }: IProps): React.ReactElement {
+export function TerminalRoot(): React.ReactElement {
const scrollHook = useRef(null);
const setRerender = useState(0)[1];
const [key, setKey] = useState(0);
@@ -108,7 +97,7 @@ export function TerminalRoot({ terminal, router, player }: IProps): React.ReactE
<>
- {terminal.outputHistory.map((item, i) => (
+ {Terminal.outputHistory.map((item, i) => (
{item instanceof Output &&
{item.hostname}
@@ -134,16 +123,16 @@ export function TerminalRoot({ terminal, router, player }: IProps): React.ReactE
))}
- {terminal.action !== null && (
+ {Terminal.action !== null && (
-
)}
-
();
const predefinedThemes = getPredefinedThemes();
@@ -80,7 +75,7 @@ export function ThemeBrowser({ router }: IProps): React.ReactElement {
-
{themes}
diff --git a/src/Themes/ui/ThemeEditorButton.tsx b/src/Themes/ui/ThemeEditorButton.tsx
index e2509802f..7e03de676 100644
--- a/src/Themes/ui/ThemeEditorButton.tsx
+++ b/src/Themes/ui/ThemeEditorButton.tsx
@@ -2,14 +2,9 @@ import React, { useState } from "react";
import Button from "@mui/material/Button";
import Tooltip from "@mui/material/Tooltip";
import { ThemeEditorModal } from "./ThemeEditorModal";
-import { IRouter } from "../../ui/Router";
import ColorizeIcon from "@mui/icons-material/Colorize";
-interface IProps {
- router: IRouter;
-}
-
-export function ThemeEditorButton({ router }: IProps): React.ReactElement {
+export function ThemeEditorButton(): React.ReactElement {
const [themeEditorOpen, setThemeEditorOpen] = useState(false);
return (
<>
@@ -18,7 +13,7 @@ export function ThemeEditorButton({ router }: IProps): React.ReactElement {
Theme Editor
- setThemeEditorOpen(false)} router={router} />
+ setThemeEditorOpen(false)} />
);
}
diff --git a/src/Themes/ui/ThemeEditorModal.tsx b/src/Themes/ui/ThemeEditorModal.tsx
index 11d5b57ff..f8fd3d823 100644
--- a/src/Themes/ui/ThemeEditorModal.tsx
+++ b/src/Themes/ui/ThemeEditorModal.tsx
@@ -15,13 +15,12 @@ import { ThemeEvents } from "./Theme";
import { Settings, defaultSettings } from "../../Settings/Settings";
import { defaultTheme } from "../Themes";
import { UserInterfaceTheme } from "../../ScriptEditor/NetscriptDefinitions";
-import { IRouter } from "../../ui/Router";
+import { Router } from "../../ui/GameRoot";
import { ThemeCollaborate } from "./ThemeCollaborate";
interface IProps {
open: boolean;
onClose: () => void;
- router: IRouter;
}
interface IColorEditorProps {
@@ -381,7 +380,7 @@ export function ThemeEditorModal(props: IProps): React.ReactElement {
-
diff --git a/src/Work/ClassWork.tsx b/src/Work/ClassWork.tsx
index 1a5d7dc63..3690978d6 100644
--- a/src/Work/ClassWork.tsx
+++ b/src/Work/ClassWork.tsx
@@ -6,7 +6,7 @@ import { numeralWrapper } from "../ui/numeralFormat";
import { dialogBoxCreate } from "../ui/React/DialogBox";
import { Money } from "../ui/React/Money";
import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { calculateClassEarnings as calculateClassEarningsRate } from "./formulas/Class";
import { Work, WorkType } from "./Work";
import { applyWorkStats, newWorkStats, sumWorkStats, WorkStats } from "./WorkStats";
@@ -146,14 +146,14 @@ export class ClassWork extends Work {
return Classes[this.classType];
}
- calculateRates(player: IPlayer): WorkStats {
- return calculateClassEarningsRate(player, player, this.classType, this.location);
+ calculateRates(): WorkStats {
+ return calculateClassEarningsRate(Player, this.classType, this.location);
}
- process(player: IPlayer, cycles: number): boolean {
+ process(cycles: number): boolean {
this.cyclesWorked += cycles;
- const rate = this.calculateRates(player);
- const earnings = applyWorkStats(player, player, rate, cycles, "class");
+ const rate = this.calculateRates();
+ const earnings = applyWorkStats(Player, rate, cycles, "class");
this.earnings = sumWorkStats(this.earnings, earnings);
return false;
}
diff --git a/src/Work/CompanyWork.tsx b/src/Work/CompanyWork.tsx
index f601904eb..85110951d 100644
--- a/src/Work/CompanyWork.tsx
+++ b/src/Work/CompanyWork.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
-import { IPlayer } from "src/PersonObjects/IPlayer";
+import { Player } from "../Player";
import { Work, WorkType } from "./Work";
import { influenceStockThroughCompanyWork } from "../StockMarket/PlayerInfluencing";
import { LocationName } from "../Locations/data/LocationNames";
@@ -33,19 +33,19 @@ export class CompanyWork extends Work {
return c;
}
- getGainRates(player: IPlayer): WorkStats {
+ getGainRates(): WorkStats {
let focusBonus = 1;
- if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
- focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
+ if (!Player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
+ focusBonus = Player.focus ? 1 : CONSTANTS.BaseFocusBonus;
}
- return scaleWorkStats(calculateCompanyWorkStats(player, player, this.getCompany()), focusBonus);
+ return scaleWorkStats(calculateCompanyWorkStats(Player, this.getCompany()), focusBonus);
}
- process(player: IPlayer, cycles: number): boolean {
+ process(cycles: number): boolean {
this.cyclesWorked += cycles;
const company = this.getCompany();
- const gains = this.getGainRates(player);
- applyWorkStats(player, player, gains, cycles, "work");
+ const gains = this.getGainRates();
+ applyWorkStats(Player, gains, cycles, "work");
company.playerReputation += gains.reputation * cycles;
influenceStockThroughCompanyWork(company, gains.reputation, cycles);
return false;
diff --git a/src/Work/CreateProgramWork.ts b/src/Work/CreateProgramWork.ts
index be5cf30f3..1a8e97070 100644
--- a/src/Work/CreateProgramWork.ts
+++ b/src/Work/CreateProgramWork.ts
@@ -2,7 +2,7 @@ import { dialogBoxCreate } from "../ui/React/DialogBox";
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
import { CONSTANTS } from "../Constants";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { Programs } from "../Programs/Programs";
import { Work, WorkType } from "./Work";
import { Program } from "../Programs/Program";
@@ -13,7 +13,6 @@ export const isCreateProgramWork = (w: Work | null): w is CreateProgramWork =>
interface CreateProgramWorkParams {
programName: string;
singularity: boolean;
- player: IPlayer;
}
export class CreateProgramWork extends Work {
@@ -26,10 +25,9 @@ export class CreateProgramWork extends Work {
this.unitCompleted = 0;
this.programName = params?.programName ?? "";
- if (params?.player) {
- const player = params.player;
- for (let i = 0; i < player.getHomeComputer().programs.length; ++i) {
- const programFile = player.getHomeComputer().programs[i];
+ if (params) {
+ for (let i = 0; i < Player.getHomeComputer().programs.length; ++i) {
+ const programFile = Player.getHomeComputer().programs[i];
if (programFile.startsWith(this.programName) && programFile.endsWith("%-INC")) {
const res = programFile.split("-");
if (res.length != 3) {
@@ -40,7 +38,7 @@ export class CreateProgramWork extends Work {
break;
}
this.unitCompleted = (percComplete / 100) * this.unitNeeded();
- player.getHomeComputer().programs.splice(i, 1);
+ Player.getHomeComputer().programs.splice(i, 1);
}
}
}
@@ -56,14 +54,14 @@ export class CreateProgramWork extends Work {
return p;
}
- process(player: IPlayer, cycles: number): boolean {
+ process(cycles: number): boolean {
let focusBonus = 1;
- if (!player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
- focusBonus = player.focus ? 1 : CONSTANTS.BaseFocusBonus;
+ if (!Player.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
+ focusBonus = Player.focus ? 1 : CONSTANTS.BaseFocusBonus;
}
//Higher hacking skill will allow you to create programs faster
const reqLvl = this.getProgram().create?.level ?? 0;
- let skillMult = (player.skills.hacking / reqLvl) * player.getIntelligenceBonus(3); //This should always be greater than 1;
+ let skillMult = (Player.skills.hacking / reqLvl) * Player.getIntelligenceBonus(3); //This should always be greater than 1;
skillMult = 1 + (skillMult - 1) / 5; //The divider constant can be adjusted as necessary
skillMult *= focusBonus;
//Skill multiplier directly applied to "time worked"
@@ -75,11 +73,11 @@ export class CreateProgramWork extends Work {
}
return false;
}
- finish(player: IPlayer, cancelled: boolean): void {
+ finish(cancelled: boolean): void {
const programName = this.programName;
if (!cancelled) {
//Complete case
- player.gainIntelligenceExp(
+ Player.gainIntelligenceExp(
(CONSTANTS.IntelligenceProgramBaseExpGain * this.cyclesWorked * CONSTANTS._idleSpeed) / 1000,
);
if (!this.singularity) {
@@ -90,14 +88,14 @@ export class CreateProgramWork extends Work {
dialogBoxCreate(lines.join(";
abstract toJSON(): IReviverValue;
}
diff --git a/src/Work/WorkStats.ts b/src/Work/WorkStats.ts
index 07472df41..ac3c5f25e 100644
--- a/src/Work/WorkStats.ts
+++ b/src/Work/WorkStats.ts
@@ -1,5 +1,5 @@
import { IPerson } from "src/PersonObjects/IPerson";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
export interface WorkStats {
money: number;
@@ -69,7 +69,6 @@ export const scaleWorkStats = (w: WorkStats, n: number, scaleMoney = true): Work
};
export const applyWorkStats = (
- player: IPlayer,
target: IPerson,
workStats: WorkStats,
cycles: number,
@@ -87,7 +86,7 @@ export const applyWorkStats = (
chaExp: expStats.chaExp,
intExp: expStats.intExp,
};
- player.gainMoney(gains.money, source);
+ Player.gainMoney(gains.money, source);
return gains;
};
diff --git a/src/Work/formulas/Class.ts b/src/Work/formulas/Class.ts
index b5263498c..46509366b 100644
--- a/src/Work/formulas/Class.ts
+++ b/src/Work/formulas/Class.ts
@@ -2,7 +2,7 @@ import { Locations } from "../../Locations/Locations";
import { Location } from "../../Locations/Location";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { CONSTANTS } from "../../Constants";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { Class, Classes, ClassType } from "../ClassWork";
import { WorkStats } from "../WorkStats";
import { Server } from "../../Server/Server";
@@ -21,13 +21,12 @@ export function calculateCost(classs: Class, location: Location): number {
}
export function calculateClassEarnings(
- player: IPlayer,
- target: IPerson,
+ person: IPerson,
type: ClassType,
locationName: LocationName,
): WorkStats {
//Find cost and exp gain per game cycle
- const hashManager = player.hashManager;
+ const hashManager = Player.hashManager;
const classs = Classes[type];
const location = Locations[locationName];
@@ -47,12 +46,12 @@ export function calculateClassEarnings(
return {
money: cost,
reputation: 0,
- hackExp: hackExp * target.mults.hacking_exp * BitNodeMultipliers.ClassGymExpGain,
- strExp: strExp * target.mults.strength_exp * BitNodeMultipliers.ClassGymExpGain,
- defExp: defExp * target.mults.defense_exp * BitNodeMultipliers.ClassGymExpGain,
- dexExp: dexExp * target.mults.dexterity_exp * BitNodeMultipliers.ClassGymExpGain,
- agiExp: agiExp * target.mults.agility_exp * BitNodeMultipliers.ClassGymExpGain,
- chaExp: chaExp * target.mults.charisma_exp * BitNodeMultipliers.ClassGymExpGain,
+ hackExp: hackExp * person.mults.hacking_exp * BitNodeMultipliers.ClassGymExpGain,
+ strExp: strExp * person.mults.strength_exp * BitNodeMultipliers.ClassGymExpGain,
+ defExp: defExp * person.mults.defense_exp * BitNodeMultipliers.ClassGymExpGain,
+ dexExp: dexExp * person.mults.dexterity_exp * BitNodeMultipliers.ClassGymExpGain,
+ agiExp: agiExp * person.mults.agility_exp * BitNodeMultipliers.ClassGymExpGain,
+ chaExp: chaExp * person.mults.charisma_exp * BitNodeMultipliers.ClassGymExpGain,
intExp: 0,
};
}
diff --git a/src/Work/formulas/Company.ts b/src/Work/formulas/Company.ts
index 40b757161..801b8813b 100644
--- a/src/Work/formulas/Company.ts
+++ b/src/Work/formulas/Company.ts
@@ -1,13 +1,13 @@
import { CompanyPositions } from "../../Company/CompanyPositions";
import { Company } from "../../Company/Company";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { WorkStats } from "../WorkStats";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { CONSTANTS } from "../../Constants";
import { IPerson } from "src/PersonObjects/IPerson";
-export const calculateCompanyWorkStats = (player: IPlayer, worker: IPerson, company: Company): WorkStats => {
- const companyPositionName = player.jobs[company.name];
+export const calculateCompanyWorkStats = (worker: IPerson, company: Company): WorkStats => {
+ const companyPositionName = Player.jobs[company.name];
const companyPosition = CompanyPositions[companyPositionName];
// If player has SF-11, calculate salary multiplier from favor
@@ -17,7 +17,7 @@ export const calculateCompanyWorkStats = (player: IPlayer, worker: IPerson, comp
}
let bn11Mult = 1;
- if (player.sourceFileLvl(11) > 0) {
+ if (Player.sourceFileLvl(11) > 0) {
bn11Mult = favorMult;
}
diff --git a/src/engine.tsx b/src/engine.tsx
index f7037ee06..03ceac12d 100644
--- a/src/engine.tsx
+++ b/src/engine.tsx
@@ -91,7 +91,7 @@ const Engine: {
Player.playtimeSinceLastAug += time;
Player.playtimeSinceLastBitnode += time;
- Terminal.process(Router, Player, numCycles);
+ Terminal.process(numCycles);
Player.processWork(numCycles);
@@ -120,7 +120,7 @@ const Engine: {
// Sleeves
for (let i = 0; i < Player.sleeves.length; ++i) {
- Player.sleeves[i].process(Player, numCycles);
+ Player.sleeves[i].process(numCycles);
}
// Counters
@@ -131,7 +131,7 @@ const Engine: {
updateOnlineScriptTimes(numCycles);
// Hacknet Nodes
- processHacknetEarnings(Player, numCycles);
+ processHacknetEarnings(numCycles);
},
/**
@@ -205,12 +205,12 @@ const Engine: {
}
}
if (Player.corporation instanceof Corporation) {
- Player.corporation.process(Player);
+ Player.corporation.process();
}
if (Engine.Counters.mechanicProcess <= 0) {
if (Player.bladeburner instanceof Bladeburner) {
try {
- Player.bladeburner.process(Router, Player);
+ Player.bladeburner.process();
} catch (e) {
exceptionAlert("Exception caught in Bladeburner.process(): " + e);
}
@@ -240,7 +240,7 @@ const Engine: {
if (loadGame(saveString)) {
ThemeEvents.emit();
- initBitNodeMultipliers(Player);
+ initBitNodeMultipliers();
initAugmentations(); // Also calls Player.reapplyAllAugmentations()
Player.reapplyAllSourceFiles();
if (Player.hasWseAccount) {
@@ -308,8 +308,8 @@ const Engine: {
}
// Hacknet Nodes offline progress
- const offlineProductionFromHacknetNodes = processHacknetEarnings(Player, numCyclesOffline);
- const hacknetProdInfo = hasHacknetServers(Player) ? (
+ const offlineProductionFromHacknetNodes = processHacknetEarnings(numCyclesOffline);
+ const hacknetProdInfo = hasHacknetServers() ? (
<>
{
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
this.setState({
errorInfo,
- page: this.props.router.page(),
+ page: Router.page(),
});
console.error(error, errorInfo);
}
@@ -47,14 +47,7 @@ export class ErrorBoundary extends React.Component {
}
}
- return (
- this.reset()}
- />
- );
+ return this.reset()} />;
}
return this.props.children;
}
diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx
index 933521ac3..b7d48c2a2 100644
--- a/src/ui/GameRoot.tsx
+++ b/src/ui/GameRoot.tsx
@@ -1,8 +1,6 @@
import React, { useState, useEffect } from "react";
import { Player } from "../Player";
-import { Engine } from "../engine";
-import { Terminal } from "../Terminal";
import { installAugmentations } from "../Augmentation/AugmentationHelpers";
import { saveObject } from "../SaveObject";
import { onExport } from "../ExportBonus";
@@ -311,7 +309,7 @@ export function GameRoot(): React.ReactElement {
let bypassGame = false;
switch (page) {
case Page.Recovery: {
- mainPage = saveObject.saveGame()}
export={() => {
// Apply the export bonus before saving the game
- onExport(Player);
+ onExport();
saveObject.exportGame();
}}
forceKill={killAllScripts}
@@ -463,7 +451,7 @@ export function GameRoot(): React.ReactElement {
{
// Apply the export bonus before saving the game
- onExport(Player);
+ onExport();
saveObject.exportGame();
}}
installAugmentationsFn={() => {
@@ -478,11 +466,11 @@ export function GameRoot(): React.ReactElement {
break;
}
case Page.ThemeBrowser: {
- mainPage =
-
+
@@ -505,8 +493,6 @@ export function GameRoot(): React.ReactElement {
{withSidebar ? (
{
diff --git a/src/ui/React/CharacterOverview.tsx b/src/ui/React/CharacterOverview.tsx
index adbcdc2f5..c4f2ab166 100644
--- a/src/ui/React/CharacterOverview.tsx
+++ b/src/ui/React/CharacterOverview.tsx
@@ -197,7 +197,7 @@ function Work(): React.ReactElement {
<>
{numeralWrapper.formatMoney(props.money)} ;
+ if (props.forPurchase){
+ if (typeof props.money !== "number") throw new Error("if value is for a purchase, money should be number, contact dev");
+ if (!Player.canAfford(props.money)) return {numeralWrapper.formatMoney(props.money)} ;
}
return (
diff --git a/src/ui/React/RecoveryRoot.tsx b/src/ui/React/RecoveryRoot.tsx
index 341cb791f..20f24acf2 100644
--- a/src/ui/React/RecoveryRoot.tsx
+++ b/src/ui/React/RecoveryRoot.tsx
@@ -3,7 +3,7 @@ import React, { useEffect } from "react";
import { Typography, Link, Button, ButtonGroup, Tooltip, Box, Paper, TextField } from "@mui/material";
import { Settings } from "../../Settings/Settings";
import { load } from "../../db";
-import { IRouter } from "../Router";
+import { Router } from "../GameRoot";
import { download } from "../../SaveObject";
import { IErrorData, newIssueUrl } from "../../utils/ErrorHelper";
import { DeleteGameButton } from "./DeleteGameButton";
@@ -19,17 +19,16 @@ export function ActivateRecoveryMode(): void {
}
interface IProps {
- router: IRouter;
softReset: () => void;
errorData?: IErrorData;
resetError?: () => void;
}
-export function RecoveryRoot({ router, softReset, errorData, resetError }: IProps): React.ReactElement {
+export function RecoveryRoot({ softReset, errorData, resetError }: IProps): React.ReactElement {
function recover(): void {
if (resetError) resetError();
RecoveryMode = false;
- router.toTerminal();
+ Router.toTerminal();
}
Settings.AutosaveInterval = 0;
diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx
index f99730478..dd518ec6d 100644
--- a/src/ui/WorkInProgressRoot.tsx
+++ b/src/ui/WorkInProgressRoot.tsx
@@ -10,7 +10,8 @@ import { LocationName } from "../Locations/data/LocationNames";
import { Locations } from "../Locations/Locations";
import { Settings } from "../Settings/Settings";
import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
-import { use } from "./Context";
+import { Player } from "../Player";
+import { Router } from "./GameRoot"
import { numeralWrapper } from "./numeralFormat";
import { Money } from "./React/Money";
import { MoneyRate } from "./React/MoneyRate";
@@ -202,9 +203,6 @@ export function WorkInProgressRoot(): React.ReactElement {
return () => clearInterval(id);
}, []);
- const player = use.Player();
- const router = use.Router();
-
let workInfo: IWorkInfo = {
buttons: {
cancel: () => undefined,
@@ -213,25 +211,25 @@ export function WorkInProgressRoot(): React.ReactElement {
stopText: "",
};
- if (player.currentWork === null) {
- setTimeout(() => router.toTerminal());
+ if (Player.currentWork === null) {
+ setTimeout(() => Router.toTerminal());
return <>;
}
- if (isCrimeWork(player.currentWork)) {
- const crime = player.currentWork.getCrime();
- const completion = (player.currentWork.unitCompleted / crime.time) * 100;
- const gains = player.currentWork.earnings();
- const successChance = crime.successRate(player);
+ if (isCrimeWork(Player.currentWork)) {
+ const crime = Player.currentWork.getCrime();
+ const completion = (Player.currentWork.unitCompleted / crime.time) * 100;
+ const gains = Player.currentWork.earnings();
+ const successChance = crime.successRate(Player);
workInfo = {
buttons: {
cancel: () => {
- router.toLocation(Locations[LocationName.Slums]);
- player.finishWork(true);
+ Router.toLocation(Locations[LocationName.Slums]);
+ Player.finishWork(true);
},
unfocus: () => {
- router.toCity();
- player.stopFocusing();
+ Router.toCity();
+ Player.stopFocusing();
},
},
title: `You are attempting ${crime.workName}`,
@@ -247,7 +245,7 @@ export function WorkInProgressRoot(): React.ReactElement {
...CrimeExpRows(gains),
],
progress: {
- remaining: crime.time - player.currentWork.unitCompleted,
+ remaining: crime.time - Player.currentWork.unitCompleted,
percentage: completion,
},
@@ -255,16 +253,16 @@ export function WorkInProgressRoot(): React.ReactElement {
};
}
- if (isClassWork(player.currentWork)) {
- const classWork = player.currentWork;
+ if (isClassWork(Player.currentWork)) {
+ const classWork = Player.currentWork;
function cancel(): void {
- player.finishWork(true);
- router.toCity();
+ Player.finishWork(true);
+ Router.toCity();
}
function unfocus(): void {
- router.toCity();
- player.stopFocusing();
+ Router.toCity();
+ Player.stopFocusing();
}
let stopText = "";
@@ -274,7 +272,7 @@ export function WorkInProgressRoot(): React.ReactElement {
stopText = "Stop taking course";
}
- const rates = classWork.calculateRates(player);
+ const rates = classWork.calculateRates();
workInfo = {
buttons: {
cancel: cancel,
@@ -302,15 +300,15 @@ export function WorkInProgressRoot(): React.ReactElement {
};
}
- if (isCreateProgramWork(player.currentWork)) {
- const create = player.currentWork;
+ if (isCreateProgramWork(Player.currentWork)) {
+ const create = Player.currentWork;
function cancel(): void {
- player.finishWork(true);
- router.toTerminal();
+ Player.finishWork(true);
+ Router.toTerminal();
}
function unfocus(): void {
- router.toTerminal();
- player.stopFocusing();
+ Router.toTerminal();
+ Player.stopFocusing();
}
const completion = (create.unitCompleted / create.unitNeeded()) * 100;
@@ -336,15 +334,15 @@ export function WorkInProgressRoot(): React.ReactElement {
};
}
- if (isGraftingWork(player.currentWork)) {
- const graft = player.currentWork;
+ if (isGraftingWork(Player.currentWork)) {
+ const graft = Player.currentWork;
function cancel(): void {
- player.finishWork(true);
- router.toTerminal();
+ Player.finishWork(true);
+ Router.toTerminal();
}
function unfocus(): void {
- router.toTerminal();
- player.stopFocusing();
+ Router.toTerminal();
+ Player.stopFocusing();
}
workInfo = {
@@ -372,15 +370,15 @@ export function WorkInProgressRoot(): React.ReactElement {
};
}
- if (isFactionWork(player.currentWork)) {
- const faction = player.currentWork.getFaction();
+ if (isFactionWork(Player.currentWork)) {
+ const faction = Player.currentWork.getFaction();
if (!faction) {
workInfo = {
buttons: {
- cancel: () => router.toFactions(),
+ cancel: () => Router.toFactions(),
},
title:
- `You have not joined ${player.currentWork.factionName || "(Faction not found)"} at this time,` +
+ `You have not joined ${Player.currentWork.factionName || "(Faction not found)"} at this time,` +
" please try again if you think this should have worked",
stopText: "Back to Factions",
@@ -388,12 +386,12 @@ export function WorkInProgressRoot(): React.ReactElement {
}
function cancel(): void {
- router.toFaction(faction);
- player.finishWork(true);
+ Router.toFaction(faction);
+ Player.finishWork(true);
}
function unfocus(): void {
- router.toFaction(faction);
- player.stopFocusing();
+ Router.toFaction(faction);
+ Player.stopFocusing();
}
const description = {
@@ -402,7 +400,7 @@ export function WorkInProgressRoot(): React.ReactElement {
[FactionWorkType.SECURITY]: "performing security detail",
};
- const exp = player.currentWork.getExpRates(player);
+ const exp = Player.currentWork.getExpRates();
workInfo = {
buttons: {
@@ -411,34 +409,34 @@ export function WorkInProgressRoot(): React.ReactElement {
},
title: (
<>
- You are currently {description[player.currentWork.factionWorkType]} for {faction.name}
+ You are currently {description[Player.currentWork.factionWorkType]} for {faction.name}
),
description: (
<>
Current Faction Reputation: {position} at {player.currentWork.companyName}
+ You are currently working as a {position} at {Player.currentWork.companyName}
),
@@ -488,7 +486,7 @@ export function WorkInProgressRoot(): React.ReactElement {
...ExpRows(gains),
],
progress: {
- elapsed: player.currentWork.cyclesWorked * CONSTANTS._idleSpeed,
+ elapsed: Player.currentWork.cyclesWorked * CONSTANTS._idleSpeed,
},
stopText: "Stop working",
From a21b1029d7c32fc79b9512339b4c2a1edb74e1a0 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 12 Sep 2022 18:00:09 -0400
Subject: [PATCH 13/46] No more player/router context
---
src/Arcade/ui/ArcadeRoot.tsx | 5 +-
src/Arcade/ui/BBCabinet.tsx | 5 +-
src/Augmentation/ui/AugmentationsRoot.tsx | 11 +-
.../ui/InstalledAugmentations.tsx | 5 +-
.../ui/PurchaseAugmentationModal.tsx | 6 +-
src/BitNode/ui/BitFlumeModal.tsx | 5 +-
.../ui/BitnodeMultipliersDescription.tsx | 17 +-
src/BitNode/ui/BitverseRoot.tsx | 26 +--
src/BitNode/ui/PortalModal.tsx | 7 +-
src/Bladeburner/ui/ActionLevel.tsx | 3 -
src/Bladeburner/ui/BlackOpPage.tsx | 5 +-
src/Bladeburner/ui/BladeburnerCinematic.tsx | 5 +-
src/Bladeburner/ui/BladeburnerRoot.tsx | 8 +-
src/Bladeburner/ui/StartButton.tsx | 5 +-
src/Company/ui/QuitJobModal.tsx | 5 +-
src/Corporation/ICorporation.ts | 5 +-
src/Corporation/ui/CorporationRoot.tsx | 5 +-
src/Corporation/ui/Industry.tsx | 2 -
src/Corporation/ui/Overview.tsx | 8 +-
.../ui/modals/BribeFactionModal.tsx | 9 +-
.../ui/modals/BuybackSharesModal.tsx | 5 +-
.../ui/modals/CreateCorporationModal.tsx | 23 ++-
src/Corporation/ui/modals/SellSharesModal.tsx | 2 -
src/Crime/Crime.ts | 6 +-
src/Exploits/Unclickable.tsx | 5 +-
src/Faction/FactionInfo.tsx | 8 +-
src/Faction/ui/CreateGangModal.tsx | 9 +-
src/Faction/ui/GangButton.tsx | 19 +-
src/Faction/ui/InvitationModal.tsx | 5 +-
src/GameOptions/ui/GameplayPage.tsx | 5 +-
src/Gang/GangMember.ts | 10 +-
src/Gang/ui/EquipmentsSubpage.tsx | 11 +-
src/Gang/ui/GangRoot.tsx | 7 +-
src/Infiltration/ui/Game.tsx | 15 +-
src/Infiltration/ui/GameTimer.tsx | 5 +-
src/Infiltration/ui/InfiltrationRoot.tsx | 11 +-
src/Infiltration/ui/Victory.tsx | 19 +-
src/Locations/ui/ApplyToJobButton.tsx | 6 +-
src/Locations/ui/City.tsx | 21 +--
src/Locations/ui/CompanyLocation.tsx | 39 ++---
src/Locations/ui/PurchaseServerModal.tsx | 5 +-
src/Locations/ui/SlumsLocation.tsx | 101 ++++++-----
src/Locations/ui/SpecialLocation.tsx | 86 +++++----
src/Locations/ui/TravelConfirmationModal.tsx | 2 -
src/Locations/ui/UniversityLocation.tsx | 12 +-
src/NetscriptFunctions/Gang.ts | 2 +-
src/NetscriptFunctions/Singularity.ts | 6 +-
.../Sleeve/ui/CovenantPurchasesRoot.tsx | 25 ++-
src/PersonObjects/Sleeve/ui/SleeveRoot.tsx | 5 +-
src/RedPill.tsx | 8 +-
src/ui/ActiveScripts/ScriptProduction.tsx | 7 +-
src/ui/CharacterStats.tsx | 165 +++++++++---------
src/ui/Context.ts | 19 --
src/ui/GameRoot.tsx | 4 +-
src/ui/React/CharacterOverview.tsx | 115 ++++++------
src/ui/React/Overview.tsx | 5 +-
56 files changed, 418 insertions(+), 527 deletions(-)
delete mode 100644 src/ui/Context.ts
diff --git a/src/Arcade/ui/ArcadeRoot.tsx b/src/Arcade/ui/ArcadeRoot.tsx
index efb1f92d9..ff353313e 100644
--- a/src/Arcade/ui/ArcadeRoot.tsx
+++ b/src/Arcade/ui/ArcadeRoot.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import { BBCabinetRoot } from "./BBCabinet";
import Button from "@mui/material/Button";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { AlertEvents } from "../../ui/React/AlertManager";
enum Page {
@@ -11,11 +11,10 @@ enum Page {
}
export function ArcadeRoot(): React.ReactElement {
- const player = use.Player();
const [page, setPage] = useState(Page.None);
function mbBurner2000(): void {
- if (player.sourceFileLvl(1) === 0) {
+ if (Player.sourceFileLvl(1) === 0) {
AlertEvents.emit("This machine is broken.");
} else {
setPage(Page.Megabyteburner2000);
diff --git a/src/Arcade/ui/BBCabinet.tsx b/src/Arcade/ui/BBCabinet.tsx
index b0627b2f0..1b3c95a85 100644
--- a/src/Arcade/ui/BBCabinet.tsx
+++ b/src/Arcade/ui/BBCabinet.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from "react";
import Typography from "@mui/material/Typography";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { Exploit } from "../../Exploits/Exploit";
const metaBB = "https://bitburner-official.github.io/bitburner-legacy/";
@@ -12,11 +12,10 @@ const style = {
};
export function BBCabinetRoot(): React.ReactElement {
- const player = use.Player();
useEffect(() => {
window.addEventListener("message", function (this: Window, ev: MessageEvent) {
if (ev.isTrusted && ev.origin == "https://bitburner-official.github.io" && ev.data) {
- player.giveExploit(Exploit.TrueRecursion);
+ Player.giveExploit(Exploit.TrueRecursion);
}
});
});
diff --git a/src/Augmentation/ui/AugmentationsRoot.tsx b/src/Augmentation/ui/AugmentationsRoot.tsx
index f5d024c86..912ebf540 100644
--- a/src/Augmentation/ui/AugmentationsRoot.tsx
+++ b/src/Augmentation/ui/AugmentationsRoot.tsx
@@ -10,8 +10,6 @@ import { PurchasedAugmentations } from "./PurchasedAugmentations";
import { SourceFilesElement } from "./SourceFiles";
import { canGetBonus } from "../../ExportBonus";
-import { use } from "../../ui/Context";
-
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import Tooltip from "@mui/material/Tooltip";
@@ -86,7 +84,6 @@ interface IProps {
export function AugmentationsRoot(props: IProps): React.ReactElement {
const [installOpen, setInstallOpen] = useState(false);
- const player = use.Player();
const setRerender = useState(false)[1];
function rerender(): void {
setRerender((o) => !o);
@@ -179,7 +176,7 @@ export function AugmentationsRoot(props: IProps): React.ReactElement {
'I never asked for this' }>
-
+
Install Augmentations
@@ -191,7 +188,7 @@ export function AugmentationsRoot(props: IProps): React.ReactElement {
- {player.queuedAugmentations.length > 0 ? (
+ {Player.queuedAugmentations.length > 0 ? (
@@ -277,8 +276,7 @@ function InfiltrationMults({ mults }: IMultsProps): React.ReactElement {
}
function BladeburnerMults({ mults }: IMultsProps): React.ReactElement {
- const player = use.Player();
- if (!player.canAccessBladeburner()) return <>;
+ if (!Player.canAccessBladeburner()) return <>;
if (mults.BladeburnerRank === 0) {
const rows: IBNMultRows = {
@@ -297,8 +295,7 @@ function BladeburnerMults({ mults }: IMultsProps): React.ReactElement {
}
function StanekMults({ mults }: IMultsProps): React.ReactElement {
- const player = use.Player();
- if (!player.canAccessCotMG()) return <>;
+ if (!Player.canAccessCotMG()) return <>;
const extraSize = mults.StaneksGiftExtraSize.toFixed(3);
const rows: IBNMultRows = {
@@ -313,8 +310,7 @@ function StanekMults({ mults }: IMultsProps): React.ReactElement {
}
function GangMults({ mults }: IMultsProps): React.ReactElement {
- const player = use.Player();
- if (player.bitNodeN !== 2 && player.sourceFileLvl(2) <= 0) return <>;
+ if (Player.bitNodeN !== 2 && Player.sourceFileLvl(2) <= 0) return <>;
const rows: IBNMultRows = {
GangSoftcap: {
@@ -328,8 +324,7 @@ function GangMults({ mults }: IMultsProps): React.ReactElement {
}
function CorporationMults({ mults }: IMultsProps): React.ReactElement {
- const player = use.Player();
- if (!player.canAccessCorporation()) return <>;
+ if (!Player.canAccessCorporation()) return <>;
if (mults.CorporationSoftcap < 0.15) {
const rows: IBNMultRows = {
diff --git a/src/BitNode/ui/BitverseRoot.tsx b/src/BitNode/ui/BitverseRoot.tsx
index 280e72bb0..a3483f832 100644
--- a/src/BitNode/ui/BitverseRoot.tsx
+++ b/src/BitNode/ui/BitverseRoot.tsx
@@ -1,10 +1,8 @@
import React, { useState } from "react";
-import { IRouter } from "../../ui/Router";
import { BitNodes } from "../BitNode";
-import { enterBitNode } from "../../RedPill";
import { PortalModal } from "./PortalModal";
import { CinematicText } from "../../ui/React/CinematicText";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles";
import IconButton from "@mui/material/IconButton";
@@ -46,7 +44,6 @@ interface IPortalProps {
level: number;
destroyedBitNode: number;
flume: boolean;
- enter: (router: IRouter, flume: boolean, destroyedBitNode: number, newBitNode: number) => void;
}
function BitNodePortal(props: IPortalProps): React.ReactElement {
const [portalOpen, setPortalOpen] = useState(false);
@@ -105,7 +102,6 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
onClose={() => setPortalOpen(false)}
n={props.n}
level={props.level}
- enter={props.enter}
destroyedBitNode={props.destroyedBitNode}
flume={props.flume}
/>
@@ -118,13 +114,10 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
interface IProps {
flume: boolean;
quick: boolean;
- enter: (router: IRouter, flume: boolean, destroyedBitNode: number, newBitNode: number) => void;
}
export function BitverseRoot(props: IProps): React.ReactElement {
- const player = use.Player();
- const enter = enterBitNode;
- const destroyed = player.bitNodeN;
+ const destroyed = Player.bitNodeN;
const [destroySequence, setDestroySequence] = useState(!props.quick);
if (destroySequence) {
@@ -158,7 +151,7 @@ export function BitverseRoot(props: IProps): React.ReactElement {
}
const nextSourceFileLvl = (n: number): number => {
- const lvl = player.sourceFileLvl(n);
+ const lvl = Player.sourceFileLvl(n);
if (n !== destroyed) {
return lvl;
}
@@ -181,7 +174,6 @@ export function BitverseRoot(props: IProps): React.ReactElement {
key={node.number}
n={node.number}
level={nextSourceFileLvl(node.number)}
- enter={enter}
flume={props.flume}
destroyedBitNode={destroyed}
/>
@@ -234,19 +226,19 @@ export function BitverseRoot(props: IProps): React.ReactElement {
O | | | \| | O / _/ | / O | |/ | | | O
| | | |O / | | O / | O O | | \ O| | | |
| | |/ \/ / __| | |/ \ | \ | |__ \ \/ \| | |
- \| O | |_/ |\| \
+ \| O | |_/ |\| \
| | |_/ | | \| / | \_| | |
\| / \| | / / \ |/
- |
-
+ |
+
| | | / / \ \ | | |
- \| | /
+ \| | /
\ | / / | | \ \ | /
- \ \JUMP
+ \ \JUMP
\|| | | | | | | | | ||/
\| \_ | | | | | | _/ |/
\ \| / \ / \ |/ /
-
+
| | | | | | | |
\JUMP3R|JUMP|3R| |R3|PMUJ|R3PMUJ/
@@ -31,7 +30,7 @@ export function BlackOpPage(props: IProps): React.ReactElement {
losses.
{props.bladeburner.blackops[BlackOperationNames.OperationDaedalus] ? (
- router.toBitVerse(false, false)}>
+ Router.toBitVerse(false, false)}>
) : (
diff --git a/src/Bladeburner/ui/BladeburnerCinematic.tsx b/src/Bladeburner/ui/BladeburnerCinematic.tsx
index 5be3e1030..8ce17ea5c 100644
--- a/src/Bladeburner/ui/BladeburnerCinematic.tsx
+++ b/src/Bladeburner/ui/BladeburnerCinematic.tsx
@@ -1,11 +1,10 @@
import React from "react";
import { FactionNames } from "../../Faction/data/FactionNames";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
import { CinematicText } from "../../ui/React/CinematicText";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
export function BladeburnerCinematic(): React.ReactElement {
- const router = use.Router();
return (
{
- router.toTerminal();
+ Router.toTerminal();
dialogBoxCreate(
`Visit the National Security Agency (NSA) to apply for their ${FactionNames.Bladeburners} ` +
"division! You will need 100 of each combat stat before doing this.",
diff --git a/src/Bladeburner/ui/BladeburnerRoot.tsx b/src/Bladeburner/ui/BladeburnerRoot.tsx
index ca19f4c93..4d9103939 100644
--- a/src/Bladeburner/ui/BladeburnerRoot.tsx
+++ b/src/Bladeburner/ui/BladeburnerRoot.tsx
@@ -3,12 +3,10 @@ import { Stats } from "./Stats";
import { Console } from "./Console";
import { AllPages } from "./AllPages";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import Box from "@mui/material/Box";
export function BladeburnerRoot(): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const setRerender = useState(false)[1];
function rerender(): void {
setRerender((old) => !old);
@@ -19,8 +17,8 @@ export function BladeburnerRoot(): React.ReactElement {
return () => clearInterval(id);
}, []);
- const bladeburner = player.bladeburner;
- if (bladeburner === null) return <>;
+ const bladeburner = Player.bladeburner;
+ if (!bladeburner) return <>;
return (
diff --git a/src/Bladeburner/ui/StartButton.tsx b/src/Bladeburner/ui/StartButton.tsx
index 2bbedb947..ce03674f3 100644
--- a/src/Bladeburner/ui/StartButton.tsx
+++ b/src/Bladeburner/ui/StartButton.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { IBladeburner } from "../IBladeburner";
import { BlackOperation } from "../BlackOperation";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import Button from "@mui/material/Button";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
@@ -13,7 +13,6 @@ interface IProps {
rerender: () => void;
}
export function StartButton(props: IProps): React.ReactElement {
- const player = use.Player();
const action = props.bladeburner.getActionObject({ name: props.name, type: props.type });
if (action == null) {
throw new Error("Failed to get Operation Object for: " + props.name);
@@ -33,7 +32,7 @@ export function StartButton(props: IProps): React.ReactElement {
if (disabled) return;
props.bladeburner.action.type = props.type;
props.bladeburner.action.name = props.name;
- if (!player.hasAugmentation(AugmentationNames.BladesSimulacrum, true)) player.finishWork(true);
+ if (!Player.hasAugmentation(AugmentationNames.BladesSimulacrum, true)) Player.finishWork(true);
props.bladeburner.startAction(props.bladeburner.action);
props.rerender();
}
diff --git a/src/Company/ui/QuitJobModal.tsx b/src/Company/ui/QuitJobModal.tsx
index 7ee05b506..0b766c28a 100644
--- a/src/Company/ui/QuitJobModal.tsx
+++ b/src/Company/ui/QuitJobModal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { Company } from "../Company";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { Modal } from "../../ui/React/Modal";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
@@ -14,9 +14,8 @@ interface IProps {
}
export function QuitJobModal(props: IProps): React.ReactElement {
- const player = use.Player();
function quit(): void {
- player.quitJob(props.locName);
+ Player.quitJob(props.locName);
props.onQuit();
props.onClose();
}
diff --git a/src/Corporation/ICorporation.ts b/src/Corporation/ICorporation.ts
index 4165d48a8..ea71c6cf5 100644
--- a/src/Corporation/ICorporation.ts
+++ b/src/Corporation/ICorporation.ts
@@ -1,5 +1,4 @@
import { Industry } from "./Industry";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { CorporationUnlockUpgrade } from "./data/CorporationUnlockUpgrades";
import { CorporationUpgrade } from "./data/CorporationUpgrades";
import { CorporationState } from "./CorporationState";
@@ -36,7 +35,7 @@ export interface ICorporation {
addFunds(amt: number): void;
getState(): string;
storeCycles(numCycles: number): void;
- process(player: IPlayer): void;
+ process(): void;
determineValuation(): void;
determineCycleValuation(): number;
getTargetSharePrice(): number;
@@ -56,7 +55,7 @@ export interface ICorporation {
getEmployeeEffMultiplier(): number;
getSalesMultiplier(): number;
getScientificResearchMultiplier(): number;
- getStarterGuide(player: IPlayer): void;
+ getStarterGuide(): void;
updateDividendTax(): void;
getCycleDividends(): number;
toJSON(): IReviverValue;
diff --git a/src/Corporation/ui/CorporationRoot.tsx b/src/Corporation/ui/CorporationRoot.tsx
index bf4766cf0..ba24dbae8 100644
--- a/src/Corporation/ui/CorporationRoot.tsx
+++ b/src/Corporation/ui/CorporationRoot.tsx
@@ -6,7 +6,7 @@ import { IIndustry } from "../IIndustry";
import { MainPanel } from "./MainPanel";
import { Industries } from "../IndustryData";
import { ExpandIndustryTab } from "./ExpandIndustryTab";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { Context } from "./Context";
import { Overview } from "./Overview";
@@ -14,8 +14,7 @@ import Tabs from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";
export function CorporationRoot(): React.ReactElement {
- const player = use.Player();
- const corporation = player.corporation;
+ const corporation = Player.corporation;
if (corporation === null) return <>;
const setRerender = useState(false)[1];
function rerender(): void {
diff --git a/src/Corporation/ui/Industry.tsx b/src/Corporation/ui/Industry.tsx
index c02643db8..447e3ccbe 100644
--- a/src/Corporation/ui/Industry.tsx
+++ b/src/Corporation/ui/Industry.tsx
@@ -7,7 +7,6 @@ import { IndustryOverview } from "./IndustryOverview";
import { IndustryWarehouse } from "./IndustryWarehouse";
import { Warehouse } from "../Warehouse";
import { OfficeSpace } from "../OfficeSpace";
-import { use } from "../../ui/Context";
import { useCorporation, useDivision } from "./Context";
import Box from "@mui/material/Box";
@@ -19,7 +18,6 @@ interface IProps {
}
export function Industry(props: IProps): React.ReactElement {
- const player = use.Player();
const corp = useCorporation();
const division = useDivision();
return (
diff --git a/src/Corporation/ui/Overview.tsx b/src/Corporation/ui/Overview.tsx
index 1dc811f0c..10fb2f7b3 100644
--- a/src/Corporation/ui/Overview.tsx
+++ b/src/Corporation/ui/Overview.tsx
@@ -21,7 +21,7 @@ import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFuncti
import { Money } from "../../ui/React/Money";
import { MoneyRate } from "../../ui/React/MoneyRate";
import { StatsTable } from "../../ui/React/StatsTable";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { useCorporation } from "./Context";
import Typography from "@mui/material/Typography";
import Tooltip from "@mui/material/Tooltip";
@@ -34,7 +34,6 @@ interface IProps {
rerender: () => void;
}
export function Overview({ rerender }: IProps): React.ReactElement {
- const player = use.Player();
const corp = useCorporation();
const profit: number = corp.revenue - corp.expenses;
@@ -100,7 +99,7 @@ export function Overview({ rerender }: IProps): React.ReactElement {
}
>
- corp.getStarterGuide(player)}>Getting Started Guide
+ corp.getStarterGuide()}>Getting Started Guide
{corp.public ?
{name}
diff --git a/src/Corporation/ui/modals/BuybackSharesModal.tsx b/src/Corporation/ui/modals/BuybackSharesModal.tsx
index 2e92cdcd9..6083015e7 100644
--- a/src/Corporation/ui/modals/BuybackSharesModal.tsx
+++ b/src/Corporation/ui/modals/BuybackSharesModal.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { Modal } from "../../../ui/React/Modal";
import { numeralWrapper } from "../../../ui/numeralFormat";
-import { use } from "../../../ui/Context";
+import { Player } from "../../../Player";
import { useCorporation } from "../Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
@@ -19,7 +19,6 @@ interface IProps {
// Create a popup that lets the player buyback shares
// This is created when the player clicks the "Buyback Shares" button in the overview panel
export function BuybackSharesModal(props: IProps): React.ReactElement {
- const player = use.Player();
const corp = useCorporation();
const [shares, setShares] = useState(NaN);
@@ -30,7 +29,7 @@ export function BuybackSharesModal(props: IProps): React.ReactElement {
isNaN(shares) ||
shares <= 0 ||
shares > corp.issuedShares ||
- shares * buybackPrice > player.money;
+ shares * buybackPrice > Player.money;
function buy(): void {
if (disabled) return;
diff --git a/src/Corporation/ui/modals/CreateCorporationModal.tsx b/src/Corporation/ui/modals/CreateCorporationModal.tsx
index 9e77fcc14..1b2b1b7a6 100644
--- a/src/Corporation/ui/modals/CreateCorporationModal.tsx
+++ b/src/Corporation/ui/modals/CreateCorporationModal.tsx
@@ -2,7 +2,8 @@ import React, { useState } from "react";
import { Money } from "../../../ui/React/Money";
import { Modal } from "../../../ui/React/Modal";
-import { use } from "../../../ui/Context";
+import { Router } from "../../../ui/GameRoot";
+import { Player } from "../../../Player";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
@@ -13,10 +14,8 @@ interface IProps {
}
export function CreateCorporationModal(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
- const canSelfFund = player.canAfford(150e9);
- if (!player.canAccessCorporation() || player.hasCorporation()) {
+ const canSelfFund = Player.canAfford(150e9);
+ if (!Player.canAccessCorporation() || Player.hasCorporation()) {
props.onClose();
return <>;
}
@@ -35,11 +34,11 @@ export function CreateCorporationModal(props: IProps): React.ReactElement {
return;
}
- player.startCorporation(name);
- player.loseMoney(150e9, "corporation");
+ Player.startCorporation(name);
+ Player.loseMoney(150e9, "corporation");
props.onClose();
- router.toCorporation();
+ Router.toCorporation();
}
function seed(): void {
@@ -47,17 +46,17 @@ export function CreateCorporationModal(props: IProps): React.ReactElement {
return;
}
- player.startCorporation(name, 500e6);
+ Player.startCorporation(name, 500e6);
props.onClose();
- router.toCorporation();
+ Router.toCorporation();
}
return (
Would you like to start a corporation? This will require $150b for registration and initial funding.{" "}
- {player.bitNodeN === 3 &&
+ {Player.bitNodeN === 3 &&
`This $150b
can either be self-funded, or you can obtain the seed money from the government in exchange for 500 million
shares`}
@@ -66,7 +65,7 @@ export function CreateCorporationModal(props: IProps): React.ReactElement {
If you would like to start one, please enter a name for your corporation below:
Use seed money
diff --git a/src/Corporation/ui/modals/SellSharesModal.tsx b/src/Corporation/ui/modals/SellSharesModal.tsx
index fdb178029..455e6efcd 100644
--- a/src/Corporation/ui/modals/SellSharesModal.tsx
+++ b/src/Corporation/ui/modals/SellSharesModal.tsx
@@ -2,7 +2,6 @@ import React, { useState } from "react";
import { numeralWrapper } from "../../../ui/numeralFormat";
import { dialogBoxCreate } from "../../../ui/React/DialogBox";
import { Modal } from "../../../ui/React/Modal";
-import { use } from "../../../ui/Context";
import { useCorporation } from "../Context";
import { ICorporation } from "../../ICorporation";
import Typography from "@mui/material/Typography";
@@ -20,7 +19,6 @@ interface IProps {
// Create a popup that lets the player sell Corporation shares
// This is created when the player clicks the "Sell Shares" button in the overview panel
export function SellSharesModal(props: IProps): React.ReactElement {
- const player = use.Player();
const corp = useCorporation();
const [shares, setShares] = useState(NaN);
diff --git a/src/Crime/Crime.ts b/src/Crime/Crime.ts
index 8100d9c0e..8edf124f8 100644
--- a/src/Crime/Crime.ts
+++ b/src/Crime/Crime.ts
@@ -1,5 +1,5 @@
import { CONSTANTS } from "../Constants";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { IPerson } from "../PersonObjects/IPerson";
import { WorkerScript } from "../Netscript/WorkerScript";
import { CrimeType } from "../utils/WorkType";
@@ -101,11 +101,11 @@ export class Crime {
this.kills = params.kills ? params.kills : 0;
}
- commit(p: IPlayer, div = 1, workerScript: WorkerScript | null = null): number {
+ commit(div = 1, workerScript: WorkerScript | null = null): number {
if (div <= 0) {
div = 1;
}
- p.startWork(
+ Player.startWork(
new CrimeWork({
crimeType: this.type,
singularity: workerScript !== null,
diff --git a/src/Exploits/Unclickable.tsx b/src/Exploits/Unclickable.tsx
index 1ab524d9e..8e6c5fe9c 100644
--- a/src/Exploits/Unclickable.tsx
+++ b/src/Exploits/Unclickable.tsx
@@ -1,16 +1,15 @@
import React from "react";
-import { use } from "../ui/Context";
+import { Player } from "../Player";
import { Exploit } from "./Exploit";
const getComputedStyle = window.getComputedStyle;
export function Unclickable(): React.ReactElement {
- const player = use.Player();
function unclickable(event: React.MouseEvent): void {
if (!event.target || !(event.target instanceof Element)) return;
const display = getComputedStyle(event.target).display;
const visibility = getComputedStyle(event.target).visibility;
- if (display === "none" && visibility === "hidden" && event.isTrusted) player.giveExploit(Exploit.Unclickable);
+ if (display === "none" && visibility === "hidden" && event.isTrusted) Player.giveExploit(Exploit.Unclickable);
}
return (
diff --git a/src/Faction/FactionInfo.tsx b/src/Faction/FactionInfo.tsx
index 96c252fc3..0a63d868d 100644
--- a/src/Faction/FactionInfo.tsx
+++ b/src/Faction/FactionInfo.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { IMap } from "../types";
import { FactionNames } from "./data/FactionNames";
-import { use } from "../ui/Context";
+import { Router } from "../ui/GameRoot";
import { Option } from "./ui/Option";
import { Typography } from "@mui/material";
@@ -449,12 +449,11 @@ export const FactionInfos: IMap = {
special: true,
assignment: (): React.ReactElement => {
- const router = use.Router();
return (
router.toBladeburner()}
+ onClick={() => Router.toBladeburner()}
/>
);
},
@@ -499,7 +498,6 @@ export const FactionInfos: IMap = {
special: true,
keepOnInstall: true,
assignment: (): React.ReactElement => {
- const router = use.Router();
return (
= {
"Stanek's Gift is a powerful augmentation that powers up the stat you chose to boost." +
"Gaining reputation with the Church of the Machine God can only be done by charging the gift."
}
- onClick={() => router.toStaneksGift()}
+ onClick={() => Router.toStaneksGift()}
/>
);
},
diff --git a/src/Faction/ui/CreateGangModal.tsx b/src/Faction/ui/CreateGangModal.tsx
index 60d788494..83064b385 100644
--- a/src/Faction/ui/CreateGangModal.tsx
+++ b/src/Faction/ui/CreateGangModal.tsx
@@ -3,7 +3,8 @@
*/
import React from "react";
import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { KEY } from "../../utils/helpers/keyCodes";
@@ -16,8 +17,6 @@ interface IProps {
}
export function CreateGangModal(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const combatGangText =
"This is a COMBAT gang. Members in this gang will have different tasks than HACKING gangs. " +
"Compared to hacking gangs, progression with combat gangs can be more difficult as territory management " +
@@ -33,9 +32,9 @@ export function CreateGangModal(props: IProps): React.ReactElement {
}
function createGang(): void {
- player.startGang(props.facName, isHacking());
+ Player.startGang(props.facName, isHacking());
props.onClose();
- router.toGang();
+ Router.toGang();
}
function onKeyUp(event: React.KeyboardEvent): void {
diff --git a/src/Faction/ui/GangButton.tsx b/src/Faction/ui/GangButton.tsx
index 82d3164ea..f88f09028 100644
--- a/src/Faction/ui/GangButton.tsx
+++ b/src/Faction/ui/GangButton.tsx
@@ -1,7 +1,8 @@
import { Button, Typography, Box, Paper, Tooltip } from "@mui/material";
import React, { useState } from "react";
import { GangConstants } from "../../Gang/data/Constants";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { Faction } from "../Faction";
import { CreateGangModal } from "./CreateGangModal";
@@ -10,14 +11,12 @@ type IProps = {
};
export function GangButton({ faction }: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const [gangOpen, setGangOpen] = useState(false);
if (
!GangConstants.Names.includes(faction.name) || // not even a gang
- !player.isAwareOfGang() || // doesn't know about gang
- (player.inGang() && player.getGangName() !== faction.name) // already in another gang
+ !Player.isAwareOfGang() || // doesn't know about gang
+ (Player.inGang() && Player.getGangName() !== faction.name) // already in another gang
) {
return <>;
}
@@ -29,7 +28,7 @@ export function GangButton({ faction }: IProps): React.ReactElement {
description: "",
};
- if (player.inGang()) {
+ if (Player.inGang()) {
data = {
enabled: true,
title: "Manage Gang",
@@ -38,9 +37,9 @@ export function GangButton({ faction }: IProps): React.ReactElement {
};
} else {
data = {
- enabled: player.canAccessGang(),
+ enabled: Player.canAccessGang(),
title: "Create Gang",
- tooltip: !player.canAccessGang() ? (
+ tooltip: !Player.canAccessGang() ? (
Unlocked when reaching {GangConstants.GangKarmaRequirement} karma
) : (
""
@@ -51,8 +50,8 @@ export function GangButton({ faction }: IProps): React.ReactElement {
const manageGang = (): void => {
// If player already has a gang, just go to the gang UI
- if (player.inGang()) {
- return router.toGang();
+ if (Player.inGang()) {
+ return Router.toGang();
}
setGangOpen(true);
diff --git a/src/Faction/ui/InvitationModal.tsx b/src/Faction/ui/InvitationModal.tsx
index 8f784f02d..9993e2188 100644
--- a/src/Faction/ui/InvitationModal.tsx
+++ b/src/Faction/ui/InvitationModal.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
import { joinFaction } from "../FactionHelpers";
import { Faction } from "../Faction";
import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { EventEmitter } from "../../utils/EventEmitter";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
@@ -11,11 +11,10 @@ export const InvitationEvent = new EventEmitter<[Faction]>();
export function InvitationModal(): React.ReactElement {
const [faction, setFaction] = useState(null);
- const player = use.Player();
function join(): void {
if (faction === null) return;
//Remove from invited factions
- const i = player.factionInvitations.findIndex((facName) => facName === faction.name);
+ const i = Player.factionInvitations.findIndex((facName) => facName === faction.name);
if (i === -1) {
console.error("Could not find faction in Player.factionInvitations");
}
diff --git a/src/GameOptions/ui/GameplayPage.tsx b/src/GameOptions/ui/GameplayPage.tsx
index f6492acfe..ab01321bb 100644
--- a/src/GameOptions/ui/GameplayPage.tsx
+++ b/src/GameOptions/ui/GameplayPage.tsx
@@ -2,10 +2,9 @@ import React from "react";
import { OptionSwitch } from "../../ui/React/OptionSwitch";
import { Settings } from "../../Settings/Settings";
import { GameOptionsPage } from "./GameOptionsPage";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
export const GameplayPage = (): React.ReactElement => {
- const player = use.Player();
return (
{
text="Suppress TIX messages"
tooltip={<>If this is set, the stock market will never create any popup.}
/>
- {player.bladeburner && (
+ {Player.bladeburner && (
(Settings.SuppressBladeburnerPopup = newValue)}
diff --git a/src/Gang/GangMember.ts b/src/Gang/GangMember.ts
index be97a58cb..80c745e64 100644
--- a/src/Gang/GangMember.ts
+++ b/src/Gang/GangMember.ts
@@ -3,7 +3,7 @@ import { GangMemberTasks } from "./GangMemberTasks";
import { GangMemberUpgrade } from "./GangMemberUpgrade";
import { GangMemberUpgrades } from "./GangMemberUpgrades";
import { IAscensionResult } from "./IAscensionResult";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { IGang } from "./IGang";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
import {
@@ -302,12 +302,14 @@ export class GangMember {
if (upg.mults.hack != null) this.hack_mult *= upg.mults.hack;
}
- buyUpgrade(upg: GangMemberUpgrade, player: IPlayer, gang: IGang): boolean {
+ buyUpgrade(upg: GangMemberUpgrade): boolean {
+ if (!Player.gang) throw new Error("Tried to buy a gang member upgrade when no gang was present");
+
// Prevent purchasing of already-owned upgrades
if (this.augmentations.includes(upg.name) || this.upgrades.includes(upg.name)) return false;
- if (player.money < gang.getUpgradeCost(upg)) return false;
- player.loseMoney(gang.getUpgradeCost(upg), "gang");
+ if (Player.money < Player.gang.getUpgradeCost(upg)) return false;
+ Player.loseMoney(Player.gang.getUpgradeCost(upg), "gang");
if (upg.type === "g") {
this.augmentations.push(upg.name);
} else {
diff --git a/src/Gang/ui/EquipmentsSubpage.tsx b/src/Gang/ui/EquipmentsSubpage.tsx
index 037a080e9..3ab0a0850 100644
--- a/src/Gang/ui/EquipmentsSubpage.tsx
+++ b/src/Gang/ui/EquipmentsSubpage.tsx
@@ -19,7 +19,7 @@ import { GangMemberUpgrade } from "../GangMemberUpgrade";
import { Money } from "../../ui/React/Money";
import { GangMember } from "../GangMember";
import { UpgradeType } from "../data/upgrades";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { Settings } from "../../Settings/Settings";
import { StatsRow } from "../../ui/React/StatsRow";
@@ -30,11 +30,10 @@ interface INextRevealProps {
function NextReveal(props: INextRevealProps): React.ReactElement {
const gang = useGang();
- const player = use.Player();
const upgrades = Object.keys(GangMemberUpgrades)
.filter((upgName: string) => {
const upg = GangMemberUpgrades[upgName];
- if (player.money > gang.getUpgradeCost(upg)) return false;
+ if (Player.money > gang.getUpgradeCost(upg)) return false;
if (upg.type !== props.type) return false;
if (props.upgrades.includes(upgName)) return false;
return true;
@@ -68,9 +67,8 @@ interface IUpgradeButtonProps {
function UpgradeButton(props: IUpgradeButtonProps): React.ReactElement {
const gang = useGang();
- const player = use.Player();
function onClick(): void {
- props.member.buyUpgrade(props.upg, player, gang);
+ props.member.buyUpgrade(props.upg);
props.rerender();
}
return (
@@ -91,7 +89,6 @@ interface IPanelProps {
function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
const gang = useGang();
- const player = use.Player();
const setRerender = useState(false)[1];
const [currentCategory, setCurrentCategory] = useState("Weapons");
@@ -103,7 +100,7 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
return Object.keys(GangMemberUpgrades)
.filter((upgName: string) => {
const upg = GangMemberUpgrades[upgName];
- if (player.money < gang.getUpgradeCost(upg)) return false;
+ if (Player.money < gang.getUpgradeCost(upg)) return false;
if (upg.type !== type) return false;
if (list.includes(upgName)) return false;
return true;
diff --git a/src/Gang/ui/GangRoot.tsx b/src/Gang/ui/GangRoot.tsx
index 1a2c1e405..a64164b1c 100644
--- a/src/Gang/ui/GangRoot.tsx
+++ b/src/Gang/ui/GangRoot.tsx
@@ -5,17 +5,16 @@ import React, { useState, useEffect } from "react";
import { ManagementSubpage } from "./ManagementSubpage";
import { TerritorySubpage } from "./TerritorySubpage";
import { EquipmentsSubpage } from "./EquipmentsSubpage";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { Context } from "./Context";
import Tabs from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";
export function GangRoot(): React.ReactElement {
- const player = use.Player();
const gang = (function () {
- if (player.gang === null) throw new Error("Gang should not be null");
- return player.gang;
+ if (Player.gang === null) throw new Error("Gang should not be null");
+ return Player.gang;
})();
const [value, setValue] = React.useState(0);
diff --git a/src/Infiltration/ui/Game.tsx b/src/Infiltration/ui/Game.tsx
index c0ebef6f8..35c8a0f60 100644
--- a/src/Infiltration/ui/Game.tsx
+++ b/src/Infiltration/ui/Game.tsx
@@ -1,7 +1,8 @@
import { Button, Container, Paper, Typography } from "@mui/material";
import React, { useState } from "react";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { BackwardGame } from "./BackwardGame";
import { BracketGame } from "./BracketGame";
import { BribeGame } from "./BribeGame";
@@ -39,8 +40,6 @@ const minigames = [
];
export function Game(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const [level, setLevel] = useState(1);
const [stage, setStage] = useState(Stage.Countdown);
const [results, setResults] = useState("");
@@ -91,17 +90,17 @@ export function Game(props: IProps): React.ReactElement {
// Kill the player immediately if they use automation, so
// it's clear they're not meant to
const damage = options?.automated
- ? player.hp.current
- : props.StartingDifficulty * 3 * (player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 0.5 : 1);
- if (player.takeDamage(damage)) {
- router.toCity();
+ ? Player.hp.current
+ : props.StartingDifficulty * 3 * (Player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 0.5 : 1);
+ if (Player.takeDamage(damage)) {
+ Router.toCity();
return;
}
setupNextGame();
}
function cancel(): void {
- router.toCity();
+ Router.toCity();
return;
}
diff --git a/src/Infiltration/ui/GameTimer.tsx b/src/Infiltration/ui/GameTimer.tsx
index 335fe4925..bf836e8ca 100644
--- a/src/Infiltration/ui/GameTimer.tsx
+++ b/src/Infiltration/ui/GameTimer.tsx
@@ -1,7 +1,7 @@
import { Paper } from "@mui/material";
import React, { useEffect, useState } from "react";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import { ProgressBar } from "../../ui/React/Progress";
interface IProps {
@@ -11,9 +11,8 @@ interface IProps {
}
export function GameTimer(props: IProps): React.ReactElement {
- const player = use.Player();
const [v, setV] = useState(100);
- const totalMillis = (player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 1.3 : 1) * props.millis;
+ const totalMillis = (Player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 1.3 : 1) * props.millis;
const tick = 200;
useEffect(() => {
diff --git a/src/Infiltration/ui/InfiltrationRoot.tsx b/src/Infiltration/ui/InfiltrationRoot.tsx
index b66a7d31b..5f86ea28b 100644
--- a/src/Infiltration/ui/InfiltrationRoot.tsx
+++ b/src/Infiltration/ui/InfiltrationRoot.tsx
@@ -1,6 +1,7 @@
import React, { useState } from "react";
import { Location } from "../../Locations/Location";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { calculateDifficulty, calculateReward } from "../formulas/game";
import { Game } from "./Game";
import { Intro } from "./Intro";
@@ -9,17 +10,15 @@ interface IProps {
}
export function InfiltrationRoot(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const [start, setStart] = useState(false);
if (props.location.infiltrationData === undefined) throw new Error("Trying to do infiltration on invalid location.");
const startingSecurityLevel = props.location.infiltrationData.startingSecurityLevel;
- const difficulty = calculateDifficulty(player, startingSecurityLevel);
- const reward = calculateReward(player, startingSecurityLevel);
+ const difficulty = calculateDifficulty(Player, startingSecurityLevel);
+ const reward = calculateReward(Player, startingSecurityLevel);
function cancel(): void {
- router.toCity();
+ Router.toCity();
}
return (
diff --git a/src/Infiltration/ui/Victory.tsx b/src/Infiltration/ui/Victory.tsx
index 51a1d2f71..bafb8f9eb 100644
--- a/src/Infiltration/ui/Victory.tsx
+++ b/src/Infiltration/ui/Victory.tsx
@@ -3,7 +3,8 @@ import React, { useState } from "react";
import { FactionNames } from "../../Faction/data/FactionNames";
import { inviteToFaction } from "../../Faction/FactionHelpers";
import { Factions } from "../../Faction/Factions";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { Money } from "../../ui/React/Money";
import { Reputation } from "../../ui/React/Reputation";
import { formatNumber } from "../../utils/StringHelperFunctions";
@@ -21,25 +22,23 @@ interface IProps {
}
export function Victory(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const [faction, setFaction] = useState("none");
function quitInfiltration(): void {
handleInfiltrators();
- router.toCity();
+ Router.toCity();
}
const soa = Factions[FactionNames.ShadowsOfAnarchy];
- const repGain = calculateTradeInformationRepReward(player, props.Reward, props.MaxLevel, props.StartingDifficulty);
- const moneyGain = calculateSellInformationCashReward(player, props.Reward, props.MaxLevel, props.StartingDifficulty);
- const infiltrationRepGain = calculateInfiltratorsRepReward(player, soa, props.StartingDifficulty);
+ const repGain = calculateTradeInformationRepReward(Player, props.Reward, props.MaxLevel, props.StartingDifficulty);
+ const moneyGain = calculateSellInformationCashReward(Player, props.Reward, props.MaxLevel, props.StartingDifficulty);
+ const infiltrationRepGain = calculateInfiltratorsRepReward(Player, soa, props.StartingDifficulty);
- const isMemberOfInfiltrators = player.factions.includes(FactionNames.ShadowsOfAnarchy);
+ const isMemberOfInfiltrators = Player.factions.includes(FactionNames.ShadowsOfAnarchy);
function sell(): void {
handleInfiltrators();
- player.gainMoney(moneyGain, "infiltration");
+ Player.gainMoney(moneyGain, "infiltration");
quitInfiltration();
}
@@ -81,7 +80,7 @@ export function Victory(props: IProps): React.ReactElement {
{"none"}
- {player.factions
+ {Player.factions
.filter((f) => Factions[f].getInfo().offersWork())
.map((f) => (
diff --git a/src/Locations/ui/ApplyToJobButton.tsx b/src/Locations/ui/ApplyToJobButton.tsx
index 20d09c63c..0441c6e07 100644
--- a/src/Locations/ui/ApplyToJobButton.tsx
+++ b/src/Locations/ui/ApplyToJobButton.tsx
@@ -7,7 +7,7 @@ import { Company } from "../../Company/Company";
import { CompanyPosition } from "../../Company/CompanyPosition";
import { getJobRequirementText } from "../../Company/GetJobRequirementText";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import Button from "@mui/material/Button";
import Tooltip from "@mui/material/Tooltip";
@@ -19,10 +19,8 @@ type IProps = {
};
export function ApplyToJobButton(props: IProps): React.ReactElement {
- const player = use.Player();
-
function getJobRequirementTooltip(): string {
- const pos = player.getNextCompanyPosition(props.company, props.entryPosType);
+ const pos = Player.getNextCompanyPosition(props.company, props.entryPosType);
if (pos == null) {
return "";
}
diff --git a/src/Locations/ui/City.tsx b/src/Locations/ui/City.tsx
index 0520550c5..5adb52911 100644
--- a/src/Locations/ui/City.tsx
+++ b/src/Locations/ui/City.tsx
@@ -12,8 +12,8 @@ import { Locations } from "../Locations";
import { Location } from "../Location";
import { Settings } from "../../Settings/Settings";
-import { use } from "../../ui/Context";
-import { IRouter } from "../../ui/Router";
+import { Player } from "../../Player";
+import { Router } from "../../ui/GameRoot";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { LocationType } from "../LocationTypeEnum";
@@ -37,19 +37,18 @@ const useStyles = makeStyles((theme: Theme) =>
}),
);
-function toLocation(router: IRouter, location: Location): void {
+function toLocation(location: Location): void {
if (location.name === LocationName.TravelAgency) {
- router.toTravel();
+ Router.toTravel();
} else if (location.name === LocationName.WorldStockExchange) {
- router.toStockMarket();
+ Router.toStockMarket();
} else {
- router.toLocation(location);
+ Router.toLocation(location);
}
}
function LocationLetter(location: Location): React.ReactElement {
location.types;
- const router = use.Router();
const classes = useStyles();
let L = "X";
if (location.types.includes(LocationType.Company)) L = "C";
@@ -68,7 +67,7 @@ function LocationLetter(location: Location): React.ReactElement {
aria-label={location.name}
key={location.name}
className={classes.location}
- onClick={() => toLocation(router, location)}
+ onClick={() => toLocation(location)}
>
{L}
@@ -147,11 +146,10 @@ function ASCIICity(props: IProps): React.ReactElement {
}
function ListCity(props: IProps): React.ReactElement {
- const router = use.Router();
const locationButtons = props.city.locations.map((locName) => {
return (
- toLocation(router, Locations[locName])}>{locName}
+ toLocation(Locations[locName])}>{locName}
);
@@ -161,8 +159,7 @@ function ListCity(props: IProps): React.ReactElement {
}
export function LocationCity(): React.ReactElement {
- const player = use.Player();
- const city = Cities[player.city];
+ const city = Cities[Player.city];
return (
<>
{city.name}
diff --git a/src/Locations/ui/CompanyLocation.tsx b/src/Locations/ui/CompanyLocation.tsx
index b64b0c58a..105c661af 100644
--- a/src/Locations/ui/CompanyLocation.tsx
+++ b/src/Locations/ui/CompanyLocation.tsx
@@ -21,7 +21,8 @@ import * as posNames from "../../Company/data/companypositionnames";
import { Reputation } from "../../ui/React/Reputation";
import { Favor } from "../../ui/React/Favor";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { QuitJobModal } from "../../Company/ui/QuitJobModal";
import { CompanyWork } from "../../Work/CompanyWork";
@@ -30,8 +31,6 @@ type IProps = {
};
export function CompanyLocation(props: IProps): React.ReactElement {
- const p = use.Player();
- const router = use.Router();
const [quitOpen, setQuitOpen] = useState(false);
const setRerender = useState(false)[1];
function rerender(): void {
@@ -60,7 +59,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
/**
* Name of company position that player holds, if applicable
*/
- const jobTitle = p.jobs[props.locName] ? p.jobs[props.locName] : null;
+ const jobTitle = Player.jobs[props.locName] ? Player.jobs[props.locName] : null;
/**
* CompanyPosition object for the job that the player holds at this company
@@ -68,13 +67,13 @@ export function CompanyLocation(props: IProps): React.ReactElement {
*/
const companyPosition = jobTitle ? CompanyPositions[jobTitle] : null;
- p.location = props.locName;
+ Player.location = props.locName;
function applyForAgentJob(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- p.applyForAgentJob();
+ Player.applyForAgentJob();
rerender();
}
@@ -82,7 +81,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForBusinessConsultantJob();
+ Player.applyForBusinessConsultantJob();
rerender();
}
@@ -90,7 +89,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForBusinessJob();
+ Player.applyForBusinessJob();
rerender();
}
@@ -98,7 +97,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForEmployeeJob();
+ Player.applyForEmployeeJob();
rerender();
}
@@ -106,7 +105,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForItJob();
+ Player.applyForItJob();
rerender();
}
@@ -114,7 +113,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForPartTimeEmployeeJob();
+ Player.applyForPartTimeEmployeeJob();
rerender();
}
@@ -122,7 +121,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForPartTimeWaiterJob();
+ Player.applyForPartTimeWaiterJob();
rerender();
}
@@ -130,7 +129,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForSecurityJob();
+ Player.applyForSecurityJob();
rerender();
}
@@ -138,7 +137,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForSoftwareConsultantJob();
+ Player.applyForSoftwareConsultantJob();
rerender();
}
@@ -146,7 +145,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForSoftwareJob();
+ Player.applyForSoftwareJob();
rerender();
}
@@ -154,7 +153,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!e.isTrusted) {
return;
}
- p.applyForWaiterJob();
+ Player.applyForWaiterJob();
rerender();
}
@@ -166,7 +165,7 @@ export function CompanyLocation(props: IProps): React.ReactElement {
if (!loc.infiltrationData)
throw new Error(`trying to start infiltration at ${props.locName} but the infiltrationData is null`);
- router.toInfiltration(loc);
+ Router.toInfiltration(loc);
}
function work(e: React.MouseEvent): void {
@@ -176,14 +175,14 @@ export function CompanyLocation(props: IProps): React.ReactElement {
const pos = companyPosition;
if (pos instanceof CompanyPosition) {
- p.startWork(
+ Player.startWork(
new CompanyWork({
singularity: false,
companyName: props.locName,
}),
);
- p.startFocusing();
- router.toWork();
+ Player.startFocusing();
+ Router.toWork();
}
}
diff --git a/src/Locations/ui/PurchaseServerModal.tsx b/src/Locations/ui/PurchaseServerModal.tsx
index 7faa8537d..60b1853d4 100644
--- a/src/Locations/ui/PurchaseServerModal.tsx
+++ b/src/Locations/ui/PurchaseServerModal.tsx
@@ -6,7 +6,7 @@ import { purchaseServer } from "../../Server/ServerPurchases";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Money } from "../../ui/React/Money";
import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
@@ -21,7 +21,6 @@ interface IProps {
}
export function PurchaseServerModal(props: IProps): React.ReactElement {
- const player = use.Player();
const [hostname, setHostname] = useState("");
function tryToPurchaseServer(): void {
@@ -56,7 +55,7 @@ export function PurchaseServerModal(props: IProps): React.ReactElement {
placeholder="Unique Hostname"
InputProps={{
endAdornment: (
-
+
Buy
),
diff --git a/src/Locations/ui/SlumsLocation.tsx b/src/Locations/ui/SlumsLocation.tsx
index 976b4e7f8..02681c873 100644
--- a/src/Locations/ui/SlumsLocation.tsx
+++ b/src/Locations/ui/SlumsLocation.tsx
@@ -10,132 +10,131 @@ import Tooltip from "@mui/material/Tooltip";
import { Crimes } from "../../Crime/Crimes";
import { numeralWrapper } from "../../ui/numeralFormat";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { Box } from "@mui/material";
export function SlumsLocation(): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
function shoplift(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Shoplift.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Shoplift.commit();
+ Router.toWork();
+ Player.focus = true;
}
function robStore(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.RobStore.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.RobStore.commit();
+ Router.toWork();
+ Player.focus = true;
}
function mug(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Mug.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Mug.commit();
+ Router.toWork();
+ Player.focus = true;
}
function larceny(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Larceny.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Larceny.commit();
+ Router.toWork();
+ Player.focus = true;
}
function dealDrugs(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.DealDrugs.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.DealDrugs.commit();
+ Router.toWork();
+ Player.focus = true;
}
function bondForgery(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.BondForgery.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.BondForgery.commit();
+ Router.toWork();
+ Player.focus = true;
}
function traffickArms(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.TraffickArms.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.TraffickArms.commit();
+ Router.toWork();
+ Player.focus = true;
}
function homicide(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Homicide.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Homicide.commit();
+ Router.toWork();
+ Player.focus = true;
}
function grandTheftAuto(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.GrandTheftAuto.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.GrandTheftAuto.commit();
+ Router.toWork();
+ Player.focus = true;
}
function kidnap(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Kidnap.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Kidnap.commit();
+ Router.toWork();
+ Player.focus = true;
}
function assassinate(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Assassination.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Assassination.commit();
+ Router.toWork();
+ Player.focus = true;
}
function heist(e: React.MouseEvent): void {
if (!e.isTrusted) {
return;
}
- Crimes.Heist.commit(player);
- router.toWork();
- player.focus = true;
+ Crimes.Heist.commit();
+ Router.toWork();
+ Player.focus = true;
}
- const shopliftChance = Crimes.Shoplift.successRate(player);
- const robStoreChance = Crimes.RobStore.successRate(player);
- const mugChance = Crimes.Mug.successRate(player);
- const larcenyChance = Crimes.Larceny.successRate(player);
- const drugsChance = Crimes.DealDrugs.successRate(player);
- const bondChance = Crimes.BondForgery.successRate(player);
- const armsChance = Crimes.TraffickArms.successRate(player);
- const homicideChance = Crimes.Homicide.successRate(player);
- const gtaChance = Crimes.GrandTheftAuto.successRate(player);
- const kidnapChance = Crimes.Kidnap.successRate(player);
- const assassinateChance = Crimes.Assassination.successRate(player);
- const heistChance = Crimes.Heist.successRate(player);
+ const shopliftChance = Crimes.Shoplift.successRate(Player);
+ const robStoreChance = Crimes.RobStore.successRate(Player);
+ const mugChance = Crimes.Mug.successRate(Player);
+ const larcenyChance = Crimes.Larceny.successRate(Player);
+ const drugsChance = Crimes.DealDrugs.successRate(Player);
+ const bondChance = Crimes.BondForgery.successRate(Player);
+ const armsChance = Crimes.TraffickArms.successRate(Player);
+ const homicideChance = Crimes.Homicide.successRate(Player);
+ const gtaChance = Crimes.GrandTheftAuto.successRate(Player);
+ const kidnapChance = Crimes.Kidnap.successRate(Player);
+ const assassinateChance = Crimes.Assassination.successRate(Player);
+ const heistChance = Crimes.Heist.successRate(Player);
return (
diff --git a/src/Locations/ui/SpecialLocation.tsx b/src/Locations/ui/SpecialLocation.tsx
index b95f750ce..0b12edf82 100644
--- a/src/Locations/ui/SpecialLocation.tsx
+++ b/src/Locations/ui/SpecialLocation.tsx
@@ -21,7 +21,8 @@ import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { Factions } from "../../Faction/Factions";
import { joinFaction } from "../../Faction/FactionHelpers";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { SnackbarEvents, ToastVariant } from "../../ui/React/Snackbar";
@@ -41,27 +42,24 @@ type IProps = {
};
export function SpecialLocation(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const setRerender = useState(false)[1];
- const inBladeburner = player.inBladeburner();
+ const inBladeburner = Player.inBladeburner();
/**
* Click handler for Bladeburner button at Sector-12 NSA
*/
function handleBladeburner(): void {
- const p = player;
- if (p.inBladeburner()) {
+ if (Player.inBladeburner()) {
// Enter Bladeburner division
- router.toBladeburner();
+ Router.toBladeburner();
} else if (
- p.skills.strength >= 100 &&
- p.skills.defense >= 100 &&
- p.skills.dexterity >= 100 &&
- p.skills.agility >= 100
+ Player.skills.strength >= 100 &&
+ Player.skills.defense >= 100 &&
+ Player.skills.dexterity >= 100 &&
+ Player.skills.agility >= 100
) {
// Apply for Bladeburner division
- p.startBladeburner();
+ Player.startBladeburner();
dialogBoxCreate("You have been accepted into the Bladeburner division!");
setRerender((old) => !old);
@@ -79,11 +77,11 @@ export function SpecialLocation(props: IProps): React.ReactElement {
* Click handler for Resleeving button at New Tokyo VitaLife
*/
function handleGrafting(): void {
- router.toGrafting();
+ Router.toGrafting();
}
function renderBladeburner(): React.ReactElement {
- if (!player.canAccessBladeburner() || BitNodeMultipliers.BladeburnerRank === 0) {
+ if (!Player.canAccessBladeburner() || BitNodeMultipliers.BladeburnerRank === 0) {
return <>;
}
const text = inBladeburner ? "Enter Bladeburner Headquarters" : "Apply to Bladeburner Division";
@@ -99,32 +97,32 @@ export function SpecialLocation(props: IProps): React.ReactElement {
function EatNoodles(): void {
SnackbarEvents.emit("You ate some delicious noodles and feel refreshed", ToastVariant.SUCCESS, 2000);
N00dles(); // This is the true power of the noodles.
- if (player.sourceFiles.length > 0) player.giveExploit(Exploit.N00dles);
- if (player.sourceFileLvl(5) > 0 || player.bitNodeN === 5) {
- player.exp.intelligence *= 1.0000000000000002;
+ if (Player.sourceFiles.length > 0) Player.giveExploit(Exploit.N00dles);
+ if (Player.sourceFileLvl(5) > 0 || Player.bitNodeN === 5) {
+ Player.exp.intelligence *= 1.0000000000000002;
}
- player.exp.hacking *= 1.0000000000000002;
- player.exp.strength *= 1.0000000000000002;
- player.exp.defense *= 1.0000000000000002;
- player.exp.agility *= 1.0000000000000002;
- player.exp.dexterity *= 1.0000000000000002;
- player.exp.charisma *= 1.0000000000000002;
- for (const node of player.hacknetNodes) {
+ Player.exp.hacking *= 1.0000000000000002;
+ Player.exp.strength *= 1.0000000000000002;
+ Player.exp.defense *= 1.0000000000000002;
+ Player.exp.agility *= 1.0000000000000002;
+ Player.exp.dexterity *= 1.0000000000000002;
+ Player.exp.charisma *= 1.0000000000000002;
+ for (const node of Player.hacknetNodes) {
if (node instanceof HacknetNode) {
- player.gainMoney(node.moneyGainRatePerSecond * 0.001, "other");
+ Player.gainMoney(node.moneyGainRatePerSecond * 0.001, "other");
} else {
const server = GetServer(node);
if (!(server instanceof HacknetServer)) throw new Error(`Server ${node} is not a hacknet server.`);
- player.hashManager.storeHashes(server.hashRate * 0.001);
+ Player.hashManager.storeHashes(server.hashRate * 0.001);
}
}
- if (player.bladeburner) {
- player.bladeburner.rank += 0.00001;
+ if (Player.bladeburner) {
+ Player.bladeburner.rank += 0.00001;
}
- if (player.corporation) {
- player.corporation.funds += player.corporation.revenue * 0.01;
+ if (Player.corporation) {
+ Player.corporation.funds += Player.corporation.revenue * 0.01;
}
}
@@ -138,7 +136,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
function CreateCorporation(): React.ReactElement {
const [open, setOpen] = useState(false);
- if (!player.canAccessCorporation()) {
+ if (!Player.canAccessCorporation()) {
return (
<>
@@ -149,7 +147,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
}
return (
<>
- setOpen(true)}>
+ setOpen(true)}>
Create a Corporation
setOpen(false)} />
@@ -158,7 +156,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
}
function renderGrafting(): React.ReactElement {
- if (!player.canAccessGrafting()) {
+ if (!Player.canAccessGrafting()) {
return <>;
}
return (
@@ -170,21 +168,21 @@ export function SpecialLocation(props: IProps): React.ReactElement {
function handleCotMG(): void {
const faction = Factions[FactionNames.ChurchOfTheMachineGod];
- if (!player.factions.includes(FactionNames.ChurchOfTheMachineGod)) {
+ if (!Player.factions.includes(FactionNames.ChurchOfTheMachineGod)) {
joinFaction(faction);
}
if (
- !player.augmentations.some((a) => a.name === AugmentationNames.StaneksGift1) &&
- !player.queuedAugmentations.some((a) => a.name === AugmentationNames.StaneksGift1)
+ !Player.augmentations.some((a) => a.name === AugmentationNames.StaneksGift1) &&
+ !Player.queuedAugmentations.some((a) => a.name === AugmentationNames.StaneksGift1)
) {
applyAugmentation({ name: AugmentationNames.StaneksGift1, level: 1 });
}
- router.toStaneksGift();
+ Router.toStaneksGift();
}
function renderCotMG(): React.ReactElement {
- const toStanek = router.toStaneksGift()}>Open Stanek's Gift ;
+ const toStanek = Router.toStaneksGift()}>Open Stanek's Gift ;
// prettier-ignore
const symbol =
{" `` "}
- if (player.hasAugmentation(AugmentationNames.StaneksGift3, true)) {
+ if (Player.hasAugmentation(AugmentationNames.StaneksGift3, true)) {
return (
<>
@@ -232,7 +230,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
);
}
- if (player.hasAugmentation(AugmentationNames.StaneksGift2, true)) {
+ if (Player.hasAugmentation(AugmentationNames.StaneksGift2, true)) {
return (
<>
@@ -249,7 +247,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
);
}
- if (player.factions.includes(FactionNames.ChurchOfTheMachineGod)) {
+ if (Player.factions.includes(FactionNames.ChurchOfTheMachineGod)) {
return (
<>
@@ -263,7 +261,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
);
}
- if (!player.canAccessCotMG()) {
+ if (!Player.canAccessCotMG()) {
return (
<>
@@ -278,8 +276,8 @@ export function SpecialLocation(props: IProps): React.ReactElement {
}
if (
- player.augmentations.filter((a) => a.name !== AugmentationNames.NeuroFluxGovernor).length > 0 ||
- player.queuedAugmentations.filter((a) => a.name !== AugmentationNames.NeuroFluxGovernor).length > 0
+ Player.augmentations.filter((a) => a.name !== AugmentationNames.NeuroFluxGovernor).length > 0 ||
+ Player.queuedAugmentations.filter((a) => a.name !== AugmentationNames.NeuroFluxGovernor).length > 0
) {
return (
<>
diff --git a/src/Locations/ui/TravelConfirmationModal.tsx b/src/Locations/ui/TravelConfirmationModal.tsx
index b6a0510a4..2d43fa641 100644
--- a/src/Locations/ui/TravelConfirmationModal.tsx
+++ b/src/Locations/ui/TravelConfirmationModal.tsx
@@ -2,7 +2,6 @@ import React from "react";
import { CONSTANTS } from "../../Constants";
import { Money } from "../../ui/React/Money";
import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
@@ -15,7 +14,6 @@ interface IProps {
}
export function TravelConfirmationModal(props: IProps): React.ReactElement {
- const player = use.Player();
const cost = CONSTANTS.TravelCost;
function travel(): void {
props.travel();
diff --git a/src/Locations/ui/UniversityLocation.tsx b/src/Locations/ui/UniversityLocation.tsx
index 29a0eaed6..b08c1fa90 100644
--- a/src/Locations/ui/UniversityLocation.tsx
+++ b/src/Locations/ui/UniversityLocation.tsx
@@ -10,7 +10,8 @@ import Button from "@mui/material/Button";
import { Location } from "../Location";
import { Money } from "../../ui/React/Money";
-import { use } from "../../ui/Context";
+import { Router } from "../../ui/GameRoot";
+import { Player } from "../../Player";
import { Box } from "@mui/material";
import { ClassWork, ClassType, Classes } from "../../Work/ClassWork";
@@ -21,19 +22,16 @@ type IProps = {
};
export function UniversityLocation(props: IProps): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
-
function take(classType: ClassType): void {
- player.startWork(
+ Player.startWork(
new ClassWork({
classType: classType,
location: props.loc.name,
singularity: false,
}),
);
- player.startFocusing();
- router.toWork();
+ Player.startFocusing();
+ Router.toWork();
}
const dataStructuresCost = calculateCost(Classes[ClassType.DataStructures], props.loc);
diff --git a/src/NetscriptFunctions/Gang.ts b/src/NetscriptFunctions/Gang.ts
index 69c889397..d880d6801 100644
--- a/src/NetscriptFunctions/Gang.ts
+++ b/src/NetscriptFunctions/Gang.ts
@@ -274,7 +274,7 @@ export function NetscriptGang(): InternalAPI {
const member = getGangMember(ctx, memberName);
const equipment = GangMemberUpgrades[equipName];
if (!equipment) return false;
- const res = member.buyUpgrade(equipment, player, gang);
+ const res = member.buyUpgrade(equipment);
if (res) {
ctx.workerScript.log(
"gang.purchaseEquipment",
diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts
index f6e35648b..7ccda9de0 100644
--- a/src/NetscriptFunctions/Singularity.ts
+++ b/src/NetscriptFunctions/Singularity.ts
@@ -1178,7 +1178,7 @@ export function NetscriptSingularity(): InternalAPI {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: '${crimeRoughName}'`);
}
helpers.log(ctx, () => `Attempting to commit ${crime.name}...`);
- const crimeTime = crime.commit(Player, 1, ctx.workerScript);
+ const crimeTime = crime.commit(1, ctx.workerScript);
if (focus) {
Player.startFocusing();
Router.toWork();
@@ -1275,7 +1275,7 @@ export function NetscriptSingularity(): InternalAPI {
const nextBN = helpers.number(ctx, "nextBN", _nextBN);
const callbackScript = helpers.string(ctx, "callbackScript", _callbackScript);
helpers.checkSingularityAccess(ctx);
- enterBitNode(Router, true, Player.bitNodeN, nextBN);
+ enterBitNode(true, Player.bitNodeN, nextBN);
if (callbackScript)
setTimeout(() => {
runAfterReset(callbackScript);
@@ -1308,7 +1308,7 @@ export function NetscriptSingularity(): InternalAPI {
wd.backdoorInstalled = true;
calculateAchievements();
- enterBitNode(Router, false, Player.bitNodeN, nextBN);
+ enterBitNode(false, Player.bitNodeN, nextBN);
if (callbackScript)
setTimeout(() => {
runAfterReset(callbackScript);
diff --git a/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx b/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx
index 0fb597bc9..c3030a06e 100644
--- a/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx
+++ b/src/PersonObjects/Sleeve/ui/CovenantPurchasesRoot.tsx
@@ -11,7 +11,7 @@ import { BaseCostPerSleeve, MaxSleevesFromCovenant } from "../SleeveCovenantPurc
import { Money } from "../../../ui/React/Money";
import { Modal } from "../../../ui/React/Modal";
-import { use } from "../../../ui/Context";
+import { Player } from "../../../Player";
import { dialogBoxCreate } from "../../../ui/React/DialogBox";
import Typography from "@mui/material/Typography";
@@ -24,14 +24,13 @@ interface IProps {
}
export function CovenantPurchasesRoot(props: IProps): React.ReactElement {
- const player = use.Player();
const [update, setUpdate] = useState(0);
/**
* Get the cost to purchase a new Duplicate Sleeve
*/
function purchaseCost(): number {
- return Math.pow(10, player.sleevesFromCovenant) * BaseCostPerSleeve;
+ return Math.pow(10, Player.sleevesFromCovenant) * BaseCostPerSleeve;
}
/**
@@ -43,20 +42,20 @@ export function CovenantPurchasesRoot(props: IProps): React.ReactElement {
// Purchasing a new Duplicate Sleeve
let purchaseDisabled = false;
- if (!player.canAfford(purchaseCost())) {
+ if (!Player.canAfford(purchaseCost())) {
purchaseDisabled = true;
}
- if (player.sleevesFromCovenant >= MaxSleevesFromCovenant) {
+ if (Player.sleevesFromCovenant >= MaxSleevesFromCovenant) {
purchaseDisabled = true;
}
function purchaseOnClick(): void {
- if (player.sleevesFromCovenant >= MaxSleevesFromCovenant) return;
+ if (Player.sleevesFromCovenant >= MaxSleevesFromCovenant) return;
- if (player.canAfford(purchaseCost())) {
- player.loseMoney(purchaseCost(), "sleeves");
- player.sleevesFromCovenant += 1;
- player.sleeves.push(new Sleeve());
+ if (Player.canAfford(purchaseCost())) {
+ Player.loseMoney(purchaseCost(), "sleeves");
+ Player.sleevesFromCovenant += 1;
+ Player.sleeves.push(new Sleeve());
rerender();
} else {
dialogBoxCreate(`You cannot afford to purchase a Duplicate Sleeve`);
@@ -65,15 +64,15 @@ export function CovenantPurchasesRoot(props: IProps): React.ReactElement {
// Purchasing Upgrades for Sleeves
const upgradePanels = [];
- for (let i = 0; i < player.sleeves.length; ++i) {
- const sleeve = player.sleeves[i];
+ for (let i = 0; i < Player.sleeves.length; ++i) {
+ const sleeve = Player.sleeves[i];
upgradePanels.push(
<>
- {player.sleevesFromCovenant < MaxSleevesFromCovenant && (
+ {Player.sleevesFromCovenant < MaxSleevesFromCovenant && (
<>
Purchase an additional Sleeves. These Duplicate Sleeves are permanent (they persist through BitNodes). You
diff --git a/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx b/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx
index 63804b052..e57ea52e3 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveRoot.tsx
@@ -2,13 +2,12 @@ import React, { useState, useEffect } from "react";
import { Box, Typography, Button, Container } from "@mui/material";
-import { use } from "../../../ui/Context";
+import { Player } from "../../../Player";
import { SleeveElem } from "./SleeveElem";
import { FAQModal } from "./FAQModal";
export function SleeveRoot(): React.ReactElement {
- const player = use.Player();
const [FAQOpen, setFAQOpen] = useState(false);
const setRerender = useState(false)[1];
function rerender(): void {
@@ -43,7 +42,7 @@ export function SleeveRoot(): React.ReactElement {
Wiki Documentation
- {player.sleeves.map((sleeve, i) => (
+ {Player.sleeves.map((sleeve, i) => (
diff --git a/src/RedPill.tsx b/src/RedPill.tsx
index 693982d87..0bcd7a054 100644
--- a/src/RedPill.tsx
+++ b/src/RedPill.tsx
@@ -8,7 +8,7 @@ import { PlayerOwnedSourceFile } from "./SourceFile/PlayerOwnedSourceFile";
import { SourceFiles } from "./SourceFile/SourceFiles";
import { dialogBoxCreate } from "./ui/React/DialogBox";
-import { IRouter } from "./ui/Router";
+import { Router } from "./ui/GameRoot";
function giveSourceFile(bitNodeNumber: number): void {
const sourceFileKey = "SourceFile" + bitNodeNumber.toString();
@@ -65,7 +65,7 @@ function giveSourceFile(bitNodeNumber: number): void {
}
}
-export function enterBitNode(router: IRouter, flume: boolean, destroyedBitNode: number, newBitNode: number): void {
+export function enterBitNode(flume: boolean, destroyedBitNode: number, newBitNode: number): void {
if (!flume) {
giveSourceFile(destroyedBitNode);
} else if (Player.sourceFileLvl(5) === 0 && newBitNode !== 5) {
@@ -79,9 +79,9 @@ export function enterBitNode(router: IRouter, flume: boolean, destroyedBitNode:
Player.bitNodeN = newBitNode;
if (newBitNode === 6) {
- router.toBladeburnerCinematic();
+ Router.toBladeburnerCinematic();
} else {
- router.toTerminal();
+ Router.toTerminal();
}
prestigeSourceFile(flume);
}
diff --git a/src/ui/ActiveScripts/ScriptProduction.tsx b/src/ui/ActiveScripts/ScriptProduction.tsx
index 15bab7fba..ed22d9bea 100644
--- a/src/ui/ActiveScripts/ScriptProduction.tsx
+++ b/src/ui/ActiveScripts/ScriptProduction.tsx
@@ -6,7 +6,7 @@ import * as React from "react";
import { Money } from "../React/Money";
import { MoneyRate } from "../React/MoneyRate";
-import { use } from "../Context";
+import { Player } from "../../Player";
import Typography from "@mui/material/Typography";
@@ -32,9 +32,8 @@ const useStyles = makeStyles((theme: Theme) =>
}),
);
export function ScriptProduction(): React.ReactElement {
- const player = use.Player();
const classes = useStyles();
- const prodRateSinceLastAug = player.scriptProdSinceLastAug / (player.playtimeSinceLastAug / 1000);
+ const prodRateSinceLastAug = Player.scriptProdSinceLastAug / (Player.playtimeSinceLastAug / 1000);
return (
@@ -45,7 +44,7 @@ export function ScriptProduction(): React.ReactElement {
-
diff --git a/src/ui/CharacterStats.tsx b/src/ui/CharacterStats.tsx
index 894e644d2..69398fc9f 100644
--- a/src/ui/CharacterStats.tsx
+++ b/src/ui/CharacterStats.tsx
@@ -9,7 +9,7 @@ import { getPurchaseServerLimit } from "../Server/ServerPurchases";
import { Settings } from "../Settings/Settings";
import { MoneySourceTracker } from "../utils/MoneySourceTracker";
import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
-import { use } from "./Context";
+import { Player } from "../Player";
import { numeralWrapper } from "./numeralFormat";
import { Modal } from "./React/Modal";
import { Money } from "./React/Money";
@@ -23,13 +23,12 @@ interface EmployersModalProps {
}
const EmployersModal = ({ open, onClose }: EmployersModalProps): React.ReactElement => {
- const player = use.Player();
return (
<>
All Employers
- {Object.keys(player.jobs).map((j) => (
+ {Object.keys(Player.jobs).map((j) => (
* {j}
))}
@@ -59,14 +58,13 @@ interface MultTableProps {
}
function MultiplierTable(props: MultTableProps): React.ReactElement {
- const player = use.Player();
return (
{props.rows.map((data) => {
const { mult, value, effValue = null, color = props.color } = data;
- if (effValue !== null && effValue !== value && player.sourceFileLvl(5) > 0) {
+ if (effValue !== null && effValue !== value && Player.sourceFileLvl(5) > 0) {
return (
<>
@@ -88,14 +86,13 @@ function MultiplierTable(props: MultTableProps): React.ReactElement {
}
function CurrentBitNode(): React.ReactElement {
- const player = use.Player();
- if (player.sourceFiles.length > 0) {
- const index = "BitNode" + player.bitNodeN;
- const lvl = Math.min(player.sourceFileLvl(player.bitNodeN) + 1, player.bitNodeN === 12 ? Infinity : 3);
+ if (Player.sourceFiles.length > 0) {
+ const index = "BitNode" + Player.bitNodeN;
+ const lvl = Math.min(Player.sourceFileLvl(Player.bitNodeN) + 1, Player.bitNodeN === 12 ? Infinity : 3);
return (
- BitNode {player.bitNodeN}: {BitNodes[index].name} (Level {lvl})
+ BitNode {Player.bitNodeN}: {BitNodes[index].name} (Level {lvl})
{BitNodes[index].info}
@@ -111,7 +108,6 @@ interface IMoneyModalProps {
}
function MoneyModal({ open, onClose }: IMoneyModalProps): React.ReactElement {
- const player = use.Player();
function convertMoneySourceTrackerToString(src: MoneySourceTracker): React.ReactElement {
const parts: [string, JSX.Element][] = [[`Total:`, General
-
<>
- setMoneyOpen(true)} sx={{ p: 0 }}>
- {player.jobs && Object.keys(player.jobs).length !== 0 ? (
+ {Player.jobs && Object.keys(Player.jobs).length !== 0 ? (
<>
- {Object.keys(player.jobs).length} total
+ {Object.keys(Player.jobs).length} total
setEmployersOpen(true)} sx={{ p: 0 }}>
@@ -265,14 +260,14 @@ export function CharacterStats(): React.ReactElement {
0 ? "Servers" : "Nodes"} owned`}
+ name={`Hacknet ${Player.bitNodeN === 9 || Player.sourceFileLvl(9) > 0 ? "Servers" : "Nodes"} owned`}
color={Settings.theme.primary}
data={{
- content: `${player.hacknetNodes.length}${
- player.bitNodeN === 9 || player.sourceFileLvl(9) > 0
+ content: `${Player.hacknetNodes.length}${
+ Player.bitNodeN === 9 || Player.sourceFileLvl(9) > 0
? ` / ${HacknetServerConstants.MaxServers}`
: ""
}`,
@@ -281,7 +276,7 @@ export function CharacterStats(): React.ReactElement {
@@ -293,38 +288,38 @@ export function CharacterStats(): React.ReactElement {
@@ -335,7 +330,7 @@ export function CharacterStats(): React.ReactElement {
Multipliers
- {player.sourceFileLvl(5) > 0 && (
+ {Player.sourceFileLvl(5) > 0 && (
@@ -361,21 +356,21 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Hacking Chance",
- value: player.mults.hacking_chance,
+ value: Player.mults.hacking_chance,
},
{
mult: "Hacking Speed",
- value: player.mults.hacking_speed,
+ value: Player.mults.hacking_speed,
},
{
mult: "Hacking Money",
- value: player.mults.hacking_money,
- effValue: player.mults.hacking_money * BitNodeMultipliers.ScriptHackMoney,
+ value: Player.mults.hacking_money,
+ effValue: Player.mults.hacking_money * BitNodeMultipliers.ScriptHackMoney,
},
{
mult: "Hacking Growth",
- value: player.mults.hacking_grow,
- effValue: player.mults.hacking_grow * BitNodeMultipliers.ServerGrowthRate,
+ value: Player.mults.hacking_grow,
+ effValue: Player.mults.hacking_grow * BitNodeMultipliers.ServerGrowthRate,
},
]}
color={Settings.theme.hack}
@@ -384,13 +379,13 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Hacking Level",
- value: player.mults.hacking,
- effValue: player.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier,
+ value: Player.mults.hacking,
+ effValue: Player.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier,
},
{
mult: "Hacking Experience",
- value: player.mults.hacking_exp,
- effValue: player.mults.hacking_exp * BitNodeMultipliers.HackExpGain,
+ value: Player.mults.hacking_exp,
+ effValue: Player.mults.hacking_exp * BitNodeMultipliers.HackExpGain,
},
]}
color={Settings.theme.hack}
@@ -399,12 +394,12 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Strength Level",
- value: player.mults.strength,
- effValue: player.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier,
+ value: Player.mults.strength,
+ effValue: Player.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier,
},
{
mult: "Strength Experience",
- value: player.mults.strength_exp,
+ value: Player.mults.strength_exp,
},
]}
color={Settings.theme.combat}
@@ -413,12 +408,12 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Defense Level",
- value: player.mults.defense,
- effValue: player.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier,
+ value: Player.mults.defense,
+ effValue: Player.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier,
},
{
mult: "Defense Experience",
- value: player.mults.defense_exp,
+ value: Player.mults.defense_exp,
},
]}
color={Settings.theme.combat}
@@ -427,12 +422,12 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Dexterity Level",
- value: player.mults.dexterity,
- effValue: player.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier,
+ value: Player.mults.dexterity,
+ effValue: Player.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier,
},
{
mult: "Dexterity Experience",
- value: player.mults.dexterity_exp,
+ value: Player.mults.dexterity_exp,
},
]}
color={Settings.theme.combat}
@@ -441,12 +436,12 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Agility Level",
- value: player.mults.agility,
- effValue: player.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier,
+ value: Player.mults.agility,
+ effValue: Player.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier,
},
{
mult: "Agility Experience",
- value: player.mults.agility_exp,
+ value: Player.mults.agility_exp,
},
]}
color={Settings.theme.combat}
@@ -455,12 +450,12 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Charisma Level",
- value: player.mults.charisma,
- effValue: player.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier,
+ value: Player.mults.charisma,
+ effValue: Player.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier,
},
{
mult: "Charisma Experience",
- value: player.mults.charisma_exp,
+ value: Player.mults.charisma_exp,
},
]}
color={Settings.theme.cha}
@@ -473,24 +468,24 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Hacknet Node Production",
- value: player.mults.hacknet_node_money,
- effValue: player.mults.hacknet_node_money * BitNodeMultipliers.HacknetNodeMoney,
+ value: Player.mults.hacknet_node_money,
+ effValue: Player.mults.hacknet_node_money * BitNodeMultipliers.HacknetNodeMoney,
},
{
mult: "Hacknet Node Purchase Cost",
- value: player.mults.hacknet_node_purchase_cost,
+ value: Player.mults.hacknet_node_purchase_cost,
},
{
mult: "Hacknet Node RAM Upgrade Cost",
- value: player.mults.hacknet_node_ram_cost,
+ value: Player.mults.hacknet_node_ram_cost,
},
{
mult: "Hacknet Node Core Purchase Cost",
- value: player.mults.hacknet_node_core_cost,
+ value: Player.mults.hacknet_node_core_cost,
},
{
mult: "Hacknet Node Level Upgrade Cost",
- value: player.mults.hacknet_node_level_cost,
+ value: Player.mults.hacknet_node_level_cost,
},
]}
color={Settings.theme.primary}
@@ -499,19 +494,19 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Company Reputation Gain",
- value: player.mults.company_rep,
+ value: Player.mults.company_rep,
color: Settings.theme.rep,
},
{
mult: "Faction Reputation Gain",
- value: player.mults.faction_rep,
- effValue: player.mults.faction_rep * BitNodeMultipliers.FactionWorkRepGain,
+ value: Player.mults.faction_rep,
+ effValue: Player.mults.faction_rep * BitNodeMultipliers.FactionWorkRepGain,
color: Settings.theme.rep,
},
{
mult: "Salary",
- value: player.mults.work_money,
- effValue: player.mults.work_money * BitNodeMultipliers.CompanyWorkMoney,
+ value: Player.mults.work_money,
+ effValue: Player.mults.work_money * BitNodeMultipliers.CompanyWorkMoney,
color: Settings.theme.money,
},
]}
@@ -521,35 +516,35 @@ export function CharacterStats(): React.ReactElement {
rows={[
{
mult: "Crime Success Chance",
- value: player.mults.crime_success,
+ value: Player.mults.crime_success,
},
{
mult: "Crime Money",
- value: player.mults.crime_money,
- effValue: player.mults.crime_money * BitNodeMultipliers.CrimeMoney,
+ value: Player.mults.crime_money,
+ effValue: Player.mults.crime_money * BitNodeMultipliers.CrimeMoney,
color: Settings.theme.money,
},
]}
color={Settings.theme.combat}
/>
- {player.canAccessBladeburner() && BitNodeMultipliers.BladeburnerRank > 0 && (
+ {Player.canAccessBladeburner() && BitNodeMultipliers.BladeburnerRank > 0 && (
BitNode Multipliers
-
)}
diff --git a/src/ui/Context.ts b/src/ui/Context.ts
deleted file mode 100644
index c54b1868a..000000000
--- a/src/ui/Context.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, { useContext } from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
-import { IRouter } from "./Router";
-
-export const Context: {
- Player: React.Context;
- Router: React.Context;
-} = {
- Player: React.createContext({} as IPlayer),
- Router: React.createContext({} as IRouter),
-};
-
-export const use: {
- Player: () => IPlayer;
- Router: () => IRouter;
-} = {
- Player: () => useContext(Context.Player),
- Router: () => useContext(Context.Router),
-};
diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx
index b7d48c2a2..8836c3f03 100644
--- a/src/ui/GameRoot.tsx
+++ b/src/ui/GameRoot.tsx
@@ -64,8 +64,6 @@ import { PromptManager } from "./React/PromptManager";
import { InvitationModal } from "../Faction/ui/InvitationModal";
import { calculateAchievements } from "../Achievements/Achievements";
-import { enterBitNode } from "../RedPill";
-import { Context } from "./Context";
import { RecoveryMode, RecoveryRoot } from "./React/RecoveryRoot";
import { AchievementsRoot } from "../Achievements/AchievementsRoot";
import { ErrorBoundary } from "./ErrorBoundary";
@@ -316,7 +314,7 @@ export function GameRoot(): React.ReactElement {
break;
}
case Page.BitVerse: {
- mainPage =
- {numeralWrapper.formatSkill(player.skills.intelligence)}
+ {numeralWrapper.formatSkill(Player.skills.intelligence)}
@@ -75,9 +75,8 @@ function Intelligence(): React.ReactElement {
}
function Bladeburner(): React.ReactElement {
- const player = use.Player();
const classes = useStyles();
- const bladeburner = player.bladeburner;
+ const bladeburner = Player.bladeburner;
if (bladeburner === null) return <>;
const action = bladeburner.getTypeAndNameFromActionId(bladeburner.action);
if (action.type === "Idle") return <>;
@@ -141,32 +140,30 @@ function WorkInProgressOverview({
}
function Work(): React.ReactElement {
- const player = use.Player();
- const router = use.Router();
const onClickFocus = (): void => {
- player.startFocusing();
- router.toWork();
+ Player.startFocusing();
+ Router.toWork();
};
- if (player.currentWork === null || player.focus) return <>;
+ if (Player.currentWork === null || Player.focus) return <>;
let details = <>;
let header = <>;
let innerText = <>;
- if (isCrimeWork(player.currentWork)) {
- const crime = player.currentWork.getCrime();
- const perc = (player.currentWork.unitCompleted / crime.time) * 100;
+ if (isCrimeWork(Player.currentWork)) {
+ const crime = Player.currentWork.getCrime();
+ const perc = (Player.currentWork.unitCompleted / crime.time) * 100;
- details = <>{player.currentWork.crimeType};
- header = <>You are attempting to {player.currentWork.crimeType};
+ details = <>{Player.currentWork.crimeType};
+ header = <>You are attempting to {Player.currentWork.crimeType};
innerText = <>{perc.toFixed(2)}%;
}
- if (isClassWork(player.currentWork)) {
- details = <>{player.currentWork.getClass().youAreCurrently};
- header = <>You are {player.currentWork.getClass().youAreCurrently};
- innerText = <>{convertTimeMsToTimeElapsedString(player.currentWork.cyclesWorked * CONSTANTS._idleSpeed)};
+ if (isClassWork(Player.currentWork)) {
+ details = <>{Player.currentWork.getClass().youAreCurrently};
+ header = <>You are {Player.currentWork.getClass().youAreCurrently};
+ innerText = <>{convertTimeMsToTimeElapsedString(Player.currentWork.cyclesWorked * CONSTANTS._idleSpeed)};
}
- if (isCreateProgramWork(player.currentWork)) {
- const create = player.currentWork;
+ if (isCreateProgramWork(Player.currentWork)) {
+ const create = Player.currentWork;
details = <>Coding {create.programName};
header = <>Creating a program;
innerText = (
@@ -175,8 +172,8 @@ function Work(): React.ReactElement {
);
}
- if (isGraftingWork(player.currentWork)) {
- const graft = player.currentWork;
+ if (isGraftingWork(Player.currentWork)) {
+ const graft = Player.currentWork;
details = <>Grafting {graft.augmentation};
header = <>Grafting an Augmentation;
innerText = (
@@ -186,8 +183,8 @@ function Work(): React.ReactElement {
);
}
- if (isFactionWork(player.currentWork)) {
- const factionWork = player.currentWork;
+ if (isFactionWork(Player.currentWork)) {
+ const factionWork = Player.currentWork;
header = (
<>
Working for {factionWork.factionName}
@@ -201,11 +198,11 @@ function Work(): React.ReactElement {
);
}
- if (isCompanyWork(player.currentWork)) {
- const companyWork = player.currentWork;
+ if (isCompanyWork(Player.currentWork)) {
+ const companyWork = Player.currentWork;
details = (
<>
- {player.jobs[companyWork.companyName]} at {companyWork.companyName}
+ {Player.jobs[companyWork.companyName]} at {companyWork.companyName}
);
header = (
@@ -215,7 +212,7 @@ function Work(): React.ReactElement {
);
innerText = (
<>
-
- {numeralWrapper.formatHp(player.hp.current)} / {numeralWrapper.formatHp(player.hp.max)}
+ {numeralWrapper.formatHp(Player.hp.current)} / {numeralWrapper.formatHp(Player.hp.max)}
@@ -343,7 +336,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
Money
- {numeralWrapper.formatMoney(player.money)}
+ {numeralWrapper.formatMoney(Player.money)}
@@ -358,7 +351,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
- {numeralWrapper.formatSkill(player.skills.hacking)}
+ {numeralWrapper.formatSkill(Player.skills.hacking)}
@@ -384,7 +377,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
- {numeralWrapper.formatSkill(player.skills.strength)}
+ {numeralWrapper.formatSkill(Player.skills.strength)}
@@ -405,7 +398,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
- {numeralWrapper.formatSkill(player.skills.defense)}
+ {numeralWrapper.formatSkill(Player.skills.defense)}
@@ -426,7 +419,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
- {numeralWrapper.formatSkill(player.skills.dexterity)}
+ {numeralWrapper.formatSkill(Player.skills.dexterity)}
@@ -447,7 +440,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
- {numeralWrapper.formatSkill(player.skills.agility)}
+ {numeralWrapper.formatSkill(Player.skills.agility)}
@@ -468,7 +461,7 @@ export function CharacterOverview({ save, killScripts }: IProps): React.ReactEle
- {numeralWrapper.formatSkill(player.skills.charisma)}
+ {numeralWrapper.formatSkill(Player.skills.charisma)}
diff --git a/src/ui/React/Overview.tsx b/src/ui/React/Overview.tsx
index 8923cbd27..cccf54681 100644
--- a/src/ui/React/Overview.tsx
+++ b/src/ui/React/Overview.tsx
@@ -7,7 +7,7 @@ import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import EqualizerIcon from "@mui/icons-material/Equalizer";
import SchoolIcon from "@mui/icons-material/School";
-import { use } from "../Context";
+import { Router } from "../GameRoot";
import { Page } from "../Router";
import { Settings } from "../../Settings/Settings";
import { Box, Button, Typography } from "@mui/material";
@@ -69,7 +69,6 @@ export function Overview({ children, mode }: IProps): React.ReactElement {
const [x, setX] = useState(Settings.overview.x);
const [y, setY] = useState(Settings.overview.y);
const classes = useStyles();
- const router = use.Router();
const CurrentIcon = open ? KeyboardArrowUpIcon : KeyboardArrowDownIcon;
const LeftIcon = mode === "tutorial" ? SchoolIcon : EqualizerIcon;
@@ -113,7 +112,7 @@ export function Overview({ children, mode }: IProps): React.ReactElement {
node.dispatchEvent(clickEvent);
};
- if (router.page() === Page.BitVerse || router.page() === Page.Loading || router.page() === Page.Recovery)
+ if (Router.page() === Page.BitVerse || Router.page() === Page.Loading || Router.page() === Page.Recovery)
return <>;
return (
From c9ee938bc64a51527e9e1ae04e7a1dfade45c530 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 12 Sep 2022 18:05:48 -0400
Subject: [PATCH 14/46] fix previous commit
---
src/ui/GameRoot.tsx | 82 +++++++++++++++---------------
src/ui/React/CharacterOverview.tsx | 2 +-
2 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx
index 8836c3f03..481d146e0 100644
--- a/src/ui/GameRoot.tsx
+++ b/src/ui/GameRoot.tsx
@@ -476,49 +476,47 @@ export function GameRoot(): React.ReactElement {
}
return (
-
-
-
-
-
-
- {!ITutorial.isRunning ? (
- saveObject.saveGame()} killScripts={killAllScripts} />
- ) : (
-
- {withSidebar ? (
-
- {
- setSideBarOpened(isOpened);
- Settings.IsSidebarOpened = isOpened;
- }}
- />
- {mainPage}
-
+ <>
+
+
+
+
+ {!ITutorial.isRunning ? (
+ saveObject.saveGame()} killScripts={killAllScripts} />
) : (
+
+ {withSidebar ? (
+
+ {
+ setSideBarOpened(isOpened);
+ Settings.IsSidebarOpened = isOpened;
+ }}
+ />
{mainPage}
- )}
-
-
-
-
-
+
+ ) : (
+ {mainPage}
+ )}
+ gangs
)}
- {Player.canAccessGrafting() &&
- !props.aug.isSpecial &&
- props.aug.name !== AugmentationNames.TheRedPill && (
-
- Grafting
-
- )}
+ {Player.canAccessGrafting() && !props.aug.isSpecial && props.aug.name !== AugmentationNames.TheRedPill && (
+
+ Grafting
+
+ )}
@@ -209,8 +207,7 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
<>
{props.augName}
- {props.augName === AugmentationNames.NeuroFluxGovernor &&
- ` - Level ${aug.getLevel()}`}
+ {props.augName === AugmentationNames.NeuroFluxGovernor && ` - Level ${aug.getLevel()}`}
{description}
@@ -223,9 +220,7 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
whiteSpace: "nowrap",
overflow: "hidden",
color:
- props.owned || !props.parent.canPurchase(aug)
- ? Settings.theme.disabled
- : Settings.theme.primary,
+ props.owned || !props.parent.canPurchase(aug) ? Settings.theme.disabled : Settings.theme.primary,
}}
>
{aug.name}
@@ -233,9 +228,7 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
- {aug.factions.length === 1 && !props.parent.sleeveAugs && (
- , State> {
deck: Deck;
constructor() {
diff --git a/src/Casino/Game.ts b/src/Casino/Game.ts
index 378f4f0cd..1a0d90032 100644
--- a/src/Casino/Game.ts
+++ b/src/Casino/Game.ts
@@ -13,4 +13,4 @@ export function reachedLimit(): boolean {
dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
}
return reached;
-}
\ No newline at end of file
+}
diff --git a/src/Exploits/Unclickable.tsx b/src/Exploits/Unclickable.tsx
index 8e6c5fe9c..b5f9f354a 100644
--- a/src/Exploits/Unclickable.tsx
+++ b/src/Exploits/Unclickable.tsx
@@ -4,7 +4,6 @@ import { Exploit } from "./Exploit";
const getComputedStyle = window.getComputedStyle;
export function Unclickable(): React.ReactElement {
-
function unclickable(event: React.MouseEvent): void {
if (!event.target || !(event.target instanceof Element)) return;
const display = getComputedStyle(event.target).display;
diff --git a/src/Hacknet/HacknetHelpers.tsx b/src/Hacknet/HacknetHelpers.tsx
index d3d710d0e..7dadce022 100644
--- a/src/Hacknet/HacknetHelpers.tsx
+++ b/src/Hacknet/HacknetHelpers.tsx
@@ -153,10 +153,7 @@ export function getMaxNumberRamUpgrades(nodeObj: HacknetNode | HacknetServer, ma
}
// Calculate the maximum number of times the Player can afford to upgrade a Hacknet Node's cores
-export function getMaxNumberCoreUpgrades(
- nodeObj: HacknetNode | HacknetServer,
- maxLevel: number,
-): number {
+export function getMaxNumberCoreUpgrades(nodeObj: HacknetNode | HacknetServer, maxLevel: number): number {
if (maxLevel == null) {
throw new Error(`getMaxNumberCoreUpgrades() called without maxLevel arg`);
}
diff --git a/src/Hacknet/ui/HacknetNodeElem.tsx b/src/Hacknet/ui/HacknetNodeElem.tsx
index b1074ddc9..818e853cb 100644
--- a/src/Hacknet/ui/HacknetNodeElem.tsx
+++ b/src/Hacknet/ui/HacknetNodeElem.tsx
@@ -77,9 +77,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
}
function upgradeLevelOnClick(): void {
const numUpgrades =
- purchaseMult === "MAX"
- ? getMaxNumberLevelUpgrades(node, HacknetNodeConstants.MaxLevel)
- : purchaseMult;
+ purchaseMult === "MAX" ? getMaxNumberLevelUpgrades(node, HacknetNodeConstants.MaxLevel) : purchaseMult;
purchaseLevelUpgrade(node, numUpgrades);
rerender();
}
@@ -128,9 +126,7 @@ export function HacknetNodeElem(props: IProps): React.ReactElement {
function upgradeCoresOnClick(): void {
const numUpgrades =
- purchaseMult === "MAX"
- ? getMaxNumberCoreUpgrades(node, HacknetNodeConstants.MaxCores)
- : purchaseMult;
+ purchaseMult === "MAX" ? getMaxNumberCoreUpgrades(node, HacknetNodeConstants.MaxCores) : purchaseMult;
purchaseCoreUpgrade(node, numUpgrades);
rerender();
}
diff --git a/src/Hacknet/ui/HacknetServerElem.tsx b/src/Hacknet/ui/HacknetServerElem.tsx
index 2a2a2d7ae..ef97988ef 100644
--- a/src/Hacknet/ui/HacknetServerElem.tsx
+++ b/src/Hacknet/ui/HacknetServerElem.tsx
@@ -60,13 +60,8 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
}
const base_increase =
- calculateHashGainRate(
- node.level + multiplier,
- 0,
- node.maxRam,
- node.cores,
- Player.mults.hacknet_node_money,
- ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
+ calculateHashGainRate(node.level + multiplier, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money) -
+ calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
const modded_increase = (base_increase * (node.maxRam - node.ramUsed)) / node.maxRam;
const upgradeLevelCost = node.calculateLevelUpgradeCost(multiplier, Player.mults.hacknet_node_level_cost);
@@ -136,8 +131,7 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
node.maxRam * Math.pow(2, multiplier),
node.cores,
Player.mults.hacknet_node_money,
- ) -
- calculateHashGainRate(node.level, node.ramUsed, node.maxRam, node.cores, Player.mults.hacknet_node_money);
+ ) - calculateHashGainRate(node.level, node.ramUsed, node.maxRam, node.cores, Player.mults.hacknet_node_money);
const upgradeRamCost = node.calculateRamUpgradeCost(multiplier, Player.mults.hacknet_node_ram_cost);
upgradeRamButton = (
@@ -183,13 +177,8 @@ export function HacknetServerElem(props: IProps): React.ReactElement {
}
const base_increase =
- calculateHashGainRate(
- node.level,
- 0,
- node.maxRam,
- node.cores + multiplier,
- Player.mults.hacknet_node_money,
- ) - calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
+ calculateHashGainRate(node.level, 0, node.maxRam, node.cores + multiplier, Player.mults.hacknet_node_money) -
+ calculateHashGainRate(node.level, 0, node.maxRam, node.cores, Player.mults.hacknet_node_money);
const modded_increase = (base_increase * (node.maxRam - node.ramUsed)) / node.maxRam;
const upgradeCoreCost = node.calculateCoreUpgradeCost(multiplier, Player.mults.hacknet_node_core_cost);
diff --git a/src/Infiltration/ui/InfiltrationRoot.tsx b/src/Infiltration/ui/InfiltrationRoot.tsx
index 5f86ea28b..30baf09ce 100644
--- a/src/Infiltration/ui/InfiltrationRoot.tsx
+++ b/src/Infiltration/ui/InfiltrationRoot.tsx
@@ -18,7 +18,7 @@ export function InfiltrationRoot(props: IProps): React.ReactElement {
const reward = calculateReward(Player, startingSecurityLevel);
function cancel(): void {
- Router.toCity();
+ Router.toCity();
}
return (
diff --git a/src/Locations/ui/HospitalLocation.tsx b/src/Locations/ui/HospitalLocation.tsx
index aabf4ae49..9467120f8 100644
--- a/src/Locations/ui/HospitalLocation.tsx
+++ b/src/Locations/ui/HospitalLocation.tsx
@@ -13,20 +13,18 @@ import { Money } from "../../ui/React/Money";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
-type IProps = {};
-
type IState = {
currHp: number;
};
-export class HospitalLocation extends React.Component {
+export class HospitalLocation extends React.Component, IState> {
/**
* Stores button styling that sets them all to block display
*/
btnStyle = { display: "block" };
- constructor(props: IProps) {
- super(props);
+ constructor() {
+ super({});
this.getCost = this.getCost.bind(this);
this.getHealed = this.getHealed.bind(this);
diff --git a/src/Locations/ui/TorButton.tsx b/src/Locations/ui/TorButton.tsx
index aee55eb67..80e69671f 100644
--- a/src/Locations/ui/TorButton.tsx
+++ b/src/Locations/ui/TorButton.tsx
@@ -5,7 +5,6 @@ import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { GetServer } from "../../Server/AllServers";
import { SpecialServers } from "../../Server/data/SpecialServers";
-
import { CONSTANTS } from "../../Constants";
import { Player } from "../../Player";
@@ -14,7 +13,7 @@ import { Money } from "../../ui/React/Money";
/**
* Attempt to purchase a TOR router using the button.
*/
- export function purchaseTorRouter(): void {
+export function purchaseTorRouter(): void {
if (Player.hasTorRouter()) {
dialogBoxCreate(`You already have a TOR Router!`);
return;
diff --git a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
index b2d106eef..07adf4e3c 100644
--- a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
+++ b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx
@@ -124,9 +124,7 @@ export const GraftingRoot = (): React.ReactElement => {
setSelectedAug(k)} selected={selectedAug === k}>
{k}
diff --git a/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts b/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
index 8d8213c6f..1b59b78fb 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveClassWork.ts
@@ -1,4 +1,3 @@
-import { IPlayer } from "../../IPlayer";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { applySleeveGains, Work, WorkType } from "./Work";
import { ClassType } from "../../../Work/ClassWork";
@@ -25,11 +24,7 @@ export class SleeveClassWork extends Work {
}
calculateRates(sleeve: Sleeve): WorkStats {
- return scaleWorkStats(
- calculateClassEarnings(sleeve, this.classType, this.location),
- sleeve.shockBonus(),
- false,
- );
+ return scaleWorkStats(calculateClassEarnings(sleeve, this.classType, this.location), sleeve.shockBonus(), false);
}
isGym(): boolean {
diff --git a/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
index 795f3d451..a3a53e5a3 100644
--- a/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
+++ b/src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts
@@ -1,4 +1,3 @@
-import { IPlayer } from "../../IPlayer";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
import { Sleeve } from "../Sleeve";
import { applySleeveGains, Work, WorkType } from "./Work";
diff --git a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
index 4d76044c9..a54ed2e3d 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
@@ -200,9 +200,7 @@ export function SleeveElem(props: IProps): React.ReactElement {
{numeralWrapper.formatMoney(props.money)} ;
+ if (props.forPurchase) {
+ if (typeof props.money !== "number")
+ throw new Error("if value is for a purchase, money should be number, contact dev");
+ if (!Player.canAfford(props.money))
+ return {numeralWrapper.formatMoney(props.money)} ;
}
return (
diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx
index dd518ec6d..d07fc6f40 100644
--- a/src/ui/WorkInProgressRoot.tsx
+++ b/src/ui/WorkInProgressRoot.tsx
@@ -11,7 +11,7 @@ import { Locations } from "../Locations/Locations";
import { Settings } from "../Settings/Settings";
import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
import { Player } from "../Player";
-import { Router } from "./GameRoot"
+import { Router } from "./GameRoot";
import { numeralWrapper } from "./numeralFormat";
import { Money } from "./React/Money";
import { MoneyRate } from "./React/MoneyRate";
From 1ac57d2e486f574b5b9f798d1c0d542d9acf8c63 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:15:36 -0400
Subject: [PATCH 16/46] Fix use-before-defined import issue
---
.../ui/BitnodeMultipliersDescription.tsx | 2 +-
src/DarkWeb/DarkWebItems.ts | 35 ++++++++++---------
src/Locations/ui/GenericLocation.tsx | 18 +++++-----
src/Locations/ui/HospitalLocation.tsx | 4 +--
src/engine.tsx | 3 ++
5 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/BitNode/ui/BitnodeMultipliersDescription.tsx b/src/BitNode/ui/BitnodeMultipliersDescription.tsx
index 21225d995..c42dc1a2a 100644
--- a/src/BitNode/ui/BitnodeMultipliersDescription.tsx
+++ b/src/BitNode/ui/BitnodeMultipliersDescription.tsx
@@ -5,7 +5,7 @@ import { uniqueId } from "lodash";
import React from "react";
import { SpecialServers } from "../../Server/data/SpecialServers";
import { Settings } from "../../Settings/Settings";
-import { Player } from "../../ui/Player";
+import { Player } from "../../Player";
import { StatsRow } from "../../ui/React/StatsRow";
import { defaultMultipliers, getBitNodeMultipliers } from "../BitNode";
import { IBitNodeMultipliers } from "../BitNodeMultipliers";
diff --git a/src/DarkWeb/DarkWebItems.ts b/src/DarkWeb/DarkWebItems.ts
index ff9161f9e..c6515d032 100644
--- a/src/DarkWeb/DarkWebItems.ts
+++ b/src/DarkWeb/DarkWebItems.ts
@@ -2,19 +2,22 @@ import { DarkWebItem } from "./DarkWebItem";
import { IMap } from "../types";
import { Programs } from "../Programs/Programs";
-export const DarkWebItems: IMap = {
- BruteSSHProgram: new DarkWebItem(Programs.BruteSSHProgram.name, 500e3, "Opens up SSH Ports."),
- FTPCrackProgram: new DarkWebItem(Programs.FTPCrackProgram.name, 1500e3, "Opens up FTP Ports."),
- RelaySMTPProgram: new DarkWebItem(Programs.RelaySMTPProgram.name, 5e6, "Opens up SMTP Ports."),
- HTTPWormProgram: new DarkWebItem(Programs.HTTPWormProgram.name, 30e6, "Opens up HTTP Ports."),
- SQLInjectProgram: new DarkWebItem(Programs.SQLInjectProgram.name, 250e6, "Opens up SQL Ports."),
- ServerProfiler: new DarkWebItem(
- Programs.ServerProfiler.name,
- 500000,
- "Displays detailed information about a server.",
- ),
- DeepscanV1: new DarkWebItem(Programs.DeepscanV1.name, 500000, "Enables 'scan-analyze' with a depth up to 5."),
- DeepscanV2: new DarkWebItem(Programs.DeepscanV2.name, 25e6, "Enables 'scan-analyze' with a depth up to 10."),
- AutolinkProgram: new DarkWebItem(Programs.AutoLink.name, 1e6, "Enables direct connect via 'scan-analyze'."),
- FormulasProgram: new DarkWebItem(Programs.Formulas.name, 5e9, "Unlock access to the formulas API."),
-};
+export const DarkWebItems: IMap = {};
+export function initDarkWebItems() {
+ Object.assign(DarkWebItems, {
+ BruteSSHProgram: new DarkWebItem(Programs.BruteSSHProgram.name, 500e3, "Opens up SSH Ports."),
+ FTPCrackProgram: new DarkWebItem(Programs.FTPCrackProgram.name, 1500e3, "Opens up FTP Ports."),
+ RelaySMTPProgram: new DarkWebItem(Programs.RelaySMTPProgram.name, 5e6, "Opens up SMTP Ports."),
+ HTTPWormProgram: new DarkWebItem(Programs.HTTPWormProgram.name, 30e6, "Opens up HTTP Ports."),
+ SQLInjectProgram: new DarkWebItem(Programs.SQLInjectProgram.name, 250e6, "Opens up SQL Ports."),
+ ServerProfiler: new DarkWebItem(
+ Programs.ServerProfiler.name,
+ 500000,
+ "Displays detailed information about a server.",
+ ),
+ DeepscanV1: new DarkWebItem(Programs.DeepscanV1.name, 500000, "Enables 'scan-analyze' with a depth up to 5."),
+ DeepscanV2: new DarkWebItem(Programs.DeepscanV2.name, 25e6, "Enables 'scan-analyze' with a depth up to 10."),
+ AutolinkProgram: new DarkWebItem(Programs.AutoLink.name, 1e6, "Enables direct connect via 'scan-analyze'."),
+ FormulasProgram: new DarkWebItem(Programs.Formulas.name, 5e9, "Unlock access to the formulas API."),
+ });
+}
diff --git a/src/Locations/ui/GenericLocation.tsx b/src/Locations/ui/GenericLocation.tsx
index 956dda058..97455a1e3 100644
--- a/src/Locations/ui/GenericLocation.tsx
+++ b/src/Locations/ui/GenericLocation.tsx
@@ -44,39 +44,39 @@ export function GenericLocation({ loc }: IProps): React.ReactElement {
const content: React.ReactNode[] = [];
if (loc.types.includes(LocationType.Company)) {
- content.push(, IState> {
/**
* Stores button styling that sets them all to block display
@@ -26,9 +27,6 @@ export class HospitalLocation extends React.Component, ISt
constructor() {
super({});
- this.getCost = this.getCost.bind(this);
- this.getHealed = this.getHealed.bind(this);
-
this.state = {
currHp: Player.hp.current,
};
diff --git a/src/engine.tsx b/src/engine.tsx
index 03ceac12d..d12e408cf 100644
--- a/src/engine.tsx
+++ b/src/engine.tsx
@@ -5,6 +5,7 @@ import { convertTimeMsToTimeElapsedString } from "./utils/StringHelperFunctions"
import { initAugmentations } from "./Augmentation/AugmentationHelpers";
import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
import { initBitNodeMultipliers } from "./BitNode/BitNode";
+import { initDarkWebItems } from "./DarkWeb/DarkWebItems";
import { Bladeburner } from "./Bladeburner/Bladeburner";
import { generateRandomContract } from "./CodingContractGenerator";
import { initCompanies } from "./Company/Companies";
@@ -241,6 +242,7 @@ const Engine: {
ThemeEvents.emit();
initBitNodeMultipliers();
+ initDarkWebItems();
initAugmentations(); // Also calls Player.reapplyAllAugmentations()
Player.reapplyAllSourceFiles();
if (Player.hasWseAccount) {
@@ -398,6 +400,7 @@ const Engine: {
initForeignServers(Player.getHomeComputer());
initCompanies();
initFactions();
+ initDarkWebItems();
initAugmentations();
// Start interactive tutorial
From 88e2cdf09c6f75c4db021e305e156ec3cdba0429 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:18:09 -0400
Subject: [PATCH 17/46] Remove more execute-on-import code
---
src/DarkWeb/DarkWebItems.ts | 3 ++-
src/Programs/Programs.ts | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/DarkWeb/DarkWebItems.ts b/src/DarkWeb/DarkWebItems.ts
index c6515d032..191540fbf 100644
--- a/src/DarkWeb/DarkWebItems.ts
+++ b/src/DarkWeb/DarkWebItems.ts
@@ -1,9 +1,10 @@
import { DarkWebItem } from "./DarkWebItem";
import { IMap } from "../types";
-import { Programs } from "../Programs/Programs";
+import { Programs, initPrograms } from "../Programs/Programs";
export const DarkWebItems: IMap = {};
export function initDarkWebItems() {
+ initPrograms();
Object.assign(DarkWebItems, {
BruteSSHProgram: new DarkWebItem(Programs.BruteSSHProgram.name, 500e3, "Opens up SSH Ports."),
FTPCrackProgram: new DarkWebItem(Programs.FTPCrackProgram.name, 1500e3, "Opens up FTP Ports."),
diff --git a/src/Programs/Programs.ts b/src/Programs/Programs.ts
index e17c5c7e0..c6885dbaa 100644
--- a/src/Programs/Programs.ts
+++ b/src/Programs/Programs.ts
@@ -3,7 +3,8 @@ import { programsMetadata } from "./data/ProgramsMetadata";
import { IMap } from "../types";
export const Programs: IMap = {};
-
-for (const params of programsMetadata) {
- Programs[params.key] = new Program(params.name, params.create, params.run);
+export function initPrograms() {
+ for (const params of programsMetadata) {
+ Programs[params.key] = new Program(params.name, params.create, params.run);
+ }
}
From dc59a10e19b222c6a977886cd01292031f7bc791 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Sun, 11 Sep 2022 15:20:25 -0400
Subject: [PATCH 18/46] Fix lit files, reallow html alerts
---
.../{LiteratureHelpers.ts => LiteratureHelpers.tsx} | 3 ++-
src/NetscriptFunctions.ts | 2 +-
src/ui/React/DialogBox.tsx | 12 ++++++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
rename src/Literature/{LiteratureHelpers.ts => LiteratureHelpers.tsx} (83%)
diff --git a/src/Literature/LiteratureHelpers.ts b/src/Literature/LiteratureHelpers.tsx
similarity index 83%
rename from src/Literature/LiteratureHelpers.ts
rename to src/Literature/LiteratureHelpers.tsx
index 0eecc2551..e2dad5a8d 100644
--- a/src/Literature/LiteratureHelpers.ts
+++ b/src/Literature/LiteratureHelpers.tsx
@@ -1,3 +1,4 @@
+import React from "react";
import { Literatures } from "./Literatures";
import { dialogBoxCreate } from "../ui/React/DialogBox";
@@ -7,5 +8,5 @@ export function showLiterature(fn: string): void {
return;
}
const txt = `${litObj.title} = {
(ctx: NetscriptContext) =>
(_message: unknown): void => {
const message = helpers.string(ctx, "message", _message);
- dialogBoxCreate(message);
+ dialogBoxCreate(message, true);
},
toast:
(ctx: NetscriptContext) =>
diff --git a/src/ui/React/DialogBox.tsx b/src/ui/React/DialogBox.tsx
index 3d32dbe9b..be44d0c45 100644
--- a/src/ui/React/DialogBox.tsx
+++ b/src/ui/React/DialogBox.tsx
@@ -3,6 +3,14 @@ import { AlertEvents } from "./AlertManager";
import React from "react";
import { Typography } from "@mui/material";
-export function dialogBoxCreate(txt: string | JSX.Element): void {
- AlertEvents.emit(typeof txt === "string" ? {txt} : txt);
+export function dialogBoxCreate(txt: string | JSX.Element, html = false): void {
+ AlertEvents.emit(
+ typeof txt !== "string" ? (
+ txt
+ ) : html ? (
+
+ ) : (
+ {txt}
+ ),
+ );
}
From c864fd7edfd8a1302235e67fccf09610fbf05cad Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:28:18 -0400
Subject: [PATCH 19/46] revert unnecessary file rename
---
src/Literature/{LiteratureHelpers.tsx => LiteratureHelpers.ts} | 1 -
1 file changed, 1 deletion(-)
rename src/Literature/{LiteratureHelpers.tsx => LiteratureHelpers.ts} (92%)
diff --git a/src/Literature/LiteratureHelpers.tsx b/src/Literature/LiteratureHelpers.ts
similarity index 92%
rename from src/Literature/LiteratureHelpers.tsx
rename to src/Literature/LiteratureHelpers.ts
index e2dad5a8d..b059d829e 100644
--- a/src/Literature/LiteratureHelpers.tsx
+++ b/src/Literature/LiteratureHelpers.ts
@@ -1,4 +1,3 @@
-import React from "react";
import { Literatures } from "./Literatures";
import { dialogBoxCreate } from "../ui/React/DialogBox";
From 21a2d49de7499e69345b077464fd81069ddb031e Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Sat, 17 Sep 2022 21:09:15 -0400
Subject: [PATCH 20/46] Finish removing player passing
---
src/CotMG/IStaneksGift.ts | 5 +-
src/CotMG/StaneksGift.ts | 23 +++--
src/Gang/Gang.ts | 12 +--
src/Gang/IGang.ts | 5 +-
src/Infiltration/formulas/game.ts | 34 +++----
src/Infiltration/formulas/victory.ts | 24 ++---
src/Infiltration/ui/InfiltrationRoot.tsx | 5 +-
src/Infiltration/ui/Victory.tsx | 6 +-
src/Milestones/Milestone.ts | 4 +-
src/Milestones/Milestones.ts | 46 +++++-----
src/Milestones/ui/MilestonesRoot.tsx | 5 +-
src/Netscript/NetscriptHelpers.ts | 6 +-
src/NetscriptFunctions.ts | 6 +-
src/NetscriptFunctions/Infiltration.ts | 12 +--
src/NetscriptFunctions/Stanek.ts | 2 +-
src/Prestige.ts | 4 +-
src/Script/ScriptHelpers.ts | 2 +-
src/Server/ServerHelpers.ts | 91 ++-----------------
src/Server/formulas/grow.ts | 4 +-
src/Terminal/Terminal.ts | 2 +-
...termineAllPossibilitiesForTabCompletion.ts | 7 +-
src/Terminal/ui/TerminalInput.tsx | 2 +-
src/engine.tsx | 8 +-
23 files changed, 112 insertions(+), 203 deletions(-)
diff --git a/src/CotMG/IStaneksGift.ts b/src/CotMG/IStaneksGift.ts
index a5a6c8912..9dbc2c329 100644
--- a/src/CotMG/IStaneksGift.ts
+++ b/src/CotMG/IStaneksGift.ts
@@ -1,14 +1,13 @@
import { ActiveFragment } from "./ActiveFragment";
import { Fragment } from "./Fragment";
-import { IPlayer } from "../PersonObjects/IPlayer";
export interface IStaneksGift {
storedCycles: number;
fragments: ActiveFragment[];
width(): number;
height(): number;
- charge(player: IPlayer, fragment: ActiveFragment, threads: number): void;
- process(p: IPlayer, n: number): void;
+ charge(fragment: ActiveFragment, threads: number): void;
+ process(n: number): void;
effect(fragment: ActiveFragment): number;
canPlace(x: number, y: number, rotation: number, fragment: Fragment): boolean;
place(x: number, y: number, rotation: number, fragment: Fragment): boolean;
diff --git a/src/CotMG/StaneksGift.ts b/src/CotMG/StaneksGift.ts
index 81425ed1f..2943eee4c 100644
--- a/src/CotMG/StaneksGift.ts
+++ b/src/CotMG/StaneksGift.ts
@@ -3,7 +3,6 @@ import { Fragment } from "./Fragment";
import { ActiveFragment } from "./ActiveFragment";
import { FragmentType } from "./FragmentType";
import { IStaneksGift } from "./IStaneksGift";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { Factions } from "../Faction/Factions";
import { CalculateEffect } from "./formulas/effect";
import { StaneksGiftEvents } from "./StaneksGiftEvents";
@@ -30,7 +29,7 @@ export class StaneksGift implements IStaneksGift {
return Math.max(3, Math.min(Math.floor(this.baseSize() / 2 + 0.6), StanekConstants.MaxSize));
}
- charge(player: IPlayer, af: ActiveFragment, threads: number): void {
+ charge(af: ActiveFragment, threads: number): void {
if (threads > af.highestCharge) {
af.numCharge = (af.highestCharge * af.numCharge) / threads + 1;
af.highestCharge = threads;
@@ -39,19 +38,19 @@ export class StaneksGift implements IStaneksGift {
}
const cotmg = Factions[FactionNames.ChurchOfTheMachineGod];
- cotmg.playerReputation += (player.mults.faction_rep * (Math.pow(threads, 0.95) * (cotmg.favor + 100))) / 1000;
+ cotmg.playerReputation += (Player.mults.faction_rep * (Math.pow(threads, 0.95) * (cotmg.favor + 100))) / 1000;
}
inBonus(): boolean {
return (this.storedCycles * CONSTANTS._idleSpeed) / 1000 > 1;
}
- process(p: IPlayer, numCycles = 1): void {
- if (!p.hasAugmentation(AugmentationNames.StaneksGift1)) return;
+ process(numCycles = 1): void {
+ if (!Player.hasAugmentation(AugmentationNames.StaneksGift1)) return;
this.storedCycles += numCycles;
this.storedCycles -= 10;
this.storedCycles = Math.max(0, this.storedCycles);
- this.updateMults(p);
+ this.updateMults();
StaneksGiftEvents.emit();
}
@@ -210,19 +209,19 @@ export class StaneksGift implements IStaneksGift {
return mults;
}
- updateMults(p: IPlayer): void {
+ updateMults(): void {
// applyEntropy also reapplies all augmentations and source files
// This wraps up the reset nicely
- p.applyEntropy(p.entropy);
+ Player.applyEntropy(Player.entropy);
const mults = this.calculateMults();
- p.mults = mergeMultipliers(p.mults, mults);
- p.updateSkillLevels();
- const zoeAmt = p.sleeves.reduce((n, sleeve) => n + (sleeve.hasAugmentation(AugmentationNames.ZOE) ? 1 : 0), 0);
+ Player.mults = mergeMultipliers(Player.mults, mults);
+ Player.updateSkillLevels();
+ const zoeAmt = Player.sleeves.reduce((n, sleeve) => n + (sleeve.hasAugmentation(AugmentationNames.ZOE) ? 1 : 0), 0);
if (zoeAmt === 0) return;
// Less powerful for each copy.
const scaling = 3 / (zoeAmt + 2);
const sleeveMults = scaleMultipliers(mults, scaling);
- for (const sleeve of p.sleeves) {
+ for (const sleeve of Player.sleeves) {
if (!sleeve.hasAugmentation(AugmentationNames.ZOE)) continue;
sleeve.resetMultipliers();
sleeve.mults = mergeMultipliers(sleeve.mults, sleeveMults);
diff --git a/src/Gang/Gang.ts b/src/Gang/Gang.ts
index 0ca99b964..1e29d2cd8 100644
--- a/src/Gang/Gang.ts
+++ b/src/Gang/Gang.ts
@@ -23,7 +23,7 @@ import { AllGangs } from "./AllGangs";
import { GangMember } from "./GangMember";
import { WorkerScript } from "../Netscript/WorkerScript";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { PowerMultiplier } from "./data/power";
import { IGang } from "./IGang";
@@ -82,7 +82,7 @@ export class Gang implements IGang {
return AllGangs[this.facName].territory;
}
- process(numCycles = 1, player: IPlayer): void {
+ process(numCycles = 1): void {
const CyclesPerSecond = 1000 / CONSTANTS._idleSpeed;
if (isNaN(numCycles)) {
@@ -95,7 +95,7 @@ export class Gang implements IGang {
const cycles = Math.min(this.storedCycles, 5 * CyclesPerSecond);
try {
- this.processGains(cycles, player);
+ this.processGains(cycles);
this.processExperienceGains(cycles);
this.processTerritoryAndPowerGains(cycles);
this.storedCycles -= cycles;
@@ -104,7 +104,7 @@ export class Gang implements IGang {
}
}
- processGains(numCycles = 1, player: IPlayer): void {
+ processGains(numCycles = 1): void {
// Get gains per cycle
let moneyGains = 0;
let respectGains = 0;
@@ -132,7 +132,7 @@ export class Gang implements IGang {
}
const favorMult = 1 + fac.favor / 100;
- fac.playerReputation += (player.mults.faction_rep * gain * favorMult) / GangConstants.GangRespectToReputationRatio;
+ fac.playerReputation += (Player.mults.faction_rep * gain * favorMult) / GangConstants.GangRespectToReputationRatio;
// Keep track of respect gained per member
for (let i = 0; i < this.members.length; ++i) {
@@ -148,7 +148,7 @@ export class Gang implements IGang {
this.wanted = newWanted;
if (this.wanted < 1) this.wanted = 1;
}
- player.gainMoney(moneyGains * numCycles, "gang");
+ Player.gainMoney(moneyGains * numCycles, "gang");
}
processTerritoryAndPowerGains(numCycles = 1): void {
diff --git a/src/Gang/IGang.ts b/src/Gang/IGang.ts
index 6d6400a19..e2037534d 100644
--- a/src/Gang/IGang.ts
+++ b/src/Gang/IGang.ts
@@ -1,7 +1,6 @@
import { GangMemberUpgrade } from "./GangMemberUpgrade";
import { GangMember } from "./GangMember";
import { WorkerScript } from "../Netscript/WorkerScript";
-import { IPlayer } from "../PersonObjects/IPlayer";
import { IAscensionResult } from "./IAscensionResult";
import { IReviverValue } from "src/utils/JSONReviver";
@@ -28,8 +27,8 @@ export interface IGang {
getPower(): number;
getTerritory(): number;
- process(numCycles: number, player: IPlayer): void;
- processGains(numCycles: number, player: IPlayer): void;
+ process(numCycles: number): void;
+ processGains(numCycles: number): void;
processTerritoryAndPowerGains(numCycles: number): void;
processExperienceGains(numCycles: number): void;
clash(won: boolean): void;
diff --git a/src/Infiltration/formulas/game.ts b/src/Infiltration/formulas/game.ts
index e6ab67a54..7cc6599dd 100644
--- a/src/Infiltration/formulas/game.ts
+++ b/src/Infiltration/formulas/game.ts
@@ -1,30 +1,30 @@
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { calculateSkill } from "../../PersonObjects/formulas/skill";
-function calculateRawDiff(player: IPlayer, stats: number, startingDifficulty: number): number {
- const difficulty = startingDifficulty - Math.pow(stats, 0.9) / 250 - player.skills.intelligence / 1600;
+function calculateRawDiff(stats: number, startingDifficulty: number): number {
+ const difficulty = startingDifficulty - Math.pow(stats, 0.9) / 250 - Player.skills.intelligence / 1600;
if (difficulty < 0) return 0;
if (difficulty > 3) return 3;
return difficulty;
}
-export function calculateDifficulty(player: IPlayer, startingSecurityLevel: number): number {
+export function calculateDifficulty(startingSecurityLevel: number): number {
const totalStats =
- player.skills.strength +
- player.skills.defense +
- player.skills.dexterity +
- player.skills.agility +
- player.skills.charisma;
- return calculateRawDiff(player, totalStats, startingSecurityLevel);
+ Player.skills.strength +
+ Player.skills.defense +
+ Player.skills.dexterity +
+ Player.skills.agility +
+ Player.skills.charisma;
+ return calculateRawDiff(totalStats, startingSecurityLevel);
}
-export function calculateReward(player: IPlayer, startingSecurityLevel: number): number {
+export function calculateReward(startingSecurityLevel: number): number {
const xpMult = 10 * 60 * 15;
const total =
- calculateSkill(player.mults.strength_exp * xpMult, player.mults.strength) +
- calculateSkill(player.mults.defense_exp * xpMult, player.mults.defense) +
- calculateSkill(player.mults.agility_exp * xpMult, player.mults.agility) +
- calculateSkill(player.mults.dexterity_exp * xpMult, player.mults.dexterity) +
- calculateSkill(player.mults.charisma_exp * xpMult, player.mults.charisma);
- return calculateRawDiff(player, total, startingSecurityLevel);
+ calculateSkill(Player.mults.strength_exp * xpMult, Player.mults.strength) +
+ calculateSkill(Player.mults.defense_exp * xpMult, Player.mults.defense) +
+ calculateSkill(Player.mults.agility_exp * xpMult, Player.mults.agility) +
+ calculateSkill(Player.mults.dexterity_exp * xpMult, Player.mults.dexterity) +
+ calculateSkill(Player.mults.charisma_exp * xpMult, Player.mults.charisma);
+ return calculateRawDiff(total, startingSecurityLevel);
}
diff --git a/src/Infiltration/formulas/victory.ts b/src/Infiltration/formulas/victory.ts
index bbfbc263b..1aa317d1c 100644
--- a/src/Infiltration/formulas/victory.ts
+++ b/src/Infiltration/formulas/victory.ts
@@ -1,15 +1,10 @@
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { Player } from "../../Player";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { LocationsMetadata } from "../../Locations/data/LocationsMetadata";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { Faction } from "../../Faction/Faction";
-export function calculateSellInformationCashReward(
- player: IPlayer,
- reward: number,
- maxLevel: number,
- difficulty: number,
-): number {
+export function calculateSellInformationCashReward(reward: number, maxLevel: number, difficulty: number): number {
const levelBonus = maxLevel * Math.pow(1.01, maxLevel);
return (
@@ -17,17 +12,12 @@ export function calculateSellInformationCashReward(
Math.pow(difficulty, 3) *
3e3 *
levelBonus *
- (player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 1.5 : 1) *
+ (Player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 1.5 : 1) *
BitNodeMultipliers.InfiltrationMoney
);
}
-export function calculateTradeInformationRepReward(
- player: IPlayer,
- reward: number,
- maxLevel: number,
- difficulty: number,
-): number {
+export function calculateTradeInformationRepReward(reward: number, maxLevel: number, difficulty: number): number {
const levelBonus = maxLevel * Math.pow(1.01, maxLevel);
return (
@@ -35,12 +25,12 @@ export function calculateTradeInformationRepReward(
Math.pow(difficulty, 1.2) *
30 *
levelBonus *
- (player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 1.5 : 1) *
+ (Player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 1.5 : 1) *
BitNodeMultipliers.InfiltrationRep
);
}
-export function calculateInfiltratorsRepReward(player: IPlayer, faction: Faction, difficulty: number): number {
+export function calculateInfiltratorsRepReward(faction: Faction, difficulty: number): number {
const maxStartingSecurityLevel = LocationsMetadata.reduce((acc, data): number => {
const startingSecurityLevel = data.infiltrationData?.startingSecurityLevel || 0;
return acc > startingSecurityLevel ? acc : startingSecurityLevel;
@@ -48,6 +38,6 @@ export function calculateInfiltratorsRepReward(player: IPlayer, faction: Faction
const baseRepGain = (difficulty / maxStartingSecurityLevel) * 5000;
return (
- baseRepGain * (player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 2 : 1) * (1 + faction.favor / 100)
+ baseRepGain * (Player.hasAugmentation(AugmentationNames.WKSharmonizer, true) ? 2 : 1) * (1 + faction.favor / 100)
);
}
diff --git a/src/Infiltration/ui/InfiltrationRoot.tsx b/src/Infiltration/ui/InfiltrationRoot.tsx
index 30baf09ce..48170d32c 100644
--- a/src/Infiltration/ui/InfiltrationRoot.tsx
+++ b/src/Infiltration/ui/InfiltrationRoot.tsx
@@ -1,7 +1,6 @@
import React, { useState } from "react";
import { Location } from "../../Locations/Location";
import { Router } from "../../ui/GameRoot";
-import { Player } from "../../Player";
import { calculateDifficulty, calculateReward } from "../formulas/game";
import { Game } from "./Game";
import { Intro } from "./Intro";
@@ -14,8 +13,8 @@ export function InfiltrationRoot(props: IProps): React.ReactElement {
if (props.location.infiltrationData === undefined) throw new Error("Trying to do infiltration on invalid location.");
const startingSecurityLevel = props.location.infiltrationData.startingSecurityLevel;
- const difficulty = calculateDifficulty(Player, startingSecurityLevel);
- const reward = calculateReward(Player, startingSecurityLevel);
+ const difficulty = calculateDifficulty(startingSecurityLevel);
+ const reward = calculateReward(startingSecurityLevel);
function cancel(): void {
Router.toCity();
diff --git a/src/Infiltration/ui/Victory.tsx b/src/Infiltration/ui/Victory.tsx
index bafb8f9eb..917708ad9 100644
--- a/src/Infiltration/ui/Victory.tsx
+++ b/src/Infiltration/ui/Victory.tsx
@@ -30,9 +30,9 @@ export function Victory(props: IProps): React.ReactElement {
}
const soa = Factions[FactionNames.ShadowsOfAnarchy];
- const repGain = calculateTradeInformationRepReward(Player, props.Reward, props.MaxLevel, props.StartingDifficulty);
- const moneyGain = calculateSellInformationCashReward(Player, props.Reward, props.MaxLevel, props.StartingDifficulty);
- const infiltrationRepGain = calculateInfiltratorsRepReward(Player, soa, props.StartingDifficulty);
+ const repGain = calculateTradeInformationRepReward(props.Reward, props.MaxLevel, props.StartingDifficulty);
+ const moneyGain = calculateSellInformationCashReward(props.Reward, props.MaxLevel, props.StartingDifficulty);
+ const infiltrationRepGain = calculateInfiltratorsRepReward(soa, props.StartingDifficulty);
const isMemberOfInfiltrators = Player.factions.includes(FactionNames.ShadowsOfAnarchy);
diff --git a/src/Milestones/Milestone.ts b/src/Milestones/Milestone.ts
index dd5c0b7e9..641cabe1f 100644
--- a/src/Milestones/Milestone.ts
+++ b/src/Milestones/Milestone.ts
@@ -1,6 +1,4 @@
-import { IPlayer } from "../PersonObjects/IPlayer";
-
export type Milestone = {
title: string;
- fulfilled: (p: IPlayer) => boolean;
+ fulfilled: () => boolean;
};
diff --git a/src/Milestones/Milestones.ts b/src/Milestones/Milestones.ts
index 24df22411..cf9cb9ad4 100644
--- a/src/Milestones/Milestones.ts
+++ b/src/Milestones/Milestones.ts
@@ -1,16 +1,16 @@
import { Milestone } from "./Milestone";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { Factions } from "../Faction/Factions";
import { Faction } from "../Faction/Faction";
import { GetServer } from "../Server/AllServers";
import { FactionNames } from "../Faction/data/FactionNames";
import { Server } from "../Server/Server";
-function allFactionAugs(p: IPlayer, f: Faction): boolean {
+function allFactionAugs(f: Faction): boolean {
const factionAugs = f.augmentations.slice().filter((aug) => aug !== "NeuroFlux Governor");
for (const factionAug of factionAugs) {
if (
- !p.augmentations.some((aug) => {
+ !Player.augmentations.some((aug) => {
return aug.name == factionAug;
})
)
@@ -38,63 +38,63 @@ export const Milestones: Milestone[] = [
},
{
title: "Join the faction hinted at in csec-test.msg",
- fulfilled: (p: IPlayer): boolean => {
- return p.factions.includes(FactionNames.CyberSec);
+ fulfilled: (): boolean => {
+ return Player.factions.includes(FactionNames.CyberSec);
},
},
{
title: `Install all the Augmentations from ${FactionNames.CyberSec}`,
- fulfilled: (p: IPlayer): boolean => {
- return allFactionAugs(p, Factions[FactionNames.CyberSec]);
+ fulfilled: (): boolean => {
+ return allFactionAugs(Factions[FactionNames.CyberSec]);
},
},
{
title: "Join the faction hinted at in nitesec-test.msg",
- fulfilled: (p: IPlayer): boolean => {
- return p.factions.includes(FactionNames.NiteSec);
+ fulfilled: (): boolean => {
+ return Player.factions.includes(FactionNames.NiteSec);
},
},
{
title: `Install all the Augmentations from ${FactionNames.NiteSec}`,
- fulfilled: (p: IPlayer): boolean => {
- return allFactionAugs(p, Factions[FactionNames.NiteSec]);
+ fulfilled: (): boolean => {
+ return allFactionAugs(Factions[FactionNames.NiteSec]);
},
},
{
title: "Join the faction hinted at in j3.msg",
- fulfilled: (p: IPlayer): boolean => {
- return p.factions.includes(FactionNames.TheBlackHand);
+ fulfilled: (): boolean => {
+ return Player.factions.includes(FactionNames.TheBlackHand);
},
},
{
title: `Install all the Augmentations from ${FactionNames.TheBlackHand}`,
- fulfilled: (p: IPlayer): boolean => {
- return allFactionAugs(p, Factions[FactionNames.TheBlackHand]);
+ fulfilled: (): boolean => {
+ return allFactionAugs(Factions[FactionNames.TheBlackHand]);
},
},
{
title: "Join the faction hinted at in 19dfj3l1nd.msg",
- fulfilled: (p: IPlayer): boolean => {
- return p.factions.includes(FactionNames.BitRunners);
+ fulfilled: (): boolean => {
+ return Player.factions.includes(FactionNames.BitRunners);
},
},
{
title: `Install all the Augmentations from ${FactionNames.BitRunners}`,
- fulfilled: (p: IPlayer): boolean => {
- return allFactionAugs(p, Factions[FactionNames.BitRunners]);
+ fulfilled: (): boolean => {
+ return allFactionAugs(Factions[FactionNames.BitRunners]);
},
},
{
title: "Complete fl1ght.exe",
- fulfilled: (p: IPlayer): boolean => {
+ fulfilled: (): boolean => {
// technically wrong but whatever
- return p.factions.includes(FactionNames.Daedalus);
+ return Player.factions.includes(FactionNames.Daedalus);
},
},
{
title: `Install the special Augmentation from ${FactionNames.Daedalus}`,
- fulfilled: (p: IPlayer): boolean => {
- return p.augmentations.some((aug) => aug.name == "The Red Pill");
+ fulfilled: (): boolean => {
+ return Player.augmentations.some((aug) => aug.name == "The Red Pill");
},
},
{
diff --git a/src/Milestones/ui/MilestonesRoot.tsx b/src/Milestones/ui/MilestonesRoot.tsx
index 7f12d24ea..911830cb8 100644
--- a/src/Milestones/ui/MilestonesRoot.tsx
+++ b/src/Milestones/ui/MilestonesRoot.tsx
@@ -1,4 +1,3 @@
-import { Player } from "../../Player";
import { Milestones } from "../Milestones";
import { Milestone } from "../Milestone";
import * as React from "react";
@@ -9,7 +8,7 @@ import Box from "@mui/material/Box";
function highestMilestone(milestones: Milestone[]): number {
let n = -1;
for (let i = 0; i < milestones.length; i++) {
- if (milestones[i].fulfilled(Player)) n = i;
+ if (milestones[i].fulfilled()) n = i;
}
return n;
@@ -21,7 +20,7 @@ export function MilestonesRoot(): JSX.Element {
if (i <= n + 1) {
return (
- [{milestone.fulfilled(Player) ? "x" : " "}] {milestone.title}
+ [{milestone.fulfilled() ? "x" : " "}] {milestone.title}
);
}
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 3a8c76282..79a2dc2bb 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -21,7 +21,7 @@ import { CONSTANTS } from "../Constants";
import { influenceStockThroughServerHack } from "../StockMarket/PlayerInfluencing";
import { IPort, NetscriptPort } from "../NetscriptPort";
import { NetscriptPorts } from "../NetscriptWorker";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { IPerson } from "../PersonObjects/IPerson";
import { FormulaGang } from "../Gang/formulas/formulas";
import { GangMember } from "../Gang/GangMember";
import { GangMemberTask } from "../Gang/GangMemberTask";
@@ -498,7 +498,7 @@ function getValidPort(ctx: NetscriptContext, port: number): IPort {
return iport;
}
-function player(ctx: NetscriptContext, p: unknown): IPlayer {
+function player(ctx: NetscriptContext, p: unknown): IPerson {
const fakePlayer = {
hp: undefined,
mults: undefined,
@@ -518,7 +518,7 @@ function player(ctx: NetscriptContext, p: unknown): IPlayer {
entropy: undefined,
};
if (!roughlyIs(fakePlayer, p)) throw makeRuntimeErrorMsg(ctx, `player should be a Player.`, "TYPE");
- return p as IPlayer;
+ return p as IPerson;
}
function server(ctx: NetscriptContext, s: unknown): Server {
diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts
index 62bd40e35..bfdb9a378 100644
--- a/src/NetscriptFunctions.ts
+++ b/src/NetscriptFunctions.ts
@@ -266,7 +266,7 @@ const base: InternalAPI = {
);
return helpers.netscriptDelay(ctx, growTime * 1000).then(function () {
const moneyBefore = server.moneyAvailable <= 0 ? 1 : server.moneyAvailable;
- processSingleServerGrowth(server, threads, Player, host.cpuCores);
+ processSingleServerGrowth(server, threads, host.cpuCores);
const moneyAfter = server.moneyAvailable;
ctx.workerScript.scriptRef.recordGrow(server.hostname, threads);
const expGain = calculateHackingExpGain(server, Player) * threads;
@@ -304,7 +304,7 @@ const base: InternalAPI = {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid argument: growth must be numeric and >= 1, is ${growth}.`);
}
- return numCycleForGrowth(server, Number(growth), Player, cores);
+ return numCycleForGrowth(server, Number(growth), cores);
},
growthAnalyzeSecurity:
(ctx: NetscriptContext) =>
@@ -321,7 +321,7 @@ const base: InternalAPI = {
}
const maxThreadsNeeded = Math.ceil(
- numCycleForGrowthCorrected(server, server.moneyMax, server.moneyAvailable, Player, cores),
+ numCycleForGrowthCorrected(server, server.moneyMax, server.moneyAvailable, cores),
);
threads = Math.min(threads, maxThreadsNeeded);
diff --git a/src/NetscriptFunctions/Infiltration.ts b/src/NetscriptFunctions/Infiltration.ts
index 51325a4ab..620e5a4bf 100644
--- a/src/NetscriptFunctions/Infiltration.ts
+++ b/src/NetscriptFunctions/Infiltration.ts
@@ -1,5 +1,3 @@
-import { Player as player } from "../Player";
-
import {
Infiltration as IInfiltration,
InfiltrationLocation,
@@ -32,15 +30,15 @@ export function NetscriptInfiltration(): InternalAPI {
if (location.infiltrationData === undefined)
throw helpers.makeRuntimeErrorMsg(ctx, `Location '${location}' does not provide infiltrations.`);
const startingSecurityLevel = location.infiltrationData.startingSecurityLevel;
- const difficulty = calculateDifficulty(player, startingSecurityLevel);
- const reward = calculateReward(player, startingSecurityLevel);
+ const difficulty = calculateDifficulty(startingSecurityLevel);
+ const reward = calculateReward(startingSecurityLevel);
const maxLevel = location.infiltrationData.maxClearanceLevel;
return {
location: JSON.parse(JSON.stringify(location)),
reward: {
- tradeRep: calculateTradeInformationRepReward(player, reward, maxLevel, startingSecurityLevel),
- sellCash: calculateSellInformationCashReward(player, reward, maxLevel, startingSecurityLevel),
- SoARep: calculateInfiltratorsRepReward(player, Factions[FactionNames.ShadowsOfAnarchy], startingSecurityLevel),
+ tradeRep: calculateTradeInformationRepReward(reward, maxLevel, startingSecurityLevel),
+ sellCash: calculateSellInformationCashReward(reward, maxLevel, startingSecurityLevel),
+ SoARep: calculateInfiltratorsRepReward(Factions[FactionNames.ShadowsOfAnarchy], startingSecurityLevel),
},
difficulty: difficulty,
};
diff --git a/src/NetscriptFunctions/Stanek.ts b/src/NetscriptFunctions/Stanek.ts
index f0753b379..84401dd9d 100644
--- a/src/NetscriptFunctions/Stanek.ts
+++ b/src/NetscriptFunctions/Stanek.ts
@@ -53,7 +53,7 @@ export function NetscriptStanek(): InternalAPI {
//Charge the fragment
const time = staneksGift.inBonus() ? 200 : 1000;
return helpers.netscriptDelay(ctx, time).then(function () {
- staneksGift.charge(player, fragment, ctx.workerScript.scriptRef.threads);
+ staneksGift.charge(fragment, ctx.workerScript.scriptRef.threads);
helpers.log(ctx, () => `Charged fragment with ${ctx.workerScript.scriptRef.threads} threads.`);
return Promise.resolve();
});
diff --git a/src/Prestige.ts b/src/Prestige.ts
index 45ea6f26a..1ebbf1789 100755
--- a/src/Prestige.ts
+++ b/src/Prestige.ts
@@ -52,7 +52,7 @@ export function prestigeAugmentation(): void {
// Reset home computer (only the programs) and add to AllServers
AddToAllServers(homeComp);
- prestigeHomeComputer(Player, homeComp);
+ prestigeHomeComputer(homeComp);
if (augmentationExists(AugmentationNames.Neurolink) && Player.hasAugmentation(AugmentationNames.Neurolink, true)) {
homeComp.programs.push(Programs.FTPCrackProgram.name);
@@ -194,7 +194,7 @@ export function prestigeSourceFile(flume: boolean): void {
// Reset home computer (only the programs) and add to AllServers
AddToAllServers(homeComp);
- prestigeHomeComputer(Player, homeComp);
+ prestigeHomeComputer(homeComp);
// Re-create foreign servers
initForeignServers(Player.getHomeComputer());
diff --git a/src/Script/ScriptHelpers.ts b/src/Script/ScriptHelpers.ts
index 078634328..2333786a6 100644
--- a/src/Script/ScriptHelpers.ts
+++ b/src/Script/ScriptHelpers.ts
@@ -43,7 +43,7 @@ export function scriptCalculateOfflineProduction(runningScript: RunningScript):
const host = GetServer(runningScript.server);
if (host === null) throw new Error("getServer of null key?");
if (!(serv instanceof Server)) throw new Error("trying to grow a non-normal server");
- const growth = processSingleServerGrowth(serv, timesGrown, Player, host.cpuCores);
+ const growth = processSingleServerGrowth(serv, timesGrown, host.cpuCores);
runningScript.log(
`'${serv.hostname}' grown by ${numeralWrapper.format(growth * 100 - 100, "0.000000%")} while offline`,
);
diff --git a/src/Server/ServerHelpers.ts b/src/Server/ServerHelpers.ts
index 979ec91a3..8393f1904 100644
--- a/src/Server/ServerHelpers.ts
+++ b/src/Server/ServerHelpers.ts
@@ -5,7 +5,7 @@ import { calculateServerGrowth } from "./formulas/grow";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { CONSTANTS } from "../Constants";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { Programs } from "../Programs/Programs";
import { LiteratureNames } from "../Literature/data/LiteratureNames";
@@ -48,7 +48,7 @@ export function safetlyCreateUniqueServer(params: IConstructorParams): Server {
* @param p - Reference to Player object
* @returns Number of "growth cycles" needed
*/
-export function numCycleForGrowth(server: Server, growth: number, p: IPlayer, cores = 1): number {
+export function numCycleForGrowth(server: Server, growth: number, cores = 1): number {
let ajdGrowthRate = 1 + (CONSTANTS.ServerBaseGrowthRate - 1) / server.hackDifficulty;
if (ajdGrowthRate > CONSTANTS.ServerMaxGrowthRate) {
ajdGrowthRate = CONSTANTS.ServerMaxGrowthRate;
@@ -60,7 +60,7 @@ export function numCycleForGrowth(server: Server, growth: number, p: IPlayer, co
const cycles =
Math.log(growth) /
(Math.log(ajdGrowthRate) *
- p.mults.hacking_grow *
+ Player.mults.hacking_grow *
serverGrowthPercentage *
BitNodeMultipliers.ServerGrowthRate *
coreBonus);
@@ -68,33 +68,6 @@ export function numCycleForGrowth(server: Server, growth: number, p: IPlayer, co
return cycles;
}
-/**
- * Replacement function for the above function that accounts for the +$1/thread functionality of grow
- * with parameters that are the same (for compatibility), but functionality is slightly different.
- * This function can ONLY be used to calculate the threads needed for a given server in its current state,
- * and so wouldn't be appropriate to use for formulas.exe or ns.growthAnalyze (as those are meant to
- * provide theoretical scenarios, or inverse hack respectively). Players COULD use this function with a
- * custom server object with the correct moneyAvailable and moneyMax amounts, combined with a multiplier
- * correctly calculated to bring the server to a new moneyAvailable (ie, passing in moneyAvailable 300 and x2
- * when you want the number of threads required to grow that particular server from 300 to 600), and this
- * function would pass back the correct number of threads. But the key thing is that it doesn't just
- * inverse/undo a hack (since the amount hacked from/to matters, not just the multiplier).
- * The above is also a rather unnecessarily obtuse way of thinking about it for a formulas.exe type of
- * application, so another function with different parameters is provided for that case below this one.
- * Instead this function is meant to hand-off from the old numCycleForGrowth function to the new one
- * where used internally for pro-rating or the like. Where you have applied a grow and want to determine
- * how many threads were needed for THAT SPECIFIC grow case using a multiplier.
- * Ideally, this function, and the original function above will be depreciated to use the methodology
- * and inputs of the new function below this one. Even for internal cases (it's actually easier to do so).
- * @param server - Server being grown
- * @param growth - How much the server money is expected to be multiplied by (e.g. 1.5 for *1.5 / +50%)
- * @param p - Reference to Player object
- * @returns Number of "growth cycles" needed
- */
-export function numCycleForGrowthTransition(server: Server, growth: number, p: IPlayer, cores = 1): number {
- return numCycleForGrowthCorrected(server, server.moneyAvailable * growth, server.moneyAvailable, p, cores);
-}
-
/**
* This function calculates the number of threads needed to grow a server from one $amount to a higher $amount
* (ie, how many threads to grow this server from $200 to $600 for example). Used primarily for a formulas (or possibly growthAnalyze)
@@ -104,16 +77,10 @@ export function numCycleForGrowthTransition(server: Server, growth: number, p: I
* @param server - Server being grown
* @param targetMoney - How much you want the server grown TO (not by), for instance, to grow from 200 to 600, input 600
* @param startMoney - How much you are growing the server from, for instance, to grow from 200 to 600, input 200
- * @param p - Reference to Player object
+ * @param cores - Number of cores on the host performing grow
* @returns Number of "growth cycles" needed
*/
-export function numCycleForGrowthCorrected(
- server: Server,
- targetMoney: number,
- startMoney: number,
- p: IPlayer,
- cores = 1,
-): number {
+export function numCycleForGrowthCorrected(server: Server, targetMoney: number, startMoney: number, cores = 1): number {
if (startMoney < 0) {
startMoney = 0;
} // servers "can't" have less than 0 dollars on them
@@ -132,7 +99,7 @@ export function numCycleForGrowthCorrected(
const serverGrowthPercentage = server.serverGrowth / 100.0;
const coreMultiplier = 1 + (cores - 1) / 16;
const threadMultiplier =
- serverGrowthPercentage * p.mults.hacking_grow * coreMultiplier * BitNodeMultipliers.ServerGrowthRate;
+ serverGrowthPercentage * Player.mults.hacking_grow * coreMultiplier * BitNodeMultipliers.ServerGrowthRate;
/* To understand what is done below we need to do some math. I hope the explanation is clear enough.
* First of, the names will be shortened for ease of manipulation:
@@ -241,47 +208,9 @@ export function numCycleForGrowthCorrected(
return cca + 1;
}
-/**
- * This function calculates the number of threads needed to grow a server based on a pre-hack money and hackAmt
- * (ie, if you're hacking a server with $1e6 moneyAvail for 60%, this function will tell you how many threads to regrow it
- * A good replacement for the current ns.growthAnalyze if you want players to have more control/responsibility
- * @param server - Server being grown
- * @param hackProp - the proportion of money hacked (total, not per thread, like 0.60 for hacking 60% of available money)
- * @param prehackMoney - how much money the server had before being hacked (like 200000 for hacking a server that had $200000 on it at time of hacking)
- * @param p - Reference to Player object
- * @returns Number of "growth cycles" needed to reverse the described hack
- */
-export function numCycleForGrowthByHackAmt(
- server: Server,
- hackProp: number,
- prehackMoney: number,
- p: IPlayer,
- cores = 1,
-): number {
- if (prehackMoney > server.moneyMax) prehackMoney = server.moneyMax;
- const posthackMoney = Math.floor(prehackMoney * Math.min(1, Math.max(0, 1 - hackProp)));
- return numCycleForGrowthCorrected(server, prehackMoney, posthackMoney, p, cores);
-}
-
-/**
- * This function calculates the number of threads needed to grow a server based on an expected growth multiplier assuming it will max out
- * (ie, if you expect to grow a server by 60% to reach maxMoney, this function will tell you how many threads to grow it)
- * PROBABLY the best replacement for the current ns.growthAnalyze to maintain existing scripts
- * @param server - Server being grown
- * @param growth - How much the server is being grown by, as a multiple in DECIMAL form (e.g. 1.5 rather than 50). Infinity is acceptable.
- * @param p - Reference to Player object
- * @returns Number of "growth cycles" needed
- */
-export function numCycleForGrowthByMultiplier(server: Server, growth: number, p: IPlayer, cores = 1): number {
- if (growth < 1.0) growth = 1.0;
- const targetMoney = server.moneyMax;
- const startingMoney = server.moneyMax / growth;
- return numCycleForGrowthCorrected(server, targetMoney, startingMoney, p, cores);
-}
-
//Applied server growth for a single server. Returns the percentage growth
-export function processSingleServerGrowth(server: Server, threads: number, p: IPlayer, cores = 1): number {
- let serverGrowth = calculateServerGrowth(server, threads, p, cores);
+export function processSingleServerGrowth(server: Server, threads: number, cores = 1): number {
+ let serverGrowth = calculateServerGrowth(server, threads, Player, cores);
if (serverGrowth < 1) {
console.warn("serverGrowth calculated to be less than 1");
serverGrowth = 1;
@@ -303,7 +232,7 @@ export function processSingleServerGrowth(server: Server, threads: number, p: IP
// if there was any growth at all, increase security
if (oldMoneyAvailable !== server.moneyAvailable) {
- let usedCycles = numCycleForGrowthCorrected(server, server.moneyAvailable, oldMoneyAvailable, p, cores);
+ let usedCycles = numCycleForGrowthCorrected(server, server.moneyAvailable, oldMoneyAvailable, cores);
// Growing increases server security twice as much as hacking
usedCycles = Math.min(Math.max(0, Math.ceil(usedCycles)), threads);
server.fortify(2 * CONSTANTS.ServerFortifyAmount * usedCycles);
@@ -311,7 +240,7 @@ export function processSingleServerGrowth(server: Server, threads: number, p: IP
return server.moneyAvailable / oldMoneyAvailable;
}
-export function prestigeHomeComputer(player: IPlayer, homeComp: Server): void {
+export function prestigeHomeComputer(homeComp: Server): void {
const hasBitflume = homeComp.programs.includes(Programs.BitFlume.name);
homeComp.programs.length = 0; //Remove programs
diff --git a/src/Server/formulas/grow.ts b/src/Server/formulas/grow.ts
index 68df5aef3..4ab2fa761 100644
--- a/src/Server/formulas/grow.ts
+++ b/src/Server/formulas/grow.ts
@@ -1,9 +1,9 @@
import { CONSTANTS } from "../../Constants";
import { Server } from "../Server";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
-import { IPlayer } from "../../PersonObjects/IPlayer";
+import { IPerson } from "../../PersonObjects/IPerson";
-export function calculateServerGrowth(server: Server, threads: number, p: IPlayer, cores = 1): number {
+export function calculateServerGrowth(server: Server, threads: number, p: IPerson, cores = 1): number {
const numServerGrowthCycles = Math.max(Math.floor(threads), 0);
//Get adjusted growth rate, which accounts for server security
diff --git a/src/Terminal/Terminal.ts b/src/Terminal/Terminal.ts
index 4cfe7517e..61c4a259c 100644
--- a/src/Terminal/Terminal.ts
+++ b/src/Terminal/Terminal.ts
@@ -250,7 +250,7 @@ export class Terminal implements ITerminal {
if (!(server instanceof Server)) throw new Error("server should be normal server");
const expGain = calculateHackingExpGain(server, Player);
const oldSec = server.hackDifficulty;
- const growth = processSingleServerGrowth(server, 25, Player, server.cpuCores) - 1;
+ const growth = processSingleServerGrowth(server, 25, server.cpuCores) - 1;
const newSec = server.hackDifficulty;
Player.gainHackingExp(expGain);
diff --git a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
index 54393f894..d1a1fcd87 100644
--- a/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
+++ b/src/Terminal/determineAllPossibilitiesForTabCompletion.ts
@@ -3,7 +3,7 @@ import { getSubdirectories } from "./DirectoryServerHelpers";
import { Aliases, GlobalAliases, substituteAliases } from "../Alias";
import { DarkWebItems } from "../DarkWeb/DarkWebItems";
-import { IPlayer } from "../PersonObjects/IPlayer";
+import { Player } from "../Player";
import { GetAllServers } from "../Server/AllServers";
import { Server } from "../Server/Server";
import { ParseCommand, ParseCommands } from "./Parser";
@@ -57,7 +57,6 @@ const commands = [
];
export async function determineAllPossibilitiesForTabCompletion(
- p: IPlayer,
input: string,
index: number,
currPath = "",
@@ -65,8 +64,8 @@ export async function determineAllPossibilitiesForTabCompletion(
input = substituteAliases(input);
let allPos: string[] = [];
allPos = allPos.concat(Object.keys(GlobalAliases));
- const currServ = p.getCurrentServer();
- const homeComputer = p.getHomeComputer();
+ const currServ = Player.getCurrentServer();
+ const homeComputer = Player.getHomeComputer();
let parentDirPath = "";
let evaledParentDirPath: string | null = null;
diff --git a/src/Terminal/ui/TerminalInput.tsx b/src/Terminal/ui/TerminalInput.tsx
index 05ba2fa4f..2e9340e55 100644
--- a/src/Terminal/ui/TerminalInput.tsx
+++ b/src/Terminal/ui/TerminalInput.tsx
@@ -222,7 +222,7 @@ export function TerminalInput(): React.ReactElement {
if (index < -1) {
index = 0;
}
- const allPos = await determineAllPossibilitiesForTabCompletion(Player, copy, index, Terminal.cwd());
+ const allPos = await determineAllPossibilitiesForTabCompletion(copy, index, Terminal.cwd());
if (allPos.length == 0) {
return;
}
diff --git a/src/engine.tsx b/src/engine.tsx
index d12e408cf..3c66e2c89 100644
--- a/src/engine.tsx
+++ b/src/engine.tsx
@@ -103,11 +103,11 @@ const Engine: {
// Gang, if applicable
if (Player.inGang() && Player.gang !== null) {
- Player.gang.process(numCycles, Player);
+ Player.gang.process(numCycles);
}
// Staneks gift
- staneksGift.process(Player, numCycles);
+ staneksGift.process(numCycles);
// Corporation
if (Player.corporation instanceof Corporation) {
@@ -330,7 +330,7 @@ const Engine: {
// Gang progress for BitNode 2
const gang = Player.gang;
if (Player.inGang() && gang !== null) {
- gang.process(numCyclesOffline, Player);
+ gang.process(numCyclesOffline);
}
// Corporation offline progress
@@ -343,7 +343,7 @@ const Engine: {
Player.bladeburner.storeCycles(numCyclesOffline);
}
- staneksGift.process(Player, numCyclesOffline);
+ staneksGift.process(numCyclesOffline);
// Sleeves offline progress
for (let i = 0; i < Player.sleeves.length; ++i) {
From e578bd76814960917e0a76cacb684bb2949d0974 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 00:14:17 -0400
Subject: [PATCH 21/46] Remove IPlayer interface
Use PlayerObject instead when referring to the type of "The Player."
---
src/PersonObjects/IPlayer.ts | 157 ------
src/PersonObjects/Player/PlayerObject.ts | 480 ++++++------------
.../Player/PlayerObjectAugmentationMethods.ts | 6 +-
.../Player/PlayerObjectBladeburnerMethods.ts | 8 +-
.../Player/PlayerObjectCorporationMethods.ts | 8 +-
.../Player/PlayerObjectGangMethods.ts | 16 +-
.../Player/PlayerObjectGeneralMethods.ts | 95 ++--
.../Player/PlayerObjectServerMethods.ts | 14 +-
.../Player/PlayerObjectWorkMethods.ts | 8 +-
9 files changed, 225 insertions(+), 567 deletions(-)
delete mode 100644 src/PersonObjects/IPlayer.ts
diff --git a/src/PersonObjects/IPlayer.ts b/src/PersonObjects/IPlayer.ts
deleted file mode 100644
index 4070fd0e1..000000000
--- a/src/PersonObjects/IPlayer.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Interface for an object that represents the player (PlayerObject)
- * Used because at the time of implementation, the PlayerObject
- * cant be converted to TypeScript.
- */
-import { Sleeve } from "./Sleeve/Sleeve";
-
-import { IMap } from "../types";
-
-import { IPlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
-import { Augmentation } from "../Augmentation/Augmentation";
-import { Company } from "../Company/Company";
-import { CompanyPosition } from "../Company/CompanyPosition";
-import { CityName } from "../Locations/data/CityNames";
-import { Faction } from "../Faction/Faction";
-import { HashManager } from "../Hacknet/HashManager";
-import { HacknetNode } from "../Hacknet/HacknetNode";
-import { LocationName } from "../Locations/data/LocationNames";
-import { Server } from "../Server/Server";
-import { BaseServer } from "../Server/BaseServer";
-import { IPlayerOwnedSourceFile } from "../SourceFile/PlayerOwnedSourceFile";
-import { MoneySourceTracker } from "../utils/MoneySourceTracker";
-import { Exploit } from "../Exploits/Exploit";
-import { ICorporation } from "../Corporation/ICorporation";
-import { IGang } from "../Gang/IGang";
-import { IBladeburner } from "../Bladeburner/IBladeburner";
-import { ICodingContractReward } from "../CodingContracts";
-import { HacknetServer } from "../Hacknet/HacknetServer";
-import { ISkillProgress } from "./formulas/skill";
-import { PlayerAchievement } from "../Achievements/Achievements";
-import { IPerson } from "./IPerson";
-import { Work } from "../Work/Work";
-import { Multipliers } from "./Multipliers";
-import { Skills } from "./Skills";
-import { HP } from "./HP";
-
-export interface IPlayer extends IPerson {
- bitNodeN: number;
- city: CityName;
- corporation: ICorporation | null;
- gang: IGang | null;
- bladeburner: IBladeburner | null;
- currentServer: string;
- factions: string[];
- factionInvitations: string[];
- hacknetNodes: (HacknetNode | string)[]; // HacknetNode object or IP of Hacknet Server
- has4SData: boolean;
- has4SDataTixApi: boolean;
- hashManager: HashManager;
- hasTixApiAccess: boolean;
- hasWseAccount: boolean;
- jobs: IMap;
- karma: number;
- numPeopleKilled: number;
- location: LocationName;
- readonly money: number;
- moneySourceA: MoneySourceTracker;
- moneySourceB: MoneySourceTracker;
- playtimeSinceLastAug: number;
- playtimeSinceLastBitnode: number;
- purchasedServers: string[];
- queuedAugmentations: IPlayerOwnedAugmentation[];
- scriptProdSinceLastAug: number;
- sleeves: Sleeve[];
- sleevesFromCovenant: number;
- sourceFiles: IPlayerOwnedSourceFile[];
- exploits: Exploit[];
- achievements: PlayerAchievement[];
- terminalCommandHistory: string[];
- lastUpdate: number;
- totalPlaytime: number;
-
- hp: HP;
- skills: Skills;
- exp: Skills;
-
- mults: Multipliers;
-
- currentWork: Work | null;
- focus: boolean;
-
- entropy: number;
-
- // Methods
- init: () => void;
- startWork(w: Work): void;
- processWork(cycles: number): void;
- finishWork(cancelled: boolean): void;
- applyForAgentJob(sing?: boolean): boolean;
- applyForBusinessConsultantJob(sing?: boolean): boolean;
- applyForBusinessJob(sing?: boolean): boolean;
- applyForEmployeeJob(sing?: boolean): boolean;
- applyForItJob(sing?: boolean): boolean;
- applyForJob(entryPosType: CompanyPosition, sing?: boolean): boolean;
- applyForNetworkEngineerJob(sing?: boolean): boolean;
- applyForPartTimeEmployeeJob(sing?: boolean): boolean;
- applyForPartTimeWaiterJob(sing?: boolean): boolean;
- applyForSecurityEngineerJob(sing?: boolean): boolean;
- applyForSecurityJob(sing?: boolean): boolean;
- applyForSoftwareConsultantJob(sing?: boolean): boolean;
- applyForSoftwareJob(sing?: boolean): boolean;
- applyForWaiterJob(sing?: boolean): boolean;
- canAccessBladeburner(): boolean;
- canAccessCorporation(): boolean;
- canAccessGang(): boolean;
- canAccessGrafting(): boolean;
- canAfford(cost: number): boolean;
- gainMoney(money: number, source: string): void;
- getCurrentServer(): BaseServer;
- getGangFaction(): Faction;
- getGangName(): string;
- getHomeComputer(): Server;
- getNextCompanyPosition(company: Company, entryPosType: CompanyPosition): CompanyPosition | null;
- getUpgradeHomeRamCost(): number;
- getUpgradeHomeCoresCost(): number;
- gotoLocation(to: LocationName): boolean;
- hasAugmentation(aug: string | Augmentation, installed?: boolean): boolean;
- hasCorporation(): boolean;
- hasGangWith(facName: string): boolean;
- hasTorRouter(): boolean;
- hasProgram(program: string): boolean;
- inBladeburner(): boolean;
- inGang(): boolean;
- isAwareOfGang(): boolean;
- isQualified(company: Company, position: CompanyPosition): boolean;
- loseMoney(money: number, source: string): void;
- reapplyAllAugmentations(resetMultipliers?: boolean): void;
- reapplyAllSourceFiles(): void;
- setMoney(amt: number): void;
- startBladeburner(): void;
- startCorporation(corpName: string, additionalShares?: number): void;
- startFocusing(): void;
- startGang(facName: string, isHacking: boolean): void;
- travel(to: CityName): boolean;
- giveExploit(exploit: Exploit): void;
- giveAchievement(achievementId: string): void;
- getCasinoWinnings(): number;
- quitJob(company: string, sing?: boolean): void;
- hasJob(): boolean;
- createHacknetServer(): HacknetServer;
- queueAugmentation(augmentationName: string): void;
- receiveInvite(factionName: string): void;
- updateSkillLevels(): void;
- gainCodingContractReward(reward: ICodingContractReward, difficulty?: number): string;
- stopFocusing(): void;
- resetMultipliers(): void;
- prestigeAugmentation(): void;
- prestigeSourceFile(): void;
- calculateSkillProgress(exp: number, mult?: number): ISkillProgress;
- hospitalize(): void;
- checkForFactionInvitations(): Faction[];
- setBitNodeNumber(n: number): void;
- canAccessCotMG(): boolean;
- sourceFileLvl(n: number): number;
- applyEntropy(stacks?: number): void;
- focusPenalty(): number;
-}
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index 50e3f4a21..af67f569a 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -10,16 +10,8 @@ import { IMap } from "../../types";
import { Sleeve } from "../Sleeve/Sleeve";
import { IPlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
import { Exploit } from "../../Exploits/Exploit";
-import { CompanyPosition } from "../../Company/CompanyPosition";
-import { Server } from "../../Server/Server";
-import { BaseServer } from "../../Server/BaseServer";
-import { HacknetServer } from "../../Hacknet/HacknetServer";
-import { Faction } from "../../Faction/Faction";
-import { Company } from "../../Company/Company";
-import { Augmentation } from "../../Augmentation/Augmentation";
-import { ICodingContractReward } from "../../CodingContracts";
-import { IPlayer } from "../IPlayer";
+import { IPerson } from "../IPerson";
import { LocationName } from "../../Locations/data/LocationNames";
import { IPlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
import { ICorporation } from "../../Corporation/ICorporation";
@@ -32,257 +24,171 @@ import { CityName } from "../../Locations/data/CityNames";
import { MoneySourceTracker } from "../../utils/MoneySourceTracker";
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../../utils/JSONReviver";
-import { ISkillProgress } from "../formulas/skill";
import { PlayerAchievement } from "../../Achievements/Achievements";
import { cyrb53 } from "../../utils/StringHelperFunctions";
import { getRandomInt } from "../../utils/helpers/getRandomInt";
-import { ITaskTracker } from "../ITaskTracker";
import { CONSTANTS } from "../../Constants";
import { Work } from "src/Work/Work";
-import { defaultMultipliers, Multipliers } from "../Multipliers";
+import { defaultMultipliers } from "../Multipliers";
import { HP } from "../HP";
import { Skills } from "../Skills";
-export class PlayerObject implements IPlayer {
+export class PlayerObject implements IPerson {
// Class members
- augmentations: IPlayerOwnedAugmentation[];
- bitNodeN: number;
- city: CityName;
- corporation: ICorporation | null;
- gang: IGang | null;
- bladeburner: IBladeburner | null;
- currentServer: string;
- factions: string[];
- factionInvitations: string[];
- hacknetNodes: (HacknetNode | string)[]; // HacknetNode object or IP of Hacknet Server
- has4SData: boolean;
- has4SDataTixApi: boolean;
- hashManager: HashManager;
- hasTixApiAccess: boolean;
- hasWseAccount: boolean;
- jobs: IMap;
- init: () => void;
- karma: number;
- numPeopleKilled: number;
- location: LocationName;
- money: number;
- moneySourceA: MoneySourceTracker;
- moneySourceB: MoneySourceTracker;
- playtimeSinceLastAug: number;
- playtimeSinceLastBitnode: number;
- purchasedServers: string[];
- queuedAugmentations: IPlayerOwnedAugmentation[];
- scriptProdSinceLastAug: number;
- sleeves: Sleeve[];
- sleevesFromCovenant: number;
- sourceFiles: IPlayerOwnedSourceFile[];
- exploits: Exploit[];
- achievements: PlayerAchievement[];
- terminalCommandHistory: string[];
+ augmentations: IPlayerOwnedAugmentation[] = [];
+ bitNodeN = 1; //current bitnode
+ city = CityName.Sector12;
+ corporation: ICorporation | null = null;
+ gang: IGang | null = null;
+ bladeburner: IBladeburner | null = null;
+ currentServer = "";
+ factions: string[] = [];
+ factionInvitations: string[] = [];
+ hacknetNodes: (HacknetNode | string)[] = []; // HacknetNode object or hostname of Hacknet Server
+ has4SData = false;
+ has4SDataTixApi = false;
+ hashManager = new HashManager();
+ hasTixApiAccess = false;
+ hasWseAccount = false;
+ jobs: IMap = {};
+ karma = 0;
+ numPeopleKilled = 0;
+ location = LocationName.TravelAgency;
+ money = 1000 + CONSTANTS.Donations;
+ moneySourceA = new MoneySourceTracker();
+ moneySourceB = new MoneySourceTracker();
+ playtimeSinceLastAug = 0;
+ playtimeSinceLastBitnode = 0;
+ purchasedServers: string[] = [];
+ queuedAugmentations: IPlayerOwnedAugmentation[] = [];
+ scriptProdSinceLastAug = 0;
+ sleeves: Sleeve[] = [];
+ sleevesFromCovenant = 0;
+ sourceFiles: IPlayerOwnedSourceFile[] = [];
+ exploits: Exploit[] = [];
+ achievements: PlayerAchievement[] = [];
+ terminalCommandHistory: string[] = [];
identifier: string;
- lastUpdate: number;
- lastSave: number;
- totalPlaytime: number;
+ lastUpdate = 0;
+ lastSave = 0;
+ totalPlaytime = 0;
- hp: HP;
- skills: Skills;
- exp: Skills;
+ hp: HP = { current: 10, max: 10 };
+ skills: Skills = {
+ hacking: 1,
+ strength: 1,
+ defense: 1,
+ dexterity: 1,
+ agility: 1,
+ charisma: 1,
+ intelligence: 0,
+ };
+ exp: Skills = {
+ hacking: 0,
+ strength: 0,
+ defense: 0,
+ dexterity: 0,
+ agility: 0,
+ charisma: 0,
+ intelligence: 0,
+ };
- mults: Multipliers;
+ mults = defaultMultipliers();
- currentWork: Work | null;
- focus: boolean;
+ currentWork: Work | null = null;
+ focus = false;
- entropy: number;
+ entropy = 0;
// Methods
- startWork: (w: Work) => void;
- processWork: (cycles: number) => void;
- finishWork: (cancelled: boolean) => void;
- applyForAgentJob: (sing?: boolean) => boolean;
- applyForBusinessConsultantJob: (sing?: boolean) => boolean;
- applyForBusinessJob: (sing?: boolean) => boolean;
- applyForEmployeeJob: (sing?: boolean) => boolean;
- applyForItJob: (sing?: boolean) => boolean;
- applyForJob: (entryPosType: CompanyPosition, sing?: boolean) => boolean;
- applyForNetworkEngineerJob: (sing?: boolean) => boolean;
- applyForPartTimeEmployeeJob: (sing?: boolean) => boolean;
- applyForPartTimeWaiterJob: (sing?: boolean) => boolean;
- applyForSecurityEngineerJob: (sing?: boolean) => boolean;
- applyForSecurityJob: (sing?: boolean) => boolean;
- applyForSoftwareConsultantJob: (sing?: boolean) => boolean;
- applyForSoftwareJob: (sing?: boolean) => boolean;
- applyForWaiterJob: (sing?: boolean) => boolean;
- canAccessBladeburner: () => boolean;
- canAccessCorporation: () => boolean;
- canAccessGang: () => boolean;
- canAccessGrafting: () => boolean;
- canAfford: (cost: number) => boolean;
- gainHackingExp: (exp: number) => void;
- gainStrengthExp: (exp: number) => void;
- gainDefenseExp: (exp: number) => void;
- gainDexterityExp: (exp: number) => void;
- gainAgilityExp: (exp: number) => void;
- gainCharismaExp: (exp: number) => void;
- gainIntelligenceExp: (exp: number) => void;
- gainStats: (retValue: ITaskTracker) => void;
- gainMoney: (money: number, source: string) => void;
- getCurrentServer: () => BaseServer;
- getGangFaction: () => Faction;
- getGangName: () => string;
- getHomeComputer: () => Server;
- getNextCompanyPosition: (company: Company, entryPosType: CompanyPosition) => CompanyPosition | null;
- getUpgradeHomeRamCost: () => number;
- getUpgradeHomeCoresCost: () => number;
- gotoLocation: (to: LocationName) => boolean;
- hasAugmentation: (aug: string | Augmentation, installed?: boolean) => boolean;
- hasCorporation: () => boolean;
- hasGangWith: (facName: string) => boolean;
- hasTorRouter: () => boolean;
- hasProgram: (program: string) => boolean;
- inBladeburner: () => boolean;
- inGang: () => boolean;
- isAwareOfGang: () => boolean;
- isQualified: (company: Company, position: CompanyPosition) => boolean;
- loseMoney: (money: number, source: string) => void;
- reapplyAllAugmentations: (resetMultipliers?: boolean) => void;
- reapplyAllSourceFiles: () => void;
- regenerateHp: (amt: number) => void;
- recordMoneySource: (amt: number, source: string) => void;
- setMoney: (amt: number) => void;
- startBladeburner: () => void;
- startCorporation: (corpName: string, additionalShares?: number) => void;
- startFocusing: () => void;
- startGang: (facName: string, isHacking: boolean) => void;
- takeDamage: (amt: number) => boolean;
- travel: (to: CityName) => boolean;
- giveExploit: (exploit: Exploit) => void;
- giveAchievement: (achievementId: string) => void;
- queryStatFromString: (str: string) => number;
- getIntelligenceBonus: (weight: number) => number;
- getCasinoWinnings: () => number;
- quitJob: (company: string, sing?: boolean) => void;
- hasJob: () => boolean;
- createHacknetServer: () => HacknetServer;
- queueAugmentation: (augmentationName: string) => void;
- receiveInvite: (factionName: string) => void;
- updateSkillLevels: () => void;
- gainCodingContractReward: (reward: ICodingContractReward, difficulty?: number) => string;
- stopFocusing: () => void;
- resetMultipliers: () => void;
- prestigeAugmentation: () => void;
- prestigeSourceFile: () => void;
- calculateSkill: (exp: number, mult?: number) => number;
- calculateSkillProgress: (exp: number, mult?: number) => ISkillProgress;
- hospitalize: () => void;
- checkForFactionInvitations: () => Faction[];
- setBitNodeNumber: (n: number) => void;
- canAccessCotMG: () => boolean;
- sourceFileLvl: (n: number) => number;
- applyEntropy: (stacks?: number) => void;
- focusPenalty: () => number;
+ init = generalMethods.init;
+ startWork = workMethods.startWork;
+ processWork = workMethods.processWork;
+ finishWork = workMethods.finishWork;
+ applyForSoftwareJob = generalMethods.applyForSoftwareJob;
+ applyForSoftwareConsultantJob = generalMethods.applyForSoftwareConsultantJob;
+ applyForItJob = generalMethods.applyForItJob;
+ applyForSecurityEngineerJob = generalMethods.applyForSecurityEngineerJob;
+ applyForNetworkEngineerJob = generalMethods.applyForNetworkEngineerJob;
+ applyForBusinessJob = generalMethods.applyForBusinessJob;
+ applyForBusinessConsultantJob = generalMethods.applyForBusinessConsultantJob;
+ applyForSecurityJob = generalMethods.applyForSecurityJob;
+ applyForAgentJob = generalMethods.applyForAgentJob;
+ applyForEmployeeJob = generalMethods.applyForEmployeeJob;
+ applyForPartTimeEmployeeJob = generalMethods.applyForPartTimeEmployeeJob;
+ applyForWaiterJob = generalMethods.applyForWaiterJob;
+ applyForPartTimeWaiterJob = generalMethods.applyForPartTimeWaiterJob;
+ applyForJob = generalMethods.applyForJob;
+ canAccessBladeburner = bladeburnerMethods.canAccessBladeburner;
+ canAccessCorporation = corporationMethods.canAccessCorporation;
+ canAccessGang = gangMethods.canAccessGang;
+ canAccessGrafting = generalMethods.canAccessGrafting;
+ canAfford = generalMethods.canAfford;
+ gainHackingExp = generalMethods.gainHackingExp;
+ gainStrengthExp = generalMethods.gainStrengthExp;
+ gainDefenseExp = generalMethods.gainDefenseExp;
+ gainDexterityExp = generalMethods.gainDexterityExp;
+ gainAgilityExp = generalMethods.gainAgilityExp;
+ gainCharismaExp = generalMethods.gainCharismaExp;
+ gainIntelligenceExp = generalMethods.gainIntelligenceExp;
+ gainStats = generalMethods.gainStats;
+ gainMoney = generalMethods.gainMoney;
+ getCurrentServer = serverMethods.getCurrentServer;
+ getGangFaction = gangMethods.getGangFaction;
+ getGangName = gangMethods.getGangName;
+ getHomeComputer = serverMethods.getHomeComputer;
+ getNextCompanyPosition = generalMethods.getNextCompanyPosition;
+ getUpgradeHomeRamCost = serverMethods.getUpgradeHomeRamCost;
+ getUpgradeHomeCoresCost = serverMethods.getUpgradeHomeCoresCost;
+ gotoLocation = generalMethods.gotoLocation;
+ hasAugmentation = augmentationMethods.hasAugmentation;
+ hasCorporation = corporationMethods.hasCorporation;
+ hasGangWith = gangMethods.hasGangWith;
+ hasTorRouter = serverMethods.hasTorRouter;
+ hasProgram = generalMethods.hasProgram;
+ inBladeburner = bladeburnerMethods.inBladeburner;
+ inGang = gangMethods.inGang;
+ isAwareOfGang = gangMethods.isAwareOfGang;
+ isQualified = generalMethods.isQualified;
+ loseMoney = generalMethods.loseMoney;
+ reapplyAllAugmentations = generalMethods.reapplyAllAugmentations;
+ reapplyAllSourceFiles = generalMethods.reapplyAllSourceFiles;
+ regenerateHp = generalMethods.regenerateHp;
+ recordMoneySource = generalMethods.recordMoneySource;
+ setMoney = generalMethods.setMoney;
+ startBladeburner = bladeburnerMethods.startBladeburner;
+ startCorporation = corporationMethods.startCorporation;
+ startFocusing = generalMethods.startFocusing;
+ startGang = gangMethods.startGang;
+ takeDamage = generalMethods.takeDamage;
+ travel = generalMethods.travel;
+ giveExploit = generalMethods.giveExploit;
+ giveAchievement = generalMethods.giveAchievement;
+ queryStatFromString = generalMethods.queryStatFromString;
+ getIntelligenceBonus = generalMethods.getIntelligenceBonus;
+ getCasinoWinnings = generalMethods.getCasinoWinnings;
+ quitJob = generalMethods.quitJob;
+ hasJob = generalMethods.hasJob;
+ createHacknetServer = serverMethods.createHacknetServer;
+ queueAugmentation = generalMethods.queueAugmentation;
+ receiveInvite = generalMethods.receiveInvite;
+ updateSkillLevels = generalMethods.updateSkillLevels;
+ gainCodingContractReward = generalMethods.gainCodingContractReward;
+ stopFocusing = generalMethods.stopFocusing;
+ resetMultipliers = generalMethods.resetMultipliers;
+ prestigeAugmentation = generalMethods.prestigeAugmentation;
+ prestigeSourceFile = generalMethods.prestigeSourceFile;
+ calculateSkill = generalMethods.calculateSkill;
+ calculateSkillProgress = generalMethods.calculateSkillProgress;
+ hospitalize = generalMethods.hospitalize;
+ checkForFactionInvitations = generalMethods.checkForFactionInvitations;
+ setBitNodeNumber = generalMethods.setBitNodeNumber;
+ canAccessCotMG = generalMethods.canAccessCotMG;
+ sourceFileLvl = generalMethods.sourceFileLvl;
+ applyEntropy = augmentationMethods.applyEntropy;
+ focusPenalty = generalMethods.focusPenalty;
constructor() {
- this.hp = { current: 10, max: 10 };
- this.skills = {
- hacking: 1,
- strength: 1,
- defense: 1,
- dexterity: 1,
- agility: 1,
- charisma: 1,
- intelligence: 0,
- };
- this.exp = {
- hacking: 0,
- strength: 0,
- defense: 0,
- dexterity: 0,
- agility: 0,
- charisma: 0,
- intelligence: 0,
- };
-
- this.mults = defaultMultipliers();
-
- //Money
- this.money = 1000 + CONSTANTS.Donations;
-
- //Location information
- this.city = CityName.Sector12;
- this.location = LocationName.TravelAgency;
-
- // Jobs that the player holds
- // Map of company name (key) -> name of company position (value. Just the name, not the CompanyPosition object)
- // The CompanyPosition name must match a key value in CompanyPositions
- this.jobs = {};
-
- // Servers
- this.currentServer = ""; //hostname of Server currently being accessed through termina;
- this.purchasedServers = []; //hostnames of purchased server;
-
- // Hacknet Nodes/Servers
- this.hacknetNodes = []; // Note= For Hacknet Servers, this array holds the hostnames of the server;
- this.hashManager = new HashManager();
-
- //Factions
- this.factions = []; //Names of all factions player has joine;
- this.factionInvitations = []; //Outstanding faction invitation;
-
- //Augmentations
- this.queuedAugmentations = [];
- this.augmentations = [];
-
- this.sourceFiles = [];
-
- //Crime statistics
- this.numPeopleKilled = 0;
- this.karma = 0;
-
- //Stock Market
- this.hasWseAccount = false;
- this.hasTixApiAccess = false;
- this.has4SData = false;
- this.has4SDataTixApi = false;
-
- //Gang
- this.gang = null;
-
- //Corporation
- this.corporation = null;
-
- //Bladeburner
- this.bladeburner = null;
-
- // Sleeves & Re-sleeving
- this.sleeves = [];
- this.sleevesFromCovenant = 0; // # of Duplicate sleeves purchased from the covenant
- //bitnode
- this.bitNodeN = 1;
-
- this.entropy = 0;
-
- //Used to store the last update time.
- this.lastUpdate = 0;
- this.lastSave = 0;
- this.totalPlaytime = 0;
-
- this.playtimeSinceLastAug = 0;
- this.playtimeSinceLastBitnode = 0;
-
- // Keep track of where money comes from
- this.moneySourceA = new MoneySourceTracker(); // Where money comes from since last-installed Augmentation
- this.moneySourceB = new MoneySourceTracker(); // Where money comes from for this entire BitNode run
- // Production since last Augmentation installation
- this.scriptProdSinceLastAug = 0;
-
- this.exploits = [];
- this.achievements = [];
- this.terminalCommandHistory = [];
-
- this.focus = false;
- this.currentWork = null;
-
// Let's get a hash of some semi-random stuff so we have something unique.
this.identifier = cyrb53(
"I-" +
@@ -292,96 +198,6 @@ export class PlayerObject implements IPlayer {
window.innerHeight +
getRandomInt(100, 999),
);
-
- this.init = generalMethods.init;
- this.prestigeAugmentation = generalMethods.prestigeAugmentation;
- this.prestigeSourceFile = generalMethods.prestigeSourceFile;
- this.receiveInvite = generalMethods.receiveInvite;
- this.calculateSkill = generalMethods.calculateSkill;
- this.calculateSkillProgress = generalMethods.calculateSkillProgress;
- this.updateSkillLevels = generalMethods.updateSkillLevels;
- this.resetMultipliers = generalMethods.resetMultipliers;
- this.hasProgram = generalMethods.hasProgram;
- this.setMoney = generalMethods.setMoney;
- this.gainMoney = generalMethods.gainMoney;
- this.loseMoney = generalMethods.loseMoney;
- this.canAfford = generalMethods.canAfford;
- this.recordMoneySource = generalMethods.recordMoneySource;
- this.gainHackingExp = generalMethods.gainHackingExp;
- this.gainStrengthExp = generalMethods.gainStrengthExp;
- this.gainDefenseExp = generalMethods.gainDefenseExp;
- this.gainDexterityExp = generalMethods.gainDexterityExp;
- this.gainAgilityExp = generalMethods.gainAgilityExp;
- this.gainCharismaExp = generalMethods.gainCharismaExp;
- this.gainIntelligenceExp = generalMethods.gainIntelligenceExp;
- this.gainStats = generalMethods.gainStats;
- this.queryStatFromString = generalMethods.queryStatFromString;
- this.startWork = workMethods.start;
- this.processWork = workMethods.process;
- this.finishWork = workMethods.finish;
- this.startFocusing = generalMethods.startFocusing;
- this.stopFocusing = generalMethods.stopFocusing;
- this.takeDamage = generalMethods.takeDamage;
- this.regenerateHp = generalMethods.regenerateHp;
- this.hospitalize = generalMethods.hospitalize;
- this.applyForJob = generalMethods.applyForJob;
- this.getNextCompanyPosition = generalMethods.getNextCompanyPosition;
- this.quitJob = generalMethods.quitJob;
- this.hasJob = generalMethods.hasJob;
- this.applyForSoftwareJob = generalMethods.applyForSoftwareJob;
- this.applyForSoftwareConsultantJob = generalMethods.applyForSoftwareConsultantJob;
- this.applyForItJob = generalMethods.applyForItJob;
- this.applyForSecurityEngineerJob = generalMethods.applyForSecurityEngineerJob;
- this.applyForNetworkEngineerJob = generalMethods.applyForNetworkEngineerJob;
- this.applyForBusinessJob = generalMethods.applyForBusinessJob;
- this.applyForBusinessConsultantJob = generalMethods.applyForBusinessConsultantJob;
- this.applyForSecurityJob = generalMethods.applyForSecurityJob;
- this.applyForAgentJob = generalMethods.applyForAgentJob;
- this.applyForEmployeeJob = generalMethods.applyForEmployeeJob;
- this.applyForPartTimeEmployeeJob = generalMethods.applyForPartTimeEmployeeJob;
- this.applyForWaiterJob = generalMethods.applyForWaiterJob;
- this.applyForPartTimeWaiterJob = generalMethods.applyForPartTimeWaiterJob;
- this.isQualified = generalMethods.isQualified;
- this.reapplyAllAugmentations = generalMethods.reapplyAllAugmentations;
- this.reapplyAllSourceFiles = generalMethods.reapplyAllSourceFiles;
- this.checkForFactionInvitations = generalMethods.checkForFactionInvitations;
- this.setBitNodeNumber = generalMethods.setBitNodeNumber;
- this.queueAugmentation = generalMethods.queueAugmentation;
- this.gainCodingContractReward = generalMethods.gainCodingContractReward;
- this.travel = generalMethods.travel;
- this.gotoLocation = generalMethods.gotoLocation;
- this.canAccessGrafting = generalMethods.canAccessGrafting;
- this.giveExploit = generalMethods.giveExploit;
- this.giveAchievement = generalMethods.giveAchievement;
- this.getIntelligenceBonus = generalMethods.getIntelligenceBonus;
- this.getCasinoWinnings = generalMethods.getCasinoWinnings;
- this.hasAugmentation = augmentationMethods.hasAugmentation;
- this.canAccessBladeburner = bladeburnerMethods.canAccessBladeburner;
- this.inBladeburner = bladeburnerMethods.inBladeburner;
- this.startBladeburner = bladeburnerMethods.startBladeburner;
- this.canAccessCorporation = corporationMethods.canAccessCorporation;
- this.hasCorporation = corporationMethods.hasCorporation;
- this.startCorporation = corporationMethods.startCorporation;
- this.canAccessGang = gangMethods.canAccessGang;
- this.isAwareOfGang = gangMethods.isAwareOfGang;
- this.getGangFaction = gangMethods.getGangFaction;
- this.getGangName = gangMethods.getGangName;
- this.hasGangWith = gangMethods.hasGangWith;
- this.inGang = gangMethods.inGang;
- this.startGang = gangMethods.startGang;
-
- this.hasTorRouter = serverMethods.hasTorRouter;
- this.getCurrentServer = serverMethods.getCurrentServer;
- this.getHomeComputer = serverMethods.getHomeComputer;
- this.getUpgradeHomeRamCost = serverMethods.getUpgradeHomeRamCost;
- this.getUpgradeHomeCoresCost = serverMethods.getUpgradeHomeCoresCost;
- this.createHacknetServer = serverMethods.createHacknetServer;
-
- this.canAccessCotMG = generalMethods.canAccessCotMG;
- this.sourceFileLvl = generalMethods.sourceFileLvl;
-
- this.applyEntropy = augmentationMethods.applyEntropy;
- this.focusPenalty = generalMethods.focusPenalty;
}
whoAmI(): string {
diff --git a/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts b/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
index d7cd35177..45bfbd44a 100644
--- a/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
@@ -1,13 +1,13 @@
/**
* Augmentation-related methods for the Player class (PlayerObject)
*/
-import { IPlayer } from "../IPlayer";
+import { PlayerObject } from "./PlayerObject";
import { Augmentation } from "../../Augmentation/Augmentation";
import { calculateEntropy } from "../Grafting/EntropyAccumulation";
-export function hasAugmentation(this: IPlayer, aug: string | Augmentation, ignoreQueued = false): boolean {
+export function hasAugmentation(this: PlayerObject, aug: string | Augmentation, ignoreQueued = false): boolean {
const augName: string = aug instanceof Augmentation ? aug.name : aug;
for (const owned of this.augmentations) {
@@ -27,7 +27,7 @@ export function hasAugmentation(this: IPlayer, aug: string | Augmentation, ignor
return false;
}
-export function applyEntropy(this: IPlayer, stacks = 1): void {
+export function applyEntropy(this: PlayerObject, stacks = 1): void {
// Re-apply all multipliers
this.reapplyAllAugmentations();
this.reapplyAllSourceFiles();
diff --git a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
index cf8d9e2ce..b8e9e31ad 100644
--- a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
@@ -1,17 +1,17 @@
import { Bladeburner } from "../../Bladeburner/Bladeburner";
-import { IPlayer } from "../IPlayer";
+import { PlayerObject } from "./PlayerObject";
-export function canAccessBladeburner(this: IPlayer): boolean {
+export function canAccessBladeburner(this: PlayerObject): boolean {
return this.bitNodeN === 6 || this.bitNodeN === 7 || this.sourceFileLvl(6) > 0 || this.sourceFileLvl(7) > 0;
}
-export function inBladeburner(this: IPlayer): boolean {
+export function inBladeburner(this: PlayerObject): boolean {
if (this.bladeburner == null) {
return false;
}
return this.bladeburner instanceof Bladeburner;
}
-export function startBladeburner(this: IPlayer): void {
+export function startBladeburner(this: PlayerObject): void {
this.bladeburner = new Bladeburner();
}
diff --git a/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts b/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts
index c853aceae..95acac366 100644
--- a/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts
@@ -3,20 +3,20 @@ import {
CorporationUnlockUpgradeIndex,
CorporationUnlockUpgrades,
} from "../../Corporation/data/CorporationUnlockUpgrades";
-import { IPlayer } from "../IPlayer";
+import { PlayerObject } from "./PlayerObject";
-export function canAccessCorporation(this: IPlayer): boolean {
+export function canAccessCorporation(this: PlayerObject): boolean {
return this.bitNodeN === 3 || this.sourceFileLvl(3) > 0;
}
-export function hasCorporation(this: IPlayer): boolean {
+export function hasCorporation(this: PlayerObject): boolean {
if (this.corporation == null) {
return false;
}
return this.corporation instanceof Corporation;
}
-export function startCorporation(this: IPlayer, corpName: string, additionalShares = 0): void {
+export function startCorporation(this: PlayerObject, corpName: string, additionalShares = 0): void {
this.corporation = new Corporation({
name: corpName,
});
diff --git a/src/PersonObjects/Player/PlayerObjectGangMethods.ts b/src/PersonObjects/Player/PlayerObjectGangMethods.ts
index 77568ee60..fbe765a74 100644
--- a/src/PersonObjects/Player/PlayerObjectGangMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGangMethods.ts
@@ -1,10 +1,10 @@
import { Factions } from "../../Faction/Factions";
import { Faction } from "../../Faction/Faction";
import { Gang } from "../../Gang/Gang";
-import { IPlayer } from "../IPlayer";
+import { PlayerObject } from "./PlayerObject";
import { GangConstants } from "../../Gang/data/Constants";
-export function canAccessGang(this: IPlayer): boolean {
+export function canAccessGang(this: PlayerObject): boolean {
if (this.bitNodeN === 2) {
return true;
}
@@ -15,11 +15,11 @@ export function canAccessGang(this: IPlayer): boolean {
return this.karma <= GangConstants.GangKarmaRequirement;
}
-export function isAwareOfGang(this: IPlayer): boolean {
+export function isAwareOfGang(this: PlayerObject): boolean {
return this.bitNodeN === 2 || this.sourceFileLvl(2) >= 1;
}
-export function getGangFaction(this: IPlayer): Faction {
+export function getGangFaction(this: PlayerObject): Faction {
const gang = this.gang;
if (gang === null) {
throw new Error("Cannot get gang faction because player is not in a gang.");
@@ -32,7 +32,7 @@ export function getGangFaction(this: IPlayer): Faction {
return fac;
}
-export function getGangName(this: IPlayer): string {
+export function getGangName(this: PlayerObject): string {
if (!this.inGang()) return "";
const gang = this.gang;
if (gang === null) {
@@ -41,7 +41,7 @@ export function getGangName(this: IPlayer): string {
return gang.facName;
}
-export function hasGangWith(this: IPlayer, facName: string): boolean {
+export function hasGangWith(this: PlayerObject, facName: string): boolean {
if (!this.inGang()) return false;
const gang = this.gang;
if (gang === null) {
@@ -50,7 +50,7 @@ export function hasGangWith(this: IPlayer, facName: string): boolean {
return gang.facName === facName;
}
-export function inGang(this: IPlayer): boolean {
+export function inGang(this: PlayerObject): boolean {
if (this.gang == null || this.gang == undefined) {
return false;
}
@@ -58,7 +58,7 @@ export function inGang(this: IPlayer): boolean {
return this.gang instanceof Gang;
}
-export function startGang(this: IPlayer, factionName: string, hacking: boolean): void {
+export function startGang(this: PlayerObject, factionName: string, hacking: boolean): void {
this.gang = new Gang(factionName, hacking);
const fac = Factions[factionName];
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
index dc13eb4d7..e44277f8f 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
@@ -1,4 +1,3 @@
-import { IPlayer } from "../IPlayer";
import { PlayerObject } from "./PlayerObject";
import { applyAugmentation } from "../../Augmentation/AugmentationHelpers";
import { PlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
@@ -56,7 +55,7 @@ import { isCompanyWork } from "../../Work/CompanyWork";
import { defaultMultipliers } from "../Multipliers";
import { serverMetadata } from "../../Server/data/servers";
-export function init(this: IPlayer): void {
+export function init(this: PlayerObject): void {
/* Initialize Player's home computer */
const t_homeComp = safetlyCreateUniqueServer({
adminRights: true,
@@ -142,7 +141,7 @@ export function prestigeAugmentation(this: PlayerObject): void {
this.finishWork(true);
}
-export function prestigeSourceFile(this: IPlayer): void {
+export function prestigeSourceFile(this: PlayerObject): void {
this.entropy = 0;
this.prestigeAugmentation();
this.karma = 0;
@@ -180,7 +179,7 @@ export function prestigeSourceFile(this: IPlayer): void {
this.augmentations = [];
}
-export function receiveInvite(this: IPlayer, factionName: string): void {
+export function receiveInvite(this: PlayerObject, factionName: string): void {
if (this.factionInvitations.includes(factionName) || this.factions.includes(factionName)) {
return;
}
@@ -193,11 +192,11 @@ export function calculateSkill(this: IPerson, exp: number, mult = 1): number {
}
//Calculates skill level progress based on experience. The same formula will be used for every skill
-export function calculateSkillProgress(this: IPlayer, exp: number, mult = 1): ISkillProgress {
+export function calculateSkillProgress(this: PlayerObject, exp: number, mult = 1): ISkillProgress {
return calculateSkillProgressF(exp, mult);
}
-export function updateSkillLevels(this: IPlayer): void {
+export function updateSkillLevels(this: PlayerObject): void {
this.skills.hacking = Math.max(
1,
Math.floor(this.calculateSkill(this.exp.hacking, this.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier)),
@@ -240,11 +239,11 @@ export function updateSkillLevels(this: IPlayer): void {
this.hp.current = Math.round(this.hp.max * ratio);
}
-export function resetMultipliers(this: IPlayer): void {
+export function resetMultipliers(this: PlayerObject): void {
this.mults = defaultMultipliers();
}
-export function hasProgram(this: IPlayer, programName: string): boolean {
+export function hasProgram(this: PlayerObject, programName: string): boolean {
const home = this.getHomeComputer();
if (home == null) {
return false;
@@ -286,7 +285,7 @@ export function loseMoney(this: PlayerObject, money: number, source: string): vo
this.recordMoneySource(-1 * money, source);
}
-export function canAfford(this: IPlayer, cost: number): boolean {
+export function canAfford(this: PlayerObject, cost: number): boolean {
if (isNaN(cost)) {
console.error(`NaN passed into Player.canAfford()`);
return false;
@@ -428,7 +427,7 @@ export function gainStats(this: IPerson, retValue: ITaskTracker): void {
}
//Given a string expression like "str" or "strength", returns the given stat
-export function queryStatFromString(this: IPlayer, str: string): number {
+export function queryStatFromString(this: PlayerObject, str: string): number {
const tempStr = str.toLowerCase();
if (tempStr.includes("hack")) {
return this.skills.hacking;
@@ -454,16 +453,16 @@ export function queryStatFromString(this: IPlayer, str: string): number {
return 0;
}
-export function startFocusing(this: IPlayer): void {
+export function startFocusing(this: PlayerObject): void {
this.focus = true;
}
-export function stopFocusing(this: IPlayer): void {
+export function stopFocusing(this: PlayerObject): void {
this.focus = false;
}
// Returns true if hospitalized, false otherwise
-export function takeDamage(this: IPlayer, amt: number): boolean {
+export function takeDamage(this: PlayerObject, amt: number): boolean {
if (typeof amt !== "number") {
console.warn(`Player.takeDamage() called without a numeric argument: ${amt}`);
return false;
@@ -489,7 +488,7 @@ export function regenerateHp(this: IPerson, amt: number): void {
}
}
-export function hospitalize(this: IPlayer): number {
+export function hospitalize(this: PlayerObject): number {
const cost = getHospitalizationCost();
SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, ToastVariant.WARNING, 2000);
@@ -502,7 +501,7 @@ export function hospitalize(this: IPlayer): number {
//Determines the job that the Player should get (if any) at the current company
//The 'sing' argument designates whether or not this is being called from
//the applyToCompany() Netscript Singularity function
-export function applyForJob(this: IPlayer, entryPosType: CompanyPosition, sing = false): boolean {
+export function applyForJob(this: PlayerObject, entryPosType: CompanyPosition, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
if (!(company instanceof Company)) {
console.error(`Could not find company that matches the location: ${this.location}. Player.applyToCompany() failed`);
@@ -555,7 +554,7 @@ export function applyForJob(this: IPlayer, entryPosType: CompanyPosition, sing =
//Returns your next position at a company given the field (software, business, etc.)
export function getNextCompanyPosition(
- this: IPlayer,
+ this: PlayerObject,
company: Company,
entryPosType: CompanyPosition,
): CompanyPosition | null {
@@ -590,7 +589,7 @@ export function getNextCompanyPosition(
return entryPosType;
}
-export function quitJob(this: IPlayer, company: string): void {
+export function quitJob(this: PlayerObject, company: string): void {
if (isCompanyWork(this.currentWork) && this.currentWork.companyName === company) {
this.finishWork(true);
}
@@ -608,23 +607,23 @@ export function quitJob(this: IPlayer, company: string): void {
* @param this The player instance
* @returns Whether the user has at least one job
*/
-export function hasJob(this: IPlayer): boolean {
+export function hasJob(this: PlayerObject): boolean {
return Boolean(Object.keys(this.jobs).length);
}
-export function applyForSoftwareJob(this: IPlayer, sing = false): boolean {
+export function applyForSoftwareJob(this: PlayerObject, sing = false): boolean {
return this.applyForJob(CompanyPositions[posNames.SoftwareCompanyPositions[0]], sing);
}
-export function applyForSoftwareConsultantJob(this: IPlayer, sing = false): boolean {
+export function applyForSoftwareConsultantJob(this: PlayerObject, sing = false): boolean {
return this.applyForJob(CompanyPositions[posNames.SoftwareConsultantCompanyPositions[0]], sing);
}
-export function applyForItJob(this: IPlayer, sing = false): boolean {
+export function applyForItJob(this: PlayerObject, sing = false): boolean {
return this.applyForJob(CompanyPositions[posNames.ITCompanyPositions[0]], sing);
}
-export function applyForSecurityEngineerJob(this: IPlayer, sing = false): boolean {
+export function applyForSecurityEngineerJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
if (this.isQualified(company, CompanyPositions[posNames.SecurityEngineerCompanyPositions[0]])) {
return this.applyForJob(CompanyPositions[posNames.SecurityEngineerCompanyPositions[0]], sing);
@@ -636,7 +635,7 @@ export function applyForSecurityEngineerJob(this: IPlayer, sing = false): boolea
}
}
-export function applyForNetworkEngineerJob(this: IPlayer, sing = false): boolean {
+export function applyForNetworkEngineerJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
if (this.isQualified(company, CompanyPositions[posNames.NetworkEngineerCompanyPositions[0]])) {
const pos = CompanyPositions[posNames.NetworkEngineerCompanyPositions[0]];
@@ -649,21 +648,21 @@ export function applyForNetworkEngineerJob(this: IPlayer, sing = false): boolean
}
}
-export function applyForBusinessJob(this: IPlayer, sing = false): boolean {
+export function applyForBusinessJob(this: PlayerObject, sing = false): boolean {
return this.applyForJob(CompanyPositions[posNames.BusinessCompanyPositions[0]], sing);
}
-export function applyForBusinessConsultantJob(this: IPlayer, sing = false): boolean {
+export function applyForBusinessConsultantJob(this: PlayerObject, sing = false): boolean {
return this.applyForJob(CompanyPositions[posNames.BusinessConsultantCompanyPositions[0]], sing);
}
-export function applyForSecurityJob(this: IPlayer, sing = false): boolean {
+export function applyForSecurityJob(this: PlayerObject, sing = false): boolean {
// TODO Police Jobs
// Indexing starts at 2 because 0 is for police officer
return this.applyForJob(CompanyPositions[posNames.SecurityCompanyPositions[2]], sing);
}
-export function applyForAgentJob(this: IPlayer, sing = false): boolean {
+export function applyForAgentJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
if (this.isQualified(company, CompanyPositions[posNames.AgentCompanyPositions[0]])) {
const pos = CompanyPositions[posNames.AgentCompanyPositions[0]];
@@ -676,7 +675,7 @@ export function applyForAgentJob(this: IPlayer, sing = false): boolean {
}
}
-export function applyForEmployeeJob(this: IPlayer, sing = false): boolean {
+export function applyForEmployeeJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
const position = posNames.MiscCompanyPositions[1];
// Check if this company has the position
@@ -700,7 +699,7 @@ export function applyForEmployeeJob(this: IPlayer, sing = false): boolean {
}
}
-export function applyForPartTimeEmployeeJob(this: IPlayer, sing = false): boolean {
+export function applyForPartTimeEmployeeJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
const position = posNames.PartTimeCompanyPositions[1];
// Check if this company has the position
@@ -723,7 +722,7 @@ export function applyForPartTimeEmployeeJob(this: IPlayer, sing = false): boolea
}
}
-export function applyForWaiterJob(this: IPlayer, sing = false): boolean {
+export function applyForWaiterJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
const position = posNames.MiscCompanyPositions[0];
// Check if this company has the position
@@ -744,7 +743,7 @@ export function applyForWaiterJob(this: IPlayer, sing = false): boolean {
}
}
-export function applyForPartTimeWaiterJob(this: IPlayer, sing = false): boolean {
+export function applyForPartTimeWaiterJob(this: PlayerObject, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
const position = posNames.PartTimeCompanyPositions[0];
// Check if this company has the position
@@ -766,7 +765,7 @@ export function applyForPartTimeWaiterJob(this: IPlayer, sing = false): boolean
}
//Checks if the Player is qualified for a certain position
-export function isQualified(this: IPlayer, company: Company, position: CompanyPosition): boolean {
+export function isQualified(this: PlayerObject, company: Company, position: CompanyPosition): boolean {
const offset = company.jobStatReqOffset;
const reqHacking = position.requiredHacking > 0 ? position.requiredHacking + offset : 0;
const reqStrength = position.requiredStrength > 0 ? position.requiredStrength + offset : 0;
@@ -787,7 +786,7 @@ export function isQualified(this: IPlayer, company: Company, position: CompanyPo
}
/********** Reapplying Augmentations and Source File ***********/
-export function reapplyAllAugmentations(this: IPlayer, resetMultipliers = true): void {
+export function reapplyAllAugmentations(this: PlayerObject, resetMultipliers = true): void {
if (resetMultipliers) {
this.resetMultipliers();
}
@@ -813,7 +812,7 @@ export function reapplyAllAugmentations(this: IPlayer, resetMultipliers = true):
this.updateSkillLevels();
}
-export function reapplyAllSourceFiles(this: IPlayer): void {
+export function reapplyAllSourceFiles(this: PlayerObject): void {
//Will always be called after reapplyAllAugmentations() so multipliers do not have to be reset
//this.resetMultipliers();
@@ -834,7 +833,7 @@ export function reapplyAllSourceFiles(this: IPlayer): void {
//This function sets the requirements to join a Faction. It checks whether the Player meets
//those requirements and will return an array of all factions that the Player should
//receive an invitation to
-export function checkForFactionInvitations(this: IPlayer): Faction[] {
+export function checkForFactionInvitations(this: PlayerObject): Faction[] {
const invitedFactions: Faction[] = []; //Array which will hold all Factions the player should be invited to
const numAugmentations = this.augmentations.length;
@@ -1320,11 +1319,11 @@ export function checkForFactionInvitations(this: IPlayer): Faction[] {
}
/************* BitNodes **************/
-export function setBitNodeNumber(this: IPlayer, n: number): void {
+export function setBitNodeNumber(this: PlayerObject, n: number): void {
this.bitNodeN = n;
}
-export function queueAugmentation(this: IPlayer, name: string): void {
+export function queueAugmentation(this: PlayerObject, name: string): void {
for (const aug of this.queuedAugmentations) {
if (aug.name == name) {
console.warn(`tried to queue ${name} twice, this may be a bug`);
@@ -1343,7 +1342,7 @@ export function queueAugmentation(this: IPlayer, name: string): void {
}
/************* Coding Contracts **************/
-export function gainCodingContractReward(this: IPlayer, reward: ICodingContractReward, difficulty = 1): string {
+export function gainCodingContractReward(this: PlayerObject, reward: ICodingContractReward, difficulty = 1): string {
if (reward == null || reward.type == null) {
return `No reward for this contract`;
}
@@ -1402,7 +1401,7 @@ export function gainCodingContractReward(this: IPlayer, reward: ICodingContractR
/* eslint-enable no-case-declarations */
}
-export function travel(this: IPlayer, to: CityName): boolean {
+export function travel(this: PlayerObject, to: CityName): boolean {
if (Cities[to] == null) {
console.warn(`Player.travel() called with invalid city: ${to}`);
return false;
@@ -1412,7 +1411,7 @@ export function travel(this: IPlayer, to: CityName): boolean {
return true;
}
-export function gotoLocation(this: IPlayer, to: LocationName): boolean {
+export function gotoLocation(this: PlayerObject, to: LocationName): boolean {
if (Locations[to] == null) {
console.warn(`Player.gotoLocation() called with invalid location: ${to}`);
return false;
@@ -1422,18 +1421,18 @@ export function gotoLocation(this: IPlayer, to: LocationName): boolean {
return true;
}
-export function canAccessGrafting(this: IPlayer): boolean {
+export function canAccessGrafting(this: PlayerObject): boolean {
return this.bitNodeN === 10 || this.sourceFileLvl(10) > 0;
}
-export function giveExploit(this: IPlayer, exploit: Exploit): void {
+export function giveExploit(this: PlayerObject, exploit: Exploit): void {
if (!this.exploits.includes(exploit)) {
this.exploits.push(exploit);
SnackbarEvents.emit("SF -1 acquired!", ToastVariant.SUCCESS, 2000);
}
}
-export function giveAchievement(this: IPlayer, achievementId: string): void {
+export function giveAchievement(this: PlayerObject, achievementId: string): void {
const achievement = achievements[achievementId];
if (!achievement) return;
if (!this.achievements.map((a) => a.ID).includes(achievementId)) {
@@ -1442,25 +1441,25 @@ export function giveAchievement(this: IPlayer, achievementId: string): void {
}
}
-export function getIntelligenceBonus(this: IPlayer, weight: number): number {
+export function getIntelligenceBonus(this: PlayerObject, weight: number): number {
return calculateIntelligenceBonus(this.skills.intelligence, weight);
}
-export function getCasinoWinnings(this: IPlayer): number {
+export function getCasinoWinnings(this: PlayerObject): number {
return this.moneySourceA.casino;
}
-export function canAccessCotMG(this: IPlayer): boolean {
+export function canAccessCotMG(this: PlayerObject): boolean {
return this.bitNodeN === 13 || this.sourceFileLvl(13) > 0;
}
-export function sourceFileLvl(this: IPlayer, n: number): number {
+export function sourceFileLvl(this: PlayerObject, n: number): number {
const sf = this.sourceFiles.find((sf) => sf.n === n);
if (!sf) return 0;
return sf.lvl;
}
-export function focusPenalty(this: IPlayer): number {
+export function focusPenalty(this: PlayerObject): number {
let focus = 1;
if (!this.hasAugmentation(AugmentationNames.NeuroreceptorManager, true)) {
focus = this.focus ? 1 : CONSTANTS.BaseFocusBonus;
diff --git a/src/PersonObjects/Player/PlayerObjectServerMethods.ts b/src/PersonObjects/Player/PlayerObjectServerMethods.ts
index 8f706fbdd..a8ff2c456 100644
--- a/src/PersonObjects/Player/PlayerObjectServerMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectServerMethods.ts
@@ -1,7 +1,7 @@
/**
* Server and HacknetServer-related methods for the Player class (PlayerObject)
*/
-import { IPlayer } from "../IPlayer";
+import { PlayerObject } from "./PlayerObject";
import { CONSTANTS } from "../../Constants";
@@ -12,23 +12,23 @@ import { HacknetServer } from "../../Hacknet/HacknetServer";
import { GetServer, AddToAllServers, createUniqueRandomIp } from "../../Server/AllServers";
import { SpecialServers } from "../../Server/data/SpecialServers";
-export function hasTorRouter(this: IPlayer): boolean {
+export function hasTorRouter(this: PlayerObject): boolean {
return this.getHomeComputer().serversOnNetwork.includes(SpecialServers.DarkWeb);
}
-export function getCurrentServer(this: IPlayer): BaseServer {
+export function getCurrentServer(this: PlayerObject): BaseServer {
const server = GetServer(this.currentServer);
if (server === null) throw new Error(`somehow connected to a server that does not exist. ${this.currentServer}`);
return server;
}
-export function getHomeComputer(this: IPlayer): Server {
+export function getHomeComputer(this: PlayerObject): Server {
const home = GetServer("home");
if (home instanceof Server) return home;
throw new Error("home computer was not a normal server");
}
-export function getUpgradeHomeRamCost(this: IPlayer): number {
+export function getUpgradeHomeRamCost(this: PlayerObject): number {
//Calculate how many times ram has been upgraded (doubled)
const currentRam = this.getHomeComputer().maxRam;
const numUpgrades = Math.log2(currentRam);
@@ -40,11 +40,11 @@ export function getUpgradeHomeRamCost(this: IPlayer): number {
return cost;
}
-export function getUpgradeHomeCoresCost(this: IPlayer): number {
+export function getUpgradeHomeCoresCost(this: PlayerObject): number {
return 1e9 * Math.pow(7.5, this.getHomeComputer().cpuCores);
}
-export function createHacknetServer(this: IPlayer): HacknetServer {
+export function createHacknetServer(this: PlayerObject): HacknetServer {
const numOwned = this.hacknetNodes.length;
const name = `hacknet-node-${numOwned}`;
const server = new HacknetServer({
diff --git a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
index c2c306db5..41dfb2d30 100644
--- a/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectWorkMethods.ts
@@ -1,20 +1,20 @@
import { Work } from "../../Work/Work";
-import { IPlayer } from "../IPlayer";
+import { PlayerObject } from "./PlayerObject";
-export function start(this: IPlayer, w: Work): void {
+export function startWork(this: PlayerObject, w: Work): void {
if (this.currentWork !== null) {
this.currentWork.finish(true);
}
this.currentWork = w;
}
-export function process(this: IPlayer, cycles = 1): void {
+export function processWork(this: PlayerObject, cycles = 1): void {
if (this.currentWork === null) return;
const finished = this.currentWork.process(cycles);
if (finished) {
this.finishWork(false);
}
}
-export function finish(this: IPlayer, cancelled: boolean): void {
+export function finishWork(this: PlayerObject, cancelled: boolean): void {
if (this.currentWork === null) return;
this.currentWork.finish(cancelled);
this.currentWork = null;
From dcd9023b93ac18b5f028954f4ee70916f174b350 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 00:26:56 -0400
Subject: [PATCH 22/46] Remove more unused interfaces
---
src/IEngine.ts | 28 ---------
src/Terminal/ITerminal.tsx | 105 -------------------------------
src/Terminal/OutputTypes.tsx | 51 +++++++++++++++
src/Terminal/Terminal.ts | 4 +-
src/Terminal/ui/TerminalRoot.tsx | 2 +-
5 files changed, 54 insertions(+), 136 deletions(-)
delete mode 100644 src/IEngine.ts
delete mode 100644 src/Terminal/ITerminal.tsx
create mode 100644 src/Terminal/OutputTypes.tsx
diff --git a/src/IEngine.ts b/src/IEngine.ts
deleted file mode 100644
index 5f99fdf97..000000000
--- a/src/IEngine.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * TypeScript interface for the game engine (engine.js), which can't be converted
- * to TypeScript at the moment
- */
-export interface IEngine {
- _lastUpdate: number;
- updateGame: (numCycles?: number) => void;
- Counters: {
- [key: string]: number | undefined;
- autoSaveCounter: number;
- updateSkillLevelsCounter: number;
- updateDisplays: number;
- updateDisplaysLong: number;
- updateActiveScriptsDisplay: number;
- createProgramNotifications: number;
- augmentationsNotifications: number;
- checkFactionInvitations: number;
- passiveFactionGrowth: number;
- messages: number;
- mechanicProcess: number;
- contractGeneration: number;
- achievementsCounter: number;
- };
- decrementAllCounters: (numCycles?: number) => void;
- checkCounters: () => void;
- load: (saveString: string) => void;
- start: () => void;
-}
diff --git a/src/Terminal/ITerminal.tsx b/src/Terminal/ITerminal.tsx
deleted file mode 100644
index c76e9e5b2..000000000
--- a/src/Terminal/ITerminal.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React from "react";
-import { TextFile } from "../TextFile";
-import { Script } from "../Script/Script";
-import { Settings } from "../Settings/Settings";
-import { formatTime } from "../utils/helpers/formatTime";
-import { BaseServer } from "../Server/BaseServer";
-
-export class Output {
- text: string;
- color: "primary" | "error" | "success" | "info" | "warn";
- constructor(text: string, color: "primary" | "error" | "success" | "info" | "warn") {
- if (Settings.TimestampsFormat) text = "[" + formatTime(Settings.TimestampsFormat) + "] " + text;
- this.text = text;
- this.color = color;
- }
-}
-
-export class RawOutput {
- raw: React.ReactNode;
- constructor(node: React.ReactNode) {
- if (Settings.TimestampsFormat)
- node = (
- <>
- [{formatTime(Settings.TimestampsFormat)}] {node}
-
- );
- this.raw = node;
- }
-}
-
-export class Link {
- hostname: string;
- dashes: string;
- constructor(dashes: string, hostname: string) {
- if (Settings.TimestampsFormat) dashes = "[" + formatTime(Settings.TimestampsFormat) + "] " + dashes;
- this.hostname = hostname;
- this.dashes = dashes;
- }
-}
-
-export class TTimer {
- time: number;
- timeLeft: number;
- action: "h" | "b" | "a" | "g" | "w";
- server?: BaseServer;
-
- constructor(time: number, action: "h" | "b" | "a" | "g" | "w", server?: BaseServer) {
- this.time = time;
- this.timeLeft = time;
- this.action = action;
- this.server = server;
- }
-}
-
-export interface ITerminal {
- action: TTimer | null;
-
- commandHistory: string[];
- commandHistoryIndex: number;
-
- outputHistory: (Output | Link | RawOutput)[];
-
- // True if a Coding Contract prompt is opened
- contractOpen: boolean;
-
- // Full Path of current directory
- // Excludes the trailing forward slash
- currDir: string;
-
- print(s: string): void;
- printRaw(node: React.ReactNode): void;
- error(s: string): void;
- success(s: string): void;
- info(s: string): void;
- warn(s: string): void;
-
- clear(): void;
- startAnalyze(): void;
- startBackdoor(): void;
- startHack(): void;
- startGrow(): void;
- startWeaken(): void;
- finishHack(server: BaseServer, cancelled?: boolean): void;
- finishGrow(server: BaseServer, cancelled?: boolean): void;
- finishWeaken(server: BaseServer, cancelled?: boolean): void;
- finishBackdoor(server: BaseServer, cancelled?: boolean): void;
- finishAnalyze(server: BaseServer, cancelled?: boolean): void;
- finishAction(cancelled?: boolean): void;
- getFilepath(filename: string): string;
- getFile(filename: string): Script | TextFile | string | null;
- getScript(filename: string): Script | null;
- getTextFile(filename: string): TextFile | null;
- getLitFile(filename: string): string | null;
- cwd(): string;
- setcwd(dir: string): void;
- runContract(name: string): void;
- executeScanAnalyzeCommand(depth?: number, all?: boolean): void;
- connectToServer(server: string): void;
- executeCommand(command: string): void;
- executeCommands(commands: string): void;
- // If there was any changes, will return true, once.
- process(cycles: number): void;
- prestige(): void;
- getProgressText(): string;
-}
diff --git a/src/Terminal/OutputTypes.tsx b/src/Terminal/OutputTypes.tsx
new file mode 100644
index 000000000..9f6148b87
--- /dev/null
+++ b/src/Terminal/OutputTypes.tsx
@@ -0,0 +1,51 @@
+import React from "react";
+import { Settings } from "../Settings/Settings";
+import { formatTime } from "../utils/helpers/formatTime";
+import { BaseServer } from "../Server/BaseServer";
+
+export class Output {
+ text: string;
+ color: "primary" | "error" | "success" | "info" | "warn";
+ constructor(text: string, color: "primary" | "error" | "success" | "info" | "warn") {
+ if (Settings.TimestampsFormat) text = "[" + formatTime(Settings.TimestampsFormat) + "] " + text;
+ this.text = text;
+ this.color = color;
+ }
+}
+
+export class RawOutput {
+ raw: React.ReactNode;
+ constructor(node: React.ReactNode) {
+ if (Settings.TimestampsFormat)
+ node = (
+ <>
+ [{formatTime(Settings.TimestampsFormat)}] {node}
+
+ );
+ this.raw = node;
+ }
+}
+
+export class Link {
+ hostname: string;
+ dashes: string;
+ constructor(dashes: string, hostname: string) {
+ if (Settings.TimestampsFormat) dashes = "[" + formatTime(Settings.TimestampsFormat) + "] " + dashes;
+ this.hostname = hostname;
+ this.dashes = dashes;
+ }
+}
+
+export class TTimer {
+ time: number;
+ timeLeft: number;
+ action: "h" | "b" | "a" | "g" | "w";
+ server?: BaseServer;
+
+ constructor(time: number, action: "h" | "b" | "a" | "g" | "w", server?: BaseServer) {
+ this.time = time;
+ this.timeLeft = time;
+ this.action = action;
+ this.server = server;
+ }
+}
diff --git a/src/Terminal/Terminal.ts b/src/Terminal/Terminal.ts
index 61c4a259c..9e56f6a19 100644
--- a/src/Terminal/Terminal.ts
+++ b/src/Terminal/Terminal.ts
@@ -1,4 +1,4 @@
-import { ITerminal, Output, Link, RawOutput, TTimer } from "./ITerminal";
+import { Output, Link, RawOutput, TTimer } from "./OutputTypes";
import { Router } from "../ui/GameRoot";
import { Player } from "../Player";
import { HacknetServer } from "../Hacknet/HacknetServer";
@@ -75,7 +75,7 @@ import { hash } from "../hash/hash";
import { apr1 } from "./commands/apr1";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
-export class Terminal implements ITerminal {
+export class Terminal {
// Flags to determine whether the player is currently running a hack or an analyze
action: TTimer | null = null;
diff --git a/src/Terminal/ui/TerminalRoot.tsx b/src/Terminal/ui/TerminalRoot.tsx
index 6eab48a5a..7f983b0af 100644
--- a/src/Terminal/ui/TerminalRoot.tsx
+++ b/src/Terminal/ui/TerminalRoot.tsx
@@ -7,7 +7,7 @@ import { Theme } from "@mui/material/styles";
import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles";
import Box from "@mui/material/Box";
-import { Output, Link, RawOutput } from "../ITerminal";
+import { Output, Link, RawOutput } from "../OutputTypes";
import { Terminal } from "../../Terminal";
import { TerminalInput } from "./TerminalInput";
import { TerminalEvents, TerminalClearEvents } from "../TerminalEvents";
From 475a8812bb0ce212c5bcd4c16d482a60ce0a0f08 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 00:40:07 -0400
Subject: [PATCH 23/46] findSleevePurchasableAugs as a class member
---
src/NetscriptFunctions/Sleeve.ts | 3 +--
src/PersonObjects/Sleeve/Sleeve.ts | 3 +++
.../Sleeve/{SleeveHelpers.ts => SleeveMethods.ts} | 6 +++---
src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx | 3 +--
4 files changed, 8 insertions(+), 7 deletions(-)
rename src/PersonObjects/Sleeve/{SleeveHelpers.ts => SleeveMethods.ts} (91%)
diff --git a/src/NetscriptFunctions/Sleeve.ts b/src/NetscriptFunctions/Sleeve.ts
index d523ccaf3..db24151dd 100644
--- a/src/NetscriptFunctions/Sleeve.ts
+++ b/src/NetscriptFunctions/Sleeve.ts
@@ -1,5 +1,4 @@
import { Player } from "../Player";
-import { findSleevePurchasableAugs } from "../PersonObjects/Sleeve/SleeveHelpers";
import { StaticAugmentations } from "../Augmentation/StaticAugmentations";
import { CityName } from "../Locations/data/CityNames";
import { findCrime } from "../Crime/CrimeHelpers";
@@ -251,7 +250,7 @@ export function NetscriptSleeve(): InternalAPI {
checkSleeveAPIAccess(ctx);
checkSleeveNumber(ctx, sleeveNumber);
- const purchasableAugs = findSleevePurchasableAugs(Player.sleeves[sleeveNumber]);
+ const purchasableAugs = Player.sleeves[sleeveNumber].findPurchasableAugs();
const augs = [];
for (let i = 0; i < purchasableAugs.length; i++) {
const aug = purchasableAugs[i];
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 189496e75..ff0f92f40 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -44,6 +44,7 @@ import { SleeveInfiltrateWork } from "./Work/SleeveInfiltrateWork";
import { SleeveSupportWork } from "./Work/SleeveSupportWork";
import { SleeveBladeburnerWork } from "./Work/SleeveBladeburnerWork";
import { SleeveCrimeWork } from "./Work/SleeveCrimeWork";
+import * as sleeveMethods from "./SleeveMethods";
export class Sleeve extends Person {
currentWork: Work | null = null;
@@ -79,6 +80,8 @@ export class Sleeve extends Person {
this.shockRecovery();
}
+ findPurchasableAugs = sleeveMethods.findPurchasableAugs;
+
shockBonus(): number {
return this.shock / 100;
}
diff --git a/src/PersonObjects/Sleeve/SleeveHelpers.ts b/src/PersonObjects/Sleeve/SleeveMethods.ts
similarity index 91%
rename from src/PersonObjects/Sleeve/SleeveHelpers.ts
rename to src/PersonObjects/Sleeve/SleeveMethods.ts
index 87460fe4c..08d762d29 100644
--- a/src/PersonObjects/Sleeve/SleeveHelpers.ts
+++ b/src/PersonObjects/Sleeve/SleeveMethods.ts
@@ -10,12 +10,12 @@ import { Multipliers } from "../Multipliers";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { getFactionAugmentationsFiltered } from "../../Faction/FactionHelpers";
-export function findSleevePurchasableAugs(sleeve: Sleeve): Augmentation[] {
+export function findPurchasableAugs(this: Sleeve): Augmentation[] {
// You can only purchase Augmentations that are actually available from
// your factions. I.e. you must be in a faction that has the Augmentation
// and you must also have enough rep in that faction in order to purchase it.
- const ownedAugNames = sleeve.augmentations.map((e) => e.name);
+ const ownedAugNames = this.augmentations.map((e) => e.name);
const availableAugs: Augmentation[] = [];
// Helper function that helps filter out augs that are already owned
@@ -85,7 +85,7 @@ export function findSleevePurchasableAugs(sleeve: Sleeve): Augmentation[] {
}
// Add the stanek sleeve aug
- if (!ownedAugNames.includes(AugmentationNames.ZOE) && p.factions.includes(FactionNames.ChurchOfTheMachineGod)) {
+ if (!ownedAugNames.includes(AugmentationNames.ZOE) && Player.factions.includes(FactionNames.ChurchOfTheMachineGod)) {
const aug = StaticAugmentations[AugmentationNames.ZOE];
availableAugs.push(aug);
}
diff --git a/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx b/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx
index 76e5c73a3..0fe9a52e0 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveAugmentationsModal.tsx
@@ -4,7 +4,6 @@ import { PurchasableAugmentations } from "../../../Augmentation/ui/PurchasableAu
import { Player } from "../../../Player";
import { Modal } from "../../../ui/React/Modal";
import { Sleeve } from "../Sleeve";
-import { findSleevePurchasableAugs } from "../SleeveHelpers";
interface IProps {
open: boolean;
@@ -29,7 +28,7 @@ export function SleeveAugmentationsModal(props: IProps): React.ReactElement {
// You can only purchase Augmentations that are actually available from
// your factions. I.e. you must be in a faction that has the Augmentation
// and you must also have enough rep in that faction in order to purchase it.
- const availableAugs = findSleevePurchasableAugs(props.sleeve);
+ const availableAugs = props.sleeve.findPurchasableAugs();
return (
From c510e478855595c0b47d37999ae9b1a68fe408a1 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 01:57:46 -0400
Subject: [PATCH 24/46] Player is now a Person
Use correct class inheritance, use class as type and remove IPlayer
---
src/Bladeburner/Action.tsx | 10 +-
src/Bladeburner/Bladeburner.tsx | 18 +-
src/Bladeburner/IAction.tsx | 10 +-
src/Bladeburner/IBladeburner.ts | 18 +-
src/CotMG/StaneksGift.ts | 2 +-
src/Crime/Crime.ts | 4 +-
src/Crime/formulas/crime.ts | 40 ----
src/Faction/formulas/donation.ts | 4 +-
src/Hacking.ts | 14 +-
src/Netscript/NetscriptHelpers.ts | 6 +-
src/PersonObjects/IPerson.ts | 33 ---
src/PersonObjects/Person.ts | 134 ++---------
src/PersonObjects/PersonMethods.ts | 199 ++++++++++++++++
src/PersonObjects/Player/PlayerObject.ts | 53 +----
.../Player/PlayerObjectGeneralMethods.ts | 220 ------------------
src/PersonObjects/Sleeve/Sleeve.ts | 5 +-
src/PersonObjects/Sleeve/SleeveMethods.ts | 9 +-
src/PersonObjects/formulas/reputation.ts | 8 +-
src/PersonObjects/formulas/skill.ts | 4 +
src/Server/formulas/grow.ts | 4 +-
src/Work/WorkStats.ts | 6 +-
src/Work/formulas/Class.ts | 4 +-
src/Work/formulas/Company.ts | 4 +-
src/Work/formulas/Faction.ts | 6 +-
24 files changed, 297 insertions(+), 518 deletions(-)
delete mode 100644 src/Crime/formulas/crime.ts
delete mode 100644 src/PersonObjects/IPerson.ts
create mode 100644 src/PersonObjects/PersonMethods.ts
diff --git a/src/Bladeburner/Action.tsx b/src/Bladeburner/Action.tsx
index 90a735046..9ec88479a 100644
--- a/src/Bladeburner/Action.tsx
+++ b/src/Bladeburner/Action.tsx
@@ -5,7 +5,7 @@ import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../uti
import { BladeburnerConstants } from "./data/Constants";
import { IBladeburner } from "./IBladeburner";
import { IAction, ISuccessChanceParams } from "./IAction";
-import { IPerson } from "../PersonObjects/IPerson";
+import { Person } from "../PersonObjects/Person";
class StatsMultiplier {
[key: string]: number;
@@ -153,7 +153,7 @@ export class Action implements IAction {
* Tests for success. Should be called when an action has completed
* @param inst {Bladeburner} - Bladeburner instance
*/
- attempt(inst: IBladeburner, person: IPerson): boolean {
+ attempt(inst: IBladeburner, person: Person): boolean {
return Math.random() < this.getSuccessChance(inst, person);
}
@@ -162,7 +162,7 @@ export class Action implements IAction {
return 1;
}
- getActionTime(inst: IBladeburner, person: IPerson): number {
+ getActionTime(inst: IBladeburner, person: Person): number {
const difficulty = this.getDifficulty();
let baseTime = difficulty / BladeburnerConstants.DifficultyToTimeFactor;
const skillFac = inst.skillMultipliers.actionTime; // Always < 1
@@ -212,7 +212,7 @@ export class Action implements IAction {
return 1;
}
- getEstSuccessChance(inst: IBladeburner, person: IPerson): [number, number] {
+ getEstSuccessChance(inst: IBladeburner, person: Person): [number, number] {
function clamp(x: number): number {
return Math.max(0, Math.min(x, 1));
}
@@ -233,7 +233,7 @@ export class Action implements IAction {
* @params - options:
* est (bool): Get success chance estimate instead of real success chance
*/
- getSuccessChance(inst: IBladeburner, person: IPerson, params: ISuccessChanceParams = { est: false }): number {
+ getSuccessChance(inst: IBladeburner, person: Person, params: ISuccessChanceParams = { est: false }): number {
if (inst == null) {
throw new Error("Invalid Bladeburner instance passed into Action.getSuccessChance");
}
diff --git a/src/Bladeburner/Bladeburner.tsx b/src/Bladeburner/Bladeburner.tsx
index 66e4bda0f..c52b72431 100644
--- a/src/Bladeburner/Bladeburner.tsx
+++ b/src/Bladeburner/Bladeburner.tsx
@@ -16,7 +16,7 @@ import { City } from "./City";
import { IAction } from "./IAction";
import { Player } from "../Player";
import { createTaskTracker, ITaskTracker } from "../PersonObjects/ITaskTracker";
-import { IPerson } from "../PersonObjects/IPerson";
+import { Person } from "../PersonObjects/Person";
import { Router } from "../ui/GameRoot";
import { ConsoleHelpText } from "./data/Help";
import { exceptionAlert } from "../utils/helpers/exceptionAlert";
@@ -995,7 +995,7 @@ export class Bladeburner implements IBladeburner {
* @param action(Action obj) - Derived action class
* @param success(bool) - Whether action was successful
*/
- getActionStats(action: IAction, person: IPerson, success: boolean): ITaskTracker {
+ getActionStats(action: IAction, person: Person, success: boolean): ITaskTracker {
const difficulty = action.getDifficulty();
/**
@@ -1025,7 +1025,7 @@ export class Bladeburner implements IBladeburner {
};
}
- getDiplomacyEffectiveness(person: IPerson): number {
+ getDiplomacyEffectiveness(person: Person): number {
// Returns a decimal by which the city's chaos level should be multiplied (e.g. 0.98)
const CharismaLinearFactor = 1e3;
const CharismaExponentialFactor = 0.045;
@@ -1035,11 +1035,11 @@ export class Bladeburner implements IBladeburner {
return (100 - charismaEff) / 100;
}
- getRecruitmentSuccessChance(person: IPerson): number {
+ getRecruitmentSuccessChance(person: Person): number {
return Math.pow(person.skills.charisma, 0.45) / (this.teamSize - this.sleeveSize + 1);
}
- getRecruitmentTime(person: IPerson): number {
+ getRecruitmentTime(person: Person): number {
const effCharisma = person.skills.charisma * this.skillMultipliers.effCha;
const charismaFactor = Math.pow(effCharisma, 0.81) + effCharisma / 90;
return Math.max(10, Math.round(BladeburnerConstants.BaseRecruitmentTimeNeeded - charismaFactor));
@@ -1257,7 +1257,7 @@ export class Bladeburner implements IBladeburner {
}
}
- completeAction(person: IPerson, actionIdent: IActionIdentifier, isPlayer = true): ITaskTracker {
+ completeAction(person: Person, actionIdent: IActionIdentifier, isPlayer = true): ITaskTracker {
let retValue = createTaskTracker();
switch (actionIdent.type) {
case ActionTypes["Contract"]:
@@ -1610,7 +1610,7 @@ export class Bladeburner implements IBladeburner {
}
}
- changeRank(person: IPerson, change: number): void {
+ changeRank(person: Person, change: number): void {
if (isNaN(change)) {
throw new Error("NaN passed into Bladeburner.changeRank()");
}
@@ -2146,7 +2146,7 @@ export class Bladeburner implements IBladeburner {
}
}
- getActionTimeNetscriptFn(person: IPerson, type: string, name: string): number | string {
+ getActionTimeNetscriptFn(person: Person, type: string, name: string): number | string {
const actionId = this.getActionIdFromTypeAndName(type, name);
if (actionId == null) {
return "bladeburner.getActionTime";
@@ -2177,7 +2177,7 @@ export class Bladeburner implements IBladeburner {
}
}
- getActionEstimatedSuccessChanceNetscriptFn(person: IPerson, type: string, name: string): [number, number] | string {
+ getActionEstimatedSuccessChanceNetscriptFn(person: Person, type: string, name: string): [number, number] | string {
const actionId = this.getActionIdFromTypeAndName(type, name);
if (actionId == null) {
return "bladeburner.getActionEstimatedSuccessChance";
diff --git a/src/Bladeburner/IAction.tsx b/src/Bladeburner/IAction.tsx
index 55202d638..0f396fa32 100644
--- a/src/Bladeburner/IAction.tsx
+++ b/src/Bladeburner/IAction.tsx
@@ -1,5 +1,5 @@
import { IReviverValue } from "../utils/JSONReviver";
-import { IPerson } from "../PersonObjects/IPerson";
+import { Person } from "../PersonObjects/Person";
import { IBladeburner } from "./IBladeburner";
interface IStatsMultiplier {
@@ -57,15 +57,15 @@ export interface IAction {
teamCount: number;
getDifficulty(): number;
- attempt(inst: IBladeburner, person: IPerson): boolean;
+ attempt(inst: IBladeburner, person: Person): boolean;
getActionTimePenalty(): number;
- getActionTime(inst: IBladeburner, person: IPerson): number;
+ getActionTime(inst: IBladeburner, person: Person): number;
getTeamSuccessBonus(inst: IBladeburner): number;
getActionTypeSkillSuccessBonus(inst: IBladeburner): number;
getChaosCompetencePenalty(inst: IBladeburner, params: ISuccessChanceParams): number;
getChaosDifficultyBonus(inst: IBladeburner): number;
- getEstSuccessChance(inst: IBladeburner, person: IPerson): [number, number];
- getSuccessChance(inst: IBladeburner, person: IPerson, params: ISuccessChanceParams): number;
+ getEstSuccessChance(inst: IBladeburner, person: Person): [number, number];
+ getSuccessChance(inst: IBladeburner, person: Person, params: ISuccessChanceParams): number;
getSuccessesNeededForNextLevel(baseSuccessesPerLevel: number): number;
setMaxLevel(baseSuccessesPerLevel: number): void;
toJSON(): IReviverValue;
diff --git a/src/Bladeburner/IBladeburner.ts b/src/Bladeburner/IBladeburner.ts
index 80062b3c2..0f3353ba1 100644
--- a/src/Bladeburner/IBladeburner.ts
+++ b/src/Bladeburner/IBladeburner.ts
@@ -2,7 +2,7 @@ import { IActionIdentifier } from "./IActionIdentifier";
import { City } from "./City";
import { Skill } from "./Skill";
import { IAction } from "./IAction";
-import { IPerson } from "../PersonObjects/IPerson";
+import { Person } from "../PersonObjects/Person";
import { ITaskTracker } from "../PersonObjects/ITaskTracker";
import { WorkerScript } from "../Netscript/WorkerScript";
import { Contract } from "./Contract";
@@ -82,8 +82,8 @@ export interface IBladeburner {
getGeneralActionNamesNetscriptFn(): string[];
getSkillNamesNetscriptFn(): string[];
startActionNetscriptFn(type: string, name: string, workerScript: WorkerScript): boolean;
- getActionTimeNetscriptFn(person: IPerson, type: string, name: string): number | string;
- getActionEstimatedSuccessChanceNetscriptFn(person: IPerson, type: string, name: string): [number, number] | string;
+ getActionTimeNetscriptFn(person: Person, type: string, name: string): number | string;
+ getActionEstimatedSuccessChanceNetscriptFn(person: Person, type: string, name: string): [number, number] | string;
getActionCountRemainingNetscriptFn(type: string, name: string, workerScript: WorkerScript): number;
getSkillLevelNetscriptFn(skillName: string, workerScript: WorkerScript): number;
getSkillUpgradeCostNetscriptFn(skillName: string, count: number, workerScript: WorkerScript): number;
@@ -102,23 +102,23 @@ export interface IBladeburner {
triggerMigration(sourceCityName: string): void;
triggerPotentialMigration(sourceCityName: string, chance: number): void;
randomEvent(): void;
- getDiplomacyEffectiveness(person: IPerson): number;
- getRecruitmentSuccessChance(person: IPerson): number;
- getRecruitmentTime(person: IPerson): number;
+ getDiplomacyEffectiveness(person: Person): number;
+ getRecruitmentSuccessChance(person: Person): number;
+ getRecruitmentTime(person: Person): number;
resetSkillMultipliers(): void;
updateSkillMultipliers(): void;
completeOperation(success: boolean): void;
getActionObject(actionId: IActionIdentifier): IAction | null;
completeContract(success: boolean, actionIdent: IActionIdentifier): void;
- completeAction(person: IPerson, actionIdent: IActionIdentifier, isPlayer?: boolean): ITaskTracker;
+ completeAction(person: Person, actionIdent: IActionIdentifier, isPlayer?: boolean): ITaskTracker;
infiltrateSynthoidCommunities(): void;
- changeRank(person: IPerson, change: number): void;
+ changeRank(person: Person, change: number): void;
processAction(seconds: number): void;
calculateStaminaGainPerSecond(): number;
calculateMaxStamina(): void;
create(): void;
process(): void;
- getActionStats(action: IAction, person: IPerson, success: boolean): ITaskTracker;
+ getActionStats(action: IAction, person: Person, success: boolean): ITaskTracker;
sleeveSupport(joining: boolean): void;
toJSON(): IReviverValue;
}
diff --git a/src/CotMG/StaneksGift.ts b/src/CotMG/StaneksGift.ts
index 2943eee4c..876f9e41d 100644
--- a/src/CotMG/StaneksGift.ts
+++ b/src/CotMG/StaneksGift.ts
@@ -225,7 +225,7 @@ export class StaneksGift implements IStaneksGift {
if (!sleeve.hasAugmentation(AugmentationNames.ZOE)) continue;
sleeve.resetMultipliers();
sleeve.mults = mergeMultipliers(sleeve.mults, sleeveMults);
- sleeve.updateStatLevels();
+ sleeve.updateSkillLevels();
}
}
diff --git a/src/Crime/Crime.ts b/src/Crime/Crime.ts
index 8edf124f8..399518581 100644
--- a/src/Crime/Crime.ts
+++ b/src/Crime/Crime.ts
@@ -1,6 +1,6 @@
import { CONSTANTS } from "../Constants";
import { Player } from "../Player";
-import { IPerson } from "../PersonObjects/IPerson";
+import { Person } from "../PersonObjects/Person";
import { WorkerScript } from "../Netscript/WorkerScript";
import { CrimeType } from "../utils/WorkType";
import { CrimeWork } from "../Work/CrimeWork";
@@ -115,7 +115,7 @@ export class Crime {
return this.time;
}
- successRate(p: IPerson): number {
+ successRate(p: Person): number {
let chance: number =
this.hacking_success_weight * p.skills.hacking +
this.strength_success_weight * p.skills.strength +
diff --git a/src/Crime/formulas/crime.ts b/src/Crime/formulas/crime.ts
deleted file mode 100644
index 0a896028b..000000000
--- a/src/Crime/formulas/crime.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { calculateIntelligenceBonus } from "../../PersonObjects/formulas/intelligence";
-import { CONSTANTS } from "../../Constants";
-
-export interface ICrime {
- hacking_success_weight: number;
- strength_success_weight: number;
- defense_success_weight: number;
- dexterity_success_weight: number;
- agility_success_weight: number;
- charisma_success_weight: number;
- difficulty: number;
-}
-
-export interface IPerson {
- hacking: number;
- strength: number;
- defense: number;
- dexterity: number;
- agility: number;
- charisma: number;
- intelligence: number;
- crime_success_mult: number;
-}
-
-export function calculateCrimeSuccessChance(crime: ICrime, person: IPerson): number {
- let chance: number =
- crime.hacking_success_weight * person.hacking +
- crime.strength_success_weight * person.strength +
- crime.defense_success_weight * person.defense +
- crime.dexterity_success_weight * person.dexterity +
- crime.agility_success_weight * person.agility +
- crime.charisma_success_weight * person.charisma +
- CONSTANTS.IntelligenceCrimeWeight * person.intelligence;
- chance /= CONSTANTS.MaxSkillLevel;
- chance /= crime.difficulty;
- chance *= person.crime_success_mult;
- chance *= calculateIntelligenceBonus(person.intelligence);
-
- return Math.min(chance, 1);
-}
diff --git a/src/Faction/formulas/donation.ts b/src/Faction/formulas/donation.ts
index 0bcd8c645..14d14bfaf 100644
--- a/src/Faction/formulas/donation.ts
+++ b/src/Faction/formulas/donation.ts
@@ -1,6 +1,6 @@
import { CONSTANTS } from "../../Constants";
-import { IPerson } from "../../PersonObjects/IPerson";
+import { Person } from "../../PersonObjects/Person";
-export function repFromDonation(amt: number, person: IPerson): number {
+export function repFromDonation(amt: number, person: Person): number {
return (amt / CONSTANTS.DonateMoneyToRepDivisor) * person.mults.faction_rep;
}
diff --git a/src/Hacking.ts b/src/Hacking.ts
index 91feb8883..d0febe357 100644
--- a/src/Hacking.ts
+++ b/src/Hacking.ts
@@ -1,12 +1,12 @@
import { BitNodeMultipliers } from "./BitNode/BitNodeMultipliers";
-import { IPerson } from "./PersonObjects/IPerson";
+import { Person } from "./PersonObjects/Person";
import { calculateIntelligenceBonus } from "./PersonObjects/formulas/intelligence";
import { Server } from "./Server/Server";
/**
* Returns the chance the person has to successfully hack a server
*/
-export function calculateHackingChance(server: Server, person: IPerson): number {
+export function calculateHackingChance(server: Server, person: Person): number {
const hackFactor = 1.75;
const difficultyMult = (100 - server.hackDifficulty) / 100;
const skillMult = hackFactor * person.skills.hacking;
@@ -30,7 +30,7 @@ export function calculateHackingChance(server: Server, person: IPerson): number
* Returns the amount of hacking experience the person will gain upon
* successfully hacking a server
*/
-export function calculateHackingExpGain(server: Server, person: IPerson): number {
+export function calculateHackingExpGain(server: Server, person: Person): number {
const baseExpGain = 3;
const diffFactor = 0.3;
if (server.baseDifficulty == null) {
@@ -46,7 +46,7 @@ export function calculateHackingExpGain(server: Server, person: IPerson): number
* Returns the percentage of money that will be stolen from a server if
* it is successfully hacked (returns the decimal form, not the actual percent value)
*/
-export function calculatePercentMoneyHacked(server: Server, person: IPerson): number {
+export function calculatePercentMoneyHacked(server: Server, person: Person): number {
// Adjust if needed for balancing. This is the divisor for the final calculation
const balanceFactor = 240;
@@ -67,7 +67,7 @@ export function calculatePercentMoneyHacked(server: Server, person: IPerson): nu
/**
* Returns time it takes to complete a hack on a server, in seconds
*/
-export function calculateHackingTime(server: Server, person: IPerson): number {
+export function calculateHackingTime(server: Server, person: Person): number {
const difficultyMult = server.requiredHackingSkill * server.hackDifficulty;
const baseDiff = 500;
@@ -88,7 +88,7 @@ export function calculateHackingTime(server: Server, person: IPerson): number {
/**
* Returns time it takes to complete a grow operation on a server, in seconds
*/
-export function calculateGrowTime(server: Server, person: IPerson): number {
+export function calculateGrowTime(server: Server, person: Person): number {
const growTimeMultiplier = 3.2; // Relative to hacking time. 16/5 = 3.2
return growTimeMultiplier * calculateHackingTime(server, person);
@@ -97,7 +97,7 @@ export function calculateGrowTime(server: Server, person: IPerson): number {
/**
* Returns time it takes to complete a weaken operation on a server, in seconds
*/
-export function calculateWeakenTime(server: Server, person: IPerson): number {
+export function calculateWeakenTime(server: Server, person: Person): number {
const weakenTimeMultiplier = 4; // Relative to hacking time
return weakenTimeMultiplier * calculateHackingTime(server, person);
diff --git a/src/Netscript/NetscriptHelpers.ts b/src/Netscript/NetscriptHelpers.ts
index 79a2dc2bb..be1cae56c 100644
--- a/src/Netscript/NetscriptHelpers.ts
+++ b/src/Netscript/NetscriptHelpers.ts
@@ -21,7 +21,7 @@ import { CONSTANTS } from "../Constants";
import { influenceStockThroughServerHack } from "../StockMarket/PlayerInfluencing";
import { IPort, NetscriptPort } from "../NetscriptPort";
import { NetscriptPorts } from "../NetscriptWorker";
-import { IPerson } from "../PersonObjects/IPerson";
+import { Person } from "../PersonObjects/Person";
import { FormulaGang } from "../Gang/formulas/formulas";
import { GangMember } from "../Gang/GangMember";
import { GangMemberTask } from "../Gang/GangMemberTask";
@@ -498,7 +498,7 @@ function getValidPort(ctx: NetscriptContext, port: number): IPort {
return iport;
}
-function player(ctx: NetscriptContext, p: unknown): IPerson {
+function player(ctx: NetscriptContext, p: unknown): Person {
const fakePlayer = {
hp: undefined,
mults: undefined,
@@ -518,7 +518,7 @@ function player(ctx: NetscriptContext, p: unknown): IPerson {
entropy: undefined,
};
if (!roughlyIs(fakePlayer, p)) throw makeRuntimeErrorMsg(ctx, `player should be a Player.`, "TYPE");
- return p as IPerson;
+ return p as Person;
}
function server(ctx: NetscriptContext, s: unknown): Server {
diff --git a/src/PersonObjects/IPerson.ts b/src/PersonObjects/IPerson.ts
deleted file mode 100644
index f1611d483..000000000
--- a/src/PersonObjects/IPerson.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Interface that represents either the player (PlayerObject) or
-// a Sleeve. Used for functions that need to take in both.
-
-import { IPlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
-import { HP } from "./HP";
-import { ITaskTracker } from "./ITaskTracker";
-import { Multipliers } from "./Multipliers";
-import { Skills } from "./Skills";
-
-export interface IPerson {
- hp: HP;
- skills: Skills;
- exp: Skills;
-
- mults: Multipliers;
-
- augmentations: IPlayerOwnedAugmentation[];
-
- getIntelligenceBonus(weight: number): number;
- gainHackingExp(exp: number): void;
- gainStrengthExp(exp: number): void;
- gainDefenseExp(exp: number): void;
- gainDexterityExp(exp: number): void;
- gainAgilityExp(exp: number): void;
- gainCharismaExp(exp: number): void;
- gainIntelligenceExp(exp: number): void;
- gainStats(retValue: ITaskTracker): void;
- calculateSkill(exp: number, mult?: number): number;
- takeDamage(amt: number): boolean;
- regenerateHp: (amt: number) => void;
- queryStatFromString: (str: string) => number;
- whoAmI: () => string;
-}
diff --git a/src/PersonObjects/Person.ts b/src/PersonObjects/Person.ts
index c08cc38dd..794f2ed62 100644
--- a/src/PersonObjects/Person.ts
+++ b/src/PersonObjects/Person.ts
@@ -1,18 +1,15 @@
-import * as generalMethods from "./Player/PlayerObjectGeneralMethods";
-import { Augmentation } from "../Augmentation/Augmentation";
+import * as personMethods from "./PersonMethods";
import { IPlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
-import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { CityName } from "../Locations/data/CityNames";
-import { CONSTANTS } from "../Constants";
import { calculateSkill } from "./formulas/skill";
import { calculateIntelligenceBonus } from "./formulas/intelligence";
-import { IPerson } from "./IPerson";
-import { defaultMultipliers, mergeAugmentation } from "./Multipliers";
+import { defaultMultipliers } from "./Multipliers";
import { Skills } from "./Skills";
import { HP } from "./HP";
+import { IReviverValue } from "../utils/JSONReviver";
// Base class representing a person-like object
-export abstract class Person implements IPerson {
+export abstract class Person {
hp: HP = { current: 10, max: 10 };
skills: Skills = {
hacking: 1,
@@ -45,126 +42,31 @@ export abstract class Person implements IPerson {
*/
city: CityName = CityName.Sector12;
- gainHackingExp = generalMethods.gainHackingExp;
- gainStrengthExp = generalMethods.gainStrengthExp;
- gainDefenseExp = generalMethods.gainDefenseExp;
- gainDexterityExp = generalMethods.gainDexterityExp;
- gainAgilityExp = generalMethods.gainAgilityExp;
- gainCharismaExp = generalMethods.gainCharismaExp;
- gainIntelligenceExp = generalMethods.gainIntelligenceExp;
- gainStats = generalMethods.gainStats;
- calculateSkill = generalMethods.calculateSkill;
- regenerateHp = generalMethods.regenerateHp;
- queryStatFromString = generalMethods.queryStatFromString;
-
- /**
- * Updates this object's multipliers for the given augmentation
- */
- applyAugmentation(aug: Augmentation): void {
- this.mults = mergeAugmentation(this.mults, aug.mults);
- }
-
- /**
- * Given an experience amount and stat multiplier, calculates the
- * stat level. Stat-agnostic (same formula for every stat)
- */
- calculateStat(exp: number, mult = 1): number {
- return calculateSkill(exp, mult);
- }
-
- /**
- * Calculate and return the amount of faction reputation earned per cycle
- * when doing Field Work for a faction
- */
- getFactionFieldWorkRepGain(): number {
- const t =
- (0.9 *
- (this.skills.hacking / CONSTANTS.MaxSkillLevel +
- this.skills.strength / CONSTANTS.MaxSkillLevel +
- this.skills.defense / CONSTANTS.MaxSkillLevel +
- this.skills.dexterity / CONSTANTS.MaxSkillLevel +
- this.skills.agility / CONSTANTS.MaxSkillLevel +
- this.skills.charisma / CONSTANTS.MaxSkillLevel)) /
- 5.5;
- return t * this.mults.faction_rep;
- }
-
- /**
- * Calculate and return the amount of faction reputation earned per cycle
- * when doing Hacking Work for a faction
- */
- getFactionHackingWorkRepGain(): number {
- return (this.skills.hacking / CONSTANTS.MaxSkillLevel) * this.mults.faction_rep;
- }
-
- /**
- * Calculate and return the amount of faction reputation earned per cycle
- * when doing Security Work for a faction
- */
- getFactionSecurityWorkRepGain(): number {
- const t =
- (0.9 *
- (this.skills.hacking / CONSTANTS.MaxSkillLevel +
- this.skills.strength / CONSTANTS.MaxSkillLevel +
- this.skills.defense / CONSTANTS.MaxSkillLevel +
- this.skills.dexterity / CONSTANTS.MaxSkillLevel +
- this.skills.agility / CONSTANTS.MaxSkillLevel)) /
- 4.5;
- return t * this.mults.faction_rep;
- }
+ gainHackingExp = personMethods.gainHackingExp;
+ gainStrengthExp = personMethods.gainStrengthExp;
+ gainDefenseExp = personMethods.gainDefenseExp;
+ gainDexterityExp = personMethods.gainDexterityExp;
+ gainAgilityExp = personMethods.gainAgilityExp;
+ gainCharismaExp = personMethods.gainCharismaExp;
+ gainIntelligenceExp = personMethods.gainIntelligenceExp;
+ gainStats = personMethods.gainStats;
+ regenerateHp = personMethods.regenerateHp;
+ queryStatFromString = personMethods.queryStatFromString;
+ updateSkillLevels = personMethods.updateSkillLevels;
+ calculateSkill = calculateSkill; //Class version is equal to imported version
/**
* Reset all multipliers to 1
*/
- resetMultipliers(): void {
+ resetMultipliers() {
this.mults = defaultMultipliers();
}
- /**
- * Update all stat levels
- */
- updateStatLevels(): void {
- this.skills.hacking = Math.max(
- 1,
- Math.floor(this.calculateStat(this.exp.hacking, this.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier)),
- );
- this.skills.strength = Math.max(
- 1,
- Math.floor(
- this.calculateStat(this.exp.strength, this.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier),
- ),
- );
- this.skills.defense = Math.max(
- 1,
- Math.floor(this.calculateStat(this.exp.defense, this.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier)),
- );
- this.skills.dexterity = Math.max(
- 1,
- Math.floor(
- this.calculateStat(this.exp.dexterity, this.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier),
- ),
- );
- this.skills.agility = Math.max(
- 1,
- Math.floor(this.calculateStat(this.exp.agility, this.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier)),
- );
- this.skills.charisma = Math.max(
- 1,
- Math.floor(
- this.calculateStat(this.exp.charisma, this.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier),
- ),
- );
-
- const ratio: number = this.hp.current / this.hp.max;
- this.hp.max = Math.floor(10 + this.skills.defense / 10);
- this.hp.current = Math.round(this.hp.max * ratio);
- }
-
getIntelligenceBonus(weight: number): number {
return calculateIntelligenceBonus(this.skills.intelligence, weight);
}
abstract takeDamage(amt: number): boolean;
-
abstract whoAmI(): string;
+ abstract toJSON(): IReviverValue;
}
diff --git a/src/PersonObjects/PersonMethods.ts b/src/PersonObjects/PersonMethods.ts
new file mode 100644
index 000000000..b3657c438
--- /dev/null
+++ b/src/PersonObjects/PersonMethods.ts
@@ -0,0 +1,199 @@
+import { Person } from "./Person";
+import { calculateSkill } from "./formulas/skill";
+import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
+import { Player } from "../Player";
+import { ITaskTracker } from "./ITaskTracker";
+
+export function gainHackingExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERR: NaN passed into Player.gainHackingExp()");
+ return;
+ }
+ this.exp.hacking += exp;
+ if (this.exp.hacking < 0) {
+ this.exp.hacking = 0;
+ }
+
+ this.skills.hacking = calculateSkill(
+ this.exp.hacking,
+ this.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier,
+ );
+}
+
+export function gainStrengthExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERR: NaN passed into Player.gainStrengthExp()");
+ return;
+ }
+ this.exp.strength += exp;
+ if (this.exp.strength < 0) {
+ this.exp.strength = 0;
+ }
+
+ this.skills.strength = calculateSkill(
+ this.exp.strength,
+ this.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier,
+ );
+}
+
+export function gainDefenseExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERR: NaN passed into player.gainDefenseExp()");
+ return;
+ }
+ this.exp.defense += exp;
+ if (this.exp.defense < 0) {
+ this.exp.defense = 0;
+ }
+
+ this.skills.defense = calculateSkill(
+ this.exp.defense,
+ this.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier,
+ );
+ const ratio = this.hp.current / this.hp.max;
+ this.hp.max = Math.floor(10 + this.skills.defense / 10);
+ this.hp.current = Math.round(this.hp.max * ratio);
+}
+
+export function gainDexterityExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERR: NaN passed into Player.gainDexterityExp()");
+ return;
+ }
+ this.exp.dexterity += exp;
+ if (this.exp.dexterity < 0) {
+ this.exp.dexterity = 0;
+ }
+
+ this.skills.dexterity = calculateSkill(
+ this.exp.dexterity,
+ this.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier,
+ );
+}
+
+export function gainAgilityExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERR: NaN passed into Player.gainAgilityExp()");
+ return;
+ }
+ this.exp.agility += exp;
+ if (this.exp.agility < 0) {
+ this.exp.agility = 0;
+ }
+
+ this.skills.agility = calculateSkill(
+ this.exp.agility,
+ this.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier,
+ );
+}
+
+export function gainCharismaExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERR: NaN passed into Player.gainCharismaExp()");
+ return;
+ }
+ this.exp.charisma += exp;
+ if (this.exp.charisma < 0) {
+ this.exp.charisma = 0;
+ }
+
+ this.skills.charisma = calculateSkill(
+ this.exp.charisma,
+ this.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier,
+ );
+}
+
+export function gainIntelligenceExp(this: Person, exp: number): void {
+ if (isNaN(exp)) {
+ console.error("ERROR: NaN passed into Player.gainIntelligenceExp()");
+ return;
+ }
+ if (Player.sourceFileLvl(5) > 0 || this.skills.intelligence > 0 || Player.bitNodeN === 5) {
+ this.exp.intelligence += exp;
+ this.skills.intelligence = Math.floor(this.calculateSkill(this.exp.intelligence, 1));
+ }
+}
+export function gainStats(this: Person, retValue: ITaskTracker): void {
+ this.gainHackingExp(retValue.hack * this.mults.hacking_exp);
+ this.gainStrengthExp(retValue.str * this.mults.strength_exp);
+ this.gainDefenseExp(retValue.def * this.mults.defense_exp);
+ this.gainDexterityExp(retValue.dex * this.mults.dexterity_exp);
+ this.gainAgilityExp(retValue.agi * this.mults.agility_exp);
+ this.gainCharismaExp(retValue.cha * this.mults.charisma_exp);
+ this.gainIntelligenceExp(retValue.int);
+}
+
+//Given a string expression like "str" or "strength", returns the given stat
+export function queryStatFromString(this: Person, str: string): number {
+ const tempStr = str.toLowerCase();
+ if (tempStr.includes("hack")) {
+ return this.skills.hacking;
+ }
+ if (tempStr.includes("str")) {
+ return this.skills.strength;
+ }
+ if (tempStr.includes("def")) {
+ return this.skills.defense;
+ }
+ if (tempStr.includes("dex")) {
+ return this.skills.dexterity;
+ }
+ if (tempStr.includes("agi")) {
+ return this.skills.agility;
+ }
+ if (tempStr.includes("cha")) {
+ return this.skills.charisma;
+ }
+ if (tempStr.includes("int")) {
+ return this.skills.intelligence;
+ }
+ return 0;
+}
+
+export function regenerateHp(this: Person, amt: number): void {
+ if (typeof amt !== "number") {
+ console.warn(`Player.regenerateHp() called without a numeric argument: ${amt}`);
+ return;
+ }
+ this.hp.current += amt;
+ if (this.hp.current > this.hp.max) {
+ this.hp.current = this.hp.max;
+ }
+}
+
+export function updateSkillLevels(this: Person): void {
+ this.skills.hacking = Math.max(
+ 1,
+ Math.floor(this.calculateSkill(this.exp.hacking, this.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier)),
+ );
+ this.skills.strength = Math.max(
+ 1,
+ Math.floor(
+ this.calculateSkill(this.exp.strength, this.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier),
+ ),
+ );
+ this.skills.defense = Math.max(
+ 1,
+ Math.floor(this.calculateSkill(this.exp.defense, this.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier)),
+ );
+ this.skills.dexterity = Math.max(
+ 1,
+ Math.floor(
+ this.calculateSkill(this.exp.dexterity, this.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier),
+ ),
+ );
+ this.skills.agility = Math.max(
+ 1,
+ Math.floor(this.calculateSkill(this.exp.agility, this.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier)),
+ );
+ this.skills.charisma = Math.max(
+ 1,
+ Math.floor(
+ this.calculateSkill(this.exp.charisma, this.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier),
+ ),
+ );
+
+ const ratio: number = this.hp.current / this.hp.max;
+ this.hp.max = Math.floor(10 + this.skills.defense / 10);
+ this.hp.current = Math.round(this.hp.max * ratio);
+}
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index af67f569a..e083fb46a 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -11,7 +11,6 @@ import { Sleeve } from "../Sleeve/Sleeve";
import { IPlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
import { Exploit } from "../../Exploits/Exploit";
-import { IPerson } from "../IPerson";
import { LocationName } from "../../Locations/data/LocationNames";
import { IPlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
import { ICorporation } from "../../Corporation/ICorporation";
@@ -20,7 +19,6 @@ import { IBladeburner } from "../../Bladeburner/IBladeburner";
import { HacknetNode } from "../../Hacknet/HacknetNode";
import { HashManager } from "../../Hacknet/HashManager";
-import { CityName } from "../../Locations/data/CityNames";
import { MoneySourceTracker } from "../../utils/MoneySourceTracker";
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../../utils/JSONReviver";
@@ -29,15 +27,11 @@ import { cyrb53 } from "../../utils/StringHelperFunctions";
import { getRandomInt } from "../../utils/helpers/getRandomInt";
import { CONSTANTS } from "../../Constants";
import { Work } from "src/Work/Work";
-import { defaultMultipliers } from "../Multipliers";
-import { HP } from "../HP";
-import { Skills } from "../Skills";
+import { Person } from "../Person";
-export class PlayerObject implements IPerson {
- // Class members
- augmentations: IPlayerOwnedAugmentation[] = [];
+export class PlayerObject extends Person {
+ // Player-specific properties
bitNodeN = 1; //current bitnode
- city = CityName.Sector12;
corporation: ICorporation | null = null;
gang: IGang | null = null;
bladeburner: IBladeburner | null = null;
@@ -73,34 +67,12 @@ export class PlayerObject implements IPerson {
lastSave = 0;
totalPlaytime = 0;
- hp: HP = { current: 10, max: 10 };
- skills: Skills = {
- hacking: 1,
- strength: 1,
- defense: 1,
- dexterity: 1,
- agility: 1,
- charisma: 1,
- intelligence: 0,
- };
- exp: Skills = {
- hacking: 0,
- strength: 0,
- defense: 0,
- dexterity: 0,
- agility: 0,
- charisma: 0,
- intelligence: 0,
- };
-
- mults = defaultMultipliers();
-
currentWork: Work | null = null;
focus = false;
entropy = 0;
- // Methods
+ // Player-specific methods
init = generalMethods.init;
startWork = workMethods.startWork;
processWork = workMethods.processWork;
@@ -124,14 +96,6 @@ export class PlayerObject implements IPerson {
canAccessGang = gangMethods.canAccessGang;
canAccessGrafting = generalMethods.canAccessGrafting;
canAfford = generalMethods.canAfford;
- gainHackingExp = generalMethods.gainHackingExp;
- gainStrengthExp = generalMethods.gainStrengthExp;
- gainDefenseExp = generalMethods.gainDefenseExp;
- gainDexterityExp = generalMethods.gainDexterityExp;
- gainAgilityExp = generalMethods.gainAgilityExp;
- gainCharismaExp = generalMethods.gainCharismaExp;
- gainIntelligenceExp = generalMethods.gainIntelligenceExp;
- gainStats = generalMethods.gainStats;
gainMoney = generalMethods.gainMoney;
getCurrentServer = serverMethods.getCurrentServer;
getGangFaction = gangMethods.getGangFaction;
@@ -153,7 +117,6 @@ export class PlayerObject implements IPerson {
loseMoney = generalMethods.loseMoney;
reapplyAllAugmentations = generalMethods.reapplyAllAugmentations;
reapplyAllSourceFiles = generalMethods.reapplyAllSourceFiles;
- regenerateHp = generalMethods.regenerateHp;
recordMoneySource = generalMethods.recordMoneySource;
setMoney = generalMethods.setMoney;
startBladeburner = bladeburnerMethods.startBladeburner;
@@ -164,21 +127,16 @@ export class PlayerObject implements IPerson {
travel = generalMethods.travel;
giveExploit = generalMethods.giveExploit;
giveAchievement = generalMethods.giveAchievement;
- queryStatFromString = generalMethods.queryStatFromString;
- getIntelligenceBonus = generalMethods.getIntelligenceBonus;
getCasinoWinnings = generalMethods.getCasinoWinnings;
quitJob = generalMethods.quitJob;
hasJob = generalMethods.hasJob;
createHacknetServer = serverMethods.createHacknetServer;
queueAugmentation = generalMethods.queueAugmentation;
receiveInvite = generalMethods.receiveInvite;
- updateSkillLevels = generalMethods.updateSkillLevels;
gainCodingContractReward = generalMethods.gainCodingContractReward;
stopFocusing = generalMethods.stopFocusing;
- resetMultipliers = generalMethods.resetMultipliers;
prestigeAugmentation = generalMethods.prestigeAugmentation;
prestigeSourceFile = generalMethods.prestigeSourceFile;
- calculateSkill = generalMethods.calculateSkill;
calculateSkillProgress = generalMethods.calculateSkillProgress;
hospitalize = generalMethods.hospitalize;
checkForFactionInvitations = generalMethods.checkForFactionInvitations;
@@ -189,6 +147,7 @@ export class PlayerObject implements IPerson {
focusPenalty = generalMethods.focusPenalty;
constructor() {
+ super();
// Let's get a hash of some semi-random stuff so we have something unique.
this.identifier = cyrb53(
"I-" +
@@ -219,4 +178,4 @@ export class PlayerObject implements IPerson {
}
}
-Reviver.constructors.PlayerObject = PlayerObject;
+Reviver.constructors.PlayerObject = PlayerObject;
\ No newline at end of file
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
index e44277f8f..f27c3bd50 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
@@ -24,11 +24,9 @@ import { LocationName } from "../../Locations/data/LocationNames";
import { Sleeve } from "../Sleeve/Sleeve";
import { isSleeveCompanyWork } from "../Sleeve/Work/SleeveCompanyWork";
import {
- calculateSkill as calculateSkillF,
calculateSkillProgress as calculateSkillProgressF,
ISkillProgress,
} from "../formulas/skill";
-import { calculateIntelligenceBonus } from "../formulas/intelligence";
import { GetServer, AddToAllServers, createUniqueRandomIp } from "../../Server/AllServers";
import { Server } from "../../Server/Server";
import { safetlyCreateUniqueServer } from "../../Server/ServerHelpers";
@@ -47,12 +45,8 @@ import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { SnackbarEvents, ToastVariant } from "../../ui/React/Snackbar";
import { achievements } from "../../Achievements/Achievements";
import { FactionNames } from "../../Faction/data/FactionNames";
-import { ITaskTracker } from "../ITaskTracker";
-import { IPerson } from "../IPerson";
-import { Player } from "../../Player";
import { isCompanyWork } from "../../Work/CompanyWork";
-import { defaultMultipliers } from "../Multipliers";
import { serverMetadata } from "../../Server/data/servers";
export function init(this: PlayerObject): void {
@@ -186,63 +180,11 @@ export function receiveInvite(this: PlayerObject, factionName: string): void {
this.factionInvitations.push(factionName);
}
-//Calculates skill level based on experience. The same formula will be used for every skill
-export function calculateSkill(this: IPerson, exp: number, mult = 1): number {
- return calculateSkillF(exp, mult);
-}
-
//Calculates skill level progress based on experience. The same formula will be used for every skill
export function calculateSkillProgress(this: PlayerObject, exp: number, mult = 1): ISkillProgress {
return calculateSkillProgressF(exp, mult);
}
-export function updateSkillLevels(this: PlayerObject): void {
- this.skills.hacking = Math.max(
- 1,
- Math.floor(this.calculateSkill(this.exp.hacking, this.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier)),
- );
- this.skills.strength = Math.max(
- 1,
- Math.floor(
- this.calculateSkill(this.exp.strength, this.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier),
- ),
- );
- this.skills.defense = Math.max(
- 1,
- Math.floor(this.calculateSkill(this.exp.defense, this.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier)),
- );
- this.skills.dexterity = Math.max(
- 1,
- Math.floor(
- this.calculateSkill(this.exp.dexterity, this.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier),
- ),
- );
- this.skills.agility = Math.max(
- 1,
- Math.floor(this.calculateSkill(this.exp.agility, this.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier)),
- );
- this.skills.charisma = Math.max(
- 1,
- Math.floor(
- this.calculateSkill(this.exp.charisma, this.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier),
- ),
- );
-
- if (this.skills.intelligence > 0) {
- this.skills.intelligence = Math.floor(this.calculateSkill(this.exp.intelligence));
- } else {
- this.skills.intelligence = 0;
- }
-
- const ratio = this.hp.current / this.hp.max;
- this.hp.max = Math.floor(10 + this.skills.defense / 10);
- this.hp.current = Math.round(this.hp.max * ratio);
-}
-
-export function resetMultipliers(this: PlayerObject): void {
- this.mults = defaultMultipliers();
-}
-
export function hasProgram(this: PlayerObject, programName: string): boolean {
const home = this.getHomeComputer();
if (home == null) {
@@ -306,153 +248,6 @@ export function recordMoneySource(this: PlayerObject, amt: number, source: strin
this.moneySourceB.record(amt, source);
}
-export function gainHackingExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERR: NaN passed into Player.gainHackingExp()");
- return;
- }
- this.exp.hacking += exp;
- if (this.exp.hacking < 0) {
- this.exp.hacking = 0;
- }
-
- this.skills.hacking = calculateSkillF(
- this.exp.hacking,
- this.mults.hacking * BitNodeMultipliers.HackingLevelMultiplier,
- );
-}
-
-export function gainStrengthExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERR: NaN passed into Player.gainStrengthExp()");
- return;
- }
- this.exp.strength += exp;
- if (this.exp.strength < 0) {
- this.exp.strength = 0;
- }
-
- this.skills.strength = calculateSkillF(
- this.exp.strength,
- this.mults.strength * BitNodeMultipliers.StrengthLevelMultiplier,
- );
-}
-
-export function gainDefenseExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERR: NaN passed into player.gainDefenseExp()");
- return;
- }
- this.exp.defense += exp;
- if (this.exp.defense < 0) {
- this.exp.defense = 0;
- }
-
- this.skills.defense = calculateSkillF(
- this.exp.defense,
- this.mults.defense * BitNodeMultipliers.DefenseLevelMultiplier,
- );
- const ratio = this.hp.current / this.hp.max;
- this.hp.max = Math.floor(10 + this.skills.defense / 10);
- this.hp.current = Math.round(this.hp.max * ratio);
-}
-
-export function gainDexterityExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERR: NaN passed into Player.gainDexterityExp()");
- return;
- }
- this.exp.dexterity += exp;
- if (this.exp.dexterity < 0) {
- this.exp.dexterity = 0;
- }
-
- this.skills.dexterity = calculateSkillF(
- this.exp.dexterity,
- this.mults.dexterity * BitNodeMultipliers.DexterityLevelMultiplier,
- );
-}
-
-export function gainAgilityExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERR: NaN passed into Player.gainAgilityExp()");
- return;
- }
- this.exp.agility += exp;
- if (this.exp.agility < 0) {
- this.exp.agility = 0;
- }
-
- this.skills.agility = calculateSkillF(
- this.exp.agility,
- this.mults.agility * BitNodeMultipliers.AgilityLevelMultiplier,
- );
-}
-
-export function gainCharismaExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERR: NaN passed into Player.gainCharismaExp()");
- return;
- }
- this.exp.charisma += exp;
- if (this.exp.charisma < 0) {
- this.exp.charisma = 0;
- }
-
- this.skills.charisma = calculateSkillF(
- this.exp.charisma,
- this.mults.charisma * BitNodeMultipliers.CharismaLevelMultiplier,
- );
-}
-
-export function gainIntelligenceExp(this: IPerson, exp: number): void {
- if (isNaN(exp)) {
- console.error("ERROR: NaN passed into Player.gainIntelligenceExp()");
- return;
- }
- if (Player.sourceFileLvl(5) > 0 || this.skills.intelligence > 0 || Player.bitNodeN === 5) {
- this.exp.intelligence += exp;
- this.skills.intelligence = Math.floor(this.calculateSkill(this.exp.intelligence, 1));
- }
-}
-
-export function gainStats(this: IPerson, retValue: ITaskTracker): void {
- this.gainHackingExp(retValue.hack * this.mults.hacking_exp);
- this.gainStrengthExp(retValue.str * this.mults.strength_exp);
- this.gainDefenseExp(retValue.def * this.mults.defense_exp);
- this.gainDexterityExp(retValue.dex * this.mults.dexterity_exp);
- this.gainAgilityExp(retValue.agi * this.mults.agility_exp);
- this.gainCharismaExp(retValue.cha * this.mults.charisma_exp);
- this.gainIntelligenceExp(retValue.int);
-}
-
-//Given a string expression like "str" or "strength", returns the given stat
-export function queryStatFromString(this: PlayerObject, str: string): number {
- const tempStr = str.toLowerCase();
- if (tempStr.includes("hack")) {
- return this.skills.hacking;
- }
- if (tempStr.includes("str")) {
- return this.skills.strength;
- }
- if (tempStr.includes("def")) {
- return this.skills.defense;
- }
- if (tempStr.includes("dex")) {
- return this.skills.dexterity;
- }
- if (tempStr.includes("agi")) {
- return this.skills.agility;
- }
- if (tempStr.includes("cha")) {
- return this.skills.charisma;
- }
- if (tempStr.includes("int")) {
- return this.skills.intelligence;
- }
- return 0;
-}
-
export function startFocusing(this: PlayerObject): void {
this.focus = true;
}
@@ -477,17 +272,6 @@ export function takeDamage(this: PlayerObject, amt: number): boolean {
}
}
-export function regenerateHp(this: IPerson, amt: number): void {
- if (typeof amt !== "number") {
- console.warn(`Player.regenerateHp() called without a numeric argument: ${amt}`);
- return;
- }
- this.hp.current += amt;
- if (this.hp.current > this.hp.max) {
- this.hp.current = this.hp.max;
- }
-}
-
export function hospitalize(this: PlayerObject): number {
const cost = getHospitalizationCost();
SnackbarEvents.emit(`You've been Hospitalized for ${numeralWrapper.formatMoney(cost)}`, ToastVariant.WARNING, 2000);
@@ -1441,10 +1225,6 @@ export function giveAchievement(this: PlayerObject, achievementId: string): void
}
}
-export function getIntelligenceBonus(this: PlayerObject, weight: number): number {
- return calculateIntelligenceBonus(this.skills.intelligence, weight);
-}
-
export function getCasinoWinnings(this: PlayerObject): number {
return this.moneySourceA.casino;
}
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index ff0f92f40..2b0d5c4a5 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -80,6 +80,7 @@ export class Sleeve extends Person {
this.shockRecovery();
}
+ applyAugmentation = sleeveMethods.applyAugmentation;
findPurchasableAugs = sleeveMethods.findPurchasableAugs;
shockBonus(): number {
@@ -147,7 +148,7 @@ export class Sleeve extends Person {
this.exp.charisma = 0;
this.applyAugmentation(aug);
this.augmentations.push({ name: aug.name, level: 1 });
- this.updateStatLevels();
+ this.updateSkillLevels();
}
/**
@@ -161,7 +162,7 @@ export class Sleeve extends Person {
this.exp.dexterity = 0;
this.exp.agility = 0;
this.exp.charisma = 0;
- this.updateStatLevels();
+ this.updateSkillLevels();
this.hp.current = this.hp.max;
// Reset task-related stuff
diff --git a/src/PersonObjects/Sleeve/SleeveMethods.ts b/src/PersonObjects/Sleeve/SleeveMethods.ts
index 08d762d29..0607ea85f 100644
--- a/src/PersonObjects/Sleeve/SleeveMethods.ts
+++ b/src/PersonObjects/Sleeve/SleeveMethods.ts
@@ -6,10 +6,17 @@ import { Player } from "../../Player";
import { Augmentation } from "../../Augmentation/Augmentation";
import { StaticAugmentations } from "../../Augmentation/StaticAugmentations";
import { Factions } from "../../Faction/Factions";
-import { Multipliers } from "../Multipliers";
+import { mergeMultipliers, Multipliers } from "../Multipliers";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { getFactionAugmentationsFiltered } from "../../Faction/FactionHelpers";
+/**
+ * Updates this object's multipliers for the given augmentation
+ */
+export function applyAugmentation(this: Sleeve, aug: Augmentation): void {
+ this.mults = mergeMultipliers(this.mults, aug.mults);
+}
+
export function findPurchasableAugs(this: Sleeve): Augmentation[] {
// You can only purchase Augmentations that are actually available from
// your factions. I.e. you must be in a faction that has the Augmentation
diff --git a/src/PersonObjects/formulas/reputation.ts b/src/PersonObjects/formulas/reputation.ts
index 149d66733..f549493ff 100644
--- a/src/PersonObjects/formulas/reputation.ts
+++ b/src/PersonObjects/formulas/reputation.ts
@@ -1,7 +1,7 @@
import { CONSTANTS } from "../../Constants";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { CalculateShareMult } from "../../NetworkShare/Share";
-import { IPerson } from "../IPerson";
+import { Person } from "../Person";
import { calculateIntelligenceBonus } from "./intelligence";
function mult(favor: number): number {
@@ -12,7 +12,7 @@ function mult(favor: number): number {
return favorMult * BitNodeMultipliers.FactionWorkRepGain;
}
-export function getHackingWorkRepGain(p: IPerson, favor: number): number {
+export function getHackingWorkRepGain(p: Person, favor: number): number {
return (
((p.skills.hacking + p.skills.intelligence / 3) / CONSTANTS.MaxSkillLevel) *
p.mults.faction_rep *
@@ -22,7 +22,7 @@ export function getHackingWorkRepGain(p: IPerson, favor: number): number {
);
}
-export function getFactionSecurityWorkRepGain(p: IPerson, favor: number): number {
+export function getFactionSecurityWorkRepGain(p: Person, favor: number): number {
const t =
(0.9 *
(p.skills.strength +
@@ -35,7 +35,7 @@ export function getFactionSecurityWorkRepGain(p: IPerson, favor: number): number
return t * p.mults.faction_rep * mult(favor) * calculateIntelligenceBonus(p.skills.intelligence, 1);
}
-export function getFactionFieldWorkRepGain(p: IPerson, favor: number): number {
+export function getFactionFieldWorkRepGain(p: Person, favor: number): number {
const t =
(0.9 *
(p.skills.strength +
diff --git a/src/PersonObjects/formulas/skill.ts b/src/PersonObjects/formulas/skill.ts
index 7f22253ca..e8f0bc479 100644
--- a/src/PersonObjects/formulas/skill.ts
+++ b/src/PersonObjects/formulas/skill.ts
@@ -1,3 +1,7 @@
+/**
+ * Given an experience amount and stat multiplier, calculates the
+ * stat level. Stat-agnostic (same formula for every stat)
+ */
export function calculateSkill(exp: number, mult = 1): number {
return Math.max(Math.floor(mult * (32 * Math.log(exp + 534.5) - 200)), 1);
}
diff --git a/src/Server/formulas/grow.ts b/src/Server/formulas/grow.ts
index 4ab2fa761..a739adf7b 100644
--- a/src/Server/formulas/grow.ts
+++ b/src/Server/formulas/grow.ts
@@ -1,9 +1,9 @@
import { CONSTANTS } from "../../Constants";
import { Server } from "../Server";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
-import { IPerson } from "../../PersonObjects/IPerson";
+import { Person } from "../../PersonObjects/Person";
-export function calculateServerGrowth(server: Server, threads: number, p: IPerson, cores = 1): number {
+export function calculateServerGrowth(server: Server, threads: number, p: Person, cores = 1): number {
const numServerGrowthCycles = Math.max(Math.floor(threads), 0);
//Get adjusted growth rate, which accounts for server security
diff --git a/src/Work/WorkStats.ts b/src/Work/WorkStats.ts
index 442fbfd1b..fb98b66cb 100644
--- a/src/Work/WorkStats.ts
+++ b/src/Work/WorkStats.ts
@@ -1,4 +1,4 @@
-import { IPerson } from "src/PersonObjects/IPerson";
+import { Person } from "src/PersonObjects/Person";
import { Player } from "../Player";
export interface WorkStats {
@@ -68,7 +68,7 @@ export const scaleWorkStats = (w: WorkStats, n: number, scaleMoney = true): Work
};
};
-export const applyWorkStats = (target: IPerson, workStats: WorkStats, cycles: number, source: string): WorkStats => {
+export const applyWorkStats = (target: Person, workStats: WorkStats, cycles: number, source: string): WorkStats => {
const expStats = applyWorkStatsExp(target, workStats, cycles);
const gains = {
money: workStats.money * cycles,
@@ -86,7 +86,7 @@ export const applyWorkStats = (target: IPerson, workStats: WorkStats, cycles: nu
return gains;
};
-export const applyWorkStatsExp = (target: IPerson, workStats: WorkStats, cycles: number): WorkStats => {
+export const applyWorkStatsExp = (target: Person, workStats: WorkStats, cycles: number): WorkStats => {
const gains = {
money: 0,
reputation: 0,
diff --git a/src/Work/formulas/Class.ts b/src/Work/formulas/Class.ts
index 54ede73fb..d685e497b 100644
--- a/src/Work/formulas/Class.ts
+++ b/src/Work/formulas/Class.ts
@@ -8,7 +8,7 @@ import { WorkStats } from "../WorkStats";
import { Server } from "../../Server/Server";
import { GetServer } from "../../Server/AllServers";
import { serverMetadata } from "../../Server/data/servers";
-import { IPerson } from "../../PersonObjects/IPerson";
+import { Person } from "../../PersonObjects/Person";
import { LocationName } from "../../Locations/data/LocationNames";
const gameCPS = 1000 / CONSTANTS._idleSpeed; // 5 cycles per second
@@ -20,7 +20,7 @@ export function calculateCost(classs: Class, location: Location): number {
return classs.earnings.money * location.costMult * discount;
}
-export function calculateClassEarnings(person: IPerson, type: ClassType, locationName: LocationName): WorkStats {
+export function calculateClassEarnings(person: Person, type: ClassType, locationName: LocationName): WorkStats {
//Find cost and exp gain per game cycle
const hashManager = Player.hashManager;
const classs = Classes[type];
diff --git a/src/Work/formulas/Company.ts b/src/Work/formulas/Company.ts
index 801b8813b..710cd89e6 100644
--- a/src/Work/formulas/Company.ts
+++ b/src/Work/formulas/Company.ts
@@ -4,9 +4,9 @@ import { Player } from "../../Player";
import { WorkStats } from "../WorkStats";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { CONSTANTS } from "../../Constants";
-import { IPerson } from "src/PersonObjects/IPerson";
+import { Person } from "../../PersonObjects/Person";
-export const calculateCompanyWorkStats = (worker: IPerson, company: Company): WorkStats => {
+export const calculateCompanyWorkStats = (worker: Person, company: Company): WorkStats => {
const companyPositionName = Player.jobs[company.name];
const companyPosition = CompanyPositions[companyPositionName];
diff --git a/src/Work/formulas/Faction.ts b/src/Work/formulas/Faction.ts
index 0a2913f38..1dd704c3a 100644
--- a/src/Work/formulas/Faction.ts
+++ b/src/Work/formulas/Faction.ts
@@ -1,4 +1,4 @@
-import { IPerson } from "../../PersonObjects/IPerson";
+import { Person } from "../../PersonObjects/Person";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { CONSTANTS } from "../../Constants";
import { FactionWorkType } from "../data/FactionWorkType";
@@ -30,7 +30,7 @@ export const FactionWorkStats: Record = {
}),
};
-export const calculateFactionRep = (person: IPerson, tpe: FactionWorkType, favor: number): number => {
+export const calculateFactionRep = (person: Person, tpe: FactionWorkType, favor: number): number => {
const repFormulas = {
[FactionWorkType.HACKING]: getHackingWorkRepGain,
[FactionWorkType.FIELD]: getFactionFieldWorkRepGain,
@@ -39,7 +39,7 @@ export const calculateFactionRep = (person: IPerson, tpe: FactionWorkType, favor
return repFormulas[tpe](person, favor);
};
-export function calculateFactionExp(person: IPerson, tpe: FactionWorkType): WorkStats {
+export function calculateFactionExp(person: Person, tpe: FactionWorkType): WorkStats {
const baseStats = FactionWorkStats[tpe];
return {
money: 0,
From 2213d06159189f66702ec02c321263f7423741e1 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 02:15:58 -0400
Subject: [PATCH 25/46] Using bladeburner and action classes as types
---
src/Bladeburner/Action.tsx | 25 +++--
src/Bladeburner/BlackOperation.ts | 4 +-
src/Bladeburner/Bladeburner.tsx | 9 +-
src/Bladeburner/Contract.ts | 4 +-
src/Bladeburner/IAction.tsx | 72 -------------
src/Bladeburner/IBladeburner.ts | 124 -----------------------
src/Bladeburner/Operation.ts | 8 +-
src/Bladeburner/ui/ActionLevel.tsx | 8 +-
src/Bladeburner/ui/AllPages.tsx | 4 +-
src/Bladeburner/ui/Autolevel.tsx | 4 +-
src/Bladeburner/ui/BlackOpElem.tsx | 4 +-
src/Bladeburner/ui/BlackOpList.tsx | 4 +-
src/Bladeburner/ui/BlackOpPage.tsx | 4 +-
src/Bladeburner/ui/Console.tsx | 4 +-
src/Bladeburner/ui/ContractElem.tsx | 8 +-
src/Bladeburner/ui/ContractList.tsx | 4 +-
src/Bladeburner/ui/ContractPage.tsx | 4 +-
src/Bladeburner/ui/GeneralActionElem.tsx | 8 +-
src/Bladeburner/ui/GeneralActionList.tsx | 4 +-
src/Bladeburner/ui/GeneralActionPage.tsx | 4 +-
src/Bladeburner/ui/OperationElem.tsx | 4 +-
src/Bladeburner/ui/OperationList.tsx | 4 +-
src/Bladeburner/ui/OperationPage.tsx | 4 +-
src/Bladeburner/ui/SkillElem.tsx | 4 +-
src/Bladeburner/ui/SkillList.tsx | 4 +-
src/Bladeburner/ui/SkillPage.tsx | 4 +-
src/Bladeburner/ui/StartButton.tsx | 4 +-
src/Bladeburner/ui/Stats.tsx | 4 +-
src/Bladeburner/ui/SuccessChance.tsx | 8 +-
src/Bladeburner/ui/TeamSizeButton.tsx | 4 +-
src/Bladeburner/ui/TeamSizeModal.tsx | 4 +-
src/Bladeburner/ui/TravelModal.tsx | 4 +-
src/NetscriptFunctions/Bladeburner.ts | 4 +-
src/PersonObjects/Player/PlayerObject.ts | 4 +-
34 files changed, 88 insertions(+), 282 deletions(-)
delete mode 100644 src/Bladeburner/IAction.tsx
delete mode 100644 src/Bladeburner/IBladeburner.ts
diff --git a/src/Bladeburner/Action.tsx b/src/Bladeburner/Action.tsx
index 9ec88479a..9874f1b2f 100644
--- a/src/Bladeburner/Action.tsx
+++ b/src/Bladeburner/Action.tsx
@@ -3,10 +3,13 @@ import { getRandomInt } from "../utils/helpers/getRandomInt";
import { addOffset } from "../utils/helpers/addOffset";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
import { BladeburnerConstants } from "./data/Constants";
-import { IBladeburner } from "./IBladeburner";
-import { IAction, ISuccessChanceParams } from "./IAction";
+import { Bladeburner } from "./Bladeburner";
import { Person } from "../PersonObjects/Person";
+interface ISuccessChanceParams {
+ est: boolean;
+}
+
class StatsMultiplier {
[key: string]: number;
@@ -41,7 +44,7 @@ export interface IActionParams {
teamCount?: number;
}
-export class Action implements IAction {
+export class Action {
name = "";
// Difficulty scales with level. See getDifficulty() method
@@ -153,7 +156,7 @@ export class Action implements IAction {
* Tests for success. Should be called when an action has completed
* @param inst {Bladeburner} - Bladeburner instance
*/
- attempt(inst: IBladeburner, person: Person): boolean {
+ attempt(inst: Bladeburner, person: Person): boolean {
return Math.random() < this.getSuccessChance(inst, person);
}
@@ -162,7 +165,7 @@ export class Action implements IAction {
return 1;
}
- getActionTime(inst: IBladeburner, person: Person): number {
+ getActionTime(inst: Bladeburner, person: Person): number {
const difficulty = this.getDifficulty();
let baseTime = difficulty / BladeburnerConstants.DifficultyToTimeFactor;
const skillFac = inst.skillMultipliers.actionTime; // Always < 1
@@ -183,16 +186,16 @@ export class Action implements IAction {
// For actions that have teams. To be implemented by subtypes.
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- getTeamSuccessBonus(inst: IBladeburner): number {
+ getTeamSuccessBonus(inst: Bladeburner): number {
return 1;
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- getActionTypeSkillSuccessBonus(inst: IBladeburner): number {
+ getActionTypeSkillSuccessBonus(inst: Bladeburner): number {
return 1;
}
- getChaosCompetencePenalty(inst: IBladeburner, params: ISuccessChanceParams): number {
+ getChaosCompetencePenalty(inst: Bladeburner, params: ISuccessChanceParams): number {
const city = inst.getCurrentCity();
if (params.est) {
return Math.pow(city.popEst / BladeburnerConstants.PopulationThreshold, BladeburnerConstants.PopulationExponent);
@@ -201,7 +204,7 @@ export class Action implements IAction {
}
}
- getChaosDifficultyBonus(inst: IBladeburner /*, params: ISuccessChanceParams*/): number {
+ getChaosDifficultyBonus(inst: Bladeburner /*, params: ISuccessChanceParams*/): number {
const city = inst.getCurrentCity();
if (city.chaos > BladeburnerConstants.ChaosThreshold) {
const diff = 1 + (city.chaos - BladeburnerConstants.ChaosThreshold);
@@ -212,7 +215,7 @@ export class Action implements IAction {
return 1;
}
- getEstSuccessChance(inst: IBladeburner, person: Person): [number, number] {
+ getEstSuccessChance(inst: Bladeburner, person: Person): [number, number] {
function clamp(x: number): number {
return Math.max(0, Math.min(x, 1));
}
@@ -233,7 +236,7 @@ export class Action implements IAction {
* @params - options:
* est (bool): Get success chance estimate instead of real success chance
*/
- getSuccessChance(inst: IBladeburner, person: Person, params: ISuccessChanceParams = { est: false }): number {
+ getSuccessChance(inst: Bladeburner, person: Person, params: ISuccessChanceParams = { est: false }): number {
if (inst == null) {
throw new Error("Invalid Bladeburner instance passed into Action.getSuccessChance");
}
diff --git a/src/Bladeburner/BlackOperation.ts b/src/Bladeburner/BlackOperation.ts
index 9691ba5c6..717c5859f 100644
--- a/src/Bladeburner/BlackOperation.ts
+++ b/src/Bladeburner/BlackOperation.ts
@@ -12,11 +12,11 @@ export class BlackOperation extends Operation {
return 1.5;
}
- getChaosCompetencePenalty(/*inst: IBladeburner, params: ISuccessChanceParams*/): number {
+ getChaosCompetencePenalty(/*inst: Bladeburner, params: ISuccessChanceParams*/): number {
return 1;
}
- getChaosDifficultyBonus(/*inst: IBladeburner, params: ISuccessChanceParams*/): number {
+ getChaosDifficultyBonus(/*inst: Bladeburner, params: ISuccessChanceParams*/): number {
return 1;
}
diff --git a/src/Bladeburner/Bladeburner.tsx b/src/Bladeburner/Bladeburner.tsx
index c52b72431..a7dff6eb2 100644
--- a/src/Bladeburner/Bladeburner.tsx
+++ b/src/Bladeburner/Bladeburner.tsx
@@ -1,5 +1,4 @@
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
-import { IBladeburner } from "./IBladeburner";
import { IActionIdentifier } from "./IActionIdentifier";
import { ActionIdentifier } from "./ActionIdentifier";
import { ActionTypes } from "./data/ActionTypes";
@@ -13,7 +12,7 @@ import { formatNumber } from "../utils/StringHelperFunctions";
import { Skills } from "./Skills";
import { Skill } from "./Skill";
import { City } from "./City";
-import { IAction } from "./IAction";
+import { Action } from "./Action";
import { Player } from "../Player";
import { createTaskTracker, ITaskTracker } from "../PersonObjects/ITaskTracker";
import { Person } from "../PersonObjects/Person";
@@ -45,7 +44,7 @@ export interface BlackOpsAttempt {
action?: BlackOperation;
}
-export class Bladeburner implements IBladeburner {
+export class Bladeburner {
numHosp = 0;
moneyLost = 0;
rank = 0;
@@ -995,7 +994,7 @@ export class Bladeburner implements IBladeburner {
* @param action(Action obj) - Derived action class
* @param success(bool) - Whether action was successful
*/
- getActionStats(action: IAction, person: Person, success: boolean): ITaskTracker {
+ getActionStats(action: Action, person: Person, success: boolean): ITaskTracker {
const difficulty = action.getDifficulty();
/**
@@ -1202,7 +1201,7 @@ export class Bladeburner implements IBladeburner {
}
}
- getActionObject(actionId: IActionIdentifier): IAction | null {
+ getActionObject(actionId: IActionIdentifier): Action | null {
/**
* Given an ActionIdentifier object, returns the corresponding
* GeneralAction, Contract, Operation, or BlackOperation object
diff --git a/src/Bladeburner/Contract.ts b/src/Bladeburner/Contract.ts
index a74d1b029..61a6a7d6f 100644
--- a/src/Bladeburner/Contract.ts
+++ b/src/Bladeburner/Contract.ts
@@ -1,4 +1,4 @@
-import { IBladeburner } from "./IBladeburner";
+import { Bladeburner } from "./Bladeburner";
import { Action, IActionParams } from "./Action";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
@@ -7,7 +7,7 @@ export class Contract extends Action {
super(params);
}
- getActionTypeSkillSuccessBonus(inst: IBladeburner): number {
+ getActionTypeSkillSuccessBonus(inst: Bladeburner): number {
return inst.skillMultipliers.successChanceContract;
}
diff --git a/src/Bladeburner/IAction.tsx b/src/Bladeburner/IAction.tsx
deleted file mode 100644
index 0f396fa32..000000000
--- a/src/Bladeburner/IAction.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { IReviverValue } from "../utils/JSONReviver";
-import { Person } from "../PersonObjects/Person";
-import { IBladeburner } from "./IBladeburner";
-
-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;
-
- // 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;
-
- // 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, person: Person): boolean;
- getActionTimePenalty(): number;
- getActionTime(inst: IBladeburner, person: Person): number;
- getTeamSuccessBonus(inst: IBladeburner): number;
- getActionTypeSkillSuccessBonus(inst: IBladeburner): number;
- getChaosCompetencePenalty(inst: IBladeburner, params: ISuccessChanceParams): number;
- getChaosDifficultyBonus(inst: IBladeburner): number;
- getEstSuccessChance(inst: IBladeburner, person: Person): [number, number];
- getSuccessChance(inst: IBladeburner, person: Person, params: ISuccessChanceParams): number;
- getSuccessesNeededForNextLevel(baseSuccessesPerLevel: number): number;
- setMaxLevel(baseSuccessesPerLevel: number): void;
- toJSON(): IReviverValue;
-}
diff --git a/src/Bladeburner/IBladeburner.ts b/src/Bladeburner/IBladeburner.ts
deleted file mode 100644
index 0f3353ba1..000000000
--- a/src/Bladeburner/IBladeburner.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { IActionIdentifier } from "./IActionIdentifier";
-import { City } from "./City";
-import { Skill } from "./Skill";
-import { IAction } from "./IAction";
-import { Person } from "../PersonObjects/Person";
-import { ITaskTracker } from "../PersonObjects/ITaskTracker";
-import { WorkerScript } from "../Netscript/WorkerScript";
-import { Contract } from "./Contract";
-import { Operation } from "./Operation";
-import { IReviverValue } from "../utils/JSONReviver";
-import { BlackOpsAttempt } from "./Bladeburner";
-
-export interface IBladeburner {
- numHosp: number;
- moneyLost: number;
- rank: number;
- maxRank: number;
-
- skillPoints: number;
- totalSkillPoints: number;
-
- teamSize: number;
- sleeveSize: number;
- teamLost: number;
- hpLost: number;
-
- storedCycles: number;
-
- randomEventCounter: number;
-
- actionTimeToComplete: number;
- actionTimeCurrent: number;
- actionTimeOverflow: number;
-
- action: IActionIdentifier;
-
- cities: Record;
- city: string;
- skills: Record;
- skillMultipliers: Record;
- staminaBonus: number;
- maxStamina: number;
- stamina: number;
- contracts: Record;
- operations: Record;
- blackops: Record;
- logging: {
- general: boolean;
- contracts: boolean;
- ops: boolean;
- blackops: boolean;
- events: boolean;
- };
- automateEnabled: boolean;
- automateActionHigh: IActionIdentifier;
- automateThreshHigh: number;
- automateActionLow: IActionIdentifier;
- automateThreshLow: number;
- consoleHistory: string[];
- consoleLogs: string[];
-
- getCurrentCity(): City;
- calculateStaminaPenalty(): number;
- canAttemptBlackOp(actionId: IActionIdentifier): BlackOpsAttempt;
- startAction(action: IActionIdentifier): void;
- upgradeSkill(skill: Skill): void;
- executeConsoleCommands(command: string): void;
- postToConsole(input: string, saveToLogs?: boolean): void;
- log(input: string): void;
- resetAction(): void;
- clearConsole(): void;
-
- prestige(): void;
- storeCycles(numCycles?: number): void;
- getTypeAndNameFromActionId(actionId: IActionIdentifier): {
- type: string;
- name: string;
- };
- getContractNamesNetscriptFn(): string[];
- getOperationNamesNetscriptFn(): string[];
- getBlackOpNamesNetscriptFn(): string[];
- getGeneralActionNamesNetscriptFn(): string[];
- getSkillNamesNetscriptFn(): string[];
- startActionNetscriptFn(type: string, name: string, workerScript: WorkerScript): boolean;
- getActionTimeNetscriptFn(person: Person, type: string, name: string): number | string;
- getActionEstimatedSuccessChanceNetscriptFn(person: Person, type: string, name: string): [number, number] | string;
- getActionCountRemainingNetscriptFn(type: string, name: string, workerScript: WorkerScript): number;
- getSkillLevelNetscriptFn(skillName: string, workerScript: WorkerScript): number;
- getSkillUpgradeCostNetscriptFn(skillName: string, count: number, workerScript: WorkerScript): number;
- upgradeSkillNetscriptFn(skillName: string, count: number, workerScript: WorkerScript): boolean;
- getTeamSizeNetscriptFn(type: string, name: string, workerScript: WorkerScript): number;
- setTeamSizeNetscriptFn(type: string, name: string, size: number, workerScript: WorkerScript): number;
- joinBladeburnerFactionNetscriptFn(workerScript: WorkerScript): boolean;
- getActionIdFromTypeAndName(type: string, name: string): IActionIdentifier | null;
- executeStartConsoleCommand(args: string[]): void;
- executeSkillConsoleCommand(args: string[]): void;
- executeLogConsoleCommand(args: string[]): void;
- executeHelpConsoleCommand(args: string[]): void;
- executeAutomateConsoleCommand(args: string[]): void;
- parseCommandArguments(command: string): string[];
- executeConsoleCommand(command: string): void;
- triggerMigration(sourceCityName: string): void;
- triggerPotentialMigration(sourceCityName: string, chance: number): void;
- randomEvent(): void;
- getDiplomacyEffectiveness(person: Person): number;
- getRecruitmentSuccessChance(person: Person): number;
- getRecruitmentTime(person: Person): number;
- resetSkillMultipliers(): void;
- updateSkillMultipliers(): void;
- completeOperation(success: boolean): void;
- getActionObject(actionId: IActionIdentifier): IAction | null;
- completeContract(success: boolean, actionIdent: IActionIdentifier): void;
- completeAction(person: Person, actionIdent: IActionIdentifier, isPlayer?: boolean): ITaskTracker;
- infiltrateSynthoidCommunities(): void;
- changeRank(person: Person, change: number): void;
- processAction(seconds: number): void;
- calculateStaminaGainPerSecond(): number;
- calculateMaxStamina(): void;
- create(): void;
- process(): void;
- getActionStats(action: IAction, person: Person, success: boolean): ITaskTracker;
- sleeveSupport(joining: boolean): void;
- toJSON(): IReviverValue;
-}
diff --git a/src/Bladeburner/Operation.ts b/src/Bladeburner/Operation.ts
index 04304988e..4eef008c1 100644
--- a/src/Bladeburner/Operation.ts
+++ b/src/Bladeburner/Operation.ts
@@ -1,4 +1,4 @@
-import { IBladeburner } from "./IBladeburner";
+import { Bladeburner } from "./Bladeburner";
import { BladeburnerConstants } from "./data/Constants";
import { Action, IActionParams } from "./Action";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
@@ -19,7 +19,7 @@ export class Operation extends Action {
}
// For actions that have teams. To be implemented by subtypes.
- getTeamSuccessBonus(inst: IBladeburner): number {
+ getTeamSuccessBonus(inst: Bladeburner): number {
if (this.teamCount && this.teamCount > 0) {
this.teamCount = Math.min(this.teamCount, inst.teamSize);
const teamMultiplier = Math.pow(this.teamCount, 0.05);
@@ -29,11 +29,11 @@ export class Operation extends Action {
return 1;
}
- getActionTypeSkillSuccessBonus(inst: IBladeburner): number {
+ getActionTypeSkillSuccessBonus(inst: Bladeburner): number {
return inst.skillMultipliers.successChanceOperation;
}
- getChaosDifficultyBonus(inst: IBladeburner /*, params: ISuccessChanceParams*/): number {
+ getChaosDifficultyBonus(inst: Bladeburner /*, params: ISuccessChanceParams*/): number {
const city = inst.getCurrentCity();
if (city.chaos > BladeburnerConstants.ChaosThreshold) {
const diff = 1 + (city.chaos - BladeburnerConstants.ChaosThreshold);
diff --git a/src/Bladeburner/ui/ActionLevel.tsx b/src/Bladeburner/ui/ActionLevel.tsx
index e87a466fe..b74625729 100644
--- a/src/Bladeburner/ui/ActionLevel.tsx
+++ b/src/Bladeburner/ui/ActionLevel.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { IAction } from "../IAction";
-import { IBladeburner } from "../IBladeburner";
+import { Action } from "../Action";
+import { Bladeburner } from "../Bladeburner";
import { BladeburnerConstants } from "../data/Constants";
import Typography from "@mui/material/Typography";
@@ -11,9 +11,9 @@ import ArrowDropUpIcon from "@mui/icons-material/ArrowDropUp";
import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
interface IProps {
- action: IAction;
+ action: Action;
isActive: boolean;
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
rerender: () => void;
}
diff --git a/src/Bladeburner/ui/AllPages.tsx b/src/Bladeburner/ui/AllPages.tsx
index 7c77ae79f..e6fa94cd6 100644
--- a/src/Bladeburner/ui/AllPages.tsx
+++ b/src/Bladeburner/ui/AllPages.tsx
@@ -4,14 +4,14 @@ import { ContractPage } from "./ContractPage";
import { OperationPage } from "./OperationPage";
import { BlackOpPage } from "./BlackOpPage";
import { SkillPage } from "./SkillPage";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Tabs from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";
import Box from "@mui/material/Box";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function AllPages(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/Autolevel.tsx b/src/Bladeburner/ui/Autolevel.tsx
index dad8188fd..6e18e64ee 100644
--- a/src/Bladeburner/ui/Autolevel.tsx
+++ b/src/Bladeburner/ui/Autolevel.tsx
@@ -1,12 +1,12 @@
import React from "react";
-import { IAction } from "../IAction";
+import { Action } from "../Action";
import Typography from "@mui/material/Typography";
import Tooltip from "@mui/material/Tooltip";
import Box from "@mui/material/Box";
import Switch from "@mui/material/Switch";
interface IProps {
- action: IAction;
+ action: Action;
rerender: () => void;
}
diff --git a/src/Bladeburner/ui/BlackOpElem.tsx b/src/Bladeburner/ui/BlackOpElem.tsx
index e5e586d84..6e81c36ec 100644
--- a/src/Bladeburner/ui/BlackOpElem.tsx
+++ b/src/Bladeburner/ui/BlackOpElem.tsx
@@ -3,7 +3,7 @@ import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/Stri
import { ActionTypes } from "../data/ActionTypes";
import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
import { TeamSizeButton } from "./TeamSizeButton";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { BlackOperation } from "../BlackOperation";
import { BlackOperations } from "../data/BlackOperations";
import { Player } from "../../Player";
@@ -15,7 +15,7 @@ import Typography from "@mui/material/Typography";
import Paper from "@mui/material/Paper";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
action: BlackOperation;
}
diff --git a/src/Bladeburner/ui/BlackOpList.tsx b/src/Bladeburner/ui/BlackOpList.tsx
index 17706bf6f..a5fa39302 100644
--- a/src/Bladeburner/ui/BlackOpList.tsx
+++ b/src/Bladeburner/ui/BlackOpList.tsx
@@ -2,10 +2,10 @@ import React from "react";
import { BlackOperations } from "../BlackOperations";
import { BlackOperation } from "../BlackOperation";
import { BlackOpElem } from "./BlackOpElem";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function BlackOpList(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/BlackOpPage.tsx b/src/Bladeburner/ui/BlackOpPage.tsx
index ecfede4c9..715ad3941 100644
--- a/src/Bladeburner/ui/BlackOpPage.tsx
+++ b/src/Bladeburner/ui/BlackOpPage.tsx
@@ -1,6 +1,6 @@
import * as React from "react";
import { BlackOpList } from "./BlackOpList";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
import { FactionNames } from "../../Faction/data/FactionNames";
import { Router } from "../../ui/GameRoot";
@@ -9,7 +9,7 @@ import { Button } from "@mui/material";
import { CorruptableText } from "../../ui/React/CorruptableText";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function BlackOpPage(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/Console.tsx b/src/Bladeburner/ui/Console.tsx
index bcc07b447..5c5565e08 100644
--- a/src/Bladeburner/ui/Console.tsx
+++ b/src/Bladeburner/ui/Console.tsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from "react";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { KEY } from "../../utils/helpers/keyCodes";
import Paper from "@mui/material/Paper";
@@ -48,7 +48,7 @@ function Line(props: ILineProps): React.ReactElement {
}
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function Console(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/ContractElem.tsx b/src/Bladeburner/ui/ContractElem.tsx
index 376236ca7..49dfc5add 100644
--- a/src/Bladeburner/ui/ContractElem.tsx
+++ b/src/Bladeburner/ui/ContractElem.tsx
@@ -3,8 +3,8 @@ import { ActionTypes } from "../data/ActionTypes";
import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
import { Contracts } from "../data/Contracts";
-import { IBladeburner } from "../IBladeburner";
-import { IAction } from "../IAction";
+import { Bladeburner } from "../Bladeburner";
+import { Action } from "../Action";
import { Player } from "../../Player";
import { SuccessChance } from "./SuccessChance";
import { CopyableText } from "../../ui/React/CopyableText";
@@ -16,8 +16,8 @@ import Typography from "@mui/material/Typography";
import Paper from "@mui/material/Paper";
interface IProps {
- bladeburner: IBladeburner;
- action: IAction;
+ bladeburner: Bladeburner;
+ action: Action;
}
export function ContractElem(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/ContractList.tsx b/src/Bladeburner/ui/ContractList.tsx
index 499a437fe..689238495 100644
--- a/src/Bladeburner/ui/ContractList.tsx
+++ b/src/Bladeburner/ui/ContractList.tsx
@@ -1,9 +1,9 @@
import React from "react";
import { ContractElem } from "./ContractElem";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function ContractList(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/ContractPage.tsx b/src/Bladeburner/ui/ContractPage.tsx
index 0af07e41c..d8a54bc2f 100644
--- a/src/Bladeburner/ui/ContractPage.tsx
+++ b/src/Bladeburner/ui/ContractPage.tsx
@@ -1,10 +1,10 @@
import * as React from "react";
import { ContractList } from "./ContractList";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function ContractPage(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/GeneralActionElem.tsx b/src/Bladeburner/ui/GeneralActionElem.tsx
index 09b1de249..b88b98dd9 100644
--- a/src/Bladeburner/ui/GeneralActionElem.tsx
+++ b/src/Bladeburner/ui/GeneralActionElem.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { ActionTypes } from "../data/ActionTypes";
import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
import { formatNumber, convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
-import { IBladeburner } from "../IBladeburner";
-import { IAction } from "../IAction";
+import { Bladeburner } from "../Bladeburner";
+import { Action } from "../Action";
import { GeneralActions } from "../data/GeneralActions";
import { Player } from "../../Player";
import { CopyableText } from "../../ui/React/CopyableText";
@@ -15,8 +15,8 @@ import Box from "@mui/material/Box";
import Paper from "@mui/material/Paper";
interface IProps {
- bladeburner: IBladeburner;
- action: IAction;
+ bladeburner: Bladeburner;
+ action: Action;
}
export function GeneralActionElem(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/GeneralActionList.tsx b/src/Bladeburner/ui/GeneralActionList.tsx
index 27e52fbc9..58a64d944 100644
--- a/src/Bladeburner/ui/GeneralActionList.tsx
+++ b/src/Bladeburner/ui/GeneralActionList.tsx
@@ -2,10 +2,10 @@ import React from "react";
import { GeneralActionElem } from "./GeneralActionElem";
import { Action } from "../Action";
import { GeneralActions } from "../GeneralActions";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function GeneralActionList(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/GeneralActionPage.tsx b/src/Bladeburner/ui/GeneralActionPage.tsx
index 10d27a86d..3dcf808c2 100644
--- a/src/Bladeburner/ui/GeneralActionPage.tsx
+++ b/src/Bladeburner/ui/GeneralActionPage.tsx
@@ -1,10 +1,10 @@
import * as React from "react";
import { GeneralActionList } from "./GeneralActionList";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function GeneralActionPage(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/OperationElem.tsx b/src/Bladeburner/ui/OperationElem.tsx
index ea39d68d6..161003d60 100644
--- a/src/Bladeburner/ui/OperationElem.tsx
+++ b/src/Bladeburner/ui/OperationElem.tsx
@@ -7,7 +7,7 @@ import { ActionLevel } from "./ActionLevel";
import { Autolevel } from "./Autolevel";
import { StartButton } from "./StartButton";
import { TeamSizeButton } from "./TeamSizeButton";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { Operation } from "../Operation";
import { Operations } from "../data/Operations";
import { Player } from "../../Player";
@@ -17,7 +17,7 @@ import Typography from "@mui/material/Typography";
import Paper from "@mui/material/Paper";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
action: Operation;
}
diff --git a/src/Bladeburner/ui/OperationList.tsx b/src/Bladeburner/ui/OperationList.tsx
index eacb779bc..610896b6c 100644
--- a/src/Bladeburner/ui/OperationList.tsx
+++ b/src/Bladeburner/ui/OperationList.tsx
@@ -1,9 +1,9 @@
import React from "react";
import { OperationElem } from "./OperationElem";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function OperationList(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/OperationPage.tsx b/src/Bladeburner/ui/OperationPage.tsx
index 3557a8867..c2b212da7 100644
--- a/src/Bladeburner/ui/OperationPage.tsx
+++ b/src/Bladeburner/ui/OperationPage.tsx
@@ -1,10 +1,10 @@
import * as React from "react";
import { OperationList } from "./OperationList";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function OperationPage(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/SkillElem.tsx b/src/Bladeburner/ui/SkillElem.tsx
index c51217bd0..e878f4339 100644
--- a/src/Bladeburner/ui/SkillElem.tsx
+++ b/src/Bladeburner/ui/SkillElem.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { CopyableText } from "../../ui/React/CopyableText";
import { formatNumber } from "../../utils/StringHelperFunctions";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
import IconButton from "@mui/material/IconButton";
@@ -13,7 +13,7 @@ import { Skill } from "../Skill";
interface IProps {
skill: Skill;
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
onUpgrade: () => void;
}
diff --git a/src/Bladeburner/ui/SkillList.tsx b/src/Bladeburner/ui/SkillList.tsx
index c6e801c58..f28b56fc2 100644
--- a/src/Bladeburner/ui/SkillList.tsx
+++ b/src/Bladeburner/ui/SkillList.tsx
@@ -1,10 +1,10 @@
import * as React from "react";
import { SkillElem } from "./SkillElem";
import { Skills } from "../Skills";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
onUpgrade: () => void;
}
diff --git a/src/Bladeburner/ui/SkillPage.tsx b/src/Bladeburner/ui/SkillPage.tsx
index 376efc748..44795d62c 100644
--- a/src/Bladeburner/ui/SkillPage.tsx
+++ b/src/Bladeburner/ui/SkillPage.tsx
@@ -2,10 +2,10 @@ import React, { useState } from "react";
import { SkillList } from "./SkillList";
import { BladeburnerConstants } from "../data/Constants";
import { formatNumber } from "../../utils/StringHelperFunctions";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function SkillPage(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/StartButton.tsx b/src/Bladeburner/ui/StartButton.tsx
index ce03674f3..b92f2b592 100644
--- a/src/Bladeburner/ui/StartButton.tsx
+++ b/src/Bladeburner/ui/StartButton.tsx
@@ -1,13 +1,13 @@
import React from "react";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { BlackOperation } from "../BlackOperation";
import { Player } from "../../Player";
import Button from "@mui/material/Button";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
type: number;
name: string;
rerender: () => void;
diff --git a/src/Bladeburner/ui/Stats.tsx b/src/Bladeburner/ui/Stats.tsx
index a9d1d0930..a0e6c2417 100644
--- a/src/Bladeburner/ui/Stats.tsx
+++ b/src/Bladeburner/ui/Stats.tsx
@@ -7,7 +7,7 @@ import { numeralWrapper } from "../../ui/numeralFormat";
import { Factions } from "../../Faction/Factions";
import { Router } from "../../ui/GameRoot";
import { joinFaction } from "../../Faction/FactionHelpers";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { TravelModal } from "./TravelModal";
import Typography from "@mui/material/Typography";
@@ -18,7 +18,7 @@ import Paper from "@mui/material/Paper";
import { FactionNames } from "../../Faction/data/FactionNames";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function Stats(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/SuccessChance.tsx b/src/Bladeburner/ui/SuccessChance.tsx
index 285a730d6..fe39358a5 100644
--- a/src/Bladeburner/ui/SuccessChance.tsx
+++ b/src/Bladeburner/ui/SuccessChance.tsx
@@ -2,13 +2,13 @@ import React from "react";
import { formatNumber } from "../../utils/StringHelperFunctions";
import { StealthIcon } from "./StealthIcon";
import { KillIcon } from "./KillIcon";
-import { IAction } from "../IAction";
-import { IBladeburner } from "../IBladeburner";
+import { Action } from "../Action";
+import { Bladeburner } from "../Bladeburner";
import { Player } from "../../Player";
interface IProps {
- bladeburner: IBladeburner;
- action: IAction;
+ bladeburner: Bladeburner;
+ action: Action;
}
export function SuccessChance(props: IProps): React.ReactElement {
diff --git a/src/Bladeburner/ui/TeamSizeButton.tsx b/src/Bladeburner/ui/TeamSizeButton.tsx
index 81093a23a..9972afb35 100644
--- a/src/Bladeburner/ui/TeamSizeButton.tsx
+++ b/src/Bladeburner/ui/TeamSizeButton.tsx
@@ -1,12 +1,12 @@
import React, { useState } from "react";
import { Operation } from "../Operation";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { TeamSizeModal } from "./TeamSizeModal";
import { formatNumber } from "../../utils/StringHelperFunctions";
import Button from "@mui/material/Button";
interface IProps {
action: Operation;
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
}
export function TeamSizeButton(props: IProps): React.ReactElement {
const [open, setOpen] = useState(false);
diff --git a/src/Bladeburner/ui/TeamSizeModal.tsx b/src/Bladeburner/ui/TeamSizeModal.tsx
index 743f864aa..52a74f621 100644
--- a/src/Bladeburner/ui/TeamSizeModal.tsx
+++ b/src/Bladeburner/ui/TeamSizeModal.tsx
@@ -2,13 +2,13 @@ import React, { useState } from "react";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { Modal } from "../../ui/React/Modal";
import { Action } from "../Action";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
action: Action;
open: boolean;
onClose: () => void;
diff --git a/src/Bladeburner/ui/TravelModal.tsx b/src/Bladeburner/ui/TravelModal.tsx
index c4e5351db..fb7bcaef5 100644
--- a/src/Bladeburner/ui/TravelModal.tsx
+++ b/src/Bladeburner/ui/TravelModal.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { IBladeburner } from "../IBladeburner";
+import { Bladeburner } from "../Bladeburner";
import { WorldMap } from "../../ui/React/WorldMap";
import { Modal } from "../../ui/React/Modal";
import { CityName } from "../../Locations/data/CityNames";
@@ -8,7 +8,7 @@ import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
interface IProps {
- bladeburner: IBladeburner;
+ bladeburner: Bladeburner;
open: boolean;
onClose: () => void;
}
diff --git a/src/NetscriptFunctions/Bladeburner.ts b/src/NetscriptFunctions/Bladeburner.ts
index 54e379700..0b0c3e8ea 100644
--- a/src/NetscriptFunctions/Bladeburner.ts
+++ b/src/NetscriptFunctions/Bladeburner.ts
@@ -2,7 +2,7 @@ import { Player } from "../Player";
import { Bladeburner } from "../Bladeburner/Bladeburner";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { Bladeburner as INetscriptBladeburner, BladeburnerCurAction } from "../ScriptEditor/NetscriptDefinitions";
-import { IAction } from "src/Bladeburner/IAction";
+import { Action } from "src/Bladeburner/Action";
import { InternalAPI, NetscriptContext } from "src/Netscript/APIWrapper";
import { BlackOperation } from "../Bladeburner/BlackOperation";
import { helpers } from "../Netscript/NetscriptHelpers";
@@ -31,7 +31,7 @@ export function NetscriptBladeburner(): InternalAPI {
}
};
- const getBladeburnerActionObject = function (ctx: NetscriptContext, type: string, name: string): IAction {
+ const getBladeburnerActionObject = function (ctx: NetscriptContext, type: string, name: string): Action {
const bladeburner = Player.bladeburner;
if (bladeburner === null) throw new Error("Must have joined bladeburner");
const actionId = bladeburner.getActionIdFromTypeAndName(type, name);
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index e083fb46a..73b8b0a50 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -15,7 +15,7 @@ import { LocationName } from "../../Locations/data/LocationNames";
import { IPlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
import { ICorporation } from "../../Corporation/ICorporation";
import { IGang } from "../../Gang/IGang";
-import { IBladeburner } from "../../Bladeburner/IBladeburner";
+import { Bladeburner } from "../../Bladeburner/Bladeburner";
import { HacknetNode } from "../../Hacknet/HacknetNode";
import { HashManager } from "../../Hacknet/HashManager";
@@ -34,7 +34,7 @@ export class PlayerObject extends Person {
bitNodeN = 1; //current bitnode
corporation: ICorporation | null = null;
gang: IGang | null = null;
- bladeburner: IBladeburner | null = null;
+ bladeburner: Bladeburner | null = null;
currentServer = "";
factions: string[] = [];
factionInvitations: string[] = [];
From 557bc1256233376961be8cb671ec0156b17b0897 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 03:15:00 -0400
Subject: [PATCH 26/46] More classes as types
---
src/Bladeburner/ActionIdentifier.ts | 3 +-
src/Bladeburner/Bladeburner.tsx | 21 +++---
src/Bladeburner/IActionIdentifier.ts | 4 --
src/Bladeburner/ui/StartButton.tsx | 3 +-
src/CotMG/BaseGift.ts | 29 ++++++++
src/CotMG/DummyGift.ts | 67 -------------------
src/CotMG/Helper.tsx | 6 +-
src/CotMG/IStaneksGift.ts | 22 ------
src/CotMG/StaneksGift.ts | 18 ++---
src/CotMG/ui/ActiveFragmentSummary.tsx | 4 +-
src/CotMG/ui/DummyGrid.tsx | 4 +-
src/CotMG/ui/FragmentInspector.tsx | 4 +-
src/CotMG/ui/FragmentSelector.tsx | 6 +-
src/CotMG/ui/Grid.tsx | 4 +-
src/CotMG/ui/MainBoard.tsx | 4 +-
src/CotMG/ui/StaneksGiftRoot.tsx | 4 +-
src/PersonObjects/Player/PlayerObject.ts | 2 +-
.../Player/PlayerObjectGeneralMethods.ts | 5 +-
18 files changed, 67 insertions(+), 143 deletions(-)
delete mode 100644 src/Bladeburner/IActionIdentifier.ts
create mode 100644 src/CotMG/BaseGift.ts
delete mode 100644 src/CotMG/DummyGift.ts
delete mode 100644 src/CotMG/IStaneksGift.ts
diff --git a/src/Bladeburner/ActionIdentifier.ts b/src/Bladeburner/ActionIdentifier.ts
index 9368bb874..cab31083f 100644
--- a/src/Bladeburner/ActionIdentifier.ts
+++ b/src/Bladeburner/ActionIdentifier.ts
@@ -1,4 +1,3 @@
-import { IActionIdentifier } from "./IActionIdentifier";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
interface IParams {
@@ -6,7 +5,7 @@ interface IParams {
type?: number;
}
-export class ActionIdentifier implements IActionIdentifier {
+export class ActionIdentifier {
name = "";
type = -1;
diff --git a/src/Bladeburner/Bladeburner.tsx b/src/Bladeburner/Bladeburner.tsx
index a7dff6eb2..1c88a4678 100644
--- a/src/Bladeburner/Bladeburner.tsx
+++ b/src/Bladeburner/Bladeburner.tsx
@@ -1,5 +1,4 @@
import { Reviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../utils/JSONReviver";
-import { IActionIdentifier } from "./IActionIdentifier";
import { ActionIdentifier } from "./ActionIdentifier";
import { ActionTypes } from "./data/ActionTypes";
import { Growths } from "./data/Growths";
@@ -66,7 +65,7 @@ export class Bladeburner {
actionTimeCurrent = 0;
actionTimeOverflow = 0;
- action: IActionIdentifier = new ActionIdentifier({
+ action: ActionIdentifier = new ActionIdentifier({
type: ActionTypes["Idle"],
});
@@ -88,11 +87,11 @@ export class Bladeburner {
events: true,
};
automateEnabled = false;
- automateActionHigh: IActionIdentifier = new ActionIdentifier({
+ automateActionHigh: ActionIdentifier = new ActionIdentifier({
type: ActionTypes["Idle"],
});
automateThreshHigh = 0;
- automateActionLow: IActionIdentifier = new ActionIdentifier({
+ automateActionLow: ActionIdentifier = new ActionIdentifier({
type: ActionTypes["Idle"],
});
automateThreshLow = 0;
@@ -124,7 +123,7 @@ export class Bladeburner {
return Math.min(1, this.stamina / (0.5 * this.maxStamina));
}
- canAttemptBlackOp(actionId: IActionIdentifier): BlackOpsAttempt {
+ canAttemptBlackOp(actionId: ActionIdentifier): BlackOpsAttempt {
// Safety measure - don't repeat BlackOps that are already done
if (this.blackops[actionId.name] != null) {
return { error: "Tried to start a Black Operation that had already been completed" };
@@ -162,7 +161,7 @@ export class Bladeburner {
}
/** This function is only for the player. Sleeves use their own functions to perform blade work. */
- startAction(actionId: IActionIdentifier): void {
+ startAction(actionId: ActionIdentifier): void {
if (actionId == null) return;
this.action = actionId;
this.actionTimeCurrent = 0;
@@ -309,7 +308,7 @@ export class Bladeburner {
}
// working on
- getActionIdFromTypeAndName(type = "", name = ""): IActionIdentifier | null {
+ getActionIdFromTypeAndName(type = "", name = ""): ActionIdentifier | null {
if (type === "" || name === "") {
return null;
}
@@ -1201,7 +1200,7 @@ export class Bladeburner {
}
}
- getActionObject(actionId: IActionIdentifier): Action | null {
+ getActionObject(actionId: ActionIdentifier): Action | null {
/**
* Given an ActionIdentifier object, returns the corresponding
* GeneralAction, Contract, Operation, or BlackOperation object
@@ -1231,7 +1230,7 @@ export class Bladeburner {
}
}
- completeContract(success: boolean, actionIdent: IActionIdentifier): void {
+ completeContract(success: boolean, actionIdent: ActionIdentifier): void {
if (actionIdent.type !== ActionTypes.Contract) {
throw new Error("completeContract() called even though current action is not a Contract");
}
@@ -1256,7 +1255,7 @@ export class Bladeburner {
}
}
- completeAction(person: Person, actionIdent: IActionIdentifier, isPlayer = true): ITaskTracker {
+ completeAction(person: Person, actionIdent: ActionIdentifier, isPlayer = true): ITaskTracker {
let retValue = createTaskTracker();
switch (actionIdent.type) {
case ActionTypes["Contract"]:
@@ -2060,7 +2059,7 @@ export class Bladeburner {
}
}
- getTypeAndNameFromActionId(actionId: IActionIdentifier): {
+ getTypeAndNameFromActionId(actionId: ActionIdentifier): {
type: string;
name: string;
} {
diff --git a/src/Bladeburner/IActionIdentifier.ts b/src/Bladeburner/IActionIdentifier.ts
deleted file mode 100644
index 3d2414e36..000000000
--- a/src/Bladeburner/IActionIdentifier.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface IActionIdentifier {
- name: string;
- type: number;
-}
diff --git a/src/Bladeburner/ui/StartButton.tsx b/src/Bladeburner/ui/StartButton.tsx
index b92f2b592..b7ff5489c 100644
--- a/src/Bladeburner/ui/StartButton.tsx
+++ b/src/Bladeburner/ui/StartButton.tsx
@@ -5,6 +5,7 @@ import { BlackOperation } from "../BlackOperation";
import { Player } from "../../Player";
import Button from "@mui/material/Button";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
+import { ActionIdentifier } from "../ActionIdentifier";
interface IProps {
bladeburner: Bladeburner;
@@ -13,7 +14,7 @@ interface IProps {
rerender: () => void;
}
export function StartButton(props: IProps): React.ReactElement {
- const action = props.bladeburner.getActionObject({ name: props.name, type: props.type });
+ const action = props.bladeburner.getActionObject(new ActionIdentifier({ name: props.name, type: props.type }));
if (action == null) {
throw new Error("Failed to get Operation Object for: " + props.name);
}
diff --git a/src/CotMG/BaseGift.ts b/src/CotMG/BaseGift.ts
new file mode 100644
index 000000000..9c6460679
--- /dev/null
+++ b/src/CotMG/BaseGift.ts
@@ -0,0 +1,29 @@
+import { ActiveFragment } from "./ActiveFragment";
+
+export class BaseGift {
+ fragments: ActiveFragment[];
+ _width?: number;
+ _height?: number;
+
+ constructor(width?: number, height?: number, fragments: ActiveFragment[] = []) {
+ this.fragments = fragments;
+ this._width = width;
+ this._height = height;
+ }
+
+ width(): number {
+ return this._width || 4;
+ }
+ height(): number {
+ return this._height || 4;
+ }
+ fragmentAt(worldX: number, worldY: number): ActiveFragment | undefined {
+ for (const aFrag of this.fragments) {
+ if (aFrag.fullAt(worldX, worldY)) {
+ return aFrag;
+ }
+ }
+
+ return undefined;
+ }
+}
diff --git a/src/CotMG/DummyGift.ts b/src/CotMG/DummyGift.ts
deleted file mode 100644
index 22de183a3..000000000
--- a/src/CotMG/DummyGift.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { ActiveFragment } from "./ActiveFragment";
-import { IStaneksGift } from "./IStaneksGift";
-
-export class DummyGift implements IStaneksGift {
- storedCycles = 0;
- fragments: ActiveFragment[] = [];
- _width: number;
- _height: number;
-
- constructor(width: number, height: number, fragments: ActiveFragment[]) {
- this.fragments = fragments;
- this._width = width;
- this._height = height;
- }
-
- width(): number {
- return this._width;
- }
- height(): number {
- return this._height;
- }
- charge(): void {
- throw new Error("unimplemented for dummy gift");
- }
- process(): void {
- throw new Error("unimplemented for dummy gift");
- }
- effect(): number {
- throw new Error("unimplemented for dummy gift");
- }
- canPlace(): boolean {
- throw new Error("unimplemented for dummy gift");
- }
- place(): boolean {
- throw new Error("unimplemented for dummy gift");
- }
- findFragment(): ActiveFragment | undefined {
- throw new Error("unimplemented for dummy gift");
- }
- fragmentAt(worldX: number, worldY: number): ActiveFragment | undefined {
- for (const aFrag of this.fragments) {
- if (aFrag.fullAt(worldX, worldY)) {
- return aFrag;
- }
- }
-
- return undefined;
- }
- delete(): boolean {
- throw new Error("unimplemented for dummy gift");
- }
- clear(): void {
- throw new Error("unimplemented for dummy gift");
- }
- count(): number {
- throw new Error("unimplemented for dummy gift");
- }
- inBonus(): boolean {
- throw new Error("unimplemented for dummy gift");
- }
- prestigeAugmentation(): void {
- throw new Error("unimplemented for dummy gift");
- }
- prestigeSourceFile(): void {
- throw new Error("unimplemented for dummy gift");
- }
-}
diff --git a/src/CotMG/Helper.tsx b/src/CotMG/Helper.tsx
index 854f6e0be..661c1948b 100644
--- a/src/CotMG/Helper.tsx
+++ b/src/CotMG/Helper.tsx
@@ -1,9 +1,9 @@
import { Reviver } from "../utils/JSONReviver";
+import { BaseGift } from "./BaseGift";
-import { IStaneksGift } from "./IStaneksGift";
import { StaneksGift } from "./StaneksGift";
-export let staneksGift: IStaneksGift = new StaneksGift();
+export let staneksGift = new StaneksGift();
export function loadStaneksGift(saveString: string): void {
if (saveString) {
@@ -23,7 +23,7 @@ export function zeros(width: number, height: number): number[][] {
return array;
}
-export function calculateGrid(gift: IStaneksGift): number[][] {
+export function calculateGrid(gift: BaseGift): number[][] {
const newgrid = zeros(gift.width(), gift.height()) as unknown as number[][];
for (let i = 0; i < gift.width(); i++) {
for (let j = 0; j < gift.height(); j++) {
diff --git a/src/CotMG/IStaneksGift.ts b/src/CotMG/IStaneksGift.ts
deleted file mode 100644
index 9dbc2c329..000000000
--- a/src/CotMG/IStaneksGift.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ActiveFragment } from "./ActiveFragment";
-import { Fragment } from "./Fragment";
-
-export interface IStaneksGift {
- storedCycles: number;
- fragments: ActiveFragment[];
- width(): number;
- height(): number;
- charge(fragment: ActiveFragment, threads: number): void;
- process(n: number): void;
- effect(fragment: ActiveFragment): number;
- canPlace(x: number, y: number, rotation: number, fragment: Fragment): boolean;
- place(x: number, y: number, rotation: number, fragment: Fragment): boolean;
- findFragment(rootX: number, rootY: number): ActiveFragment | undefined;
- fragmentAt(rootX: number, rootY: number): ActiveFragment | undefined;
- delete(rootX: number, rootY: number): boolean;
- clear(): void;
- count(fragment: Fragment): number;
- inBonus(): boolean;
- prestigeAugmentation(): void;
- prestigeSourceFile(): void;
-}
diff --git a/src/CotMG/StaneksGift.ts b/src/CotMG/StaneksGift.ts
index 876f9e41d..a914c4b6e 100644
--- a/src/CotMG/StaneksGift.ts
+++ b/src/CotMG/StaneksGift.ts
@@ -2,7 +2,7 @@ import { FactionNames } from "../Faction/data/FactionNames";
import { Fragment } from "./Fragment";
import { ActiveFragment } from "./ActiveFragment";
import { FragmentType } from "./FragmentType";
-import { IStaneksGift } from "./IStaneksGift";
+import { BaseGift } from "./BaseGift";
import { Factions } from "../Faction/Factions";
import { CalculateEffect } from "./formulas/effect";
import { StaneksGiftEvents } from "./StaneksGiftEvents";
@@ -14,9 +14,11 @@ import { Player } from "../Player";
import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
import { defaultMultipliers, mergeMultipliers, Multipliers, scaleMultipliers } from "../PersonObjects/Multipliers";
-export class StaneksGift implements IStaneksGift {
+export class StaneksGift extends BaseGift {
storedCycles = 0;
- fragments: ActiveFragment[] = [];
+ constructor() {
+ super();
+ }
baseSize(): number {
return StanekConstants.BaseSize + BitNodeMultipliers.StaneksGiftExtraSize + Player.sourceFileLvl(13);
@@ -95,16 +97,6 @@ export class StaneksGift implements IStaneksGift {
return this.fragments.find((f) => f.x === rootX && f.y === rootY);
}
- fragmentAt(worldX: number, worldY: number): ActiveFragment | undefined {
- for (const aFrag of this.fragments) {
- if (aFrag.fullAt(worldX, worldY)) {
- return aFrag;
- }
- }
-
- return undefined;
- }
-
count(fragment: Fragment): number {
let amt = 0;
for (const aFrag of this.fragments) {
diff --git a/src/CotMG/ui/ActiveFragmentSummary.tsx b/src/CotMG/ui/ActiveFragmentSummary.tsx
index 5eb8c4c03..75495a5be 100644
--- a/src/CotMG/ui/ActiveFragmentSummary.tsx
+++ b/src/CotMG/ui/ActiveFragmentSummary.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { ActiveFragment } from "../ActiveFragment";
-import { IStaneksGift } from "../IStaneksGift";
+import { StaneksGift } from "../StaneksGift";
import { FragmentType, Effect } from "../FragmentType";
import { numeralWrapper } from "../../ui/numeralFormat";
@@ -10,7 +10,7 @@ import Table from "@mui/material/Table";
import { TableBody, TableCell, TableRow } from "@mui/material";
type IProps = {
- gift: IStaneksGift;
+ gift: StaneksGift;
};
function formatEffect(effect: number, type: FragmentType): string {
diff --git a/src/CotMG/ui/DummyGrid.tsx b/src/CotMG/ui/DummyGrid.tsx
index 94dbbda89..ad2b675e8 100644
--- a/src/CotMG/ui/DummyGrid.tsx
+++ b/src/CotMG/ui/DummyGrid.tsx
@@ -1,7 +1,7 @@
import { Box, Table } from "@mui/material";
import * as React from "react";
import { ActiveFragment } from "../ActiveFragment";
-import { DummyGift } from "../DummyGift";
+import { BaseGift } from "../BaseGift";
import { Grid } from "./Grid";
import { zeros } from "../Helper";
@@ -12,7 +12,7 @@ interface IProps {
}
export function DummyGrid(props: IProps): React.ReactElement {
- const gift = new DummyGift(props.width, props.height, props.fragments);
+ const gift = new BaseGift(props.width, props.height, props.fragments);
const ghostGrid = zeros(props.width, props.height);
return (
diff --git a/src/CotMG/ui/FragmentInspector.tsx b/src/CotMG/ui/FragmentInspector.tsx
index 3582c3b55..0c089a4d3 100644
--- a/src/CotMG/ui/FragmentInspector.tsx
+++ b/src/CotMG/ui/FragmentInspector.tsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";
import { ActiveFragment } from "../ActiveFragment";
-import { IStaneksGift } from "../IStaneksGift";
+import { StaneksGift } from "../StaneksGift";
import { FragmentType, Effect } from "../FragmentType";
import { numeralWrapper } from "../../ui/numeralFormat";
@@ -8,7 +8,7 @@ import Paper from "@mui/material/Paper";
import Typography from "@mui/material/Typography";
type IProps = {
- gift: IStaneksGift;
+ gift: StaneksGift;
fragment: ActiveFragment | undefined;
x: number;
y: number;
diff --git a/src/CotMG/ui/FragmentSelector.tsx b/src/CotMG/ui/FragmentSelector.tsx
index 4a0af8967..3940e3599 100644
--- a/src/CotMG/ui/FragmentSelector.tsx
+++ b/src/CotMG/ui/FragmentSelector.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { Fragments, Fragment, NoneFragment, DeleteFragment } from "../Fragment";
import { FragmentType, Effect } from "../FragmentType";
-import { IStaneksGift } from "../IStaneksGift";
+import { StaneksGift } from "../StaneksGift";
import { FragmentPreview } from "./FragmentPreview";
import { numeralWrapper } from "../../ui/numeralFormat";
@@ -11,7 +11,7 @@ import Typography from "@mui/material/Typography";
import Box from "@mui/material/Box";
type IOptionProps = {
- gift: IStaneksGift;
+ gift: StaneksGift;
fragment: Fragment;
selectFragment: (fragment: Fragment) => void;
};
@@ -46,7 +46,7 @@ function FragmentOption(props: IOptionProps): React.ReactElement {
}
type IProps = {
- gift: IStaneksGift;
+ gift: StaneksGift;
selectFragment: (fragment: Fragment) => void;
};
diff --git a/src/CotMG/ui/Grid.tsx b/src/CotMG/ui/Grid.tsx
index 78dd13b98..82efcdf09 100644
--- a/src/CotMG/ui/Grid.tsx
+++ b/src/CotMG/ui/Grid.tsx
@@ -2,14 +2,14 @@ import { TableBody, TableRow } from "@mui/material";
import * as React from "react";
import { ActiveFragment } from "../ActiveFragment";
import { calculateGrid } from "../Helper";
-import { IStaneksGift } from "../IStaneksGift";
+import { BaseGift } from "../BaseGift";
import { Cell } from "./Cell";
interface IProps {
width: number;
height: number;
ghostGrid: number[][];
- gift: IStaneksGift;
+ gift: BaseGift;
enter(i: number, j: number): void;
click(i: number, j: number): void;
}
diff --git a/src/CotMG/ui/MainBoard.tsx b/src/CotMG/ui/MainBoard.tsx
index 21ddecbc6..a320dee53 100644
--- a/src/CotMG/ui/MainBoard.tsx
+++ b/src/CotMG/ui/MainBoard.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
import { Fragment, NoneFragment } from "../Fragment";
import { FragmentType } from "../FragmentType";
-import { IStaneksGift } from "../IStaneksGift";
+import { StaneksGift } from "../StaneksGift";
import { FragmentInspector } from "./FragmentInspector";
import { FragmentSelector } from "./FragmentSelector";
import Box from "@mui/material/Box";
@@ -14,7 +14,7 @@ import Tooltip from "@mui/material/Tooltip";
import Typography from "@mui/material/Typography";
interface IProps {
- gift: IStaneksGift;
+ gift: StaneksGift;
}
export function MainBoard(props: IProps): React.ReactElement {
diff --git a/src/CotMG/ui/StaneksGiftRoot.tsx b/src/CotMG/ui/StaneksGiftRoot.tsx
index eaacc58ad..d4c091ff8 100644
--- a/src/CotMG/ui/StaneksGiftRoot.tsx
+++ b/src/CotMG/ui/StaneksGiftRoot.tsx
@@ -3,7 +3,7 @@ import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFuncti
import { CONSTANTS } from "../../Constants";
import { StaneksGiftEvents } from "../StaneksGiftEvents";
import { MainBoard } from "./MainBoard";
-import { IStaneksGift } from "../IStaneksGift";
+import { StaneksGift } from "../StaneksGift";
import { Info } from "@mui/icons-material";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
import Typography from "@mui/material/Typography";
@@ -13,7 +13,7 @@ import { DummyGrid } from "./DummyGrid";
import Container from "@mui/material/Container";
type IProps = {
- staneksGift: IStaneksGift;
+ staneksGift: StaneksGift;
};
export function StaneksGiftRoot({ staneksGift }: IProps): React.ReactElement {
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index 73b8b0a50..d42cc2e39 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -178,4 +178,4 @@ export class PlayerObject extends Person {
}
}
-Reviver.constructors.PlayerObject = PlayerObject;
\ No newline at end of file
+Reviver.constructors.PlayerObject = PlayerObject;
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
index f27c3bd50..490d92739 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
@@ -23,10 +23,7 @@ import { CityName } from "../../Locations/data/CityNames";
import { LocationName } from "../../Locations/data/LocationNames";
import { Sleeve } from "../Sleeve/Sleeve";
import { isSleeveCompanyWork } from "../Sleeve/Work/SleeveCompanyWork";
-import {
- calculateSkillProgress as calculateSkillProgressF,
- ISkillProgress,
-} from "../formulas/skill";
+import { calculateSkillProgress as calculateSkillProgressF, ISkillProgress } from "../formulas/skill";
import { GetServer, AddToAllServers, createUniqueRandomIp } from "../../Server/AllServers";
import { Server } from "../../Server/Server";
import { safetlyCreateUniqueServer } from "../../Server/ServerHelpers";
From bc7c15ad77f3d7ac98fa153027f64dccdc122077 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 06:47:54 -0400
Subject: [PATCH 27/46] corp: classes are types
---
src/Corporation/Actions.ts | 36 ++++-----
src/Corporation/Employee.ts | 6 +-
src/Corporation/ICorporation.ts | 62 ---------------
src/Corporation/IIndustry.ts | 78 -------------------
src/Corporation/Industry.ts | 17 ++--
src/Corporation/IndustryData.tsx | 32 ++++----
src/Corporation/OfficeSpace.ts | 8 +-
src/Corporation/Product.ts | 6 +-
src/Corporation/Warehouse.ts | 10 +--
src/Corporation/ui/Context.ts | 16 ++--
src/Corporation/ui/CorporationRoot.tsx | 4 +-
src/Corporation/ui/ExpandIndustryTab.tsx | 4 +-
src/Corporation/ui/Helpers.tsx | 4 +-
.../ui/IndustryProductEquation.tsx | 4 +-
src/Corporation/ui/IndustryWarehouse.tsx | 8 +-
src/Corporation/ui/MainPanel.tsx | 4 +-
src/Corporation/ui/MoneyCost.tsx | 4 +-
src/Corporation/ui/modals/ExportModal.tsx | 10 +--
src/Corporation/ui/modals/ResearchModal.tsx | 6 +-
src/Corporation/ui/modals/SellSharesModal.tsx | 4 +-
.../ui/modals/UpgradeOfficeSizeModal.tsx | 4 +-
src/NetscriptFunctions/Corporation.ts | 13 ++--
src/PersonObjects/Player/PlayerObject.ts | 4 +-
23 files changed, 100 insertions(+), 244 deletions(-)
delete mode 100644 src/Corporation/ICorporation.ts
delete mode 100644 src/Corporation/IIndustry.ts
diff --git a/src/Corporation/Actions.ts b/src/Corporation/Actions.ts
index 07e475b6f..820017692 100644
--- a/src/Corporation/Actions.ts
+++ b/src/Corporation/Actions.ts
@@ -1,8 +1,6 @@
import { Player } from "../Player";
import { MaterialSizes } from "./MaterialSizes";
-import { ICorporation } from "./ICorporation";
import { Corporation } from "./Corporation";
-import { IIndustry } from "./IIndustry";
import { IndustryStartingCosts, IndustryResearchTrees } from "./IndustryData";
import { Industry } from "./Industry";
import { CorporationConstants } from "./data/Constants";
@@ -17,7 +15,7 @@ import { EmployeePositions } from "./EmployeePositions";
import { ResearchMap } from "./ResearchMap";
import { isRelevantMaterial } from "./ui/Helpers";
-export function NewIndustry(corporation: ICorporation, industry: string, name: string): void {
+export function NewIndustry(corporation: Corporation, industry: string, name: string): void {
if (corporation.divisions.find(({ type }) => industry == type))
throw new Error(`You have already expanded into the ${industry} industry!`);
@@ -47,7 +45,7 @@ export function NewIndustry(corporation: ICorporation, industry: string, name: s
}
}
-export function NewCity(corporation: ICorporation, division: IIndustry, city: string): void {
+export function NewCity(corporation: Corporation, division: Industry, city: string): void {
if (corporation.funds < CorporationConstants.OfficeInitialCost) {
throw new Error("You don't have enough company funds to open a new office!");
}
@@ -61,7 +59,7 @@ export function NewCity(corporation: ICorporation, division: IIndustry, city: st
});
}
-export function UnlockUpgrade(corporation: ICorporation, upgrade: CorporationUnlockUpgrade): void {
+export function UnlockUpgrade(corporation: Corporation, upgrade: CorporationUnlockUpgrade): void {
if (corporation.funds < upgrade.price) {
throw new Error("Insufficient funds");
}
@@ -71,7 +69,7 @@ export function UnlockUpgrade(corporation: ICorporation, upgrade: CorporationUnl
corporation.unlock(upgrade);
}
-export function LevelUpgrade(corporation: ICorporation, upgrade: CorporationUpgrade): void {
+export function LevelUpgrade(corporation: Corporation, upgrade: CorporationUpgrade): void {
const baseCost = upgrade.basePrice;
const priceMult = upgrade.priceMult;
const level = corporation.upgrades[upgrade.index];
@@ -83,7 +81,7 @@ export function LevelUpgrade(corporation: ICorporation, upgrade: CorporationUpgr
}
}
-export function IssueDividends(corporation: ICorporation, rate: number): void {
+export function IssueDividends(corporation: Corporation, rate: number): void {
if (isNaN(rate) || rate < 0 || rate > CorporationConstants.DividendMaxRate) {
throw new Error(`Invalid value. Must be an number between 0 and ${CorporationConstants.DividendMaxRate}`);
}
@@ -252,7 +250,7 @@ export function BuyMaterial(material: Material, amt: number): void {
material.buy = amt;
}
-export function BulkPurchase(corp: ICorporation, warehouse: Warehouse, material: Material, amt: number): void {
+export function BulkPurchase(corp: Corporation, warehouse: Warehouse, material: Material, amt: number): void {
const matSize = MaterialSizes[material.name];
const maxAmount = (warehouse.size - warehouse.sizeUsed) / matSize;
if (isNaN(amt) || amt < 0) {
@@ -270,7 +268,7 @@ export function BulkPurchase(corp: ICorporation, warehouse: Warehouse, material:
}
}
-export function SellShares(corporation: ICorporation, numShares: number): number {
+export function SellShares(corporation: Corporation, numShares: number): number {
if (isNaN(numShares)) throw new Error("Invalid value for number of shares");
if (numShares < 0) throw new Error("Invalid value for number of shares");
if (numShares > corporation.numShares) throw new Error("You don't have that many shares to sell!");
@@ -290,7 +288,7 @@ export function SellShares(corporation: ICorporation, numShares: number): number
return profit;
}
-export function BuyBackShares(corporation: ICorporation, numShares: number): boolean {
+export function BuyBackShares(corporation: Corporation, numShares: number): boolean {
if (isNaN(numShares)) throw new Error("Invalid value for number of shares");
if (numShares < 0) throw new Error("Invalid value for number of shares");
if (numShares > corporation.issuedShares) throw new Error("You don't have that many shares to buy!");
@@ -318,7 +316,7 @@ export function AutoAssignJob(office: OfficeSpace, job: string, count: number):
return office.autoAssignJob(job, count);
}
-export function UpgradeOfficeSize(corp: ICorporation, office: OfficeSpace, size: number): void {
+export function UpgradeOfficeSize(corp: Corporation, office: OfficeSpace, size: number): void {
const initialPriceMult = Math.round(office.size / CorporationConstants.OfficeInitialSize);
const costMultiplier = 1.09;
// Calculate cost to upgrade size by 15 employees
@@ -332,7 +330,7 @@ export function UpgradeOfficeSize(corp: ICorporation, office: OfficeSpace, size:
corp.funds = corp.funds - cost;
}
-export function BuyCoffee(corp: ICorporation, office: OfficeSpace): boolean {
+export function BuyCoffee(corp: Corporation, office: OfficeSpace): boolean {
const cost = office.getCoffeeCost();
if (corp.funds < cost) {
return false;
@@ -346,7 +344,7 @@ export function BuyCoffee(corp: ICorporation, office: OfficeSpace): boolean {
return true;
}
-export function ThrowParty(corp: ICorporation, office: OfficeSpace, costPerEmployee: number): number {
+export function ThrowParty(corp: Corporation, office: OfficeSpace, costPerEmployee: number): number {
const mult = 1 + costPerEmployee / 10e6;
const cost = costPerEmployee * office.employees.length;
if (corp.funds < cost) {
@@ -361,7 +359,7 @@ export function ThrowParty(corp: ICorporation, office: OfficeSpace, costPerEmplo
return mult;
}
-export function PurchaseWarehouse(corp: ICorporation, division: IIndustry, city: string): void {
+export function PurchaseWarehouse(corp: Corporation, division: Industry, city: string): void {
if (corp.funds < CorporationConstants.WarehouseInitialCost) return;
if (division.warehouses[city] instanceof Warehouse) return;
division.warehouses[city] = new Warehouse({
@@ -380,7 +378,7 @@ export function UpgradeWarehouseCost(warehouse: Warehouse, amt: number): number
);
}
-export function UpgradeWarehouse(corp: ICorporation, division: IIndustry, warehouse: Warehouse, amt = 1): void {
+export function UpgradeWarehouse(corp: Corporation, division: Industry, warehouse: Warehouse, amt = 1): void {
const sizeUpgradeCost = UpgradeWarehouseCost(warehouse, amt);
if (corp.funds < sizeUpgradeCost) return;
warehouse.level += amt;
@@ -388,7 +386,7 @@ export function UpgradeWarehouse(corp: ICorporation, division: IIndustry, wareho
corp.funds = corp.funds - sizeUpgradeCost;
}
-export function HireAdVert(corp: ICorporation, division: IIndustry): void {
+export function HireAdVert(corp: Corporation, division: Industry): void {
const cost = division.getAdVertCost();
if (corp.funds < cost) return;
corp.funds = corp.funds - cost;
@@ -396,8 +394,8 @@ export function HireAdVert(corp: ICorporation, division: IIndustry): void {
}
export function MakeProduct(
- corp: ICorporation,
- division: IIndustry,
+ corp: Corporation,
+ division: Industry,
city: string,
productName: string,
designInvest: number,
@@ -449,7 +447,7 @@ export function MakeProduct(
products[product.name] = product;
}
-export function Research(division: IIndustry, researchName: string): void {
+export function Research(division: Industry, researchName: string): void {
const researchTree = IndustryResearchTrees[division.type];
if (researchTree === undefined) throw new Error(`No research tree for industry '${division.type}'`);
const allResearch = researchTree.getAllNodes();
diff --git a/src/Corporation/Employee.ts b/src/Corporation/Employee.ts
index a8c71e636..8cbd5e9cb 100644
--- a/src/Corporation/Employee.ts
+++ b/src/Corporation/Employee.ts
@@ -2,8 +2,8 @@ import { CorporationConstants } from "./data/Constants";
import { getRandomInt } from "../utils/helpers/getRandomInt";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
import { EmployeePositions } from "./EmployeePositions";
-import { ICorporation } from "./ICorporation";
-import { IIndustry } from "./IIndustry";
+import { Corporation } from "./Corporation";
+import { Industry } from "./Industry";
interface IParams {
name?: string;
@@ -77,7 +77,7 @@ export class Employee {
return salary;
}
- calculateProductivity(corporation: ICorporation, industry: IIndustry): number {
+ calculateProductivity(corporation: Corporation, industry: Industry): number {
const effCre = this.cre * corporation.getEmployeeCreMultiplier() * industry.getEmployeeCreMultiplier(),
effCha = this.cha * corporation.getEmployeeChaMultiplier() * industry.getEmployeeChaMultiplier(),
effInt = this.int * corporation.getEmployeeIntMultiplier() * industry.getEmployeeIntMultiplier(),
diff --git a/src/Corporation/ICorporation.ts b/src/Corporation/ICorporation.ts
deleted file mode 100644
index ea71c6cf5..000000000
--- a/src/Corporation/ICorporation.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Industry } from "./Industry";
-import { CorporationUnlockUpgrade } from "./data/CorporationUnlockUpgrades";
-import { CorporationUpgrade } from "./data/CorporationUpgrades";
-import { CorporationState } from "./CorporationState";
-import { IReviverValue } from "../utils/JSONReviver";
-
-export interface ICorporation {
- name: string;
-
- divisions: Industry[];
-
- funds: number;
- revenue: number;
- expenses: number;
- fundingRound: number;
- public: boolean;
- totalShares: number;
- numShares: number;
- shareSalesUntilPriceUpdate: number;
- shareSaleCooldown: number;
- issueNewSharesCooldown: number;
- dividendRate: number;
- dividendTax: number;
- issuedShares: number;
- sharePrice: number;
- storedCycles: number;
- valuation: number;
-
- unlockUpgrades: number[];
- upgrades: number[];
- upgradeMultipliers: number[];
-
- state: CorporationState;
-
- addFunds(amt: number): void;
- getState(): string;
- storeCycles(numCycles: number): void;
- process(): void;
- determineValuation(): void;
- determineCycleValuation(): number;
- getTargetSharePrice(): number;
- updateSharePrice(): void;
- immediatelyUpdateSharePrice(): void;
- calculateShareSale(numShares: number): [number, number, number];
- convertCooldownToString(cd: number): string;
- unlock(upgrade: CorporationUnlockUpgrade): void;
- upgrade(upgrade: CorporationUpgrade): void;
- getProductionMultiplier(): number;
- getStorageMultiplier(): number;
- getDreamSenseGain(): number;
- getAdvertisingMultiplier(): number;
- getEmployeeCreMultiplier(): number;
- getEmployeeChaMultiplier(): number;
- getEmployeeIntMultiplier(): number;
- getEmployeeEffMultiplier(): number;
- getSalesMultiplier(): number;
- getScientificResearchMultiplier(): number;
- getStarterGuide(): void;
- updateDividendTax(): void;
- getCycleDividends(): number;
- toJSON(): IReviverValue;
-}
diff --git a/src/Corporation/IIndustry.ts b/src/Corporation/IIndustry.ts
deleted file mode 100644
index 0ea8646a1..000000000
--- a/src/Corporation/IIndustry.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Material } from "./Material";
-import { Warehouse } from "./Warehouse";
-import { ICorporation } from "./ICorporation";
-import { OfficeSpace } from "./OfficeSpace";
-import { Product } from "./Product";
-import { IReviverValue } from "../utils/JSONReviver";
-
-export interface IIndustry {
- name: string;
- type: string;
- sciResearch: Material;
- researched: { [key: string]: boolean | undefined };
- reqMats: { [key: string]: number | undefined };
-
- prodMats: string[];
-
- products: { [key: string]: Product | undefined };
- makesProducts: boolean;
-
- awareness: number;
- popularity: number;
- startingCost: number;
-
- reFac: number;
- sciFac: number;
- hwFac: number;
- robFac: number;
- aiFac: number;
- advFac: number;
-
- prodMult: number;
-
- // Decimal
- lastCycleRevenue: number;
- lastCycleExpenses: number;
- thisCycleRevenue: number;
- thisCycleExpenses: number;
-
- state: string;
- newInd: boolean;
- warehouses: { [key: string]: Warehouse | 0 };
- offices: { [key: string]: OfficeSpace | 0 };
- numAdVerts: number;
-
- init(): void;
- getProductDescriptionText(): string;
- getMaximumNumberProducts(): number;
- hasMaximumNumberProducts(): boolean;
- calculateProductionFactors(): void;
- updateWarehouseSizeUsed(warehouse: Warehouse): void;
- process(marketCycles: number, state: string, corporation: ICorporation): void;
- processMaterialMarket(): void;
- processProductMarket(marketCycles: number): void;
- processMaterials(marketCycles: number, corporation: ICorporation): [number, number];
- processProducts(marketCycles: number, corporation: ICorporation): [number, number];
- processProduct(marketCycles: number, product: Product, corporation: ICorporation): number;
- resetImports(state: string): void;
- discontinueProduct(product: Product): void;
- getAdVertCost(): number;
- applyAdVert(corporation: ICorporation): void;
- getOfficeProductivity(office: OfficeSpace, params?: { forProduct?: boolean }): number;
- getBusinessFactor(office: OfficeSpace): number;
- getAdvertisingFactors(): [number, number, number, number];
- getMarketFactor(mat: { dmd: number; cmp: number }): number;
- hasResearch(name: string): boolean;
- updateResearchTree(): void;
- getAdvertisingMultiplier(): number;
- getEmployeeChaMultiplier(): number;
- getEmployeeCreMultiplier(): number;
- getEmployeeEffMultiplier(): number;
- getEmployeeIntMultiplier(): number;
- getProductionMultiplier(): number;
- getProductProductionMultiplier(): number;
- getSalesMultiplier(): number;
- getScientificResearchMultiplier(): number;
- getStorageMultiplier(): number;
- toJSON(): IReviverValue;
-}
diff --git a/src/Corporation/Industry.ts b/src/Corporation/Industry.ts
index affcf04e2..74426c857 100644
--- a/src/Corporation/Industry.ts
+++ b/src/Corporation/Industry.ts
@@ -12,16 +12,15 @@ import { dialogBoxCreate } from "../ui/React/DialogBox";
import { isString } from "../utils/helpers/isString";
import { MaterialSizes } from "./MaterialSizes";
import { Warehouse } from "./Warehouse";
-import { ICorporation } from "./ICorporation";
-import { IIndustry } from "./IIndustry";
+import { Corporation } from "./Corporation";
interface IParams {
name?: string;
- corp?: ICorporation;
+ corp?: Corporation;
type?: string;
}
-export class Industry implements IIndustry {
+export class Industry {
name = "";
type = Industries.Agriculture;
sciResearch = new Material({ name: "Scientific Research" });
@@ -385,7 +384,7 @@ export class Industry implements IIndustry {
}
}
- process(marketCycles = 1, state: string, corporation: ICorporation): void {
+ process(marketCycles = 1, state: string, corporation: Corporation): void {
this.state = state;
//At the start of a cycle, store and reset revenue/expenses
@@ -518,7 +517,7 @@ export class Industry implements IIndustry {
}
//Process production, purchase, and import/export of materials
- processMaterials(marketCycles = 1, corporation: ICorporation): [number, number] {
+ processMaterials(marketCycles = 1, corporation: Corporation): [number, number] {
let revenue = 0,
expenses = 0;
this.calculateProductionFactors();
@@ -949,7 +948,7 @@ export class Industry implements IIndustry {
}
//Process production & sale of this industry's FINISHED products (including all of their stats)
- processProducts(marketCycles = 1, corporation: ICorporation): [number, number] {
+ processProducts(marketCycles = 1, corporation: Corporation): [number, number] {
let revenue = 0;
const expenses = 0;
@@ -985,7 +984,7 @@ export class Industry implements IIndustry {
}
//Processes FINISHED products
- processProduct(marketCycles = 1, product: Product, corporation: ICorporation): number {
+ processProduct(marketCycles = 1, product: Product, corporation: Corporation): number {
let totalProfit = 0;
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
const city = CorporationConstants.Cities[i];
@@ -1225,7 +1224,7 @@ export class Industry implements IIndustry {
return 1e9 * Math.pow(1.06, this.numAdVerts);
}
- applyAdVert(corporation: ICorporation): void {
+ applyAdVert(corporation: Corporation): void {
const advMult = corporation.getAdvertisingMultiplier() * this.getAdvertisingMultiplier();
const awareness = (this.awareness + 3 * advMult) * (1.01 * advMult);
this.awareness = Math.min(awareness, Number.MAX_VALUE);
diff --git a/src/Corporation/IndustryData.tsx b/src/Corporation/IndustryData.tsx
index d2ae99dd3..0608129ef 100644
--- a/src/Corporation/IndustryData.tsx
+++ b/src/Corporation/IndustryData.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { ResearchTree } from "./ResearchTree";
-import { ICorporation } from "./ICorporation";
+import { Corporation } from "./Corporation";
import { getBaseResearchTreeCopy, getProductIndustryResearchTreeCopy } from "./data/BaseResearchTree";
import { MoneyCost } from "./ui/MoneyCost";
@@ -59,8 +59,8 @@ export const IndustryStartingCosts: IIndustryMap = {
};
// Map of description for each industry
-export const IndustryDescriptions: IIndustryMap<(corp: ICorporation) => React.ReactElement> = {
- Energy: (corp: ICorporation) => (
+export const IndustryDescriptions: IIndustryMap<(corp: Corporation) => React.ReactElement> = {
+ Energy: (corp: Corporation) => (
<>
Engage in the production and distribution of energy.
;
- Division: React.Context;
+ Corporation: React.Context;
+ Division: React.Context;
} = {
- Corporation: React.createContext({} as ICorporation),
- Division: React.createContext({} as IIndustry),
+ Corporation: React.createContext({} as Corporation),
+ Division: React.createContext({} as Industry),
};
-export const useCorporation = (): ICorporation => useContext(Context.Corporation);
-export const useDivision = (): IIndustry => useContext(Context.Division);
+export const useCorporation = (): Corporation => useContext(Context.Corporation);
+export const useDivision = (): Industry => useContext(Context.Division);
diff --git a/src/Corporation/ui/CorporationRoot.tsx b/src/Corporation/ui/CorporationRoot.tsx
index ba24dbae8..3ca775af3 100644
--- a/src/Corporation/ui/CorporationRoot.tsx
+++ b/src/Corporation/ui/CorporationRoot.tsx
@@ -2,7 +2,7 @@
// These are the tabs at the top of the UI that let you switch to different
// divisions, see an overview of your corporation, or create a new industry
import React, { useState, useEffect } from "react";
-import { IIndustry } from "../IIndustry";
+import { Industry } from "../Industry";
import { MainPanel } from "./MainPanel";
import { Industries } from "../IndustryData";
import { ExpandIndustryTab } from "./ExpandIndustryTab";
@@ -32,7 +32,7 @@ export function CorporationRoot(): React.ReactElement {
const canExpand =
Object.keys(Industries).filter(
(industryType: string) =>
- corporation.divisions.find((division: IIndustry) => division.type === industryType) === undefined,
+ corporation.divisions.find((division: Industry) => division.type === industryType) === undefined,
).length > 0;
return (
diff --git a/src/Corporation/ui/ExpandIndustryTab.tsx b/src/Corporation/ui/ExpandIndustryTab.tsx
index 74faabadf..8c4a36df5 100644
--- a/src/Corporation/ui/ExpandIndustryTab.tsx
+++ b/src/Corporation/ui/ExpandIndustryTab.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import { dialogBoxCreate } from "../../ui/React/DialogBox";
import { IndustryStartingCosts, Industries, IndustryDescriptions } from "../IndustryData";
import { useCorporation } from "./Context";
-import { IIndustry } from "../IIndustry";
+import { Industry } from "../Industry";
import { NewIndustry } from "../Actions";
import Typography from "@mui/material/Typography";
@@ -23,7 +23,7 @@ export function ExpandIndustryTab(props: IProps): React.ReactElement {
const possibleIndustries = allIndustries
.filter(
(industryType: string) =>
- corp.divisions.find((division: IIndustry) => division.type === industryType) === undefined,
+ corp.divisions.find((division: Industry) => division.type === industryType) === undefined,
)
.sort();
const [industry, setIndustry] = useState(possibleIndustries.length > 0 ? possibleIndustries[0] : "");
diff --git a/src/Corporation/ui/Helpers.tsx b/src/Corporation/ui/Helpers.tsx
index 30d116105..9f7b505d5 100644
--- a/src/Corporation/ui/Helpers.tsx
+++ b/src/Corporation/ui/Helpers.tsx
@@ -1,8 +1,8 @@
-import { IIndustry } from "../IIndustry";
+import { Industry } from "../Industry";
// Returns a boolean indicating whether the given material is relevant for the
// current industry.
-export function isRelevantMaterial(matName: string, division: IIndustry): boolean {
+export function isRelevantMaterial(matName: string, division: Industry): boolean {
// Materials that affect Production multiplier
const prodMultiplierMats = ["Hardware", "Robots", "AICores", "RealEstate", "AI Cores", "Real Estate"];
diff --git a/src/Corporation/ui/IndustryProductEquation.tsx b/src/Corporation/ui/IndustryProductEquation.tsx
index ce43b555e..c245b06b0 100644
--- a/src/Corporation/ui/IndustryProductEquation.tsx
+++ b/src/Corporation/ui/IndustryProductEquation.tsx
@@ -1,9 +1,9 @@
import React from "react";
-import { IIndustry } from "../IIndustry";
+import { Industry } from "../Industry";
import { MathJaxWrapper } from "../../MathJaxWrapper";
interface IProps {
- division: IIndustry;
+ division: Industry;
}
export function IndustryProductEquation(props: IProps): React.ReactElement {
diff --git a/src/Corporation/ui/IndustryWarehouse.tsx b/src/Corporation/ui/IndustryWarehouse.tsx
index 0284e27ad..c60998cec 100644
--- a/src/Corporation/ui/IndustryWarehouse.tsx
+++ b/src/Corporation/ui/IndustryWarehouse.tsx
@@ -13,8 +13,8 @@ import { MaterialSizes } from "../MaterialSizes";
import { numeralWrapper } from "../../ui/numeralFormat";
-import { ICorporation } from "../ICorporation";
-import { IIndustry } from "../IIndustry";
+import { Corporation } from "../Corporation";
+import { Industry } from "../Industry";
import { MoneyCost } from "./MoneyCost";
import { isRelevantMaterial } from "./Helpers";
import { IndustryProductEquation } from "./IndustryProductEquation";
@@ -30,8 +30,8 @@ import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles";
interface IProps {
- corp: ICorporation;
- division: IIndustry;
+ corp: Corporation;
+ division: Industry;
warehouse: Warehouse | 0;
currentCity: string;
rerender: () => void;
diff --git a/src/Corporation/ui/MainPanel.tsx b/src/Corporation/ui/MainPanel.tsx
index 35a2833fd..ac865870d 100644
--- a/src/Corporation/ui/MainPanel.tsx
+++ b/src/Corporation/ui/MainPanel.tsx
@@ -4,7 +4,7 @@
import React from "react";
import { CityTabs } from "./CityTabs";
-import { IIndustry } from "../IIndustry";
+import { Industry } from "../Industry";
import { Context, useCorporation } from "./Context";
import { CityName } from "../../Locations/data/CityNames";
@@ -18,7 +18,7 @@ export function MainPanel(props: IProps): React.ReactElement {
const corp = useCorporation();
const division =
props.divisionName !== "Overview"
- ? corp.divisions.find((division: IIndustry) => division.name === props.divisionName)
+ ? corp.divisions.find((division: Industry) => division.name === props.divisionName)
: undefined; // use undefined because find returns undefined
if (division === undefined) throw new Error("Cannot find division");
diff --git a/src/Corporation/ui/MoneyCost.tsx b/src/Corporation/ui/MoneyCost.tsx
index 536ee2b95..8a2f17b6a 100644
--- a/src/Corporation/ui/MoneyCost.tsx
+++ b/src/Corporation/ui/MoneyCost.tsx
@@ -1,6 +1,6 @@
import * as React from "react";
import { numeralWrapper } from "../../ui/numeralFormat";
-import { ICorporation } from "../ICorporation";
+import { Corporation } from "../Corporation";
import { Theme } from "@mui/material/styles";
import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles";
@@ -18,7 +18,7 @@ const useStyles = makeStyles((theme: Theme) =>
interface IProps {
money: number;
- corp: ICorporation;
+ corp: Corporation;
}
export function MoneyCost(props: IProps): React.ReactElement {
diff --git a/src/Corporation/ui/modals/ExportModal.tsx b/src/Corporation/ui/modals/ExportModal.tsx
index 947e932de..8161261ec 100644
--- a/src/Corporation/ui/modals/ExportModal.tsx
+++ b/src/Corporation/ui/modals/ExportModal.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import { dialogBoxCreate } from "../../../ui/React/DialogBox";
import { Material } from "../../Material";
import { Export } from "../../Export";
-import { IIndustry } from "../../IIndustry";
+import { Industry } from "../../Industry";
import { ExportMaterial } from "../../Actions";
import { Modal } from "../../../ui/React/Modal";
import { useCorporation } from "../Context";
@@ -23,7 +23,7 @@ interface IProps {
// Create a popup that lets the player manage exports
export function ExportModal(props: IProps): React.ReactElement {
const corp = useCorporation();
- const possibleDivisions = corp.divisions.filter((division: IIndustry) =>
+ const possibleDivisions = corp.divisions.filter((division: Industry) =>
isRelevantMaterial(props.mat.name, division),
);
if (possibleDivisions.length === 0) throw new Error("Export popup created with no divisions.");
@@ -72,7 +72,7 @@ export function ExportModal(props: IProps): React.ReactElement {
rerender();
}
- const currentDivision = corp.divisions.find((division: IIndustry) => division.name === industry);
+ const currentDivision = corp.divisions.find((division: Industry) => division.name === industry);
if (currentDivision === undefined)
throw new Error(`Export popup somehow ended up with undefined division '${currentDivision}'`);
const possibleCities = Object.keys(currentDivision.warehouses).filter(
@@ -90,8 +90,8 @@ export function ExportModal(props: IProps): React.ReactElement {
{corp.divisions
- .filter((division: IIndustry) => isRelevantMaterial(props.mat.name, division))
- .map((division: IIndustry) => (
+ .filter((division: Industry) => isRelevantMaterial(props.mat.name, division))
+ .map((division: Industry) => (
{division.name}
diff --git a/src/Corporation/ui/modals/ResearchModal.tsx b/src/Corporation/ui/modals/ResearchModal.tsx
index d0c47d3aa..58a77ca31 100644
--- a/src/Corporation/ui/modals/ResearchModal.tsx
+++ b/src/Corporation/ui/modals/ResearchModal.tsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import { Modal } from "../../../ui/React/Modal";
import { IndustryResearchTrees } from "../../IndustryData";
import { CorporationConstants } from "../../data/Constants";
-import { IIndustry } from "../../IIndustry";
+import { Industry } from "../../Industry";
import { Research } from "../../Actions";
import { Node } from "../../ResearchTree";
import { ResearchMap } from "../../ResearchMap";
@@ -20,7 +20,7 @@ import CheckIcon from "@mui/icons-material/Check";
interface INodeProps {
n: Node | null;
- division: IIndustry;
+ division: Industry;
}
function Upgrade({ n, division }: INodeProps): React.ReactElement {
const [open, setOpen] = useState(false);
@@ -129,7 +129,7 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
interface IProps {
open: boolean;
onClose: () => void;
- industry: IIndustry;
+ industry: Industry;
}
// Create the Research Tree UI for this Industry
diff --git a/src/Corporation/ui/modals/SellSharesModal.tsx b/src/Corporation/ui/modals/SellSharesModal.tsx
index 455e6efcd..f034c47f1 100644
--- a/src/Corporation/ui/modals/SellSharesModal.tsx
+++ b/src/Corporation/ui/modals/SellSharesModal.tsx
@@ -3,7 +3,7 @@ import { numeralWrapper } from "../../../ui/numeralFormat";
import { dialogBoxCreate } from "../../../ui/React/DialogBox";
import { Modal } from "../../../ui/React/Modal";
import { useCorporation } from "../Context";
-import { ICorporation } from "../../ICorporation";
+import { Corporation } from "../../Corporation";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { Money } from "../../../ui/React/Money";
@@ -24,7 +24,7 @@ export function SellSharesModal(props: IProps): React.ReactElement {
const disabled = isNaN(shares) || shares <= 0 || shares > corp.numShares;
- function ProfitIndicator(props: { shares: number | null; corp: ICorporation }): React.ReactElement {
+ function ProfitIndicator(props: { shares: number | null; corp: Corporation }): React.ReactElement {
if (props.shares === null) return <>;
let text = "";
if (isNaN(props.shares) || props.shares <= 0) {
diff --git a/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx b/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
index 83d5a7952..3a49dc68b 100644
--- a/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
+++ b/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { numeralWrapper } from "../../../ui/numeralFormat";
import { CorporationConstants } from "../../data/Constants";
import { OfficeSpace } from "../../OfficeSpace";
-import { ICorporation } from "../../ICorporation";
+import { Corporation } from "../../Corporation";
import { UpgradeOfficeSize } from "../../Actions";
import { Modal } from "../../../ui/React/Modal";
import { useCorporation } from "../Context";
@@ -14,7 +14,7 @@ import Box from "@mui/material/Box";
interface IUpgradeButton {
cost: number;
size: number;
- corp: ICorporation;
+ corp: Corporation;
office: OfficeSpace;
onClose: () => void;
rerender: () => void;
diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts
index 0a8e3c0a9..8c0940245 100644
--- a/src/NetscriptFunctions/Corporation.ts
+++ b/src/NetscriptFunctions/Corporation.ts
@@ -5,8 +5,8 @@ import { Employee } from "../Corporation/Employee";
import { Product } from "../Corporation/Product";
import { Material } from "../Corporation/Material";
import { Warehouse } from "../Corporation/Warehouse";
-import { IIndustry } from "../Corporation/IIndustry";
-import { ICorporation } from "../Corporation/ICorporation";
+import { Industry } from "../Corporation/Industry";
+import { Corporation } from "../Corporation/Corporation";
import {
Corporation as NSCorporation,
@@ -59,7 +59,6 @@ import {
import { CorporationUnlockUpgrades } from "../Corporation/data/CorporationUnlockUpgrades";
import { CorporationUpgrades } from "../Corporation/data/CorporationUpgrades";
import { EmployeePositions } from "../Corporation/EmployeePositions";
-import { Industry } from "../Corporation/Industry";
import { IndustryResearchTrees, IndustryStartingCosts } from "../Corporation/IndustryData";
import { CorporationConstants } from "../Corporation/data/Constants";
import { ResearchMap } from "../Corporation/ResearchMap";
@@ -191,7 +190,7 @@ export function NetscriptCorporation(): InternalAPI {
return true;
}
- function getResearchCost(division: IIndustry, researchName: string): number {
+ function getResearchCost(division: Industry, researchName: string): number {
const researchTree = IndustryResearchTrees[division.type];
if (researchTree === undefined) throw new Error(`No research tree for industry '${division.type}'`);
const allResearch = researchTree.getAllNodes();
@@ -200,7 +199,7 @@ export function NetscriptCorporation(): InternalAPI {
return research.cost;
}
- function hasResearched(division: IIndustry, researchName: string): boolean {
+ function hasResearched(division: Industry, researchName: string): boolean {
return division.researched[researchName] === undefined ? false : (division.researched[researchName] as boolean);
}
@@ -223,13 +222,13 @@ export function NetscriptCorporation(): InternalAPI {
return true;
}
- function getCorporation(): ICorporation {
+ function getCorporation(): Corporation {
const corporation = player.corporation;
if (corporation === null) throw new Error("cannot be called without a corporation");
return corporation;
}
- function getDivision(divisionName: string): IIndustry {
+ function getDivision(divisionName: string): Industry {
const corporation = getCorporation();
const division = corporation.divisions.find((div) => div.name === divisionName);
if (division === undefined) throw new Error(`No division named '${divisionName}'`);
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index d42cc2e39..0dff3a48f 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -13,7 +13,7 @@ import { Exploit } from "../../Exploits/Exploit";
import { LocationName } from "../../Locations/data/LocationNames";
import { IPlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
-import { ICorporation } from "../../Corporation/ICorporation";
+import { Corporation } from "../../Corporation/Corporation";
import { IGang } from "../../Gang/IGang";
import { Bladeburner } from "../../Bladeburner/Bladeburner";
import { HacknetNode } from "../../Hacknet/HacknetNode";
@@ -32,7 +32,7 @@ import { Person } from "../Person";
export class PlayerObject extends Person {
// Player-specific properties
bitNodeN = 1; //current bitnode
- corporation: ICorporation | null = null;
+ corporation: Corporation | null = null;
gang: IGang | null = null;
bladeburner: Bladeburner | null = null;
currentServer = "";
From db835862d7fd439c3720dd89e5a254a18a2694ca Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 06:49:30 -0400
Subject: [PATCH 28/46] format
---
src/Corporation/ui/modals/ExportModal.tsx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/Corporation/ui/modals/ExportModal.tsx b/src/Corporation/ui/modals/ExportModal.tsx
index 8161261ec..41bdd057a 100644
--- a/src/Corporation/ui/modals/ExportModal.tsx
+++ b/src/Corporation/ui/modals/ExportModal.tsx
@@ -23,9 +23,7 @@ interface IProps {
// Create a popup that lets the player manage exports
export function ExportModal(props: IProps): React.ReactElement {
const corp = useCorporation();
- const possibleDivisions = corp.divisions.filter((division: Industry) =>
- isRelevantMaterial(props.mat.name, division),
- );
+ const possibleDivisions = corp.divisions.filter((division: Industry) => isRelevantMaterial(props.mat.name, division));
if (possibleDivisions.length === 0) throw new Error("Export popup created with no divisions.");
const defaultDivision = possibleDivisions[0];
if (Object.keys(defaultDivision.warehouses).length === 0)
From 6e3a6be1069081e8160ef36dd4c21841cd31b2b6 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 07:23:35 -0400
Subject: [PATCH 29/46] Remove some redundant typing
---
src/Bladeburner/data/Constants.ts | 30 +---------------
src/Bladeburner/data/SkillNames.ts | 17 +--------
src/Corporation/data/Constants.ts | 34 +-----------------
src/Corporation/ui/Context.ts | 5 +--
src/CotMG/data/Constants.ts | 6 +---
src/Gang/Gang.ts | 3 +-
src/Gang/GangMember.ts | 10 +++---
src/Gang/IGang.ts | 46 ------------------------
src/Gang/data/Constants.ts | 9 +----
src/Gang/ui/Context.ts | 10 +++---
src/Hacknet/data/Constants.ts | 45 ++---------------------
src/InteractiveTutorial.ts | 42 +++-------------------
src/PersonObjects/Player/PlayerObject.ts | 8 ++---
src/SourceFile/PlayerOwnedSourceFile.ts | 5 ---
14 files changed, 26 insertions(+), 244 deletions(-)
delete mode 100644 src/Gang/IGang.ts
diff --git a/src/Bladeburner/data/Constants.ts b/src/Bladeburner/data/Constants.ts
index 27a1e413c..96151f7fc 100644
--- a/src/Bladeburner/data/Constants.ts
+++ b/src/Bladeburner/data/Constants.ts
@@ -1,33 +1,5 @@
import { CityName } from "./../../Locations/data/CityNames";
-export const BladeburnerConstants: {
- CityNames: string[];
- CyclesPerSecond: number;
- StaminaGainPerSecond: number;
- BaseStaminaLoss: number;
- MaxStaminaToGainFactor: number;
- DifficultyToTimeFactor: number;
- DiffMultExponentialFactor: number;
- DiffMultLinearFactor: number;
- EffAgiLinearFactor: number;
- EffDexLinearFactor: number;
- EffAgiExponentialFactor: number;
- EffDexExponentialFactor: number;
- BaseRecruitmentTimeNeeded: number;
- PopulationThreshold: number;
- PopulationExponent: number;
- ChaosThreshold: number;
- BaseStatGain: number;
- BaseIntGain: number;
- ActionCountGrowthPeriod: number;
- RankToFactionRepFactor: number;
- RankNeededForFaction: number;
- ContractSuccessesPerLevel: number;
- OperationSuccessesPerLevel: number;
- RanksPerSkillPoint: number;
- ContractBaseMoneyGain: number;
- HrcHpGain: number;
- HrcStaminaGain: number;
-} = {
+export const BladeburnerConstants = {
CityNames: [
CityName.Aevum,
CityName.Chongqing,
diff --git a/src/Bladeburner/data/SkillNames.ts b/src/Bladeburner/data/SkillNames.ts
index 866ecac1f..7a0750633 100644
--- a/src/Bladeburner/data/SkillNames.ts
+++ b/src/Bladeburner/data/SkillNames.ts
@@ -1,19 +1,4 @@
-export const SkillNames: {
- BladesIntuition: string;
- Cloak: string;
- Marksman: string;
- WeaponProficiency: string;
- ShortCircuit: string;
- DigitalObserver: string;
- Tracer: string;
- Overclock: string;
- Reaper: string;
- EvasiveSystem: string;
- Datamancer: string;
- CybersEdge: string;
- HandsOfMidas: string;
- Hyperdrive: string;
-} = {
+export const SkillNames = {
BladesIntuition: "Blade's Intuition",
Cloak: "Cloak",
Marksman: "Marksman",
diff --git a/src/Corporation/data/Constants.ts b/src/Corporation/data/Constants.ts
index e3ef5757e..776e50f3d 100644
--- a/src/Corporation/data/Constants.ts
+++ b/src/Corporation/data/Constants.ts
@@ -1,39 +1,7 @@
import { CityName } from "./../../Locations/data/CityNames";
const CyclesPerMarketCycle = 50;
const AllCorporationStates = ["START", "PURCHASE", "PRODUCTION", "SALE", "EXPORT"];
-export const CorporationConstants: {
- INITIALSHARES: number;
- SHARESPERPRICEUPDATE: number;
- IssueNewSharesCooldown: number;
- SellSharesCooldown: number;
- CyclesPerMarketCycle: number;
- CyclesPerIndustryStateCycle: number;
- SecsPerMarketCycle: number;
- Cities: string[];
- WarehouseInitialCost: number;
- WarehouseInitialSize: number;
- WarehouseUpgradeBaseCost: number;
- OfficeInitialCost: number;
- OfficeInitialSize: number;
- OfficeUpgradeBaseCost: number;
- BribeThreshold: number;
- BribeToRepRatio: number;
- ProductProductionCostRatio: number;
- DividendMaxRate: number;
- EmployeeSalaryMultiplier: number;
- CyclesPerEmployeeRaise: number;
- EmployeeRaiseAmount: number;
- BaseMaxProducts: number;
- AllCorporationStates: string[];
- AllMaterials: string[];
- AllIndustryTypes: string[];
- AllUnlocks: string[];
- AllUpgrades: string[];
- AllResearch: string[];
- FundingRoundShares: number[];
- FundingRoundMultiplier: number[];
- ValuationLength: number;
-} = {
+export const CorporationConstants = {
INITIALSHARES: 1e9, //Total number of shares you have at your company
SHARESPERPRICEUPDATE: 1e6, //When selling large number of shares, price is dynamically updated for every batch of this amount
IssueNewSharesCooldown: 216e3, // 12 Hour in terms of game cycles
diff --git a/src/Corporation/ui/Context.ts b/src/Corporation/ui/Context.ts
index 42bcfcf72..5563110d5 100644
--- a/src/Corporation/ui/Context.ts
+++ b/src/Corporation/ui/Context.ts
@@ -2,10 +2,7 @@ import React, { useContext } from "react";
import { Corporation } from "../Corporation";
import { Industry } from "../Industry";
-export const Context: {
- Corporation: React.Context;
- Division: React.Context;
-} = {
+export const Context = {
Corporation: React.createContext({} as Corporation),
Division: React.createContext({} as Industry),
};
diff --git a/src/CotMG/data/Constants.ts b/src/CotMG/data/Constants.ts
index c8e42eb0b..578aac1e1 100644
--- a/src/CotMG/data/Constants.ts
+++ b/src/CotMG/data/Constants.ts
@@ -1,8 +1,4 @@
-export const StanekConstants: {
- RAMBonus: number;
- BaseSize: number;
- MaxSize: number;
-} = {
+export const StanekConstants = {
RAMBonus: 0.1,
BaseSize: 9,
MaxSize: 25,
diff --git a/src/Gang/Gang.ts b/src/Gang/Gang.ts
index 1e29d2cd8..3f7449d02 100644
--- a/src/Gang/Gang.ts
+++ b/src/Gang/Gang.ts
@@ -25,9 +25,8 @@ import { GangMember } from "./GangMember";
import { WorkerScript } from "../Netscript/WorkerScript";
import { Player } from "../Player";
import { PowerMultiplier } from "./data/power";
-import { IGang } from "./IGang";
-export class Gang implements IGang {
+export class Gang {
facName: string;
members: GangMember[];
wanted: number;
diff --git a/src/Gang/GangMember.ts b/src/Gang/GangMember.ts
index 80c745e64..177b10f8d 100644
--- a/src/Gang/GangMember.ts
+++ b/src/Gang/GangMember.ts
@@ -4,7 +4,7 @@ import { GangMemberUpgrade } from "./GangMemberUpgrade";
import { GangMemberUpgrades } from "./GangMemberUpgrades";
import { IAscensionResult } from "./IAscensionResult";
import { Player } from "../Player";
-import { IGang } from "./IGang";
+import { Gang } from "./Gang";
import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../utils/JSONReviver";
import {
calculateRespectGain,
@@ -111,7 +111,7 @@ export class GangMember {
return GangMemberTasks["Unassigned"];
}
- calculateRespectGain(gang: IGang): number {
+ calculateRespectGain(gang: Gang): number {
const task = this.getTask();
const g = {
respect: gang.respect,
@@ -121,7 +121,7 @@ export class GangMember {
return calculateRespectGain(g, this, task);
}
- calculateWantedLevelGain(gang: IGang): number {
+ calculateWantedLevelGain(gang: Gang): number {
const task = this.getTask();
const g = {
respect: gang.respect,
@@ -131,7 +131,7 @@ export class GangMember {
return calculateWantedLevelGain(g, this, task);
}
- calculateMoneyGain(gang: IGang): number {
+ calculateMoneyGain(gang: Gang): number {
const task = this.getTask();
const g = {
respect: gang.respect,
@@ -191,7 +191,7 @@ export class GangMember {
this.calculateAscensionMult(this.cha_asc_points);
}
- recordEarnedRespect(numCycles = 1, gang: IGang): void {
+ recordEarnedRespect(numCycles = 1, gang: Gang): void {
this.earnedRespect += this.calculateRespectGain(gang) * numCycles;
}
diff --git a/src/Gang/IGang.ts b/src/Gang/IGang.ts
deleted file mode 100644
index e2037534d..000000000
--- a/src/Gang/IGang.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { GangMemberUpgrade } from "./GangMemberUpgrade";
-import { GangMember } from "./GangMember";
-import { WorkerScript } from "../Netscript/WorkerScript";
-import { IAscensionResult } from "./IAscensionResult";
-import { IReviverValue } from "src/utils/JSONReviver";
-
-export interface IGang {
- facName: string;
- members: GangMember[];
- wanted: number;
- respect: number;
-
- isHackingGang: boolean;
-
- respectGainRate: number;
- wantedGainRate: number;
- moneyGainRate: number;
-
- storedCycles: number;
-
- storedTerritoryAndPowerCycles: number;
-
- territoryClashChance: number;
- territoryWarfareEngaged: boolean;
-
- notifyMemberDeath: boolean;
-
- getPower(): number;
- getTerritory(): number;
- process(numCycles: number): void;
- processGains(numCycles: number): void;
- processTerritoryAndPowerGains(numCycles: number): void;
- processExperienceGains(numCycles: number): void;
- clash(won: boolean): void;
- canRecruitMember(): boolean;
- getRespectNeededToRecruitMember(): number;
- recruitMember(name: string): boolean;
- getWantedPenalty(): number;
- calculatePower(): number;
- killMember(member: GangMember): void;
- ascendMember(member: GangMember, workerScript?: WorkerScript): IAscensionResult;
- getDiscount(): number;
- getAllTaskNames(): string[];
- getUpgradeCost(upg: GangMemberUpgrade): number;
- toJSON(): IReviverValue;
-}
diff --git a/src/Gang/data/Constants.ts b/src/Gang/data/Constants.ts
index 6d3ada486..fb4eaea00 100644
--- a/src/Gang/data/Constants.ts
+++ b/src/Gang/data/Constants.ts
@@ -1,13 +1,6 @@
import { FactionNames } from "../../Faction/data/FactionNames";
-export const GangConstants: {
- GangRespectToReputationRatio: number;
- MaximumGangMembers: number;
- CyclesPerTerritoryAndPowerUpdate: number;
- AscensionMultiplierRatio: number;
- Names: string[];
- GangKarmaRequirement: number;
-} = {
+export const GangConstants = {
// Respect is divided by this to get rep gain
GangRespectToReputationRatio: 75,
MaximumGangMembers: 12,
diff --git a/src/Gang/ui/Context.ts b/src/Gang/ui/Context.ts
index 267cf43d5..a968e90e8 100644
--- a/src/Gang/ui/Context.ts
+++ b/src/Gang/ui/Context.ts
@@ -1,10 +1,8 @@
import React, { useContext } from "react";
-import { IGang } from "../IGang";
+import { Gang } from "../Gang";
-export const Context: {
- Gang: React.Context;
-} = {
- Gang: React.createContext({} as IGang),
+export const Context = {
+ Gang: React.createContext({} as Gang),
};
-export const useGang = (): IGang => useContext(Context.Gang);
+export const useGang = (): Gang => useContext(Context.Gang);
diff --git a/src/Hacknet/data/Constants.ts b/src/Hacknet/data/Constants.ts
index 9d675eaea..db7b2f24f 100644
--- a/src/Hacknet/data/Constants.ts
+++ b/src/Hacknet/data/Constants.ts
@@ -1,23 +1,4 @@
-export const HacknetNodeConstants: {
- // Constants for Hacknet Node production
- MoneyGainPerLevel: number;
-
- // Constants for Hacknet Node purchase/upgrade costs
- BaseCost: number;
- LevelBaseCost: number;
- RamBaseCost: number;
- CoreBaseCost: number;
-
- PurchaseNextMult: number;
- UpgradeLevelMult: number;
- UpgradeRamMult: number;
- UpgradeCoreMult: number;
-
- // Constants for max upgrade levels for Hacknet Nodes
- MaxLevel: number;
- MaxRam: number;
- MaxCores: number;
-} = {
+export const HacknetNodeConstants = {
MoneyGainPerLevel: 1.5,
BaseCost: 1000,
@@ -48,29 +29,7 @@ export const PurchaseMultipliers: {
MAX: "MAX",
};
-export const HacknetServerConstants: {
- // Constants for Hacknet Server stats/production
- HashesPerLevel: number;
-
- // Constants for Hacknet Server purchase/upgrade costs
- BaseCost: number;
- RamBaseCost: number;
- CoreBaseCost: number;
- CacheBaseCost: number;
-
- PurchaseMult: number; // Multiplier for puchasing an additional Hacknet Server
- UpgradeLevelMult: number; // Multiplier for cost when upgrading level
- UpgradeRamMult: number; // Multiplier for cost when upgrading RAM
- UpgradeCoreMult: number; // Multiplier for cost when buying another core
- UpgradeCacheMult: number; // Multiplier for cost when upgrading cache
- MaxServers: number; // Max number of Hacknet Servers you can own
-
- // Constants for max upgrade levels for Hacknet Server
- MaxLevel: number;
- MaxRam: number;
- MaxCores: number;
- MaxCache: number;
-} = {
+export const HacknetServerConstants = {
HashesPerLevel: 0.001,
BaseCost: 50e3,
diff --git a/src/InteractiveTutorial.ts b/src/InteractiveTutorial.ts
index 2d7b16848..aec7c03ac 100644
--- a/src/InteractiveTutorial.ts
+++ b/src/InteractiveTutorial.ts
@@ -39,43 +39,7 @@ enum iTutorialSteps {
End,
}
-const ITutorial: {
- currStep: iTutorialSteps;
- isRunning: boolean;
- stepIsDone: {
- [iTutorialSteps.Start]: boolean;
- [iTutorialSteps.NSSelection]: boolean;
- [iTutorialSteps.GoToCharacterPage]: boolean;
- [iTutorialSteps.CharacterPage]: boolean;
- [iTutorialSteps.CharacterGoToTerminalPage]: boolean;
- [iTutorialSteps.TerminalIntro]: boolean;
- [iTutorialSteps.TerminalHelp]: boolean;
- [iTutorialSteps.TerminalLs]: boolean;
- [iTutorialSteps.TerminalScan]: boolean;
- [iTutorialSteps.TerminalScanAnalyze1]: boolean;
- [iTutorialSteps.TerminalScanAnalyze2]: boolean;
- [iTutorialSteps.TerminalConnect]: boolean;
- [iTutorialSteps.TerminalAnalyze]: boolean;
- [iTutorialSteps.TerminalNuke]: boolean;
- [iTutorialSteps.TerminalManualHack]: boolean;
- [iTutorialSteps.TerminalHackingMechanics]: boolean;
- [iTutorialSteps.TerminalGoHome]: boolean;
- [iTutorialSteps.TerminalCreateScript]: boolean;
- [iTutorialSteps.TerminalTypeScript]: boolean;
- [iTutorialSteps.TerminalFree]: boolean;
- [iTutorialSteps.TerminalRunScript]: boolean;
- [iTutorialSteps.TerminalGoToActiveScriptsPage]: boolean;
- [iTutorialSteps.ActiveScriptsPage]: boolean;
- [iTutorialSteps.ActiveScriptsToTerminal]: boolean;
- [iTutorialSteps.TerminalTailScript]: boolean;
- [iTutorialSteps.GoToHacknetNodesPage]: boolean;
- [iTutorialSteps.HacknetNodesIntroduction]: boolean;
- [iTutorialSteps.HacknetNodesGoToWorldPage]: boolean;
- [iTutorialSteps.WorldDescription]: boolean;
- [iTutorialSteps.TutorialPageInfo]: boolean;
- [iTutorialSteps.End]: boolean;
- };
-} = {
+const ITutorial = {
currStep: iTutorialSteps.Start,
isRunning: false,
@@ -141,7 +105,9 @@ function iTutorialPrevStep(): void {
function iTutorialEnd(): void {
ITutorial.isRunning = false;
ITutorial.currStep = iTutorialSteps.Start;
- Player.getHomeComputer().messages.push(LiteratureNames.HackersStartingHandbook);
+ const messages = Player.getHomeComputer().messages;
+ const handbook = LiteratureNames.HackersStartingHandbook;
+ if (!messages.includes(handbook)) messages.push(handbook);
ITutorialEvents.emit();
}
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index 0dff3a48f..d193e13f1 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -8,13 +8,13 @@ import * as workMethods from "./PlayerObjectWorkMethods";
import { IMap } from "../../types";
import { Sleeve } from "../Sleeve/Sleeve";
-import { IPlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
+import { PlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
import { Exploit } from "../../Exploits/Exploit";
import { LocationName } from "../../Locations/data/LocationNames";
import { IPlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
import { Corporation } from "../../Corporation/Corporation";
-import { IGang } from "../../Gang/IGang";
+import { Gang } from "../../Gang/Gang";
import { Bladeburner } from "../../Bladeburner/Bladeburner";
import { HacknetNode } from "../../Hacknet/HacknetNode";
@@ -33,7 +33,7 @@ export class PlayerObject extends Person {
// Player-specific properties
bitNodeN = 1; //current bitnode
corporation: Corporation | null = null;
- gang: IGang | null = null;
+ gang: Gang | null = null;
bladeburner: Bladeburner | null = null;
currentServer = "";
factions: string[] = [];
@@ -58,7 +58,7 @@ export class PlayerObject extends Person {
scriptProdSinceLastAug = 0;
sleeves: Sleeve[] = [];
sleevesFromCovenant = 0;
- sourceFiles: IPlayerOwnedSourceFile[] = [];
+ sourceFiles: PlayerOwnedSourceFile[] = [];
exploits: Exploit[] = [];
achievements: PlayerAchievement[] = [];
terminalCommandHistory: string[] = [];
diff --git a/src/SourceFile/PlayerOwnedSourceFile.ts b/src/SourceFile/PlayerOwnedSourceFile.ts
index 1d6374c1b..55d99667f 100644
--- a/src/SourceFile/PlayerOwnedSourceFile.ts
+++ b/src/SourceFile/PlayerOwnedSourceFile.ts
@@ -10,8 +10,3 @@ export class PlayerOwnedSourceFile {
this.lvl = level;
}
}
-
-export interface IPlayerOwnedSourceFile {
- lvl: number;
- n: number;
-}
From 37d9b0c78d2b3901e146dc35e18921a7828a4d2a Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 07:39:53 -0400
Subject: [PATCH 30/46] Fix gang faction type
---
src/Gang/data/Constants.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Gang/data/Constants.ts b/src/Gang/data/Constants.ts
index fb4eaea00..2c4f072cf 100644
--- a/src/Gang/data/Constants.ts
+++ b/src/Gang/data/Constants.ts
@@ -16,6 +16,6 @@ export const GangConstants = {
FactionNames.SpeakersForTheDead,
FactionNames.NiteSec,
FactionNames.TheBlackHand,
- ],
+ ] as string[],
GangKarmaRequirement: -54000,
};
From e5e6b05be0e11b33b46e7cfb88328242961e37a5 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Fri, 23 Sep 2022 08:27:16 -0400
Subject: [PATCH 31/46] format+lint+build fix
---
src/NetscriptFunctions/Singularity.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts
index 7ccda9de0..e4d6217cd 100644
--- a/src/NetscriptFunctions/Singularity.ts
+++ b/src/NetscriptFunctions/Singularity.ts
@@ -1320,7 +1320,7 @@ export function NetscriptSingularity(): InternalAPI {
},
exportGame: (ctx: NetscriptContext) => (): void => {
helpers.checkSingularityAccess(ctx);
- onExport(player);
+ onExport();
return saveObject.exportGame();
},
exportGameBonus: (ctx: NetscriptContext) => (): boolean => {
From 88505e93788b8c4adbed0e7073cb22df3620d613 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 12:51:25 -0400
Subject: [PATCH 32/46] stray lint fix
---
src/Augmentation/data/AugmentationCreator.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Augmentation/data/AugmentationCreator.tsx b/src/Augmentation/data/AugmentationCreator.tsx
index b34f48eb5..04f3085cb 100644
--- a/src/Augmentation/data/AugmentationCreator.tsx
+++ b/src/Augmentation/data/AugmentationCreator.tsx
@@ -6,7 +6,6 @@ import { WHRNG } from "../../Casino/RNG";
import React from "react";
import { FactionNames } from "../../Faction/data/FactionNames";
import { CONSTANTS } from "../../Constants";
-import { Faction } from "src/Faction/Faction";
interface CircadianBonus {
bonuses: {
From ba1a10b4f794d205920a7b04e97fc34b59ff80e4 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Sun, 28 Aug 2022 05:33:38 -0400
Subject: [PATCH 33/46] Unify error handling
---
src/Casino/Game.tsx | 31 +++++++++++++++++++++++
src/Locations/LocationsHelpers.tsx | 40 ++++++++++++++++++++++++++++++
src/NetscriptWorker.ts | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 src/Casino/Game.tsx
create mode 100644 src/Locations/LocationsHelpers.tsx
diff --git a/src/Casino/Game.tsx b/src/Casino/Game.tsx
new file mode 100644
index 000000000..b20eda813
--- /dev/null
+++ b/src/Casino/Game.tsx
@@ -0,0 +1,31 @@
+import * as React from "react";
+import { IPlayer } from "../PersonObjects/IPlayer";
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+
+const gainLimit = 10e9;
+
+export function win(p: IPlayer, n: number): void {
+ p.gainMoney(n, "casino");
+}
+
+export function reachedLimit(p: IPlayer): boolean {
+ const reached = p.getCasinoWinnings() > gainLimit;
+ if (reached) {
+ dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
+ }
+ return reached;
+}
+
+export class Game extends React.Component {
+ win(p: IPlayer, n: number): void {
+ p.gainMoney(n, "casino");
+ }
+
+ reachedLimit(p: IPlayer): boolean {
+ const reached = p.getCasinoWinnings() > gainLimit;
+ if (reached) {
+ dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
+ }
+ return reached;
+ }
+}
diff --git a/src/Locations/LocationsHelpers.tsx b/src/Locations/LocationsHelpers.tsx
new file mode 100644
index 000000000..86e449f2e
--- /dev/null
+++ b/src/Locations/LocationsHelpers.tsx
@@ -0,0 +1,40 @@
+/**
+ * Location and traveling-related helper functions.
+ * Mostly used for UI
+ */
+import { SpecialServers } from "../Server/data/SpecialServers";
+import { CONSTANTS } from "../Constants";
+
+import { IPlayer } from "../PersonObjects/IPlayer";
+import { GetServer } from "../Server/AllServers";
+
+import { dialogBoxCreate } from "../ui/React/DialogBox";
+
+/**
+ * Attempt to purchase a TOR router
+ * @param {IPlayer} p - Player object
+ */
+export function purchaseTorRouter(p: IPlayer): void {
+ if (p.hasTorRouter()) {
+ dialogBoxCreate(`You already have a TOR Router!`);
+ return;
+ }
+ if (!p.canAfford(CONSTANTS.TorRouterCost)) {
+ dialogBoxCreate("You cannot afford to purchase the TOR router!");
+ return;
+ }
+ p.loseMoney(CONSTANTS.TorRouterCost, "other");
+
+ const darkweb = GetServer(SpecialServers.DarkWeb);
+ if (!darkweb) {
+ throw new Error("Dark web is not a server.");
+ }
+
+ p.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
+ darkweb.serversOnNetwork.push(p.getHomeComputer().hostname);
+ dialogBoxCreate(
+ "You have purchased a TOR router!\n" +
+ "You now have access to the dark web from your home computer.\n" +
+ "Use the scan/scan-analyze commands to search for the dark web connection.",
+ );
+}
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index a69548656..847f3e622 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -24,7 +24,7 @@ import { Settings } from "./Settings/Settings";
import { generate } from "escodegen";
-import { dialogBoxCreate } from "./ui/React/DialogBox";
+import { dialogBoxCreate} from "./ui/React/DialogBox";
import { arrayToString } from "./utils/helpers/arrayToString";
import { roundToTwo } from "./utils/helpers/roundToTwo";
From 0e67fbee21e4862ce57b3262c3a260a5015e9248 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 29 Aug 2022 02:41:17 -0400
Subject: [PATCH 34/46] Unify error handling
---
src/Netscript/killWorkerScript.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Netscript/killWorkerScript.ts b/src/Netscript/killWorkerScript.ts
index 84224ca49..658565569 100644
--- a/src/Netscript/killWorkerScript.ts
+++ b/src/Netscript/killWorkerScript.ts
@@ -62,7 +62,8 @@ function stopAndCleanUpWorkerScript(ws: WorkerScript): void {
//Clean up any ongoing netscriptDelay
if (ws.delay) clearTimeout(ws.delay);
ws.delayReject?.(new ScriptDeath(ws));
-
+ ws.env.runningFn = "";
+
if (typeof ws.atExit === "function") {
try {
ws.env.stopFlag = false;
From 3a139518d8dad0e52e081e67786c41559c38a157 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Mon, 5 Sep 2022 09:55:57 -0400
Subject: [PATCH 35/46] unified errors
---
src/NetscriptWorker.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/NetscriptWorker.ts b/src/NetscriptWorker.ts
index 847f3e622..a69548656 100644
--- a/src/NetscriptWorker.ts
+++ b/src/NetscriptWorker.ts
@@ -24,7 +24,7 @@ import { Settings } from "./Settings/Settings";
import { generate } from "escodegen";
-import { dialogBoxCreate} from "./ui/React/DialogBox";
+import { dialogBoxCreate } from "./ui/React/DialogBox";
import { arrayToString } from "./utils/helpers/arrayToString";
import { roundToTwo } from "./utils/helpers/roundToTwo";
From c5f2b959f62b9a2edfd3d8027ea03fd198030285 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 6 Sep 2022 09:07:12 -0400
Subject: [PATCH 36/46] commit1
---
src/Casino/Game.tsx | 31 -----------------------
src/Locations/LocationsHelpers.tsx | 40 ------------------------------
2 files changed, 71 deletions(-)
delete mode 100644 src/Casino/Game.tsx
delete mode 100644 src/Locations/LocationsHelpers.tsx
diff --git a/src/Casino/Game.tsx b/src/Casino/Game.tsx
deleted file mode 100644
index b20eda813..000000000
--- a/src/Casino/Game.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as React from "react";
-import { IPlayer } from "../PersonObjects/IPlayer";
-import { dialogBoxCreate } from "../ui/React/DialogBox";
-
-const gainLimit = 10e9;
-
-export function win(p: IPlayer, n: number): void {
- p.gainMoney(n, "casino");
-}
-
-export function reachedLimit(p: IPlayer): boolean {
- const reached = p.getCasinoWinnings() > gainLimit;
- if (reached) {
- dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
- }
- return reached;
-}
-
-export class Game extends React.Component {
- win(p: IPlayer, n: number): void {
- p.gainMoney(n, "casino");
- }
-
- reachedLimit(p: IPlayer): boolean {
- const reached = p.getCasinoWinnings() > gainLimit;
- if (reached) {
- dialogBoxCreate("Alright cheater get out of here. You're not allowed here anymore.");
- }
- return reached;
- }
-}
diff --git a/src/Locations/LocationsHelpers.tsx b/src/Locations/LocationsHelpers.tsx
deleted file mode 100644
index 86e449f2e..000000000
--- a/src/Locations/LocationsHelpers.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Location and traveling-related helper functions.
- * Mostly used for UI
- */
-import { SpecialServers } from "../Server/data/SpecialServers";
-import { CONSTANTS } from "../Constants";
-
-import { IPlayer } from "../PersonObjects/IPlayer";
-import { GetServer } from "../Server/AllServers";
-
-import { dialogBoxCreate } from "../ui/React/DialogBox";
-
-/**
- * Attempt to purchase a TOR router
- * @param {IPlayer} p - Player object
- */
-export function purchaseTorRouter(p: IPlayer): void {
- if (p.hasTorRouter()) {
- dialogBoxCreate(`You already have a TOR Router!`);
- return;
- }
- if (!p.canAfford(CONSTANTS.TorRouterCost)) {
- dialogBoxCreate("You cannot afford to purchase the TOR router!");
- return;
- }
- p.loseMoney(CONSTANTS.TorRouterCost, "other");
-
- const darkweb = GetServer(SpecialServers.DarkWeb);
- if (!darkweb) {
- throw new Error("Dark web is not a server.");
- }
-
- p.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
- darkweb.serversOnNetwork.push(p.getHomeComputer().hostname);
- dialogBoxCreate(
- "You have purchased a TOR router!\n" +
- "You now have access to the dark web from your home computer.\n" +
- "Use the scan/scan-analyze commands to search for the dark web connection.",
- );
-}
From 5f0758d04c22fa84d8a329e7b59769e6ce7a6cea Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Sun, 11 Sep 2022 15:20:25 -0400
Subject: [PATCH 37/46] Fix lit files, reallow html alerts
---
src/Literature/{LiteratureHelpers.ts => LiteratureHelpers.tsx} | 1 +
1 file changed, 1 insertion(+)
rename src/Literature/{LiteratureHelpers.ts => LiteratureHelpers.tsx} (92%)
diff --git a/src/Literature/LiteratureHelpers.ts b/src/Literature/LiteratureHelpers.tsx
similarity index 92%
rename from src/Literature/LiteratureHelpers.ts
rename to src/Literature/LiteratureHelpers.tsx
index b059d829e..e2dad5a8d 100644
--- a/src/Literature/LiteratureHelpers.ts
+++ b/src/Literature/LiteratureHelpers.tsx
@@ -1,3 +1,4 @@
+import React from "react";
import { Literatures } from "./Literatures";
import { dialogBoxCreate } from "../ui/React/DialogBox";
From bc2bdbe137ad1b6dd523836ad55437d897eb07a0 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:28:18 -0400
Subject: [PATCH 38/46] revert unnecessary file rename
---
src/Literature/{LiteratureHelpers.tsx => LiteratureHelpers.ts} | 1 -
1 file changed, 1 deletion(-)
rename src/Literature/{LiteratureHelpers.tsx => LiteratureHelpers.ts} (92%)
diff --git a/src/Literature/LiteratureHelpers.tsx b/src/Literature/LiteratureHelpers.ts
similarity index 92%
rename from src/Literature/LiteratureHelpers.tsx
rename to src/Literature/LiteratureHelpers.ts
index e2dad5a8d..b059d829e 100644
--- a/src/Literature/LiteratureHelpers.tsx
+++ b/src/Literature/LiteratureHelpers.ts
@@ -1,4 +1,3 @@
-import React from "react";
import { Literatures } from "./Literatures";
import { dialogBoxCreate } from "../ui/React/DialogBox";
From 0dbe80a841727ffad26399e2f18c3a75bf82ac44 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 01:57:46 -0400
Subject: [PATCH 39/46] Player is now a Person
Use correct class inheritance, use class as type and remove IPlayer
---
src/PersonObjects/Sleeve/Sleeve.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 2b0d5c4a5..07921514b 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -45,6 +45,7 @@ import { SleeveSupportWork } from "./Work/SleeveSupportWork";
import { SleeveBladeburnerWork } from "./Work/SleeveBladeburnerWork";
import { SleeveCrimeWork } from "./Work/SleeveCrimeWork";
import * as sleeveMethods from "./SleeveMethods";
+import { mergeMultipliers } from "../Multipliers";
export class Sleeve extends Person {
currentWork: Work | null = null;
From 8a9515f15407aad5400c7288c58c1ed13aab025a Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 20 Sep 2022 03:15:00 -0400
Subject: [PATCH 40/46] More classes as types
---
src/PersonObjects/Sleeve/Sleeve.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 07921514b..2b0d5c4a5 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -45,7 +45,6 @@ import { SleeveSupportWork } from "./Work/SleeveSupportWork";
import { SleeveBladeburnerWork } from "./Work/SleeveBladeburnerWork";
import { SleeveCrimeWork } from "./Work/SleeveCrimeWork";
import * as sleeveMethods from "./SleeveMethods";
-import { mergeMultipliers } from "../Multipliers";
export class Sleeve extends Person {
currentWork: Work | null = null;
From b364cdf7343c365f4edd3e39e2cca8fe41011cb8 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:20:42 -0400
Subject: [PATCH 41/46] Rebase fix, move hasAugmentation to Person
---
src/Crime/CrimeHelpers.ts | 1 +
src/PersonObjects/PersonMethods.ts | 4 ++++
src/PersonObjects/Player/PlayerObject.ts | 5 +---
.../Player/PlayerObjectAugmentationMethods.ts | 23 -------------------
4 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/src/Crime/CrimeHelpers.ts b/src/Crime/CrimeHelpers.ts
index 56cbe7bc6..c11b6ee47 100644
--- a/src/Crime/CrimeHelpers.ts
+++ b/src/Crime/CrimeHelpers.ts
@@ -4,6 +4,7 @@ import { Player } from "../Player";
import { dialogBoxCreate } from "../ui/React/DialogBox";
+//This is only used for the player
export function determineCrimeSuccess(type: string): boolean {
let chance = 0;
let found = false;
diff --git a/src/PersonObjects/PersonMethods.ts b/src/PersonObjects/PersonMethods.ts
index b3657c438..9c4d4bbb8 100644
--- a/src/PersonObjects/PersonMethods.ts
+++ b/src/PersonObjects/PersonMethods.ts
@@ -197,3 +197,7 @@ export function updateSkillLevels(this: Person): void {
this.hp.max = Math.floor(10 + this.skills.defense / 10);
this.hp.current = Math.round(this.hp.max * ratio);
}
+
+export function hasAugmentation(this: Person, augName: string, ignoreQueued: boolean = false) {
+ return this.augmentations.some((a) => a.name === augName && (ignoreQueued || !this.queuedAugmentations.includes(a)));
+}
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index d193e13f1..7ee34ca1f 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -53,9 +53,7 @@ export class PlayerObject extends Person {
moneySourceB = new MoneySourceTracker();
playtimeSinceLastAug = 0;
playtimeSinceLastBitnode = 0;
- purchasedServers: string[] = [];
- queuedAugmentations: IPlayerOwnedAugmentation[] = [];
- scriptProdSinceLastAug = 0;
+ purchasedServers: string[] = []; scriptProdSinceLastAug = 0;
sleeves: Sleeve[] = [];
sleevesFromCovenant = 0;
sourceFiles: PlayerOwnedSourceFile[] = [];
@@ -105,7 +103,6 @@ export class PlayerObject extends Person {
getUpgradeHomeRamCost = serverMethods.getUpgradeHomeRamCost;
getUpgradeHomeCoresCost = serverMethods.getUpgradeHomeCoresCost;
gotoLocation = generalMethods.gotoLocation;
- hasAugmentation = augmentationMethods.hasAugmentation;
hasCorporation = corporationMethods.hasCorporation;
hasGangWith = gangMethods.hasGangWith;
hasTorRouter = serverMethods.hasTorRouter;
diff --git a/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts b/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
index 45bfbd44a..a5da1c307 100644
--- a/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
@@ -2,31 +2,8 @@
* Augmentation-related methods for the Player class (PlayerObject)
*/
import { PlayerObject } from "./PlayerObject";
-
-import { Augmentation } from "../../Augmentation/Augmentation";
-
import { calculateEntropy } from "../Grafting/EntropyAccumulation";
-export function hasAugmentation(this: PlayerObject, aug: string | Augmentation, ignoreQueued = false): boolean {
- const augName: string = aug instanceof Augmentation ? aug.name : aug;
-
- for (const owned of this.augmentations) {
- if (owned.name === augName) {
- return true;
- }
- }
-
- if (!ignoreQueued) {
- for (const owned of this.queuedAugmentations) {
- if (owned.name === augName) {
- return true;
- }
- }
- }
-
- return false;
-}
-
export function applyEntropy(this: PlayerObject, stacks = 1): void {
// Re-apply all multipliers
this.reapplyAllAugmentations();
From 81412db02e2f7e81f62f6fd1de14de970b93e4ac Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:27:17 -0400
Subject: [PATCH 42/46] format & lint fix
---
src/PersonObjects/Person.ts | 13 ++++---------
src/PersonObjects/Player/PlayerObject.ts | 3 ++-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/PersonObjects/Person.ts b/src/PersonObjects/Person.ts
index 794f2ed62..e1e8c3243 100644
--- a/src/PersonObjects/Person.ts
+++ b/src/PersonObjects/Person.ts
@@ -32,14 +32,11 @@ export abstract class Person {
mults = defaultMultipliers();
- /**
- * Augmentations
- */
+ /** Augmentations */
augmentations: IPlayerOwnedAugmentation[] = [];
+ queuedAugmentations: IPlayerOwnedAugmentation[] = [];
- /**
- * City that the person is in
- */
+ /** City that the person is in */
city: CityName = CityName.Sector12;
gainHackingExp = personMethods.gainHackingExp;
@@ -55,9 +52,7 @@ export abstract class Person {
updateSkillLevels = personMethods.updateSkillLevels;
calculateSkill = calculateSkill; //Class version is equal to imported version
- /**
- * Reset all multipliers to 1
- */
+ /** Reset all multipliers to 1 */
resetMultipliers() {
this.mults = defaultMultipliers();
}
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index 7ee34ca1f..7a08ca5d7 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -53,7 +53,8 @@ export class PlayerObject extends Person {
moneySourceB = new MoneySourceTracker();
playtimeSinceLastAug = 0;
playtimeSinceLastBitnode = 0;
- purchasedServers: string[] = []; scriptProdSinceLastAug = 0;
+ purchasedServers: string[] = [];
+ scriptProdSinceLastAug = 0;
sleeves: Sleeve[] = [];
sleevesFromCovenant = 0;
sourceFiles: PlayerOwnedSourceFile[] = [];
From 38063f62a7242ffcd6f272f4de2ea26345726cbd Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 15:14:34 -0400
Subject: [PATCH 43/46] build fix, lint, remove some instanceof checks
---
src/Augmentation/AugmentationHelpers.tsx | 8 +-
src/Augmentation/PlayerOwnedAugmentation.ts | 5 -
.../ui/PurchaseAugmentationModal.tsx | 4 +-
src/Bladeburner/Bladeburner.tsx | 28 ++----
src/Company/Companies.ts | 2 +-
src/Company/Company.ts | 6 +-
src/Corporation/Actions.ts | 8 +-
src/Corporation/Corporation.tsx | 3 +-
src/Corporation/Industry.ts | 23 ++---
src/Corporation/ui/IndustryWarehouse.tsx | 8 +-
src/Corporation/ui/MaterialElem.tsx | 3 +-
.../ui/modals/SmartSupplyModal.tsx | 3 +-
src/DevMenu.tsx | 7 +-
src/Faction/FactionHelpers.tsx | 4 +-
src/Faction/Factions.ts | 3 -
src/Faction/ui/FactionRoot.tsx | 2 +-
src/Faction/ui/GangButton.tsx | 4 +-
src/Gang/Gang.ts | 3 +-
src/Hacknet/ui/HashUpgradeModal.tsx | 3 +-
src/Locations/Locations.ts | 2 +-
src/Locations/ui/CompanyLocation.tsx | 3 +-
src/NetscriptFunctions/Bladeburner.ts | 2 +-
src/NetscriptFunctions/Gang.ts | 92 ++++++-------------
src/NetscriptFunctions/Singularity.ts | 13 +--
src/PersonObjects/Person.ts | 6 +-
src/PersonObjects/PersonMethods.ts | 2 +-
src/PersonObjects/Player/PlayerObject.ts | 1 -
.../Player/PlayerObjectBladeburnerMethods.ts | 5 +-
.../Player/PlayerObjectCorporationMethods.ts | 5 +-
.../Player/PlayerObjectGangMethods.ts | 33 ++-----
.../Player/PlayerObjectGeneralMethods.ts | 28 ++----
src/PersonObjects/Sleeve/Sleeve.ts | 5 +-
src/PersonObjects/Sleeve/SleeveMethods.ts | 2 +-
src/Prestige.ts | 10 +-
src/SaveObject.tsx | 7 +-
src/Server/BaseServer.ts | 11 +--
src/engine.tsx | 56 ++++-------
src/ui/WorkInProgressRoot.tsx | 3 +-
38 files changed, 131 insertions(+), 282 deletions(-)
diff --git a/src/Augmentation/AugmentationHelpers.tsx b/src/Augmentation/AugmentationHelpers.tsx
index c388356f6..bdfebe870 100644
--- a/src/Augmentation/AugmentationHelpers.tsx
+++ b/src/Augmentation/AugmentationHelpers.tsx
@@ -1,6 +1,6 @@
import { Augmentation } from "./Augmentation";
import { StaticAugmentations } from "./StaticAugmentations";
-import { PlayerOwnedAugmentation, IPlayerOwnedAugmentation } from "./PlayerOwnedAugmentation";
+import { PlayerOwnedAugmentation } from "./PlayerOwnedAugmentation";
import { AugmentationNames } from "./data/AugmentationNames";
import { CONSTANTS } from "../Constants";
@@ -71,7 +71,7 @@ function resetAugmentation(aug: Augmentation): void {
AddToStaticAugmentations(aug);
}
-function applyAugmentation(aug: IPlayerOwnedAugmentation, reapply = false): void {
+function applyAugmentation(aug: PlayerOwnedAugmentation, reapply = false): void {
const staticAugmentation = StaticAugmentations[aug.name];
// Apply multipliers
@@ -146,8 +146,8 @@ function augmentationExists(name: string): boolean {
return StaticAugmentations.hasOwnProperty(name);
}
-export function isRepeatableAug(aug: Augmentation): boolean {
- const augName = aug instanceof Augmentation ? aug.name : aug;
+export function isRepeatableAug(aug: Augmentation | string): boolean {
+ const augName = typeof aug === "string" ? aug : aug.name;
return augName === AugmentationNames.NeuroFluxGovernor;
}
diff --git a/src/Augmentation/PlayerOwnedAugmentation.ts b/src/Augmentation/PlayerOwnedAugmentation.ts
index e8807b894..b762b2e41 100644
--- a/src/Augmentation/PlayerOwnedAugmentation.ts
+++ b/src/Augmentation/PlayerOwnedAugmentation.ts
@@ -6,8 +6,3 @@ export class PlayerOwnedAugmentation {
this.name = name;
}
}
-
-export interface IPlayerOwnedAugmentation {
- level: number;
- name: string;
-}
diff --git a/src/Augmentation/ui/PurchaseAugmentationModal.tsx b/src/Augmentation/ui/PurchaseAugmentationModal.tsx
index 20990efb7..c719efee6 100644
--- a/src/Augmentation/ui/PurchaseAugmentationModal.tsx
+++ b/src/Augmentation/ui/PurchaseAugmentationModal.tsx
@@ -18,12 +18,12 @@ interface IProps {
}
export function PurchaseAugmentationModal(props: IProps): React.ReactElement {
- if (typeof props.aug === "undefined" || typeof props.faction === "undefined") {
+ if (!props.aug || !props.faction) {
return <>;
}
function buy(): void {
- if (!isRepeatableAug(props.aug as Augmentation) && Player.hasAugmentation(props.aug as Augmentation)) {
+ if (!props.aug || (!isRepeatableAug(props.aug) && Player.hasAugmentation(props.aug.name))) {
return;
}
diff --git a/src/Bladeburner/Bladeburner.tsx b/src/Bladeburner/Bladeburner.tsx
index 1c88a4678..00cef4634 100644
--- a/src/Bladeburner/Bladeburner.tsx
+++ b/src/Bladeburner/Bladeburner.tsx
@@ -23,7 +23,6 @@ import { BladeburnerConstants } from "./data/Constants";
import { numeralWrapper } from "../ui/numeralFormat";
import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
import { addOffset } from "../utils/helpers/addOffset";
-import { Faction } from "../Faction/Faction";
import { Factions, factionExists } from "../Faction/Factions";
import { calculateHospitalizationCost } from "../Hospital/Hospital";
import { dialogBoxCreate } from "../ui/React/DialogBox";
@@ -113,9 +112,7 @@ export class Bladeburner {
getCurrentCity(): City {
const city = this.cities[this.city];
- if (!(city instanceof City)) {
- throw new Error("Bladeburner.getCurrentCity() did not properly return a City object");
- }
+ if (!city) throw new Error("Invalid city in Bladeburner.getCurrentCity()");
return city;
}
@@ -541,7 +538,7 @@ export class Bladeburner {
case 3: {
const skillName = args[2];
const skill = Skills[skillName];
- if (skill == null || !(skill instanceof Skill)) {
+ if (!skill) {
this.postToConsole("Invalid skill name (Note that it is case-sensitive): " + skillName);
break;
}
@@ -683,10 +680,7 @@ export class Bladeburner {
".",
);
} else if (flag.toLowerCase().includes("en")) {
- if (
- !(this.automateActionLow instanceof ActionIdentifier) ||
- !(this.automateActionHigh instanceof ActionIdentifier)
- ) {
+ if (!this.automateActionLow || !this.automateActionHigh) {
return this.log("Failed to enable automation. Actions were not set");
}
this.automateEnabled = true;
@@ -897,9 +891,7 @@ export class Bladeburner {
// Choose random source/destination city for events
const sourceCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
const sourceCity = this.cities[sourceCityName];
- if (!(sourceCity instanceof City)) {
- throw new Error("sourceCity was not a City object in Bladeburner.randomEvent()");
- }
+ if (!sourceCity) throw new Error("Invalid sourceCity in Bladeburner.randomEvent()");
let destCityName = BladeburnerConstants.CityNames[getRandomInt(0, 5)];
while (destCityName === sourceCityName) {
@@ -907,9 +899,7 @@ export class Bladeburner {
}
const destCity = this.cities[destCityName];
- if (!(sourceCity instanceof City) || !(destCity instanceof City)) {
- throw new Error("sourceCity/destCity was not a City object in Bladeburner.randomEvent()");
- }
+ if (!sourceCity || !destCity) throw new Error("Invalid sourceCity or destCity in Bladeburner.randomEvent()");
if (chance <= 0.05) {
// New Synthoid Community, 5%
@@ -1621,7 +1611,7 @@ export class Bladeburner {
const bladeburnersFactionName = FactionNames.Bladeburners;
if (factionExists(bladeburnersFactionName)) {
const bladeburnerFac = Factions[bladeburnersFactionName];
- if (!(bladeburnerFac instanceof Faction)) {
+ if (!bladeburnerFac) {
throw new Error(
`Could not properly get ${FactionNames.Bladeburners} Faction object in ${FactionNames.Bladeburners} UI Overview Faction button`,
);
@@ -1650,7 +1640,7 @@ export class Bladeburner {
if (this.actionTimeToComplete <= 0) {
throw new Error(`Invalid actionTimeToComplete value: ${this.actionTimeToComplete}, type; ${this.action.type}`);
}
- if (!(this.action instanceof ActionIdentifier)) {
+ if (!this.action) {
throw new Error("Bladeburner.action is not an ActionIdentifier Object");
}
@@ -2018,9 +2008,7 @@ export class Bladeburner {
// Chaos goes down very slowly
for (const cityName of BladeburnerConstants.CityNames) {
const city = this.cities[cityName];
- if (!(city instanceof City)) {
- throw new Error("Invalid City object when processing passive chaos reduction in Bladeburner.process");
- }
+ if (!city) throw new Error("Invalid city when processing passive chaos reduction in Bladeburner.process");
city.chaos -= 0.0001 * seconds;
city.chaos = Math.max(0, city.chaos);
}
diff --git a/src/Company/Companies.ts b/src/Company/Companies.ts
index 0847795eb..7ad6d9d39 100644
--- a/src/Company/Companies.ts
+++ b/src/Company/Companies.ts
@@ -29,7 +29,7 @@ export function initCompanies(): void {
for (const companyName of Object.keys(Companies)) {
const company = Companies[companyName];
const oldCompany = oldCompanies[companyName];
- if (!(oldCompany instanceof Company)) {
+ if (!oldCompany) {
// New game, so no OldCompanies data
company.favor = 0;
} else {
diff --git a/src/Company/Company.ts b/src/Company/Company.ts
index 49473c6d4..492ed4ad3 100644
--- a/src/Company/Company.ts
+++ b/src/Company/Company.ts
@@ -88,11 +88,7 @@ export class Company {
}
hasPosition(pos: CompanyPosition | string): boolean {
- if (pos instanceof CompanyPosition) {
- return this.companyPositions[pos.name] != null;
- } else {
- return this.companyPositions[pos] != null;
- }
+ return this.companyPositions[typeof pos === "string" ? pos : pos.name] != null;
}
hasAgentPositions(): boolean {
diff --git a/src/Corporation/Actions.ts b/src/Corporation/Actions.ts
index 820017692..3b65654a7 100644
--- a/src/Corporation/Actions.ts
+++ b/src/Corporation/Actions.ts
@@ -361,7 +361,7 @@ export function ThrowParty(corp: Corporation, office: OfficeSpace, costPerEmploy
export function PurchaseWarehouse(corp: Corporation, division: Industry, city: string): void {
if (corp.funds < CorporationConstants.WarehouseInitialCost) return;
- if (division.warehouses[city] instanceof Warehouse) return;
+ if (division.warehouses[city]) return;
division.warehouses[city] = new Warehouse({
corp: corp,
industry: division,
@@ -439,7 +439,7 @@ export function MakeProduct(
designCost: designInvest,
advCost: marketingInvest,
});
- if (products[product.name] instanceof Product) {
+ if (products[product.name]) {
throw new Error(`You already have a product with this name!`);
}
@@ -470,10 +470,10 @@ export function Research(division: Industry, researchName: string): void {
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
const city = CorporationConstants.Cities[i];
const warehouse = division.warehouses[city];
- if (!(warehouse instanceof Warehouse)) {
+ if (!warehouse) {
continue;
}
- if (Player.corporation instanceof Corporation) {
+ if (Player.corporation) {
// Stores cycles in a "buffer". Processed separately using Engine Counters
warehouse.updateSize(Player.corporation, division);
}
diff --git a/src/Corporation/Corporation.tsx b/src/Corporation/Corporation.tsx
index edb3314e0..dacb5ea24 100644
--- a/src/Corporation/Corporation.tsx
+++ b/src/Corporation/Corporation.tsx
@@ -1,7 +1,6 @@
import { CorporationState } from "./CorporationState";
import { CorporationUnlockUpgrade, CorporationUnlockUpgrades } from "./data/CorporationUnlockUpgrades";
import { CorporationUpgrade, CorporationUpgrades } from "./data/CorporationUpgrades";
-import { Warehouse } from "./Warehouse";
import { CorporationConstants } from "./data/Constants";
import { Industry } from "./Industry";
@@ -331,7 +330,7 @@ export class Corporation {
for (const city of Object.keys(industry.warehouses)) {
const warehouse = industry.warehouses[city];
if (warehouse === 0) continue;
- if (industry.warehouses.hasOwnProperty(city) && warehouse instanceof Warehouse) {
+ if (industry.warehouses.hasOwnProperty(city) && warehouse) {
warehouse.updateSize(this, industry);
}
}
diff --git a/src/Corporation/Industry.ts b/src/Corporation/Industry.ts
index 74426c857..fe1a6d8a8 100644
--- a/src/Corporation/Industry.ts
+++ b/src/Corporation/Industry.ts
@@ -355,9 +355,7 @@ export class Industry {
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
const city = CorporationConstants.Cities[i];
const warehouse = this.warehouses[city];
- if (!(warehouse instanceof Warehouse)) {
- continue;
- }
+ if (!warehouse) continue;
const materials = warehouse.materials;
@@ -413,10 +411,7 @@ export class Industry {
let employeeSalary = 0;
for (const officeLoc of Object.keys(this.offices)) {
const office = this.offices[officeLoc];
- if (office === 0) continue;
- if (office instanceof OfficeSpace) {
- employeeSalary += office.process(marketCycles, corporation, this);
- }
+ if (office) employeeSalary += office.process(marketCycles, corporation, this);
}
this.thisCycleExpenses = this.thisCycleExpenses + employeeSalary;
@@ -467,7 +462,7 @@ export class Industry {
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
//If this industry has a warehouse in this city, process the market
//for every material this industry requires or produces
- if (this.warehouses[CorporationConstants.Cities[i]] instanceof Warehouse) {
+ if (this.warehouses[CorporationConstants.Cities[i]]) {
const wh = this.warehouses[CorporationConstants.Cities[i]];
if (wh === 0) continue;
for (const name of Object.keys(reqMats)) {
@@ -527,7 +522,7 @@ export class Industry {
const office = this.offices[city];
if (office === 0) continue;
- if (this.warehouses[city] instanceof Warehouse) {
+ if (this.warehouses[city]) {
const warehouse = this.warehouses[city];
if (warehouse === 0) continue;
@@ -893,7 +888,7 @@ export class Industry {
if (corporation.divisions[foo].name === exp.ind) {
const expIndustry = corporation.divisions[foo];
const expWarehouse = expIndustry.warehouses[exp.city];
- if (!(expWarehouse instanceof Warehouse)) {
+ if (!expWarehouse) {
console.error(`Invalid export! ${expIndustry.name} ${exp.city}`);
break;
}
@@ -936,7 +931,7 @@ export class Industry {
//Produce Scientific Research based on R&D employees
//Scientific Research can be produced without a warehouse
- if (office instanceof OfficeSpace) {
+ if (office) {
this.sciResearch.qty +=
0.004 *
Math.pow(office.employeeProd[EmployeePositions.RandD], 0.5) *
@@ -975,7 +970,7 @@ export class Industry {
for (const prodName of Object.keys(this.products)) {
if (this.products.hasOwnProperty(prodName)) {
const prod = this.products[prodName];
- if (prod instanceof Product && prod.fin) {
+ if (prod && prod.fin) {
revenue += this.processProduct(marketCycles, prod, corporation);
}
}
@@ -991,7 +986,7 @@ export class Industry {
const office = this.offices[city];
if (office === 0) continue;
const warehouse = this.warehouses[city];
- if (warehouse instanceof Warehouse) {
+ if (warehouse) {
switch (this.state) {
case "PRODUCTION": {
//Calculate the maximum production of this material based
@@ -1195,7 +1190,7 @@ export class Industry {
if (state === "EXPORT") {
for (let i = 0; i < CorporationConstants.Cities.length; ++i) {
const city = CorporationConstants.Cities[i];
- if (!(this.warehouses[city] instanceof Warehouse)) {
+ if (!this.warehouses[city]) {
continue;
}
const warehouse = this.warehouses[city];
diff --git a/src/Corporation/ui/IndustryWarehouse.tsx b/src/Corporation/ui/IndustryWarehouse.tsx
index c60998cec..f6bfbf1f3 100644
--- a/src/Corporation/ui/IndustryWarehouse.tsx
+++ b/src/Corporation/ui/IndustryWarehouse.tsx
@@ -3,8 +3,6 @@
import React, { useState } from "react";
import { CorporationConstants } from "../data/Constants";
-import { Material } from "../Material";
-import { Product } from "../Product";
import { Warehouse } from "../Warehouse";
import { SmartSupplyModal } from "./modals/SmartSupplyModal";
import { ProductElem } from "./ProductElem";
@@ -92,7 +90,7 @@ function WarehouseRoot(props: IProps): React.ReactElement {
// Create React components for materials
const mats = [];
for (const matName of Object.keys(props.warehouse.materials)) {
- if (!(props.warehouse.materials[matName] instanceof Material)) continue;
+ if (!props.warehouse.materials[matName]) continue;
// Only create UI for materials that are relevant for the industry or in stock
const isInStock = props.warehouse.materials[matName].qty > 0;
const isRelevant = isRelevantMaterial(matName, division);
@@ -113,7 +111,7 @@ function WarehouseRoot(props: IProps): React.ReactElement {
if (division.makesProducts && Object.keys(division.products).length > 0) {
for (const productName of Object.keys(division.products)) {
const product = division.products[productName];
- if (!(product instanceof Product)) continue;
+ if (!product) continue;
products.push(
{
if (BitNodeMultipliers.BladeburnerRank === 0) {
return false; // Disabled in this bitnode
}
- if (Player.bladeburner instanceof Bladeburner) {
+ if (Player.bladeburner) {
return true; // Already member
} else if (
Player.skills.strength >= 100 &&
diff --git a/src/NetscriptFunctions/Gang.ts b/src/NetscriptFunctions/Gang.ts
index d880d6801..c08fb12f6 100644
--- a/src/NetscriptFunctions/Gang.ts
+++ b/src/NetscriptFunctions/Gang.ts
@@ -1,6 +1,6 @@
import { FactionNames } from "../Faction/data/FactionNames";
import { GangConstants } from "../Gang/data/Constants";
-import { Player as player } from "../Player";
+import { Player } from "../Player";
import { Gang } from "../Gang/Gang";
import { AllGangs } from "../Gang/AllGangs";
import { GangMemberTasks } from "../Gang/GangMemberTasks";
@@ -22,18 +22,14 @@ import {
import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
export function NetscriptGang(): InternalAPI {
- const checkGangApiAccess = function (ctx: NetscriptContext): void {
- const gang = player.gang;
- if (gang === null) throw new Error("Must have joined gang");
- const hasAccess = gang instanceof Gang;
- if (!hasAccess) {
- throw helpers.makeRuntimeErrorMsg(ctx, `You do not currently have a Gang`);
- }
+ /** Functions as an API check and also returns the gang object */
+ const getGang = function (ctx: NetscriptContext): Gang {
+ if (!Player.gang) throw helpers.makeRuntimeErrorMsg(ctx, "Must have joined gang", "API ACCESS");
+ return Player.gang;
};
const getGangMember = function (ctx: NetscriptContext, name: string): GangMember {
- const gang = player.gang;
- if (gang === null) throw new Error("Must have joined gang");
+ const gang = getGang(ctx);
for (const member of gang.members) if (member.name === name) return member;
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid gang member: '${name}'`);
};
@@ -54,27 +50,23 @@ export function NetscriptGang(): InternalAPI {
const faction = helpers.string(ctx, "faction", _faction);
// this list is copied from Faction/ui/Root.tsx
- if (!player.canAccessGang() || !GangConstants.Names.includes(faction)) return false;
- if (player.inGang()) return false;
- if (!player.factions.includes(faction)) return false;
+ if (!Player.canAccessGang() || !GangConstants.Names.includes(faction)) return false;
+ if (Player.gang) return false;
+ if (!Player.factions.includes(faction)) return false;
const isHacking = faction === FactionNames.NiteSec || faction === FactionNames.TheBlackHand;
- player.startGang(faction, isHacking);
+ Player.startGang(faction, isHacking);
return true;
},
inGang: () => (): boolean => {
- return player.inGang();
+ return Player.gang ? true : false;
},
getMemberNames: (ctx: NetscriptContext) => (): string[] => {
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
return gang.members.map((member) => member.name);
},
getGangInformation: (ctx: NetscriptContext) => (): GangGenInfo => {
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
return {
faction: gang.facName,
isHacking: gang.isHackingGang,
@@ -91,7 +83,7 @@ export function NetscriptGang(): InternalAPI {
};
},
getOtherGangInformation: (ctx: NetscriptContext) => (): GangOtherInfo => {
- checkGangApiAccess(ctx);
+ getGang(ctx);
const cpy: Record = {};
for (const gang of Object.keys(AllGangs)) {
cpy[gang] = Object.assign({}, AllGangs[gang]);
@@ -103,9 +95,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_memberName: unknown): GangMemberInfo => {
const memberName = helpers.string(ctx, "memberName", _memberName);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
const member = getGangMember(ctx, memberName);
return {
name: member.name,
@@ -155,18 +145,14 @@ export function NetscriptGang(): InternalAPI {
};
},
canRecruitMember: (ctx: NetscriptContext) => (): boolean => {
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
return gang.canRecruitMember();
},
recruitMember:
(ctx: NetscriptContext) =>
(_memberName: unknown): boolean => {
const memberName = helpers.string(ctx, "memberName", _memberName);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
const recruited = gang.recruitMember(memberName);
if (recruited) {
ctx.workerScript.log("gang.recruitMember", () => `Successfully recruited Gang Member '${memberName}'`);
@@ -177,9 +163,7 @@ export function NetscriptGang(): InternalAPI {
return recruited;
},
getTaskNames: (ctx: NetscriptContext) => (): string[] => {
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
const tasks = gang.getAllTaskNames();
tasks.unshift("Unassigned");
return tasks;
@@ -189,10 +173,8 @@ export function NetscriptGang(): InternalAPI {
(_memberName: unknown, _taskName: unknown): boolean => {
const memberName = helpers.string(ctx, "memberName", _memberName);
const taskName = helpers.string(ctx, "taskName", _taskName);
- checkGangApiAccess(ctx);
+ const gang = getGang(ctx);
const member = getGangMember(ctx, memberName);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
if (!gang.getAllTaskNames().includes(taskName)) {
ctx.workerScript.log(
"gang.setMemberTask",
@@ -221,23 +203,21 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_taskName: unknown): GangTaskStats => {
const taskName = helpers.string(ctx, "taskName", _taskName);
- checkGangApiAccess(ctx);
+ getGang(ctx);
const task = getGangTask(ctx, taskName);
const copy = Object.assign({}, task);
copy.territory = Object.assign({}, task.territory);
return copy;
},
getEquipmentNames: (ctx: NetscriptContext) => (): string[] => {
- checkGangApiAccess(ctx);
+ getGang(ctx);
return Object.keys(GangMemberUpgrades);
},
getEquipmentCost:
(ctx: NetscriptContext) =>
(_equipName: unknown): number => {
const equipName = helpers.string(ctx, "equipName", _equipName);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
const upg = GangMemberUpgrades[equipName];
if (upg === null) return Infinity;
return gang.getUpgradeCost(upg);
@@ -246,7 +226,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_equipName: unknown): string => {
const equipName = helpers.string(ctx, "equipName", _equipName);
- checkGangApiAccess(ctx);
+ getGang(ctx);
const upg = GangMemberUpgrades[equipName];
if (upg == null) return "";
return upg.getType();
@@ -255,7 +235,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_equipName: unknown): EquipmentStats => {
const equipName = helpers.string(ctx, "equipName", _equipName);
- checkGangApiAccess(ctx);
+ getGang(ctx);
const equipment = GangMemberUpgrades[equipName];
if (!equipment) {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid equipment: ${equipName}`);
@@ -268,9 +248,7 @@ export function NetscriptGang(): InternalAPI {
(_memberName: unknown, _equipName: unknown): boolean => {
const memberName = helpers.string(ctx, "memberName", _memberName);
const equipName = helpers.string(ctx, "equipName", _equipName);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ getGang(ctx);
const member = getGangMember(ctx, memberName);
const equipment = GangMemberUpgrades[equipName];
if (!equipment) return false;
@@ -293,9 +271,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_memberName: unknown): GangMemberAscension | undefined => {
const memberName = helpers.string(ctx, "memberName", _memberName);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
const member = getGangMember(ctx, memberName);
if (!member.canAscend()) return;
return gang.ascendMember(member, ctx.workerScript);
@@ -304,9 +280,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_memberName: unknown): GangMemberAscension | undefined => {
const memberName = helpers.string(ctx, "memberName", _memberName);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ getGang(ctx);
const member = getGangMember(ctx, memberName);
if (!member.canAscend()) return;
return {
@@ -318,9 +292,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_engage: unknown): void => {
const engage = !!_engage;
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
if (engage) {
gang.territoryWarfareEngaged = true;
ctx.workerScript.log("gang.setTerritoryWarfare", () => "Engaging in Gang Territory Warfare");
@@ -333,9 +305,7 @@ export function NetscriptGang(): InternalAPI {
(ctx: NetscriptContext) =>
(_otherGang: unknown): number => {
const otherGang = helpers.string(ctx, "otherGang", _otherGang);
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
if (AllGangs[otherGang] == null) {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid gang: ${otherGang}`);
}
@@ -346,9 +316,7 @@ export function NetscriptGang(): InternalAPI {
return playerPower / (otherPower + playerPower);
},
getBonusTime: (ctx: NetscriptContext) => (): number => {
- checkGangApiAccess(ctx);
- const gang = player.gang;
- if (gang === null) throw new Error("Should not be called without Gang");
+ const gang = getGang(ctx);
return Math.round(gang.storedCycles / 5) * 1000;
},
};
diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts
index e4d6217cd..7ac5483cc 100644
--- a/src/NetscriptFunctions/Singularity.ts
+++ b/src/NetscriptFunctions/Singularity.ts
@@ -19,7 +19,6 @@ import {
} from "../ScriptEditor/NetscriptDefinitions";
import { findCrime } from "../Crime/CrimeHelpers";
-import { CompanyPosition } from "../Company/CompanyPosition";
import { CompanyPositions } from "../Company/CompanyPositions";
import { DarkWebItems } from "../DarkWeb/DarkWebItems";
import { CityName } from "../Locations/data/CityNames";
@@ -76,9 +75,7 @@ export function NetscriptSingularity(): InternalAPI {
const getCompany = function (ctx: NetscriptContext, name: string): Company {
const company = Companies[name];
- if (company == null || !(company instanceof Company)) {
- throw helpers.makeRuntimeErrorMsg(ctx, `Invalid company name: '${name}'`);
- }
+ if (!company) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid company name: '${name}'`);
return company;
};
@@ -784,7 +781,7 @@ export function NetscriptSingularity(): InternalAPI {
const focus = !!_focus;
// Make sure its a valid company
- if (companyName == null || companyName === "" || !(Companies[companyName] instanceof Company)) {
+ if (companyName == null || companyName === "" || !Companies[companyName]) {
helpers.log(ctx, () => `Invalid company: '${companyName}'`);
return false;
}
@@ -798,7 +795,7 @@ export function NetscriptSingularity(): InternalAPI {
// Check to make sure company position data is valid
const companyPositionName = Player.jobs[companyName];
const companyPosition = CompanyPositions[companyPositionName];
- if (companyPositionName === "" || !(companyPosition instanceof CompanyPosition)) {
+ if (companyPositionName === "" || !companyPosition) {
helpers.log(ctx, () => "You do not have a job");
return false;
}
@@ -953,7 +950,7 @@ export function NetscriptSingularity(): InternalAPI {
const faction = getFaction(ctx, facName);
// if the player is in a gang and the target faction is any of the gang faction, fail
- if (Player.inGang() && faction.name === Player.getGangFaction().name) {
+ if (Player.gang && faction.name === Player.getGangFaction().name) {
helpers.log(ctx, () => `You can't work for '${facName}' because youre managing a gang for it`);
return false;
}
@@ -1071,7 +1068,7 @@ export function NetscriptSingularity(): InternalAPI {
helpers.log(ctx, () => `You can't donate to '${facName}' because you aren't a member`);
return false;
}
- if (Player.inGang() && faction.name === Player.getGangFaction().name) {
+ if (Player.gang && faction.name === Player.getGangFaction().name) {
helpers.log(ctx, () => `You can't donate to '${facName}' because youre managing a gang for it`);
return false;
}
diff --git a/src/PersonObjects/Person.ts b/src/PersonObjects/Person.ts
index e1e8c3243..787c57cb1 100644
--- a/src/PersonObjects/Person.ts
+++ b/src/PersonObjects/Person.ts
@@ -1,5 +1,5 @@
import * as personMethods from "./PersonMethods";
-import { IPlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
+import { PlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
import { CityName } from "../Locations/data/CityNames";
import { calculateSkill } from "./formulas/skill";
import { calculateIntelligenceBonus } from "./formulas/intelligence";
@@ -33,8 +33,8 @@ export abstract class Person {
mults = defaultMultipliers();
/** Augmentations */
- augmentations: IPlayerOwnedAugmentation[] = [];
- queuedAugmentations: IPlayerOwnedAugmentation[] = [];
+ augmentations: PlayerOwnedAugmentation[] = [];
+ queuedAugmentations: PlayerOwnedAugmentation[] = [];
/** City that the person is in */
city: CityName = CityName.Sector12;
diff --git a/src/PersonObjects/PersonMethods.ts b/src/PersonObjects/PersonMethods.ts
index 9c4d4bbb8..8ed01d5ef 100644
--- a/src/PersonObjects/PersonMethods.ts
+++ b/src/PersonObjects/PersonMethods.ts
@@ -198,6 +198,6 @@ export function updateSkillLevels(this: Person): void {
this.hp.current = Math.round(this.hp.max * ratio);
}
-export function hasAugmentation(this: Person, augName: string, ignoreQueued: boolean = false) {
+export function hasAugmentation(this: Person, augName: string, ignoreQueued = false) {
return this.augmentations.some((a) => a.name === augName && (ignoreQueued || !this.queuedAugmentations.includes(a)));
}
diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts
index 7a08ca5d7..6d5e31182 100644
--- a/src/PersonObjects/Player/PlayerObject.ts
+++ b/src/PersonObjects/Player/PlayerObject.ts
@@ -12,7 +12,6 @@ import { PlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
import { Exploit } from "../../Exploits/Exploit";
import { LocationName } from "../../Locations/data/LocationNames";
-import { IPlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
import { Corporation } from "../../Corporation/Corporation";
import { Gang } from "../../Gang/Gang";
import { Bladeburner } from "../../Bladeburner/Bladeburner";
diff --git a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
index b8e9e31ad..3febedfdf 100644
--- a/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectBladeburnerMethods.ts
@@ -6,10 +6,7 @@ export function canAccessBladeburner(this: PlayerObject): boolean {
}
export function inBladeburner(this: PlayerObject): boolean {
- if (this.bladeburner == null) {
- return false;
- }
- return this.bladeburner instanceof Bladeburner;
+ return Boolean(this.bladeburner);
}
export function startBladeburner(this: PlayerObject): void {
diff --git a/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts b/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts
index 95acac366..1014c112a 100644
--- a/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectCorporationMethods.ts
@@ -10,10 +10,7 @@ export function canAccessCorporation(this: PlayerObject): boolean {
}
export function hasCorporation(this: PlayerObject): boolean {
- if (this.corporation == null) {
- return false;
- }
- return this.corporation instanceof Corporation;
+ return Boolean(this.corporation);
}
export function startCorporation(this: PlayerObject, corpName: string, additionalShares = 0): void {
diff --git a/src/PersonObjects/Player/PlayerObjectGangMethods.ts b/src/PersonObjects/Player/PlayerObjectGangMethods.ts
index fbe765a74..9911349cd 100644
--- a/src/PersonObjects/Player/PlayerObjectGangMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGangMethods.ts
@@ -21,41 +21,22 @@ export function isAwareOfGang(this: PlayerObject): boolean {
export function getGangFaction(this: PlayerObject): Faction {
const gang = this.gang;
- if (gang === null) {
- throw new Error("Cannot get gang faction because player is not in a gang.");
- }
+ if (gang === null) throw new Error("Cannot get gang faction because player is not in a gang.");
+
const fac = Factions[gang.facName];
- if (fac == null) {
- throw new Error(`Gang has invalid faction name: ${gang.facName}`);
- }
+ if (fac == null) throw new Error(`Gang has invalid faction name: ${gang.facName}`);
return fac;
}
export function getGangName(this: PlayerObject): string {
- if (!this.inGang()) return "";
const gang = this.gang;
- if (gang === null) {
- throw new Error("Cannot get gang faction because player is not in a gang.");
- }
- return gang.facName;
+ return gang ? gang.facName : "";
}
export function hasGangWith(this: PlayerObject, facName: string): boolean {
- if (!this.inGang()) return false;
const gang = this.gang;
- if (gang === null) {
- throw new Error("Cannot get gang faction because player is not in a gang.");
- }
- return gang.facName === facName;
-}
-
-export function inGang(this: PlayerObject): boolean {
- if (this.gang == null || this.gang == undefined) {
- return false;
- }
-
- return this.gang instanceof Gang;
+ return gang ? gang.facName === facName : false;
}
export function startGang(this: PlayerObject, factionName: string, hacking: boolean): void {
@@ -67,3 +48,7 @@ export function startGang(this: PlayerObject, factionName: string, hacking: bool
}
fac.playerReputation = 0;
}
+
+export function inGang(this: PlayerObject) {
+ return Boolean(this.gang);
+}
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
index 490d92739..21dde3745 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
@@ -105,15 +105,7 @@ export function prestigeAugmentation(this: PlayerObject): void {
this.sleeves.push(new Sleeve());
}
- for (let i = 0; i < this.sleeves.length; ++i) {
- if (this.sleeves[i] instanceof Sleeve) {
- if (this.sleeves[i].shock >= 100) {
- this.sleeves[i].synchronize();
- } else {
- this.sleeves[i].shockRecovery();
- }
- }
- }
+ this.sleeves.forEach((sleeve) => (sleeve.shock >= 100 ? sleeve.synchronize() : sleeve.shockRecovery()));
this.lastUpdate = new Date().getTime();
@@ -137,13 +129,7 @@ export function prestigeSourceFile(this: PlayerObject): void {
this.prestigeAugmentation();
this.karma = 0;
// Duplicate sleeves are reset to level 1 every Bit Node (but the number of sleeves you have persists)
- for (let i = 0; i < this.sleeves.length; ++i) {
- if (this.sleeves[i] instanceof Sleeve) {
- this.sleeves[i].prestige();
- } else {
- this.sleeves[i] = new Sleeve();
- }
- }
+ this.sleeves.forEach((sleeve) => sleeve.prestige());
if (this.bitNodeN === 10) {
for (let i = 0; i < this.sleeves.length; i++) {
@@ -284,7 +270,7 @@ export function hospitalize(this: PlayerObject): number {
//the applyToCompany() Netscript Singularity function
export function applyForJob(this: PlayerObject, entryPosType: CompanyPosition, sing = false): boolean {
const company = Companies[this.location]; //Company being applied to
- if (!(company instanceof Company)) {
+ if (!company) {
console.error(`Could not find company that matches the location: ${this.location}. Player.applyToCompany() failed`);
return false;
}
@@ -1131,7 +1117,7 @@ export function gainCodingContractReward(this: PlayerObject, reward: ICodingCont
/* eslint-disable no-case-declarations */
switch (reward.type) {
case CodingContractRewardType.FactionReputation:
- if (reward.name == null || !(Factions[reward.name] instanceof Faction)) {
+ if (reward.name == null || !Factions[reward.name]) {
// If no/invalid faction was designated, just give rewards to all factions
reward.type = CodingContractRewardType.FactionReputationAll;
return this.gainCodingContractReward(reward);
@@ -1156,14 +1142,12 @@ export function gainCodingContractReward(this: PlayerObject, reward: ICodingCont
const gainPerFaction = Math.floor(totalGain / factions.length);
for (const facName of factions) {
- if (!(Factions[facName] instanceof Faction)) {
- continue;
- }
+ if (!Factions[facName]) continue;
Factions[facName].playerReputation += gainPerFaction;
}
return `Gained ${gainPerFaction} reputation for each of the following factions: ${factions.toString()}`;
case CodingContractRewardType.CompanyReputation: {
- if (reward.name == null || !(Companies[reward.name] instanceof Company)) {
+ if (reward.name == null || !Companies[reward.name]) {
//If no/invalid company was designated, just give rewards to all factions
reward.type = CodingContractRewardType.FactionReputationAll;
return this.gainCodingContractReward(reward);
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 2b0d5c4a5..96a078ba2 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -24,7 +24,6 @@ import { Contracts } from "../../Bladeburner/data/Contracts";
import { CONSTANTS } from "../../Constants";
-import { Faction } from "../../Faction/Faction";
import { Factions } from "../../Faction/Factions";
import { CityName } from "../../Locations/data/CityNames";
@@ -307,7 +306,7 @@ export class Sleeve extends Person {
* Returns boolean indicating success
*/
workForCompany(companyName: string): boolean {
- if (!(Companies[companyName] instanceof Company) || Player.jobs[companyName] == null) {
+ if (!Companies[companyName] || Player.jobs[companyName] == null) {
return false;
}
@@ -327,7 +326,7 @@ export class Sleeve extends Person {
*/
workForFaction(factionName: string, workType: string): boolean {
const faction = Factions[factionName];
- if (factionName === "" || !faction || !(faction instanceof Faction) || !Player.factions.includes(factionName)) {
+ if (factionName === "" || !faction || !Player.factions.includes(factionName)) {
return false;
}
diff --git a/src/PersonObjects/Sleeve/SleeveMethods.ts b/src/PersonObjects/Sleeve/SleeveMethods.ts
index 0607ea85f..2009da2f7 100644
--- a/src/PersonObjects/Sleeve/SleeveMethods.ts
+++ b/src/PersonObjects/Sleeve/SleeveMethods.ts
@@ -61,7 +61,7 @@ export function findPurchasableAugs(this: Sleeve): Augmentation[] {
// If player is in a gang, then we return all augs that the player
// has enough reputation for (since that gang offers all augs)
- if (Player.inGang()) {
+ if (Player.gang) {
const fac = Player.getGangFaction();
const gangAugs = getFactionAugmentationsFiltered(fac);
diff --git a/src/Prestige.ts b/src/Prestige.ts
index 1ebbf1789..e3ec486ce 100755
--- a/src/Prestige.ts
+++ b/src/Prestige.ts
@@ -4,11 +4,9 @@ import { StaticAugmentations } from "./Augmentation/StaticAugmentations";
import { augmentationExists, initAugmentations } from "./Augmentation/AugmentationHelpers";
import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
import { initBitNodeMultipliers } from "./BitNode/BitNode";
-import { Bladeburner } from "./Bladeburner/Bladeburner";
import { Companies, initCompanies } from "./Company/Companies";
import { resetIndustryResearchTrees } from "./Corporation/IndustryData";
import { Programs } from "./Programs/Programs";
-import { Faction } from "./Faction/Faction";
import { Factions, initFactions } from "./Faction/Factions";
import { joinFaction } from "./Faction/FactionHelpers";
import { updateHashManagerCapacity } from "./Hacknet/HacknetHelpers";
@@ -108,11 +106,9 @@ export function prestigeAugmentation(): void {
// Gang
const gang = Player.gang;
- if (Player.inGang() && gang !== null) {
+ if (gang) {
const faction = Factions[gang.facName];
- if (faction instanceof Faction) {
- joinFaction(faction);
- }
+ if (faction) joinFaction(faction);
const penalty = 0.95;
for (const m of gang.members) {
m.hack_asc_points *= penalty;
@@ -130,7 +126,7 @@ export function prestigeAugmentation(): void {
}
// Cancel Bladeburner action
- if (Player.bladeburner instanceof Bladeburner) {
+ if (Player.bladeburner) {
Player.bladeburner.prestige();
}
diff --git a/src/SaveObject.tsx b/src/SaveObject.tsx
index 451198ec1..8262f1faf 100755
--- a/src/SaveObject.tsx
+++ b/src/SaveObject.tsx
@@ -97,9 +97,8 @@ class BitburnerSaveObject {
this.LastExportBonus = JSON.stringify(ExportBonus.LastExportBonus);
this.StaneksGiftSave = JSON.stringify(staneksGift);
- if (Player.inGang()) {
- this.AllGangsSave = JSON.stringify(AllGangs);
- }
+ if (Player.gang) this.AllGangsSave = JSON.stringify(AllGangs);
+
const saveString = btoa(unescape(encodeURIComponent(JSON.stringify(this))));
return saveString;
@@ -724,7 +723,7 @@ function loadGame(saveString: string): boolean {
console.error("ERROR: Failed to parse last export bonus Settings " + err);
}
}
- if (Player.inGang() && saveObj.hasOwnProperty("AllGangsSave")) {
+ if (Player.gang && saveObj.hasOwnProperty("AllGangsSave")) {
try {
loadAllGangs(saveObj.AllGangsSave);
} catch (e) {
diff --git a/src/Server/BaseServer.ts b/src/Server/BaseServer.ts
index 6e00e71fd..6ba4b96c8 100644
--- a/src/Server/BaseServer.ts
+++ b/src/Server/BaseServer.ts
@@ -164,15 +164,8 @@ export class BaseServer {
}
removeContract(contract: CodingContract | string): void {
- if (contract instanceof CodingContract) {
- this.contracts = this.contracts.filter((c) => {
- return c.fn !== contract.fn;
- });
- } else {
- this.contracts = this.contracts.filter((c) => {
- return c.fn !== contract;
- });
- }
+ const index = this.contracts.findIndex((c) => c.fn === (typeof contract === "string" ? contract : contract.fn));
+ if (index > -1) this.contracts.splice(index, 1);
}
/**
diff --git a/src/engine.tsx b/src/engine.tsx
index 3c66e2c89..0611e4669 100644
--- a/src/engine.tsx
+++ b/src/engine.tsx
@@ -6,10 +6,8 @@ import { initAugmentations } from "./Augmentation/AugmentationHelpers";
import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
import { initBitNodeMultipliers } from "./BitNode/BitNode";
import { initDarkWebItems } from "./DarkWeb/DarkWebItems";
-import { Bladeburner } from "./Bladeburner/Bladeburner";
import { generateRandomContract } from "./CodingContractGenerator";
import { initCompanies } from "./Company/Companies";
-import { Corporation } from "./Corporation/Corporation";
import { CONSTANTS } from "./Constants";
import { Factions, initFactions } from "./Faction/Factions";
import { staneksGift } from "./CotMG/Helper";
@@ -101,28 +99,20 @@ const Engine: {
processStockPrices(numCycles);
}
- // Gang, if applicable
- if (Player.inGang() && Player.gang !== null) {
- Player.gang.process(numCycles);
- }
+ // Gang
+ if (Player.gang) Player.gang.process(numCycles);
// Staneks gift
staneksGift.process(numCycles);
// Corporation
- if (Player.corporation instanceof Corporation) {
- // Stores cycles in a "buffer". Processed separately using Engine Counters
- Player.corporation.storeCycles(numCycles);
- }
+ if (Player.corporation) Player.corporation.storeCycles(numCycles);
- if (Player.bladeburner instanceof Bladeburner) {
- Player.bladeburner.storeCycles(numCycles);
- }
+ // Bladeburner
+ if (Player.bladeburner) Player.bladeburner.storeCycles(numCycles);
// Sleeves
- for (let i = 0; i < Player.sleeves.length; ++i) {
- Player.sleeves[i].process(numCycles);
- }
+ Player.sleeves.forEach((sleeve) => sleeve.process(numCycles));
// Counters
Engine.decrementAllCounters(numCycles);
@@ -205,11 +195,11 @@ const Engine: {
Engine.Counters.messages = 150;
}
}
- if (Player.corporation instanceof Corporation) {
+ if (Player.corporation) {
Player.corporation.process();
}
if (Engine.Counters.mechanicProcess <= 0) {
- if (Player.bladeburner instanceof Bladeburner) {
+ if (Player.bladeburner) {
try {
Player.bladeburner.process();
} catch (e) {
@@ -328,39 +318,25 @@ const Engine: {
}
// Gang progress for BitNode 2
- const gang = Player.gang;
- if (Player.inGang() && gang !== null) {
- gang.process(numCyclesOffline);
- }
+ if (Player.gang) Player.gang.process(numCyclesOffline);
// Corporation offline progress
- if (Player.corporation instanceof Corporation) {
- Player.corporation.storeCycles(numCyclesOffline);
- }
+ if (Player.corporation) Player.corporation.storeCycles(numCyclesOffline);
// Bladeburner offline progress
- if (Player.bladeburner instanceof Bladeburner) {
- Player.bladeburner.storeCycles(numCyclesOffline);
- }
+ if (Player.bladeburner) Player.bladeburner.storeCycles(numCyclesOffline);
staneksGift.process(numCyclesOffline);
// Sleeves offline progress
- for (let i = 0; i < Player.sleeves.length; ++i) {
- Player.sleeves[i].process(numCyclesOffline);
- }
+ Player.sleeves.forEach((sleeve) => sleeve.process(numCyclesOffline));
// Update total playtime
const time = numCyclesOffline * CONSTANTS._idleSpeed;
- if (Player.totalPlaytime == null) {
- Player.totalPlaytime = 0;
- }
- if (Player.playtimeSinceLastAug == null) {
- Player.playtimeSinceLastAug = 0;
- }
- if (Player.playtimeSinceLastBitnode == null) {
- Player.playtimeSinceLastBitnode = 0;
- }
+ Player.totalPlaytime ??= 0;
+ Player.playtimeSinceLastAug ??= 0;
+ Player.playtimeSinceLastBitnode ??= 0;
+
Player.totalPlaytime += time;
Player.playtimeSinceLastAug += time;
Player.playtimeSinceLastBitnode += time;
diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx
index d07fc6f40..f4f30fbdb 100644
--- a/src/ui/WorkInProgressRoot.tsx
+++ b/src/ui/WorkInProgressRoot.tsx
@@ -4,7 +4,6 @@ import Typography from "@mui/material/Typography";
import { uniqueId } from "lodash";
import React, { useEffect, useState } from "react";
import { Companies } from "../Company/Companies";
-import { Company } from "../Company/Company";
import { CONSTANTS } from "../Constants";
import { LocationName } from "../Locations/data/LocationNames";
import { Locations } from "../Locations/Locations";
@@ -430,7 +429,7 @@ export function WorkInProgressRoot(): React.ReactElement {
if (isCompanyWork(Player.currentWork)) {
const comp = Companies[Player.currentWork.companyName];
- if (comp == null || !(comp instanceof Company)) {
+ if (comp) {
workInfo = {
buttons: {
cancel: () => Router.toTerminal(),
From 3d4d02a57357f9ee9c27ad4e8e996a5196269eb8 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 16:15:11 -0400
Subject: [PATCH 44/46] remove unnecessary function
---
src/Augmentation/AugmentationHelpers.tsx | 4 +--
src/Augmentation/ui/PlayerMultipliers.tsx | 4 +--
src/PersonObjects/Multipliers.ts | 35 -----------------------
3 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/src/Augmentation/AugmentationHelpers.tsx b/src/Augmentation/AugmentationHelpers.tsx
index bdfebe870..90610c71e 100644
--- a/src/Augmentation/AugmentationHelpers.tsx
+++ b/src/Augmentation/AugmentationHelpers.tsx
@@ -21,7 +21,7 @@ import {
initUnstableCircadianModulator,
} from "./data/AugmentationCreator";
import { Router } from "../ui/GameRoot";
-import { mergeAugmentation } from "../PersonObjects/Multipliers";
+import { mergeMultipliers } from "../PersonObjects/Multipliers";
export function AddToStaticAugmentations(aug: Augmentation): void {
const name = aug.name;
@@ -75,7 +75,7 @@ function applyAugmentation(aug: PlayerOwnedAugmentation, reapply = false): void
const staticAugmentation = StaticAugmentations[aug.name];
// Apply multipliers
- Player.mults = mergeAugmentation(Player.mults, staticAugmentation.mults);
+ Player.mults = mergeMultipliers(Player.mults, staticAugmentation.mults);
// Special logic for Congruity Implant
if (aug.name === AugmentationNames.CongruityImplant && !reapply) {
diff --git a/src/Augmentation/ui/PlayerMultipliers.tsx b/src/Augmentation/ui/PlayerMultipliers.tsx
index 5ddb8b07f..ca7b4c58a 100644
--- a/src/Augmentation/ui/PlayerMultipliers.tsx
+++ b/src/Augmentation/ui/PlayerMultipliers.tsx
@@ -4,7 +4,7 @@
import { DoubleArrow } from "@mui/icons-material";
import { List, ListItem, ListItemText, Paper, Typography } from "@mui/material";
import * as React from "react";
-import { Multipliers, defaultMultipliers, mergeAugmentation } from "../../PersonObjects/Multipliers";
+import { Multipliers, defaultMultipliers, mergeMultipliers } from "../../PersonObjects/Multipliers";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { Player } from "../../Player";
import { Settings } from "../../Settings/Settings";
@@ -15,7 +15,7 @@ function calculateAugmentedStats(): Multipliers {
let augP: Multipliers = defaultMultipliers();
for (const aug of Player.queuedAugmentations) {
const augObj = StaticAugmentations[aug.name];
- augP = mergeAugmentation(augP, augObj.mults);
+ augP = mergeMultipliers(augP, augObj.mults);
}
return augP;
}
diff --git a/src/PersonObjects/Multipliers.ts b/src/PersonObjects/Multipliers.ts
index 7e7bd44b1..44fd4727b 100644
--- a/src/PersonObjects/Multipliers.ts
+++ b/src/PersonObjects/Multipliers.ts
@@ -68,41 +68,6 @@ export const defaultMultipliers = (): Multipliers => {
};
};
-export const mergeAugmentation = (m0: Multipliers, m1: AugmentationStats): Multipliers => {
- return {
- hacking_chance: m0.hacking_chance * (m1.hacking_chance ?? 1),
- hacking_speed: m0.hacking_speed * (m1.hacking_speed ?? 1),
- hacking_money: m0.hacking_money * (m1.hacking_money ?? 1),
- hacking_grow: m0.hacking_grow * (m1.hacking_grow ?? 1),
- hacking: m0.hacking * (m1.hacking ?? 1),
- hacking_exp: m0.hacking_exp * (m1.hacking_exp ?? 1),
- strength: m0.strength * (m1.strength ?? 1),
- strength_exp: m0.strength_exp * (m1.strength_exp ?? 1),
- defense: m0.defense * (m1.defense ?? 1),
- defense_exp: m0.defense_exp * (m1.defense_exp ?? 1),
- dexterity: m0.dexterity * (m1.dexterity ?? 1),
- dexterity_exp: m0.dexterity_exp * (m1.dexterity_exp ?? 1),
- agility: m0.agility * (m1.agility ?? 1),
- agility_exp: m0.agility_exp * (m1.agility_exp ?? 1),
- charisma: m0.charisma * (m1.charisma ?? 1),
- charisma_exp: m0.charisma_exp * (m1.charisma_exp ?? 1),
- hacknet_node_money: m0.hacknet_node_money * (m1.hacknet_node_money ?? 1),
- hacknet_node_purchase_cost: m0.hacknet_node_purchase_cost * (m1.hacknet_node_purchase_cost ?? 1),
- hacknet_node_ram_cost: m0.hacknet_node_ram_cost * (m1.hacknet_node_ram_cost ?? 1),
- hacknet_node_core_cost: m0.hacknet_node_core_cost * (m1.hacknet_node_core_cost ?? 1),
- hacknet_node_level_cost: m0.hacknet_node_level_cost * (m1.hacknet_node_level_cost ?? 1),
- company_rep: m0.company_rep * (m1.company_rep ?? 1),
- faction_rep: m0.faction_rep * (m1.faction_rep ?? 1),
- work_money: m0.work_money * (m1.work_money ?? 1),
- crime_success: m0.crime_success * (m1.crime_success ?? 1),
- crime_money: m0.crime_money * (m1.crime_money ?? 1),
- bladeburner_max_stamina: m0.bladeburner_max_stamina * (m1.bladeburner_max_stamina ?? 1),
- bladeburner_stamina_gain: m0.bladeburner_stamina_gain * (m1.bladeburner_stamina_gain ?? 1),
- bladeburner_analysis: m0.bladeburner_analysis * (m1.bladeburner_analysis ?? 1),
- bladeburner_success_chance: m0.bladeburner_success_chance * (m1.bladeburner_success_chance ?? 1),
- };
-};
-
export const mergeMultipliers = (m0: Multipliers, m1: Multipliers): Multipliers => {
return {
hacking_chance: m0.hacking_chance * m1.hacking_chance,
From 25be5c2990692a166efba9c80edf4ad1ed8db9f7 Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 16:20:26 -0400
Subject: [PATCH 45/46] Remove unused augmentationStats interface
All augmentations have all multipliers
---
src/Netscript/killWorkerScript.ts | 2 +-
src/PersonObjects/Multipliers.ts | 2 -
src/ScriptEditor/NetscriptDefinitions.d.ts | 161 ++++++++-------------
3 files changed, 63 insertions(+), 102 deletions(-)
diff --git a/src/Netscript/killWorkerScript.ts b/src/Netscript/killWorkerScript.ts
index 658565569..58f46c784 100644
--- a/src/Netscript/killWorkerScript.ts
+++ b/src/Netscript/killWorkerScript.ts
@@ -63,7 +63,7 @@ function stopAndCleanUpWorkerScript(ws: WorkerScript): void {
if (ws.delay) clearTimeout(ws.delay);
ws.delayReject?.(new ScriptDeath(ws));
ws.env.runningFn = "";
-
+
if (typeof ws.atExit === "function") {
try {
ws.env.stopFlag = false;
diff --git a/src/PersonObjects/Multipliers.ts b/src/PersonObjects/Multipliers.ts
index 44fd4727b..1976ecb3e 100644
--- a/src/PersonObjects/Multipliers.ts
+++ b/src/PersonObjects/Multipliers.ts
@@ -1,5 +1,3 @@
-import { AugmentationStats } from "../ScriptEditor/NetscriptDefinitions";
-
export interface Multipliers {
hacking_chance: number;
hacking_speed: number;
diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts
index 5fa815893..903f65400 100644
--- a/src/ScriptEditor/NetscriptDefinitions.d.ts
+++ b/src/ScriptEditor/NetscriptDefinitions.d.ts
@@ -75,37 +75,67 @@ interface Player {
/**
* @public
*/
-export interface Multipliers {
- hacking_chance: number;
- hacking_speed: number;
- hacking_money: number;
- hacking_grow: number;
- hacking: number;
- hacking_exp: number;
- strength: number;
- strength_exp: number;
- defense: number;
- defense_exp: number;
- dexterity: number;
- dexterity_exp: number;
- agility: number;
- agility_exp: number;
- charisma: number;
- charisma_exp: number;
- hacknet_node_money: number;
- hacknet_node_purchase_cost: number;
- hacknet_node_ram_cost: number;
- hacknet_node_core_cost: number;
- hacknet_node_level_cost: number;
- company_rep: number;
- faction_rep: number;
- work_money: number;
- crime_success: number;
- crime_money: number;
- bladeburner_max_stamina: number;
- bladeburner_stamina_gain: number;
- bladeburner_analysis: number;
- bladeburner_success_chance: number;
+ export interface Multipliers {
+ /** Multiplier to hacking skill */
+ hacking?: number;
+ /** Multiplier to strength skill */
+ strength?: number;
+ /** Multiplier to defense skill */
+ defense?: number;
+ /** Multiplier to dexterity skill */
+ dexterity?: number;
+ /** Multiplier to agility skill */
+ agility?: number;
+ /** Multiplier to charisma skill */
+ charisma?: number;
+ /** Multiplier to hacking experience gain rate */
+ hacking_exp?: number;
+ /** Multiplier to strength experience gain rate */
+ strength_exp?: number;
+ /** Multiplier to defense experience gain rate */
+ defense_exp?: number;
+ /** Multiplier to dexterity experience gain rate */
+ dexterity_exp?: number;
+ /** Multiplier to agility experience gain rate */
+ agility_exp?: number;
+ /** Multiplier to charisma experience gain rate */
+ charisma_exp?: number;
+ /** Multiplier to chance of successfully performing a hack */
+ hacking_chance?: number;
+ /** Multiplier to hacking speed */
+ hacking_speed?: number;
+ /** Multiplier to amount of money the player gains from hacking */
+ hacking_money?: number;
+ /** Multiplier to amount of money injected into servers using grow */
+ hacking_grow?: number;
+ /** Multiplier to amount of reputation gained when working */
+ company_rep?: number;
+ /** Multiplier to amount of reputation gained when working */
+ faction_rep?: number;
+ /** Multiplier to amount of money gained from crimes */
+ crime_money?: number;
+ /** Multiplier to crime success rate */
+ crime_success?: number;
+ /** Multiplier to amount of money gained from working */
+ work_money?: number;
+ /** Multiplier to amount of money produced by Hacknet Nodes */
+ hacknet_node_money?: number;
+ /** Multiplier to cost of purchasing a Hacknet Node */
+ hacknet_node_purchase_cost?: number;
+ /** Multiplier to cost of ram for a Hacknet Node */
+ hacknet_node_ram_cost?: number;
+ /** Multiplier to cost of core for a Hacknet Node */
+ hacknet_node_core_cost?: number;
+ /** Multiplier to cost of leveling up a Hacknet Node */
+ hacknet_node_level_cost?: number;
+ /** Multiplier to Bladeburner max stamina */
+ bladeburner_max_stamina?: number;
+ /** Multiplier to Bladeburner stamina gain rate */
+ bladeburner_stamina_gain?: number;
+ /** Multiplier to effectiveness in Bladeburner Field Analysis */
+ bladeburner_analysis?: number;
+ /** Multiplier to success chance in Bladeburner contracts/operations */
+ bladeburner_success_chance?: number;
}
/**
@@ -198,73 +228,6 @@ export interface CrimeStats {
intelligence_exp: number;
}
-/**
- * Data representing the internal values of an Augmentation.
- * @public
- */
-export interface AugmentationStats {
- /** Multiplier to hacking skill */
- hacking?: number;
- /** Multiplier to strength skill */
- strength?: number;
- /** Multiplier to defense skill */
- defense?: number;
- /** Multiplier to dexterity skill */
- dexterity?: number;
- /** Multiplier to agility skill */
- agility?: number;
- /** Multiplier to charisma skill */
- charisma?: number;
- /** Multiplier to hacking experience gain rate */
- hacking_exp?: number;
- /** Multiplier to strength experience gain rate */
- strength_exp?: number;
- /** Multiplier to defense experience gain rate */
- defense_exp?: number;
- /** Multiplier to dexterity experience gain rate */
- dexterity_exp?: number;
- /** Multiplier to agility experience gain rate */
- agility_exp?: number;
- /** Multiplier to charisma experience gain rate */
- charisma_exp?: number;
- /** Multiplier to chance of successfully performing a hack */
- hacking_chance?: number;
- /** Multiplier to hacking speed */
- hacking_speed?: number;
- /** Multiplier to amount of money the player gains from hacking */
- hacking_money?: number;
- /** Multiplier to amount of money injected into servers using grow */
- hacking_grow?: number;
- /** Multiplier to amount of reputation gained when working */
- company_rep?: number;
- /** Multiplier to amount of reputation gained when working */
- faction_rep?: number;
- /** Multiplier to amount of money gained from crimes */
- crime_money?: number;
- /** Multiplier to crime success rate */
- crime_success?: number;
- /** Multiplier to amount of money gained from working */
- work_money?: number;
- /** Multiplier to amount of money produced by Hacknet Nodes */
- hacknet_node_money?: number;
- /** Multiplier to cost of purchasing a Hacknet Node */
- hacknet_node_purchase_cost?: number;
- /** Multiplier to cost of ram for a Hacknet Node */
- hacknet_node_ram_cost?: number;
- /** Multiplier to cost of core for a Hacknet Node */
- hacknet_node_core_cost?: number;
- /** Multiplier to cost of leveling up a Hacknet Node */
- hacknet_node_level_cost?: number;
- /** Multiplier to Bladeburner max stamina */
- bladeburner_max_stamina?: number;
- /** Multiplier to Bladeburner stamina gain rate */
- bladeburner_stamina_gain?: number;
- /** Multiplier to effectiveness in Bladeburner Field Analysis */
- bladeburner_analysis?: number;
- /** Multiplier to success chance in Bladeburner contracts/operations */
- bladeburner_success_chance?: number;
-}
-
/**
* Options to affect the behavior of {@link NS.hack | hack}, {@link NS.grow | grow}, and {@link NS.weaken | weaken}.
* @public
@@ -2175,7 +2138,7 @@ export interface Singularity {
* @param name - Name of Augmentation. CASE-SENSITIVE.
* @returns Augmentation stats.
*/
- getAugmentationStats(name: string): AugmentationStats;
+ getAugmentationStats(name: string): Multipliers;
/**
* Install your purchased augmentations.
From 16fac67257590c0b6abe85d0b97620f879c6384a Mon Sep 17 00:00:00 2001
From: Snarling <84951833+Snarling@users.noreply.github.com>
Date: Tue, 27 Sep 2022 16:23:53 -0400
Subject: [PATCH 46/46] fix broken rebase
---
src/NetscriptFunctions/Singularity.ts | 4 ++--
src/PersonObjects/Person.ts | 1 +
src/PersonObjects/Sleeve/Sleeve.ts | 4 ----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts
index 7ac5483cc..3b6eb4ba3 100644
--- a/src/NetscriptFunctions/Singularity.ts
+++ b/src/NetscriptFunctions/Singularity.ts
@@ -12,7 +12,7 @@ import { RunningScript } from "../Script/RunningScript";
import { calculateAchievements } from "../Achievements/Achievements";
import {
- AugmentationStats,
+ Multipliers,
CrimeStats,
Singularity as ISingularity,
SourceFileLvl,
@@ -168,7 +168,7 @@ export function NetscriptSingularity(): InternalAPI {
return aug.getCost().repCost;
},
getAugmentationStats: (ctx: NetscriptContext) =>
- function (_augName: unknown): AugmentationStats {
+ function (_augName: unknown): Multipliers {
helpers.checkSingularityAccess(ctx);
const augName = helpers.string(ctx, "augName", _augName);
const aug = getAugmentation(ctx, augName);
diff --git a/src/PersonObjects/Person.ts b/src/PersonObjects/Person.ts
index 787c57cb1..d969b0470 100644
--- a/src/PersonObjects/Person.ts
+++ b/src/PersonObjects/Person.ts
@@ -50,6 +50,7 @@ export abstract class Person {
regenerateHp = personMethods.regenerateHp;
queryStatFromString = personMethods.queryStatFromString;
updateSkillLevels = personMethods.updateSkillLevels;
+ hasAugmentation = personMethods.hasAugmentation;
calculateSkill = calculateSkill; //Class version is equal to imported version
/** Reset all multipliers to 1 */
diff --git a/src/PersonObjects/Sleeve/Sleeve.ts b/src/PersonObjects/Sleeve/Sleeve.ts
index 96a078ba2..cb820d408 100644
--- a/src/PersonObjects/Sleeve/Sleeve.ts
+++ b/src/PersonObjects/Sleeve/Sleeve.ts
@@ -280,10 +280,6 @@ export class Sleeve extends Person {
return true;
}
- hasAugmentation(aug: string): boolean {
- return this.augmentations.some((a) => a.name === aug);
- }
-
tryBuyAugmentation(aug: Augmentation): boolean {
if (!Player.canAfford(aug.baseCost)) {
return false;