Merge pull request #3310 from danielyxie/dev

Fix a few bugs

src/Augmentation/AugmentationHelpers.tsx

@@ -97,7 +97,10 @@ export function updateAugmentationCosts(): void {
       if (augmentationToUpdate.name === AugmentationNames.NeuroFluxGovernor) {
         updateNeuroFluxGovernorCosts(augmentationToUpdate);
       } else {
-        augmentationToUpdate.baseCost = augmentationToUpdate.startingCost * getGenericAugmentationPriceMultiplier();
+        augmentationToUpdate.baseCost =
+          augmentationToUpdate.startingCost *
+          getGenericAugmentationPriceMultiplier() *
+          BitNodeMultipliers.AugmentationMoneyCost;
       }
     }
   }

src/Constants.ts

@@ -287,7 +287,7 @@ export const CONSTANTS: {
   TotalNumBitNodes: 24,
 
   LatestUpdate: `
-  v1.6.0 - 2022-03-29 Grafting
+  v1.6.1 - 2022-03-29 Grafting
   ----------------------------
 
   ** Vitalife secret lab **

src/NetscriptFunctions/Bladeburner.ts

@@ -353,7 +353,8 @@ export function NetscriptBladeburner(
       checkBladeburnerCity("switchCity", cityName);
       const bladeburner = player.bladeburner;
       if (bladeburner === null) throw new Error("Should not be called without Bladeburner");
-      return bladeburner.city === cityName;
+      bladeburner.city = cityName;
+      return true;
     },
     getStamina: function (): [number, number] {
       helper.updateDynamicRam("getStamina", getRamCost(player, "bladeburner", "getStamina"));

src/NetscriptFunctions/Grafting.ts

@@ -1,5 +1,6 @@
-import { CityName } from "../Locations/data/CityNames";
 import { Augmentations } from "../Augmentation/Augmentations";
+import { hasAugmentationPrereqs } from "../Faction/FactionHelpers";
+import { CityName } from "../Locations/data/CityNames";
 import { getRamCost } from "../Netscript/RamCostGenerator";
 import { WorkerScript } from "../Netscript/WorkerScript";
 import { GraftableAugmentation } from "../PersonObjects/Grafting/GraftableAugmentation";
@@ -70,6 +71,11 @@ export function NetscriptGrafting(player: IPlayer, workerScript: WorkerScript, h
         return false;
       }
 
+      if (!hasAugmentationPrereqs(craftableAug.augmentation)) {
+        workerScript.log("grafting.graftAugmentation", () => `You don't have the pre-requisites for ${augName}`);
+        return false;
+      }
+
       player.loseMoney(craftableAug.cost, "augmentations");
       player.startGraftAugmentationWork(augName, craftableAug.time);
 

src/NetscriptJSEvaluator.ts

@@ -30,6 +30,7 @@ export async function compile(player: IPlayer, script: Script, scripts: Script[]
   const uurls = _getScriptUrls(script, scripts, []);
   const url = uurls[uurls.length - 1].url;
   if (script.url && script.url !== url) {
+    URL.revokeObjectURL(script.url);
     // Thoughts: Should we be revoking any URLs here?
     // If a script is modified repeatedly between two states,
     // we could reuse the blob at a later time.
@@ -42,8 +43,9 @@ export async function compile(player: IPlayer, script: Script, scripts: Script[]
     //   });
     // }
   }
-  script.url = url;
+  if (script.dependencies.length > 0) script.dependencies.forEach((dep) => URL.revokeObjectURL(dep.url));
-  script.module = new Promise((resolve) => resolve(eval("import(url)")));
+  script.url = uurls[uurls.length - 1].url;
+  script.module = new Promise((resolve) => resolve(eval("import(uurls[uurls.length - 1].url)")));
   script.dependencies = uurls;
 }
 

src/PersonObjects/Grafting/ui/GraftingRoot.tsx

@@ -1,22 +1,20 @@
+import { Construction, CheckBox, CheckBoxOutlineBlank } from "@mui/icons-material";
+import { Box, Button, Container, List, ListItemButton, Paper, Typography } from "@mui/material";
 import React, { useState } from "react";
-
+import { Augmentation } from "../../../Augmentation/Augmentation";
-import { Typography, Container, Box, Paper, List, ListItemButton, Button } from "@mui/material";
-import { Construction } from "@mui/icons-material";
-
-import { use } from "../../../ui/Context";
-import { Money } from "../../../ui/React/Money";
-import { ConfirmationModal } from "../../../ui/React/ConfirmationModal";
 import { Augmentations } from "../../../Augmentation/Augmentations";
 import { AugmentationNames } from "../../../Augmentation/data/AugmentationNames";
-import { Settings } from "../../../Settings/Settings";
+import { CONSTANTS } from "../../../Constants";
-import { IMap } from "../../../types";
+import { hasAugmentationPrereqs } from "../../../Faction/FactionHelpers";
-import { convertTimeMsToTimeElapsedString, formatNumber } from "../../../utils/StringHelperFunctions";
 import { LocationName } from "../../../Locations/data/LocationNames";
 import { Locations } from "../../../Locations/Locations";
-import { CONSTANTS } from "../../../Constants";
+import { Settings } from "../../../Settings/Settings";
-
+import { IMap } from "../../../types";
+import { use } from "../../../ui/Context";
+import { ConfirmationModal } from "../../../ui/React/ConfirmationModal";
+import { Money } from "../../../ui/React/Money";
+import { convertTimeMsToTimeElapsedString, formatNumber } from "../../../utils/StringHelperFunctions";
 import { IPlayer } from "../../IPlayer";
-
 import { GraftableAugmentation } from "../GraftableAugmentation";
 
 const GraftableAugmentations: IMap<GraftableAugmentation> = {};
@@ -33,6 +31,36 @@ export const getAvailableAugs = (player: IPlayer): string[] => {
   return augs.filter((augmentation: string) => !player.hasAugmentation(augmentation));
 };
 
+const canGraft = (player: IPlayer, 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;
+
+  return (
+    <Typography color={Settings.theme.money}>
+      <b>Pre-Requisites:</b>
+      <br />
+      {aug.prereqs.map((preAug) => (
+        <span style={{ display: "flex", alignItems: "center" }}>
+          {player.hasAugmentation(preAug) ? <CheckBox sx={{ mr: 1 }} /> : <CheckBoxOutlineBlank sx={{ mr: 1 }} />}
+          {preAug}
+        </span>
+      ))}
+    </Typography>
+  );
+};
+
 export const GraftingRoot = (): React.ReactElement => {
   const player = use.Player();
   const router = use.Router();
@@ -80,7 +108,7 @@ export const GraftingRoot = (): React.ReactElement => {
               <Button
                 onClick={() => setGraftOpen(true)}
                 sx={{ width: "100%" }}
-                disabled={player.money < GraftableAugmentations[selectedAug].cost}
+                disabled={!canGraft(player, GraftableAugmentations[selectedAug])}
               >
                 Graft Augmentation (
                 <Typography>
@@ -115,6 +143,11 @@ export const GraftingRoot = (): React.ReactElement => {
                 )}
                 {/* Use formula so the displayed creation time is accurate to player bonus */}
               </Typography>
+              {Augmentations[selectedAug].prereqs.length > 0 && (
+                <AugPreReqsChecklist player={player} aug={Augmentations[selectedAug]} />
+              )}
+
+              <br />
               <Typography sx={{ maxHeight: 305, overflowY: "scroll" }}>
                 {(() => {
                   const aug = Augmentations[selectedAug];