Merge branch 'dev' into bugfix/corp-updates

src/NetscriptFunctions/Corporation.ts

@@ -356,11 +356,14 @@ export function NetscriptCorporation(
       const cityName = helper.city("getMaterial", "cityName", _cityName);
       const materialName = helper.string("getMaterial", "materialName", _materialName);
       const material = getMaterial(divisionName, cityName, materialName);
+      const corporation = getCorporation();
       return {
         cost: material.bCost,
         name: material.name,
         qty: material.qty,
         qlt: material.qlt,
+        dmd: corporation.unlockUpgrades[2] ? material.dmd : undefined,
+        cmp: corporation.unlockUpgrades[3] ? material.cmp : undefined,
         prod: material.prd,
         sell: material.sll,
       };
@@ -370,10 +373,20 @@ export function NetscriptCorporation(
       const divisionName = helper.string("getProduct", "divisionName", _divisionName);
       const productName = helper.string("getProduct", "productName", _productName);
       const product = getProduct(divisionName, productName);
+      const corporation = getCorporation();
       return {
         name: product.name,
-        dmd: product.dmd,
-        cmp: product.cmp,
+        dmd: corporation.unlockUpgrades[2] ? product.dmd : undefined,
+        cmp: corporation.unlockUpgrades[3] ? product.cmp : undefined,
+        rat: product.rat,
+        properties: {
+          qlt: product.qlt,
+          per: product.per,
+          dur: product.dur,
+          rel: product.rel,
+          aes: product.aes,
+          fea: product.fea,
+        },
         pCost: product.pCost,
         sCost: product.sCost,
         cityData: product.data,
@@ -678,9 +691,6 @@ export function NetscriptCorporation(
       const office = getOffice(divisionName, cityName);
       if (!Object.values(EmployeePositions).includes(job)) throw new Error(`'${job}' is not a valid job.`);
       return netscriptDelay(1000, workerScript).then(function () {
-        if (workerScript.env.stopFlag) {
-          return Promise.reject(workerScript);
-        }
         return Promise.resolve(office.setEmployeeToJob(job, amount));
       });
     },
@@ -794,6 +804,15 @@ export function NetscriptCorporation(
           "Research & Development": office.employeeProd[EmployeePositions.RandD],
           Training: office.employeeProd[EmployeePositions.Training],
         },
+        employeeJobs: {
+          Operations: office.employeeJobs[EmployeePositions.Operations],
+          Engineer: office.employeeJobs[EmployeePositions.Engineer],
+          Business: office.employeeJobs[EmployeePositions.Business],
+          Management: office.employeeJobs[EmployeePositions.Management],
+          "Research & Development": office.employeeJobs[EmployeePositions.RandD],
+          Training: office.employeeJobs[EmployeePositions.Training],
+          Unassigned: office.employeeJobs[EmployeePositions.Unassigned],
+        },
       };
     },
     getEmployee: function (_divisionName: unknown, _cityName: unknown, _employeeName: unknown): NSEmployee {

src/NetscriptFunctions/Grafting.ts

@@ -54,7 +54,7 @@ export function NetscriptGrafting(player: IPlayer, workerScript: WorkerScript, h
       if (player.city !== CityName.NewTokyo) {
         throw helper.makeRuntimeErrorMsg(
           "grafting.graftAugmentation",
-          "You must be in New Tokyo to begin crafting an Augmentation.",
+          "You must be in New Tokyo to begin grafting an Augmentation.",
         );
       }
       if (!getAvailableAugs(player).includes(augName)) {
@@ -90,7 +90,7 @@ export function NetscriptGrafting(player: IPlayer, workerScript: WorkerScript, h
         Router.toTerminal();
       }
 
-      workerScript.log("grafting.graftAugmentation", () => `Began crafting Augmentation ${augName}.`);
+      workerScript.log("grafting.graftAugmentation", () => `Began grafting Augmentation ${augName}.`);
       return true;
     },
   };

src/NetscriptFunctions/Sleeve.ts

@@ -97,7 +97,7 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
     travel: function (_sleeveNumber: unknown, _cityName: unknown): boolean {
       updateRam("travel");
       const sleeveNumber = helper.number("travel", "sleeveNumber", _sleeveNumber);
-      const cityName = helper.string("setToUniversityCourse", "cityName", _cityName);
+      const cityName = helper.string("travel", "cityName", _cityName);
       checkSleeveAPIAccess("travel");
       checkSleeveNumber("travel", sleeveNumber);
       return player.sleeves[sleeveNumber].travel(player, cityName as CityName);
@@ -105,7 +105,7 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
     setToCompanyWork: function (_sleeveNumber: unknown, acompanyName: unknown): boolean {
       updateRam("setToCompanyWork");
       const sleeveNumber = helper.number("setToCompanyWork", "sleeveNumber", _sleeveNumber);
-      const companyName = helper.string("setToUniversityCourse", "companyName", acompanyName);
+      const companyName = helper.string("setToCompanyWork", "companyName", acompanyName);
       checkSleeveAPIAccess("setToCompanyWork");
       checkSleeveNumber("setToCompanyWork", sleeveNumber);
 
@@ -117,7 +117,7 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
         const other = player.sleeves[i];
         if (other.currentTask === SleeveTaskType.Company && other.currentTaskLocation === companyName) {
           throw helper.makeRuntimeErrorMsg(
-            "sleeve.setToFactionWork",
+            "sleeve.setToCompanyWork",
             `Sleeve ${sleeveNumber} cannot work for company ${companyName} because Sleeve ${i} is already working for them.`,
           );
         }
@@ -132,8 +132,8 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
     ): boolean | undefined {
       updateRam("setToFactionWork");
       const sleeveNumber = helper.number("setToFactionWork", "sleeveNumber", _sleeveNumber);
-      const factionName = helper.string("setToUniversityCourse", "factionName", _factionName);
-      const workType = helper.string("setToUniversityCourse", "workType", _workType);
+      const factionName = helper.string("setToFactionWork", "factionName", _factionName);
+      const workType = helper.string("setToFactionWork", "workType", _workType);
       checkSleeveAPIAccess("setToFactionWork");
       checkSleeveNumber("setToFactionWork", sleeveNumber);
 
@@ -163,8 +163,8 @@ export function NetscriptSleeve(player: IPlayer, workerScript: WorkerScript, hel
     setToGymWorkout: function (_sleeveNumber: unknown, _gymName: unknown, _stat: unknown): boolean {
       updateRam("setToGymWorkout");
       const sleeveNumber = helper.number("setToGymWorkout", "sleeveNumber", _sleeveNumber);
-      const gymName = helper.string("setToUniversityCourse", "gymName", _gymName);
-      const stat = helper.string("setToUniversityCourse", "stat", _stat);
+      const gymName = helper.string("setToGymWorkout", "gymName", _gymName);
+      const stat = helper.string("setToGymWorkout", "stat", _stat);
       checkSleeveAPIAccess("setToGymWorkout");
       checkSleeveNumber("setToGymWorkout", sleeveNumber);
 

src/NetscriptFunctions/Stanek.ts

@@ -2,112 +2,112 @@ import { INetscriptHelper } from "./INetscriptHelper";
 import { IPlayer } from "../PersonObjects/IPlayer";
 import { WorkerScript } from "../Netscript/WorkerScript";
 import { netscriptDelay } from "../NetscriptEvaluator";
-import { getRamCost } from "../Netscript/RamCostGenerator";
 
 import { staneksGift } from "../CotMG/Helper";
 import { Fragments, FragmentById } from "../CotMG/Fragment";
 
 import {
-  Stanek as IStanek,
   Fragment as IFragment,
   ActiveFragment as IActiveFragment,
+  Stanek as IStanek,
 } from "../ScriptEditor/NetscriptDefinitions";
 import { AugmentationNames } from "../Augmentation/data/AugmentationNames";
+import { NetscriptContext, InternalAPI } from "../Netscript/APIWrapper";
 
-export function NetscriptStanek(player: IPlayer, workerScript: WorkerScript, helper: INetscriptHelper): IStanek {
+export function NetscriptStanek(
+  player: IPlayer,
+  workerScript: WorkerScript,
+  helper: INetscriptHelper,
+): InternalAPI<IStanek> {
   function checkStanekAPIAccess(func: string): void {
     if (!player.hasAugmentation(AugmentationNames.StaneksGift1, true)) {
       helper.makeRuntimeErrorMsg(func, "Requires Stanek's Gift installed.");
     }
   }
 
-  const updateRam = (funcName: string): void =>
-    helper.updateDynamicRam(funcName, getRamCost(player, "stanek", funcName));
-
   return {
-    giftWidth: function (): number {
-      updateRam("giftWidth");
-      checkStanekAPIAccess("giftWidth");
-      return staneksGift.width();
-    },
-    giftHeight: function (): number {
-      updateRam("giftHeight");
-      checkStanekAPIAccess("giftHeight");
-      return staneksGift.height();
-    },
-    chargeFragment: function (_rootX: unknown, _rootY: unknown): Promise<void> {
-      updateRam("chargeFragment");
-      const rootX = helper.number("stanek.chargeFragment", "rootX", _rootX);
-      const rootY = helper.number("stanek.chargeFragment", "rootY", _rootY);
-      checkStanekAPIAccess("chargeFragment");
-      const fragment = staneksGift.findFragment(rootX, rootY);
-      if (!fragment)
-        throw helper.makeRuntimeErrorMsg("stanek.chargeFragment", `No fragment with root (${rootX}, ${rootY}).`);
-      const time = staneksGift.inBonus() ? 200 : 1000;
-      return netscriptDelay(time, workerScript).then(function () {
-        const charge = staneksGift.charge(player, fragment, workerScript.scriptRef.threads);
-        workerScript.log("stanek.chargeFragment", () => `Charged fragment for ${charge} charge.`);
-        return Promise.resolve();
-      });
-    },
-    fragmentDefinitions: function (): IFragment[] {
-      updateRam("fragmentDefinitions");
-      checkStanekAPIAccess("fragmentDefinitions");
-      workerScript.log("stanek.fragmentDefinitions", () => `Returned ${Fragments.length} fragments`);
-      return Fragments.map((f) => f.copy());
-    },
-    activeFragments: function (): IActiveFragment[] {
-      updateRam("activeFragments");
-      checkStanekAPIAccess("activeFragments");
-      workerScript.log("stanek.activeFragments", () => `Returned ${staneksGift.fragments.length} fragments`);
-      return staneksGift.fragments.map((af) => {
-        return { ...af.copy(), ...af.fragment().copy() };
-      });
-    },
-    clearGift: function (): void {
-      updateRam("clearGift");
-      checkStanekAPIAccess("clearGift");
-      workerScript.log("stanek.clearGift", () => `Cleared Stanek's Gift.`);
-      staneksGift.clear();
-    },
-    canPlaceFragment: function (_rootX: unknown, _rootY: unknown, _rotation: unknown, _fragmentId: unknown): boolean {
-      updateRam("canPlaceFragment");
-      const rootX = helper.number("stanek.canPlaceFragment", "rootX", _rootX);
-      const rootY = helper.number("stanek.canPlaceFragment", "rootY", _rootY);
-      const rotation = helper.number("stanek.canPlaceFragment", "rotation", _rotation);
-      const fragmentId = helper.number("stanek.canPlaceFragment", "fragmentId", _fragmentId);
-      checkStanekAPIAccess("canPlaceFragment");
-      const fragment = FragmentById(fragmentId);
-      if (!fragment) throw helper.makeRuntimeErrorMsg("stanek.canPlaceFragment", `Invalid fragment id: ${fragmentId}`);
-      const can = staneksGift.canPlace(rootX, rootY, rotation, fragment);
-      return can;
-    },
-    placeFragment: function (_rootX: unknown, _rootY: unknown, _rotation: unknown, _fragmentId: unknown): boolean {
-      updateRam("placeFragment");
-      const rootX = helper.number("stanek.placeFragment", "rootX", _rootX);
-      const rootY = helper.number("stanek.placeFragment", "rootY", _rootY);
-      const rotation = helper.number("stanek.placeFragment", "rotation", _rotation);
-      const fragmentId = helper.number("stanek.placeFragment", "fragmentId", _fragmentId);
-      checkStanekAPIAccess("placeFragment");
-      const fragment = FragmentById(fragmentId);
-      if (!fragment) throw helper.makeRuntimeErrorMsg("stanek.placeFragment", `Invalid fragment id: ${fragmentId}`);
-      return staneksGift.place(rootX, rootY, rotation, fragment);
-    },
-    getFragment: function (_rootX: unknown, _rootY: unknown): IActiveFragment | undefined {
-      updateRam("getFragment");
-      const rootX = helper.number("stanek.getFragment", "rootX", _rootX);
-      const rootY = helper.number("stanek.getFragment", "rootY", _rootY);
-      checkStanekAPIAccess("getFragment");
-      const fragment = staneksGift.findFragment(rootX, rootY);
-      if (fragment !== undefined) return fragment.copy();
-      return undefined;
-    },
-    removeFragment: function (_rootX: unknown, _rootY: unknown): boolean {
-      updateRam("removeFragment");
-      const rootX = helper.number("stanek.removeFragment", "rootX", _rootX);
-      const rootY = helper.number("stanek.removeFragment", "rootY", _rootY);
-      checkStanekAPIAccess("removeFragment");
-      return staneksGift.delete(rootX, rootY);
-    },
+    giftWidth: () =>
+      function (): number {
+        checkStanekAPIAccess("giftWidth");
+        return staneksGift.width();
+      },
+    giftHeight: () =>
+      function (): number {
+        checkStanekAPIAccess("giftHeight");
+        return staneksGift.height();
+      },
+    chargeFragment: (_ctx: NetscriptContext) =>
+      function (_rootX: unknown, _rootY: unknown): Promise<void> {
+        const rootX = _ctx.helper.number("rootX", _rootX);
+        const rootY = _ctx.helper.number("rootY", _rootY);
+        checkStanekAPIAccess("chargeFragment");
+        const fragment = staneksGift.findFragment(rootX, rootY);
+        if (!fragment) throw _ctx.makeRuntimeErrorMsg(`No fragment with root (${rootX}, ${rootY}).`);
+        const time = staneksGift.inBonus() ? 200 : 1000;
+        return netscriptDelay(time, workerScript).then(function () {
+          const charge = staneksGift.charge(player, fragment, workerScript.scriptRef.threads);
+          _ctx.log(() => `Charged fragment for ${charge} charge.`);
+          return Promise.resolve();
+        });
+      },
+    fragmentDefinitions: (_ctx: NetscriptContext) =>
+      function (): IFragment[] {
+        checkStanekAPIAccess("fragmentDefinitions");
+        _ctx.log(() => `Returned ${Fragments.length} fragments`);
+        return Fragments.map((f) => f.copy());
+      },
+    activeFragments: (_ctx: NetscriptContext) =>
+      function (): IActiveFragment[] {
+        checkStanekAPIAccess("activeFragments");
+        _ctx.log(() => `Returned ${staneksGift.fragments.length} fragments`);
+        return staneksGift.fragments.map((af) => {
+          return { ...af.copy(), ...af.fragment().copy() };
+        });
+      },
+    clearGift: (_ctx: NetscriptContext) =>
+      function (): void {
+        checkStanekAPIAccess("clearGift");
+        _ctx.log(() => `Cleared Stanek's Gift.`);
+        staneksGift.clear();
+      },
+    canPlaceFragment: (_ctx: NetscriptContext) =>
+      function (_rootX: unknown, _rootY: unknown, _rotation: unknown, _fragmentId: unknown): boolean {
+        const rootX = _ctx.helper.number("rootX", _rootX);
+        const rootY = _ctx.helper.number("rootY", _rootY);
+        const rotation = _ctx.helper.number("rotation", _rotation);
+        const fragmentId = _ctx.helper.number("fragmentId", _fragmentId);
+        checkStanekAPIAccess("canPlaceFragment");
+        const fragment = FragmentById(fragmentId);
+        if (!fragment) throw _ctx.makeRuntimeErrorMsg(`Invalid fragment id: ${fragmentId}`);
+        const can = staneksGift.canPlace(rootX, rootY, rotation, fragment);
+        return can;
+      },
+    placeFragment: (_ctx: NetscriptContext) =>
+      function (_rootX: unknown, _rootY: unknown, _rotation: unknown, _fragmentId: unknown): boolean {
+        const rootX = _ctx.helper.number("rootX", _rootX);
+        const rootY = _ctx.helper.number("rootY", _rootY);
+        const rotation = _ctx.helper.number("rotation", _rotation);
+        const fragmentId = _ctx.helper.number("fragmentId", _fragmentId);
+        checkStanekAPIAccess("placeFragment");
+        const fragment = FragmentById(fragmentId);
+        if (!fragment) throw _ctx.makeRuntimeErrorMsg(`Invalid fragment id: ${fragmentId}`);
+        return staneksGift.place(rootX, rootY, rotation, fragment);
+      },
+    getFragment: (_ctx: NetscriptContext) =>
+      function (_rootX: unknown, _rootY: unknown): IActiveFragment | undefined {
+        const rootX = _ctx.helper.number("rootX", _rootX);
+        const rootY = _ctx.helper.number("rootY", _rootY);
+        checkStanekAPIAccess("getFragment");
+        const fragment = staneksGift.findFragment(rootX, rootY);
+        if (fragment !== undefined) return fragment.copy();
+        return undefined;
+      },
+    removeFragment: (_ctx: NetscriptContext) =>
+      function (_rootX: unknown, _rootY: unknown): boolean {
+        const rootX = _ctx.helper.number("rootX", _rootX);
+        const rootY = _ctx.helper.number("rootY", _rootY);
+        checkStanekAPIAccess("removeFragment");
+        return staneksGift.delete(rootX, rootY);
+      },
   };
 }

src/NetscriptFunctions/StockMarket.ts

@@ -3,7 +3,7 @@ import { WorkerScript } from "../Netscript/WorkerScript";
 import { IPlayer } from "../PersonObjects/IPlayer";
 import { getRamCost } from "../Netscript/RamCostGenerator";
 import { buyStock, sellStock, shortStock, sellShort } from "../StockMarket/BuyingAndSelling";
-import { StockMarket, SymbolToStockMap, placeOrder, cancelOrder } from "../StockMarket/StockMarket";
+import { StockMarket, SymbolToStockMap, placeOrder, cancelOrder, initStockMarketFn } from "../StockMarket/StockMarket";
 import { getBuyTransactionCost, getSellTransactionGain } from "../StockMarket/StockMarketHelpers";
 import { OrderTypes } from "../StockMarket/data/OrderTypes";
 import { PositionTypes } from "../StockMarket/data/PositionTypes";
@@ -411,6 +411,7 @@ export function NetscriptStockMarket(player: IPlayer, workerScript: WorkerScript
       }
 
       player.hasWseAccount = true;
+      initStockMarketFn();
       player.loseMoney(getStockMarketWseCost(), "stock");
       workerScript.log("stock.purchaseWseAccount", () => "Purchased WSE Account Access");
       return true;