GO: Various changes before 2.6.0 (#1120)

src/NetscriptFunctions/Bladeburner.ts

@@ -17,11 +17,11 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
   const getBladeburner = function (ctx: NetscriptContext): Bladeburner {
     const apiAccess = Player.bitNodeN === 7 || Player.sourceFileLvl(7) > 0;
     if (!apiAccess) {
-      throw helpers.makeRuntimeErrorMsg(ctx, "You have not unlocked the bladeburner API.", "API ACCESS");
+      throw helpers.errorMessage(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.");
+      throw helpers.errorMessage(ctx, "You must be a member of the Bladeburner division to use this API.");
     return bladeburner;
   };
 
@@ -30,11 +30,11 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
     if (bladeburner === null) throw new Error("Must have joined bladeburner");
     const actionId = bladeburner.getActionIdFromTypeAndName(type, name);
     if (!actionId) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Invalid action type='${type}', name='${name}'`);
+      throw helpers.errorMessage(ctx, `Invalid action type='${type}', name='${name}'`);
     }
     const actionObj = bladeburner.getActionObject(actionId);
     if (!actionObj) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Invalid action type='${type}', name='${name}'`);
+      throw helpers.errorMessage(ctx, `Invalid action type='${type}', name='${name}'`);
     }
 
     return actionObj;
@@ -80,7 +80,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       try {
         return bladeburner.startActionNetscriptFn(type, name, ctx.workerScript);
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     stopBladeburnerAction: (ctx) => () => {
@@ -105,7 +105,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
           return time;
         }
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     getActionCurrentTime: (ctx) => () => {
@@ -116,7 +116,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
           1000;
         return timecomputed;
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     getActionEstimatedSuccessChance: (ctx) => (_type, _name) => {
@@ -133,7 +133,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
           return chance;
         }
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     getActionRepGain: (ctx) => (_type, _name, _level) => {
@@ -152,7 +152,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       try {
         return bladeburner.getActionCountRemainingNetscriptFn(type, name, ctx.workerScript);
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     getActionMaxLevel: (ctx) => (_type, _name) => {
@@ -202,7 +202,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
         checkBladeburnerAccess(ctx);
         const action = getBladeburnerActionObject(ctx, type, name);
         if (level < 1 || level > action.maxLevel) {
-          throw helpers.makeRuntimeErrorMsg(ctx, `Level must be between 1 and ${action.maxLevel}, is ${level}`);
+          throw helpers.errorMessage(ctx, `Level must be between 1 and ${action.maxLevel}, is ${level}`);
         }
         action.level = level;
       },
@@ -220,7 +220,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       try {
         return bladeburner.getSkillLevelNetscriptFn(skillName, ctx.workerScript);
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     getSkillUpgradeCost:
@@ -232,7 +232,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
         try {
           return bladeburner.getSkillUpgradeCostNetscriptFn(skillName, count, ctx.workerScript);
         } catch (e: unknown) {
-          throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+          throw helpers.errorMessage(ctx, String(e));
         }
       },
     upgradeSkill:
@@ -244,7 +244,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
         try {
           return bladeburner.upgradeSkillNetscriptFn(skillName, count, ctx.workerScript);
         } catch (e: unknown) {
-          throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+          throw helpers.errorMessage(ctx, String(e));
         }
       },
     getTeamSize: (ctx) => (_type, _name) => {
@@ -254,7 +254,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       try {
         return bladeburner.getTeamSizeNetscriptFn(type, name, ctx.workerScript);
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     setTeamSize: (ctx) => (_type, _name, _size) => {
@@ -265,7 +265,7 @@ export function NetscriptBladeburner(): InternalAPI<INetscriptBladeburner> {
       try {
         return bladeburner.setTeamSizeNetscriptFn(type, name, size, ctx.workerScript);
       } catch (e: unknown) {
-        throw helpers.makeRuntimeErrorMsg(ctx, String(e));
+        throw helpers.errorMessage(ctx, String(e));
       }
     },
     getCityEstimatedPopulation: (ctx) => (_cityName) => {

src/NetscriptFunctions/CodingContract.ts

@@ -11,7 +11,7 @@ export function NetscriptCodingContract(): InternalAPI<ICodingContract> {
     const server = helpers.getServer(ctx, hostname);
     const contract = server.getContract(filename);
     if (contract == null) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Cannot find contract '${filename}' on server '${hostname}'`);
+      throw helpers.errorMessage(ctx, `Cannot find contract '${filename}' on server '${hostname}'`);
     }
 
     return contract;

src/NetscriptFunctions/Corporation.ts

@@ -178,10 +178,10 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
   }
 
   function checkAccess(ctx: NetscriptContext, api?: CorpUnlockName): void {
-    if (!player.corporation) throw helpers.makeRuntimeErrorMsg(ctx, "Must own a corporation.");
+    if (!player.corporation) throw helpers.errorMessage(ctx, "Must own a corporation.");
     if (!api) return;
     if (!player.corporation.unlocks.has(api)) {
-      throw helpers.makeRuntimeErrorMsg(ctx, "You do not have access to this API.");
+      throw helpers.errorMessage(ctx, "You do not have access to this API.");
     }
   }
 
@@ -216,7 +216,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         const cityName = getEnumHelper("CityName").nsGetMember(ctx, _cityName);
         const amt = helpers.number(ctx, "amount", _amt);
         if (amt < 1) {
-          throw helpers.makeRuntimeErrorMsg(ctx, "You must provide a positive number");
+          throw helpers.errorMessage(ctx, "You must provide a positive number");
         }
         const warehouse = getWarehouse(divisionName, cityName);
         return UpgradeWarehouseCost(warehouse, amt);
@@ -306,7 +306,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
         const amt = helpers.number(ctx, "amount", _amt);
         const corporation = getCorporation();
         if (amt < 1) {
-          throw helpers.makeRuntimeErrorMsg(ctx, "You must provide a positive number");
+          throw helpers.errorMessage(ctx, "You must provide a positive number");
         }
         UpgradeWarehouse(corporation, getDivision(divisionName), getWarehouse(divisionName, cityName), amt);
       },
@@ -346,7 +346,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const enabled = !!_enabled;
       const warehouse = getWarehouse(divisionName, cityName);
       if (!hasUnlock(CorpUnlockName.SmartSupply))
-        throw helpers.makeRuntimeErrorMsg(ctx, `You have not purchased the Smart Supply upgrade!`);
+        throw helpers.errorMessage(ctx, `You have not purchased the Smart Supply upgrade!`);
       SetSmartSupply(warehouse, enabled);
     },
     setSmartSupplyOption: (ctx) => (_divisionName, _cityName, _materialName, _option) => {
@@ -358,14 +358,14 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const material = getMaterial(divisionName, cityName, materialName);
       const option = getEnumHelper("SmartSupplyOption").nsGetMember(ctx, _option);
       if (!hasUnlock(CorpUnlockName.SmartSupply))
-        throw helpers.makeRuntimeErrorMsg(ctx, `You have not purchased the Smart Supply upgrade!`);
+        throw helpers.errorMessage(ctx, `You have not purchased the Smart Supply upgrade!`);
       SetSmartSupplyOption(warehouse, material, option);
     },
     buyMaterial: (ctx) => (_divisionName, _cityName, _materialName, _amt) => {
       checkAccess(ctx, CorpUnlockName.WarehouseAPI);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const division = getCorporation().divisions.get(divisionName);
-      if (!division) throw helpers.makeRuntimeErrorMsg(ctx, `No division with provided name ${divisionName}`);
+      if (!division) throw helpers.errorMessage(ctx, `No division with provided name ${divisionName}`);
       const cityName = getEnumHelper("CityName").nsGetMember(ctx, _cityName);
       const materialName = getEnumHelper("CorpMaterialName").nsGetMember(ctx, _materialName, "materialName");
       const amt = helpers.number(ctx, "amt", _amt);
@@ -378,7 +378,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       checkAccess(ctx, CorpUnlockName.WarehouseAPI);
       const divisionName = helpers.string(ctx, "divisionName", _divisionName);
       const division = getCorporation().divisions.get(divisionName);
-      if (!division) throw helpers.makeRuntimeErrorMsg(ctx, `No division with provided name ${divisionName}`);
+      if (!division) throw helpers.errorMessage(ctx, `No division with provided name ${divisionName}`);
       const corporation = getCorporation();
       const cityName = getEnumHelper("CityName").nsGetMember(ctx, _cityName);
       const materialName = getEnumHelper("CorpMaterialName").nsGetMember(ctx, _materialName, "materialName");
@@ -446,7 +446,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const materialName = getEnumHelper("CorpMaterialName").nsGetMember(ctx, _materialName, "materialName");
       const on = !!_on;
       if (!getDivision(divisionName).hasResearch("Market-TA.I"))
-        throw helpers.makeRuntimeErrorMsg(ctx, `You have not researched MarketTA.I for division: ${divisionName}`);
+        throw helpers.errorMessage(ctx, `You have not researched MarketTA.I for division: ${divisionName}`);
       SetMaterialMarketTA1(getMaterial(divisionName, cityName, materialName), on);
     },
     setMaterialMarketTA2: (ctx) => (_divisionName, _cityName, _materialName, _on) => {
@@ -456,7 +456,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const materialName = getEnumHelper("CorpMaterialName").nsGetMember(ctx, _materialName, "materialName");
       const on = !!_on;
       if (!getDivision(divisionName).hasResearch("Market-TA.II"))
-        throw helpers.makeRuntimeErrorMsg(ctx, `You have not researched MarketTA.II for division: ${divisionName}`);
+        throw helpers.errorMessage(ctx, `You have not researched MarketTA.II for division: ${divisionName}`);
       SetMaterialMarketTA2(getMaterial(divisionName, cityName, materialName), on);
     },
     setProductMarketTA1: (ctx) => (_divisionName, _productName, _on) => {
@@ -465,7 +465,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const productName = helpers.string(ctx, "productName", _productName);
       const on = !!_on;
       if (!getDivision(divisionName).hasResearch("Market-TA.I"))
-        throw helpers.makeRuntimeErrorMsg(ctx, `You have not researched MarketTA.I for division: ${divisionName}`);
+        throw helpers.errorMessage(ctx, `You have not researched MarketTA.I for division: ${divisionName}`);
       SetProductMarketTA1(getProduct(divisionName, productName), on);
     },
     setProductMarketTA2: (ctx) => (_divisionName, _productName, _on) => {
@@ -474,7 +474,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const productName = helpers.string(ctx, "productName", _productName);
       const on = !!_on;
       if (!getDivision(divisionName).hasResearch("Market-TA.II"))
-        throw helpers.makeRuntimeErrorMsg(ctx, `You have not researched MarketTA.II for division: ${divisionName}`);
+        throw helpers.errorMessage(ctx, `You have not researched MarketTA.II for division: ${divisionName}`);
       SetProductMarketTA2(getProduct(divisionName, productName), on);
     },
   };
@@ -528,7 +528,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
 
       if (job === CorpEmployeeJob.Unassigned) return false;
       if (amount < 0 || !Number.isInteger(amount))
-        throw helpers.makeRuntimeErrorMsg(
+        throw helpers.errorMessage(
           ctx,
           `Invalid value for amount! Must be an integer and greater than or be 0". Amount:'${amount}'`,
         );
@@ -538,7 +538,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       const totalNewEmployees = amount - office.employeeNextJobs[job];
 
       if (office.employeeNextJobs[CorpEmployeeJob.Unassigned] < totalNewEmployees)
-        throw helpers.makeRuntimeErrorMsg(
+        throw helpers.errorMessage(
           ctx,
           `Unable to bring '${job} employees to ${amount}. Requires ${totalNewEmployees} unassigned employees`,
         );
@@ -678,7 +678,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
       if (rate < 0 || rate > max)
         throw new Error(`Invalid value for rate field! Must be numeric, greater than 0, and less than ${max}`);
       const corporation = getCorporation();
-      if (!corporation.public) throw helpers.makeRuntimeErrorMsg(ctx, `Your company has not gone public!`);
+      if (!corporation.public) throw helpers.errorMessage(ctx, `Your company has not gone public!`);
       IssueDividends(corporation, rate);
     },
     issueNewShares: (ctx) => (_amount) => {
@@ -773,7 +773,7 @@ export function NetscriptCorporation(): InternalAPI<NSCorporation> {
     goPublic: (ctx) => (_numShares) => {
       checkAccess(ctx);
       const corporation = getCorporation();
-      if (corporation.public) throw helpers.makeRuntimeErrorMsg(ctx, "corporation is already public");
+      if (corporation.public) throw helpers.errorMessage(ctx, "corporation is already public");
       const numShares = helpers.number(ctx, "numShares", _numShares);
       GoPublic(corporation, numShares);
       return true;

src/NetscriptFunctions/Formulas.ts

@@ -63,7 +63,7 @@ import { findCrime } from "../Crime/CrimeHelpers";
 export function NetscriptFormulas(): InternalAPI<IFormulas> {
   const checkFormulasAccess = function (ctx: NetscriptContext): void {
     if (!player.hasProgram(CompletedProgramName.formulas)) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Requires Formulas.exe to run.`);
+      throw helpers.errorMessage(ctx, `Requires Formulas.exe to run.`);
     }
   };
   const formulasFunctions: InternalAPI<IFormulas> = {
@@ -316,7 +316,7 @@ export function NetscriptFormulas(): InternalAPI<IFormulas> {
         checkFormulasAccess(ctx);
         const upg = player.hashManager.getUpgrade(upgName);
         if (!upg) {
-          throw helpers.makeRuntimeErrorMsg(ctx, `Invalid Hash Upgrade: ${upgName}`);
+          throw helpers.errorMessage(ctx, `Invalid Hash Upgrade: ${upgName}`);
         }
         return upg.getCost(level);
       },

src/NetscriptFunctions/Gang.ts

@@ -17,20 +17,20 @@ import { getEnumHelper } from "../utils/EnumHelper";
 export function NetscriptGang(): InternalAPI<IGang> {
   /** 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");
+    if (!Player.gang) throw helpers.errorMessage(ctx, "Must have joined gang", "API ACCESS");
     return Player.gang;
   };
 
   const getGangMember = function (ctx: NetscriptContext, name: string): GangMember {
     const gang = getGang(ctx);
     for (const member of gang.members) if (member.name === name) return member;
-    throw helpers.makeRuntimeErrorMsg(ctx, `Invalid gang member: '${name}'`);
+    throw helpers.errorMessage(ctx, `Invalid gang member: '${name}'`);
   };
 
   const getGangTask = function (ctx: NetscriptContext, name: string): GangMemberTask {
     const task = GangMemberTasks[name];
     if (!task) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Invalid task: '${name}'`);
+      throw helpers.errorMessage(ctx, `Invalid task: '${name}'`);
     }
 
     return task;
@@ -60,13 +60,13 @@ export function NetscriptGang(): InternalAPI<IGang> {
       const newName = helpers.string(ctx, "newName", _newName);
       const member = gang.members.find((m) => m.name === memberName);
       if (!memberName) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid memberName: "" (empty string)`);
+        throw helpers.errorMessage(ctx, `Invalid memberName: "" (empty string)`);
       }
       if (!newName) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid newName: "" (empty string)`);
+        throw helpers.errorMessage(ctx, `Invalid newName: "" (empty string)`);
       }
       if (newName === memberName) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `newName and memberName must be different, but both were: ${newName}`);
+        throw helpers.errorMessage(ctx, `newName and memberName must be different, but both were: ${newName}`);
       }
       if (!member) {
         helpers.log(ctx, () => `Failed to rename member: No member exists with memberName: ${memberName}`);
@@ -253,7 +253,7 @@ export function NetscriptGang(): InternalAPI<IGang> {
       getGang(ctx);
       const equipment = GangMemberUpgrades[equipName];
       if (!equipment) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid equipment: ${equipName}`);
+        throw helpers.errorMessage(ctx, `Invalid equipment: ${equipName}`);
       }
       const typecheck: EquipmentStats = equipment.mults;
       return Object.assign({}, typecheck);
@@ -328,7 +328,7 @@ export function NetscriptGang(): InternalAPI<IGang> {
       const otherGang = helpers.string(ctx, "otherGang", _otherGang);
       const gang = getGang(ctx);
       if (AllGangs[otherGang] == null) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid gang: ${otherGang}`);
+        throw helpers.errorMessage(ctx, `Invalid gang: ${otherGang}`);
       }
 
       const playerPower = AllGangs[gang.facName].power;

src/NetscriptFunctions/Go.ts

@@ -1,9 +1,11 @@
-import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
+import type { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
+import type { Go as NSGo } from "@nsdefs";
+import type { Play } from "../Go/Types";
+
+import { GoColor } from "@enums";
+import { Go } from "../Go/Go";
 import { helpers } from "../Netscript/NetscriptHelpers";
-import { Player } from "@player";
-import { Go } from "@nsdefs";
-import { Play, playerColors } from "../Go/boardState/goConstants";
-import { getSimplifiedBoardState } from "../Go/boardAnalysis/boardAnalysis";
+import { simpleBoardFromBoard } from "../Go/boardAnalysis/boardAnalysis";
 import {
   cheatDestroyNode,
   cheatPlayTwoMoves,
@@ -21,6 +23,7 @@ import {
   resetBoardState,
   throwError,
 } from "../Go/effects/netscriptGoImplementation";
+import { getEnumHelper } from "../utils/EnumHelper";
 
 const logger = (ctx: NetscriptContext) => (message: string) => helpers.log(ctx, () => message);
 const error = (ctx: NetscriptContext) => (message: string) => throwError(ctx.workerScript, message);
@@ -29,7 +32,7 @@ const error = (ctx: NetscriptContext) => (message: string) => throwError(ctx.wor
  * Ensures the given coordinates are valid for the current board size
  */
 function validateRowAndColumn(ctx: NetscriptContext, x: number, y: number) {
-  const boardSize = Player.go.boardState.board.length;
+  const boardSize = Go.currentGame.board.length;
 
   if (x < 0 || x >= boardSize) {
     throwError(
@@ -45,7 +48,7 @@ function validateRowAndColumn(ctx: NetscriptContext, x: number, y: number) {
 /**
  * Go API implementation
  */
-export function NetscriptGo(): InternalAPI<Go> {
+export function NetscriptGo(): InternalAPI<NSGo> {
   return {
     makeMove:
       (ctx: NetscriptContext) =>
@@ -57,7 +60,7 @@ export function NetscriptGo(): InternalAPI<Go> {
         return makePlayerMove(logger(ctx), x, y);
       },
     passTurn: (ctx: NetscriptContext) => async (): Promise<Play> => {
-      if (Player.go.boardState.previousPlayer === playerColors.black) {
+      if (Go.currentGame.previousPlayer === GoColor.black) {
         helpers.log(ctx, () => `It is not your turn; you cannot pass.`);
         helpers.log(ctx, () => `Do you have multiple scripts running, or did you forget to await makeMove() ?`);
         return Promise.resolve(invalidMoveResponse);
@@ -65,16 +68,16 @@ export function NetscriptGo(): InternalAPI<Go> {
       return handlePassTurn(logger(ctx));
     },
     getBoardState: () => () => {
-      return getSimplifiedBoardState(Player.go.boardState.board);
+      return simpleBoardFromBoard(Go.currentGame.board);
     },
     getOpponent: () => () => {
-      return Player.go.boardState.ai;
+      return Go.currentGame.ai;
     },
     resetBoardState: (ctx) => (_opponent, _boardSize) => {
-      const opponentString = helpers.string(ctx, "opponent", _opponent);
+      const opponent = getEnumHelper("GoOpponent").nsGetMember(ctx, _opponent);
       const boardSize = helpers.number(ctx, "boardSize", _boardSize);
 
-      return resetBoardState(error(ctx), opponentString, boardSize);
+      return resetBoardState(error(ctx), opponent, boardSize);
     },
     analysis: {
       getValidMoves: () => () => {
@@ -93,7 +96,7 @@ export function NetscriptGo(): InternalAPI<Go> {
     cheat: {
       getCheatSuccessChance: (ctx: NetscriptContext) => () => {
         checkCheatApiAccess(error(ctx));
-        return cheatSuccessChance(Player.go.boardState.cheatCount);
+        return cheatSuccessChance(Go.currentGame.cheatCount);
       },
       removeRouter:
         (ctx: NetscriptContext) =>

src/NetscriptFunctions/Grafting.ts

@@ -16,7 +16,7 @@ import { getEnumHelper } from "../utils/EnumHelper";
 export function NetscriptGrafting(): InternalAPI<IGrafting> {
   const checkGraftingAPIAccess = (ctx: NetscriptContext): void => {
     if (!Player.canAccessGrafting()) {
-      throw helpers.makeRuntimeErrorMsg(
+      throw helpers.errorMessage(
         ctx,
         "You do not currently have access to the Grafting 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 NetscriptGrafting(): InternalAPI<IGrafting> {
       const augName = getEnumHelper("AugmentationName").nsGetMember(ctx, _augName);
       checkGraftingAPIAccess(ctx);
       if (!isValidGraftingAugName(augName)) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid aug: ${augName}`);
+        throw helpers.errorMessage(ctx, `Invalid aug: ${augName}`);
       }
       const graftableAug = new GraftableAugmentation(Augmentations[augName]);
       return graftableAug.cost;
@@ -40,7 +40,7 @@ export function NetscriptGrafting(): InternalAPI<IGrafting> {
       const augName = getEnumHelper("AugmentationName").nsGetMember(ctx, _augName);
       checkGraftingAPIAccess(ctx);
       if (!isValidGraftingAugName(augName)) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid aug: ${augName}`);
+        throw helpers.errorMessage(ctx, `Invalid aug: ${augName}`);
       }
       const graftableAug = new GraftableAugmentation(Augmentations[augName]);
       return calculateGraftingTimeWithBonus(graftableAug);
@@ -59,7 +59,7 @@ export function NetscriptGrafting(): InternalAPI<IGrafting> {
         const focus = !!_focus;
         checkGraftingAPIAccess(ctx);
         if (Player.city !== CityName.NewTokyo) {
-          throw helpers.makeRuntimeErrorMsg(ctx, "You must be in New Tokyo to begin grafting an Augmentation.");
+          throw helpers.errorMessage(ctx, "You must be in New Tokyo to begin grafting an Augmentation.");
         }
         if (!isValidGraftingAugName(augName)) {
           helpers.log(ctx, () => `Invalid aug: ${augName}`);

src/NetscriptFunctions/Hacknet.ts

@@ -26,7 +26,7 @@ export function NetscriptHacknet(): InternalAPI<IHacknet> {
   // Utility function to get Hacknet Node object
   const getHacknetNode = function (ctx: NetscriptContext, i: number): HacknetNode | HacknetServer {
     if (i < 0 || i >= player.hacknetNodes.length) {
-      throw helpers.makeRuntimeErrorMsg(ctx, "Index specified for Hacknet Node is out-of-bounds: " + i);
+      throw helpers.errorMessage(ctx, "Index specified for Hacknet Node is out-of-bounds: " + i);
     }
 
     if (hasHacknetServers()) {
@@ -35,7 +35,7 @@ export function NetscriptHacknet(): InternalAPI<IHacknet> {
       const hserver = GetServer(hi);
       if (!(hserver instanceof HacknetServer)) throw new Error("hacknet server was not actually hacknet server");
       if (hserver == null) {
-        throw helpers.makeRuntimeErrorMsg(
+        throw helpers.errorMessage(
           ctx,
           `Could not get Hacknet Server for index ${i}. This is probably a bug, please report to game dev`,
         );
@@ -217,7 +217,7 @@ export function NetscriptHacknet(): InternalAPI<IHacknet> {
       const upgName = helpers.string(ctx, "upgName", _upgName);
       const level = player.hashManager.upgrades[upgName];
       if (level === undefined) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid Hash Upgrade: ${upgName}`);
+        throw helpers.errorMessage(ctx, `Invalid Hash Upgrade: ${upgName}`);
       }
       return level;
     },

src/NetscriptFunctions/Infiltration.ts

@@ -21,9 +21,9 @@ export function NetscriptInfiltration(): InternalAPI<NetscriptInfiltation> {
 
   const calculateInfiltrationData = (ctx: NetscriptContext, locationName: LocationName): InfiltrationLocation => {
     const location = Locations[locationName];
-    if (location === undefined) throw helpers.makeRuntimeErrorMsg(ctx, `Location '${location}' does not exists.`);
+    if (location === undefined) throw helpers.errorMessage(ctx, `Location '${location}' does not exists.`);
     if (location.infiltrationData === undefined)
-      throw helpers.makeRuntimeErrorMsg(ctx, `Location '${location}' does not provide infiltrations.`);
+      throw helpers.errorMessage(ctx, `Location '${location}' does not provide infiltrations.`);
     const startingSecurityLevel = location.infiltrationData.startingSecurityLevel;
     const difficulty = calculateDifficulty(startingSecurityLevel);
     const reward = calculateReward(startingSecurityLevel);

src/NetscriptFunctions/Singularity.ts

@@ -190,7 +190,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       const cbScript = _cbScript
         ? resolveScriptFilePath(helpers.string(ctx, "cbScript", _cbScript), ctx.workerScript.name)
         : false;
-      if (cbScript === null) throw helpers.makeRuntimeErrorMsg(ctx, `Could not resolve file path: ${_cbScript}`);
+      if (cbScript === null) throw helpers.errorMessage(ctx, `Could not resolve file path: ${_cbScript}`);
 
       helpers.log(ctx, () => "Soft resetting. This will cause this script to be killed");
       installAugmentations(true);
@@ -201,7 +201,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       const cbScript = _cbScript
         ? resolveScriptFilePath(helpers.string(ctx, "cbScript", _cbScript), ctx.workerScript.name)
         : false;
-      if (cbScript === null) throw helpers.makeRuntimeErrorMsg(ctx, `Could not resolve file path: ${_cbScript}`);
+      if (cbScript === null) throw helpers.errorMessage(ctx, `Could not resolve file path: ${_cbScript}`);
 
       if (Player.queuedAugmentations.length === 0) {
         helpers.log(ctx, () => "You do not have any Augmentations to be installed.");
@@ -409,7 +409,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
           Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain / 50000);
           return true;
         default:
-          throw helpers.makeRuntimeErrorMsg(ctx, `Invalid city name: '${cityName}'.`);
+          throw helpers.errorMessage(ctx, `Invalid city name: '${cityName}'.`);
       }
     },
 
@@ -428,7 +428,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       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");
+      if (!darkweb) throw helpers.errorMessage(ctx, "DarkWeb was not a server but should have been");
 
       Player.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
       darkweb.serversOnNetwork.push(Player.getHomeComputer().hostname);
@@ -483,12 +483,12 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       helpers.checkSingularityAccess(ctx);
       const hostname = helpers.string(ctx, "hostname", _hostname);
       if (!hostname) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid hostname: '${hostname}'`);
+        throw helpers.errorMessage(ctx, `Invalid hostname: '${hostname}'`);
       }
 
       const target = GetServer(hostname);
       if (target == null) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid hostname: '${hostname}'`);
+        throw helpers.errorMessage(ctx, `Invalid hostname: '${hostname}'`);
       }
 
       //Home case
@@ -545,7 +545,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       // No root access or skill level too low
       const canHack = netscriptCanHack(server);
       if (!canHack.res) {
-        throw helpers.makeRuntimeErrorMsg(ctx, canHack.msg || "");
+        throw helpers.errorMessage(ctx, canHack.msg || "");
       }
 
       helpers.log(
@@ -573,7 +573,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       helpers.checkSingularityAccess(ctx);
       const focus = !!_focus;
       if (Player.currentWork === null) {
-        throw helpers.makeRuntimeErrorMsg(ctx, "Not currently working");
+        throw helpers.errorMessage(ctx, "Not currently working");
       }
 
       if (!Player.focus && focus) {
@@ -682,7 +682,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       const company = Companies[companyName];
 
       if (!company.hasPosition(positionName)) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Company '${companyName}' does not have position '${positionName}'`);
+        throw helpers.errorMessage(ctx, `Company '${companyName}' does not have position '${positionName}'`);
       }
 
       const job = CompanyPositions[positionName];
@@ -706,7 +706,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
         const jobName = Player.jobs[companyName];
         // Make sure player is actually employed at the company
         if (!jobName) {
-          throw helpers.makeRuntimeErrorMsg(ctx, `You do not have a job at: '${companyName}'`);
+          throw helpers.errorMessage(ctx, `You do not have a job at: '${companyName}'`);
         }
 
         const wasFocused = Player.focus;
@@ -1005,7 +1005,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
 
       // If input isn't a crimeType, use search using roughname.
       const crime = findCrime(crimeType);
-      if (crime == null) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: '${crimeType}'`);
+      if (crime == null) throw helpers.errorMessage(ctx, `Invalid crime: '${crimeType}'`);
 
       helpers.log(ctx, () => `Attempting to commit ${crime.type}...`);
       const crimeTime = crime.commit(1, ctx.workerScript);
@@ -1024,7 +1024,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
 
       // If input isn't a crimeType, use search using roughname.
       const crime = findCrime(crimeType);
-      if (crime == null) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: '${crimeType}'`);
+      if (crime == null) throw helpers.errorMessage(ctx, `Invalid crime: '${crimeType}'`);
 
       return crime.successRate(Player);
     },
@@ -1034,7 +1034,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
 
       // If input isn't a crimeType, use search using roughname.
       const crime = findCrime(crimeType);
-      if (crime == null) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: '${crimeType}'`);
+      if (crime == null) throw helpers.errorMessage(ctx, `Invalid crime: '${crimeType}'`);
 
       const crimeStatsWithMultipliers = calculateCrimeWorkStats(Player, crime);
 
@@ -1079,7 +1079,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       // doesn't exist, it's the first time they've run the script. So throw an error to let them know
       // that they need to fix it.
       if (item == null) {
-        throw helpers.makeRuntimeErrorMsg(
+        throw helpers.errorMessage(
           ctx,
           `No such exploit ('${programName}') found on the darkweb! ` +
             `\nThis function is not case-sensitive. Did you perhaps forget .exe at the end?`,
@@ -1098,7 +1098,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       const cbScript = _cbScript
         ? resolveScriptFilePath(helpers.string(ctx, "cbScript", _cbScript), ctx.workerScript.name)
         : false;
-      if (cbScript === null) throw helpers.makeRuntimeErrorMsg(ctx, `Could not resolve file path: ${_cbScript}`);
+      if (cbScript === null) throw helpers.errorMessage(ctx, `Could not resolve file path: ${_cbScript}`);
       enterBitNode(true, Player.bitNodeN, nextBN);
       if (cbScript) setTimeout(() => runAfterReset(cbScript), 500);
     },
@@ -1111,7 +1111,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
       const cbScript = _cbScript
         ? resolveScriptFilePath(helpers.string(ctx, "cbScript", _cbScript), ctx.workerScript.name)
         : false;
-      if (cbScript === null) throw helpers.makeRuntimeErrorMsg(ctx, `Could not resolve file path: ${_cbScript}`);
+      if (cbScript === null) throw helpers.errorMessage(ctx, `Could not resolve file path: ${_cbScript}`);
 
       const wd = GetServer(SpecialServers.WorldDaemon);
       if (!(wd instanceof Server)) throw new Error("WorldDaemon was not a normal server. This is a bug contact dev.");

src/NetscriptFunctions/Sleeve.ts

@@ -16,7 +16,7 @@ import { Factions } from "../Faction/Factions";
 export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
   const checkSleeveAPIAccess = function (ctx: NetscriptContext) {
     if (Player.bitNodeN !== 10 && !Player.sourceFileLvl(10)) {
-      throw helpers.makeRuntimeErrorMsg(
+      throw helpers.errorMessage(
         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",
       );
@@ -27,7 +27,7 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
     if (sleeveNumber >= Player.sleeves.length || sleeveNumber < 0) {
       const msg = `Invalid sleeve number: ${sleeveNumber}`;
       helpers.log(ctx, () => msg);
-      throw helpers.makeRuntimeErrorMsg(ctx, msg);
+      throw helpers.errorMessage(ctx, msg);
     }
   };
 
@@ -91,7 +91,7 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
         }
         const other = Player.sleeves[i];
         if (isSleeveCompanyWork(other.currentWork) && other.currentWork.companyName === companyName) {
-          throw helpers.makeRuntimeErrorMsg(
+          throw helpers.errorMessage(
             ctx,
             `Sleeve ${sleeveNumber} cannot work for company ${companyName} because Sleeve ${i} is already working for them.`,
           );
@@ -108,7 +108,7 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
       checkSleeveNumber(ctx, sleeveNumber);
 
       if (!Factions[factionName].isMember) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Cannot work for faction ${factionName} without being a member.`);
+        throw helpers.errorMessage(ctx, `Cannot work for faction ${factionName} without being a member.`);
       }
 
       // Cannot work at the same faction that another sleeve is working at
@@ -118,7 +118,7 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
         }
         const other = Player.sleeves[i];
         if (isSleeveFactionWork(other.currentWork) && other.currentWork.factionName === factionName) {
-          throw helpers.makeRuntimeErrorMsg(
+          throw helpers.errorMessage(
             ctx,
             `Sleeve ${sleeveNumber} cannot work for faction ${factionName} because Sleeve ${i} is already working for them.`,
           );
@@ -126,7 +126,7 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
       }
 
       if (Player.gang && Player.gang.facName == factionName) {
-        throw helpers.makeRuntimeErrorMsg(
+        throw helpers.errorMessage(
           ctx,
           `Sleeve ${sleeveNumber} cannot work for faction ${factionName} because you have started a gang with them.`,
         );
@@ -208,12 +208,12 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
       checkSleeveNumber(ctx, sleeveNumber);
 
       if (Player.sleeves[sleeveNumber].shock > 0) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Sleeve shock too high: Sleeve ${sleeveNumber}`);
+        throw helpers.errorMessage(ctx, `Sleeve shock too high: Sleeve ${sleeveNumber}`);
       }
 
       const aug = Augmentations[augName];
       if (!aug) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid aug: ${augName}`);
+        throw helpers.errorMessage(ctx, `Invalid aug: ${augName}`);
       }
 
       return Player.sleeves[sleeveNumber].tryBuyAugmentation(aug);
@@ -250,7 +250,7 @@ export function NetscriptSleeve(): InternalAPI<NetscriptSleeve> {
           }
           const other = Player.sleeves[i];
           if (isSleeveBladeburnerWork(other.currentWork) && other.currentWork.actionName === contract) {
-            throw helpers.makeRuntimeErrorMsg(
+            throw helpers.errorMessage(
               ctx,
               `Sleeve ${sleeveNumber} cannot take on contracts because Sleeve ${i} is already performing that action.`,
             );

src/NetscriptFunctions/Stanek.ts

@@ -16,7 +16,7 @@ import { getCoreBonus } from "../Server/ServerHelpers";
 export function NetscriptStanek(): InternalAPI<IStanek> {
   function checkStanekAPIAccess(ctx: NetscriptContext): void {
     if (!Player.hasAugmentation(AugmentationName.StaneksGift1, true)) {
-      throw helpers.makeRuntimeErrorMsg(ctx, "Stanek's Gift is not installed");
+      throw helpers.errorMessage(ctx, "Stanek's Gift is not installed");
     }
   }
 
@@ -36,9 +36,9 @@ export function NetscriptStanek(): InternalAPI<IStanek> {
       checkStanekAPIAccess(ctx);
       const fragment = staneksGift.findFragment(rootX, rootY);
       //Check whether the selected fragment can ge charged
-      if (!fragment) throw helpers.makeRuntimeErrorMsg(ctx, `No fragment with root (${rootX}, ${rootY}).`);
+      if (!fragment) throw helpers.errorMessage(ctx, `No fragment with root (${rootX}, ${rootY}).`);
       if (fragment.fragment().type == FragmentType.Booster) {
-        throw helpers.makeRuntimeErrorMsg(
+        throw helpers.errorMessage(
           ctx,
           `The fragment with root (${rootX}, ${rootY}) is a Booster Fragment and thus cannot be charged.`,
         );
@@ -79,7 +79,7 @@ export function NetscriptStanek(): InternalAPI<IStanek> {
       const fragmentId = helpers.number(ctx, "fragmentId", _fragmentId);
       checkStanekAPIAccess(ctx);
       const fragment = FragmentById(fragmentId);
-      if (!fragment) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid fragment id: ${fragmentId}`);
+      if (!fragment) throw helpers.errorMessage(ctx, `Invalid fragment id: ${fragmentId}`);
       const can = staneksGift.canPlace(rootX, rootY, rotation, fragment);
       return can;
     },
@@ -90,7 +90,7 @@ export function NetscriptStanek(): InternalAPI<IStanek> {
       const fragmentId = helpers.number(ctx, "fragmentId", _fragmentId);
       checkStanekAPIAccess(ctx);
       const fragment = FragmentById(fragmentId);
-      if (!fragment) throw helpers.makeRuntimeErrorMsg(ctx, `Invalid fragment id: ${fragmentId}`);
+      if (!fragment) throw helpers.errorMessage(ctx, `Invalid fragment id: ${fragmentId}`);
       return staneksGift.place(rootX, rootY, rotation, fragment);
     },
     getFragment: (ctx) => (_rootX, _rootY) => {

src/NetscriptFunctions/StockMarket.ts

@@ -26,17 +26,17 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
   /** Checks if the player has TIX API access. Throws an error if the player does not */
   const checkTixApiAccess = function (ctx: NetscriptContext): void {
     if (!Player.hasWseAccount) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `You don't have WSE Access! Cannot use ${ctx.function}()`);
+      throw helpers.errorMessage(ctx, `You don't have WSE Access! Cannot use ${ctx.function}()`);
     }
     if (!Player.hasTixApiAccess) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `You don't have TIX API Access! Cannot use ${ctx.function}()`);
+      throw helpers.errorMessage(ctx, `You don't have TIX API Access! Cannot use ${ctx.function}()`);
     }
   };
 
   const getStockFromSymbol = function (ctx: NetscriptContext, symbol: string): Stock {
     const stock = SymbolToStockMap[symbol];
     if (stock == null) {
-      throw helpers.makeRuntimeErrorMsg(ctx, `Invalid stock symbol: '${symbol}'`);
+      throw helpers.errorMessage(ctx, `Invalid stock symbol: '${symbol}'`);
     }
 
     return stock;
@@ -85,7 +85,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       checkTixApiAccess(ctx);
       const stock = SymbolToStockMap[symbol];
       if (stock == null) {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid stock symbol: ${symbol}`);
+        throw helpers.errorMessage(ctx, `Invalid stock symbol: ${symbol}`);
       }
       return [stock.playerShares, stock.playerAvgPx, stock.playerShortShares, stock.playerAvgShortPx];
     },
@@ -169,10 +169,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       checkTixApiAccess(ctx);
       if (Player.bitNodeN !== 8) {
         if (Player.sourceFileLvl(8) <= 1) {
-          throw helpers.makeRuntimeErrorMsg(
-            ctx,
-            "You must either be in BitNode-8 or you must have Source-File 8 Level 2.",
-          );
+          throw helpers.errorMessage(ctx, "You must either be in BitNode-8 or you must have Source-File 8 Level 2.");
         }
       }
       const stock = getStockFromSymbol(ctx, symbol);
@@ -186,10 +183,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       checkTixApiAccess(ctx);
       if (Player.bitNodeN !== 8) {
         if (Player.sourceFileLvl(8) <= 1) {
-          throw helpers.makeRuntimeErrorMsg(
-            ctx,
-            "You must either be in BitNode-8 or you must have Source-File 8 Level 2.",
-          );
+          throw helpers.errorMessage(ctx, "You must either be in BitNode-8 or you must have Source-File 8 Level 2.");
         }
       }
       const stock = getStockFromSymbol(ctx, symbol);
@@ -206,10 +200,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       checkTixApiAccess(ctx);
       if (Player.bitNodeN !== 8) {
         if (Player.sourceFileLvl(8) <= 2) {
-          throw helpers.makeRuntimeErrorMsg(
-            ctx,
-            "You must either be in BitNode-8 or you must have Source-File 8 Level 3.",
-          );
+          throw helpers.errorMessage(ctx, "You must either be in BitNode-8 or you must have Source-File 8 Level 3.");
         }
       }
       const stock = getStockFromSymbol(ctx, symbol);
@@ -226,7 +217,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       } else if (ltype.includes("stop") && ltype.includes("sell")) {
         orderType = OrderType.StopSell;
       } else {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid order type: ${type}`);
+        throw helpers.errorMessage(ctx, `Invalid order type: ${type}`);
       }
 
       const lpos = pos.toLowerCase();
@@ -235,7 +226,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       } else if (lpos.includes("s")) {
         orderPos = PositionType.Short;
       } else {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid position type: ${pos}`);
+        throw helpers.errorMessage(ctx, `Invalid position type: ${pos}`);
       }
 
       return placeOrder(stock, shares, price, orderType, orderPos, ctx);
@@ -249,18 +240,12 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       checkTixApiAccess(ctx);
       if (Player.bitNodeN !== 8) {
         if (Player.sourceFileLvl(8) <= 2) {
-          throw helpers.makeRuntimeErrorMsg(
-            ctx,
-            "You must either be in BitNode-8 or you must have Source-File 8 Level 3.",
-          );
+          throw helpers.errorMessage(ctx, "You must either be in BitNode-8 or you must have Source-File 8 Level 3.");
         }
       }
       const stock = getStockFromSymbol(ctx, symbol);
       if (isNaN(shares) || isNaN(price)) {
-        throw helpers.makeRuntimeErrorMsg(
-          ctx,
-          `Invalid shares or price. Must be numeric. shares=${shares}, price=${price}`,
-        );
+        throw helpers.errorMessage(ctx, `Invalid shares or price. Must be numeric. shares=${shares}, price=${price}`);
       }
       let orderType;
       let orderPos;
@@ -274,7 +259,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       } else if (ltype.includes("stop") && ltype.includes("sell")) {
         orderType = OrderType.StopSell;
       } else {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid order type: ${type}`);
+        throw helpers.errorMessage(ctx, `Invalid order type: ${type}`);
       }
 
       const lpos = pos.toLowerCase();
@@ -283,7 +268,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       } else if (lpos.includes("s")) {
         orderPos = PositionType.Short;
       } else {
-        throw helpers.makeRuntimeErrorMsg(ctx, `Invalid position type: ${pos}`);
+        throw helpers.errorMessage(ctx, `Invalid position type: ${pos}`);
       }
       const params = {
         stock: stock,
@@ -298,7 +283,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
       checkTixApiAccess(ctx);
       if (Player.bitNodeN !== 8) {
         if (Player.sourceFileLvl(8) <= 2) {
-          throw helpers.makeRuntimeErrorMsg(ctx, "You must either be in BitNode-8 or have Source-File 8 Level 3.");
+          throw helpers.errorMessage(ctx, "You must either be in BitNode-8 or have Source-File 8 Level 3.");
         }
       }
 
@@ -325,7 +310,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
     getVolatility: (ctx) => (_symbol) => {
       const symbol = helpers.string(ctx, "symbol", _symbol);
       if (!Player.has4SDataTixApi) {
-        throw helpers.makeRuntimeErrorMsg(ctx, "You don't have 4S Market Data TIX API Access!");
+        throw helpers.errorMessage(ctx, "You don't have 4S Market Data TIX API Access!");
       }
       const stock = getStockFromSymbol(ctx, symbol);
 
@@ -334,7 +319,7 @@ export function NetscriptStockMarket(): InternalAPI<TIX> {
     getForecast: (ctx) => (_symbol) => {
       const symbol = helpers.string(ctx, "symbol", _symbol);
       if (!Player.has4SDataTixApi) {
-        throw helpers.makeRuntimeErrorMsg(ctx, "You don't have 4S Market Data TIX API Access!");
+        throw helpers.errorMessage(ctx, "You don't have 4S Market Data TIX API Access!");
       }
       const stock = getStockFromSymbol(ctx, symbol);
 

src/NetscriptFunctions/UserInterface.ts

@@ -7,7 +7,8 @@ import { CONSTANTS } from "../Constants";
 import { hash } from "../hash/hash";
 import { InternalAPI, NetscriptContext } from "../Netscript/APIWrapper";
 import { Terminal } from "../../src/Terminal";
-import { helpers, makeRuntimeErrorMsg } from "../Netscript/NetscriptHelpers";
+import { helpers } from "../Netscript/NetscriptHelpers";
+import { errorMessage } from "../Netscript/ErrorMessages";
 
 /** Will probably remove the below function in favor of a different approach to object type assertion.
  *  This method cannot be used to handle optional properties. */
@@ -18,7 +19,7 @@ export function assertObjectType<T extends object>(
   desiredObject: T,
 ): asserts obj is T {
   if (typeof obj !== "object" || obj === null) {
-    throw makeRuntimeErrorMsg(
+    throw errorMessage(
       ctx,
       `Type ${obj === null ? "null" : typeof obj} provided for ${name}. Must be an object.`,
       "TYPE",
@@ -26,15 +27,11 @@ export function assertObjectType<T extends object>(
   }
   for (const [key, val] of Object.entries(desiredObject)) {
     if (!Object.hasOwn(obj, key)) {
-      throw makeRuntimeErrorMsg(
-        ctx,
-        `Object provided for argument ${name} is missing required property ${key}.`,
-        "TYPE",
-      );
+      throw errorMessage(ctx, `Object provided for argument ${name} is missing required property ${key}.`, "TYPE");
     }
     const objVal = (obj as Record<string, unknown>)[key];
     if (typeof val !== typeof objVal) {
-      throw makeRuntimeErrorMsg(
+      throw errorMessage(
         ctx,
         `Incorrect type ${typeof objVal} provided for property ${key} on ${name} argument. Should be type ${typeof val}.`,
         "TYPE",