Merge pull request #3213 from danielyxie/dev

critical bug fix

src/Augmentation/AugmentationHelpers.tsx

@@ -138,7 +138,6 @@ function initAugmentations(): void {
     (key) => ((UnstableCircadianModulatorParams as any)[key] = randomBonuses.bonuses[key]),
   );
 
-
   //Misc/Hybrid augmentations
   const NeuroFluxGovernor = new Augmentation({
     name: AugmentationNames.NeuroFluxGovernor,
@@ -221,11 +220,7 @@ function initAugmentations(): void {
       defense_mult: 1.08,
       agility_mult: 1.08,
       dexterity_mult: 1.08,
-      factions: [
+      factions: [FactionNames.Tetrads, FactionNames.TheDarkArmy, FactionNames.TheSyndicate],
-        FactionNames.Tetrads,
-        FactionNames.TheDarkArmy,
-        FactionNames.TheSyndicate,
-      ],
     }),
     new Augmentation({
       name: AugmentationNames.Targeting1,
@@ -638,7 +633,13 @@ function initAugmentations(): void {
         "memory and the mind. This implant allows the user to not only access a computer's memory, but also alter " +
         "and delete it.",
       hacking_money_mult: 1.25,
-      factions: [FactionNames.BitRunners, FactionNames.TheBlackHand, FactionNames.NiteSec, FactionNames.Chongqing, FactionNames.NewTokyo],
+      factions: [
+        FactionNames.BitRunners,
+        FactionNames.TheBlackHand,
+        FactionNames.NiteSec,
+        FactionNames.Chongqing,
+        FactionNames.NewTokyo,
+      ],
     }),
     new Augmentation({
       name: AugmentationNames.ENM,
@@ -947,7 +948,12 @@ function initAugmentations(): void {
       charisma_exp_mult: 1.05,
       company_rep_mult: 1.1,
       work_money_mult: 1.2,
-      factions: [FactionNames.BachmanAssociates, FactionNames.ClarkeIncorporated, FactionNames.FourSigma, FactionNames.KuaiGongInternational],
+      factions: [
+        FactionNames.BachmanAssociates,
+        FactionNames.ClarkeIncorporated,
+        FactionNames.FourSigma,
+        FactionNames.KuaiGongInternational,
+      ],
     }),
     new Augmentation({
       name: AugmentationNames.PCDNI,
@@ -959,7 +965,12 @@ function initAugmentations(): void {
         "it using the brain's electrochemical signals.",
       company_rep_mult: 1.3,
       hacking_mult: 1.08,
-      factions: [FactionNames.FourSigma, FactionNames.OmniTekIncorporated, FactionNames.ECorp, FactionNames.BladeIndustries],
+      factions: [
+        FactionNames.FourSigma,
+        FactionNames.OmniTekIncorporated,
+        FactionNames.ECorp,
+        FactionNames.BladeIndustries,
+      ],
     }),
     new Augmentation({
       name: AugmentationNames.PCDNIOptimizer,
@@ -999,7 +1010,13 @@ function initAugmentations(): void {
         "triggers feelings of admiration and approval in other people.",
       company_rep_mult: 1.1,
       faction_rep_mult: 1.1,
-      factions: [FactionNames.TianDiHui, FactionNames.TheSyndicate, FactionNames.NWO, FactionNames.MegaCorp, FactionNames.FourSigma],
+      factions: [
+        FactionNames.TianDiHui,
+        FactionNames.TheSyndicate,
+        FactionNames.NWO,
+        FactionNames.MegaCorp,
+        FactionNames.FourSigma,
+      ],
     }),
     new Augmentation({
       name: AugmentationNames.ADRPheromone2,
@@ -1011,7 +1028,12 @@ function initAugmentations(): void {
         "triggers feelings of admiration, approval, and respect in others.",
       company_rep_mult: 1.2,
       faction_rep_mult: 1.2,
-      factions: [FactionNames.Silhouette, FactionNames.FourSigma, FactionNames.BachmanAssociates, FactionNames.ClarkeIncorporated],
+      factions: [
+        FactionNames.Silhouette,
+        FactionNames.FourSigma,
+        FactionNames.BachmanAssociates,
+        FactionNames.ClarkeIncorporated,
+      ],
     }),
     new Augmentation({
       name: AugmentationNames.ShadowsSimulacrum,
@@ -1025,11 +1047,7 @@ function initAugmentations(): void {
         "espionage and surveillance work.",
       company_rep_mult: 1.15,
       faction_rep_mult: 1.15,
-      factions: [
+      factions: [FactionNames.TheSyndicate, FactionNames.TheDarkArmy, FactionNames.SpeakersForTheDead],
-        FactionNames.TheSyndicate,
-        FactionNames.TheDarkArmy,
-        FactionNames.SpeakersForTheDead
-      ],
     }),
     new Augmentation({
       name: AugmentationNames.HacknetNodeCPUUpload,
@@ -1443,8 +1461,8 @@ function initAugmentations(): void {
       moneyCost: 1.25e8,
       info: (
         <>
-          A collection of digital assets saved on a small chip. The chip is implanted into your wrist. A small jack in the
+          A collection of digital assets saved on a small chip. The chip is implanted into your wrist. A small jack in
-          chip allows you to connect it to a computer and upload the assets.
+          the chip allows you to connect it to a computer and upload the assets.
         </>
       ),
       startingMoney: 1e6,
@@ -1582,12 +1600,12 @@ function initAugmentations(): void {
       ),
       factions: [FactionNames.TianDiHui],
     }),
-  ]
+  ];
 
   // Special Bladeburner Augmentations
   const BladeburnersFactionName = FactionNames.Bladeburners;
   if (factionExists(BladeburnersFactionName)) {
-    augmentations.concat([
+    augmentations.push(
       new Augmentation({
         name: AugmentationNames.EsperEyewear,
         repCost: 1.25e3,
@@ -1850,13 +1868,13 @@ function initAugmentations(): void {
         isSpecial: true,
         factions: [BladeburnersFactionName],
       }),
-    ])
+    );
   }
 
   // Special CotMG Augmentations
   const ChurchOfTheMachineGodFactionName = FactionNames.ChurchOfTheMachineGod;
   if (factionExists(ChurchOfTheMachineGodFactionName)) {
-    augmentations.concat([
+    augmentations.push(
       new Augmentation({
         name: AugmentationNames.StaneksGift1,
         repCost: 0,
@@ -1975,10 +1993,10 @@ function initAugmentations(): void {
         stats: <>Staneks Gift has no penalty.</>,
         factions: [ChurchOfTheMachineGodFactionName],
       }),
-    ])
+    );
   }
 
-  augmentations.map(resetAugmentation)
+  augmentations.map(resetAugmentation);
 
   // Update costs based on how many have been purchased
   mult = Math.pow(

src/BitNode/ui/BitverseRoot.tsx

@@ -14,7 +14,6 @@ import Tooltip from "@mui/material/Tooltip";
 import { Settings } from "../../Settings/Settings";
 import Button from "@mui/material/Button";
 
-
 const useStyles = makeStyles(() =>
   createStyles({
     portal: {
@@ -70,7 +69,7 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
   if (props.level === 2) {
     cssClass = classes.level2;
   }
-  cssClass = `${classes.portal} ${cssClass}`
+  cssClass = `${classes.portal} ${cssClass}`;
 
   return (
     <>
@@ -86,12 +85,10 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
         }
       >
         {Settings.DisableASCIIArt ? (
-          <Button
+          <Button onClick={() => setPortalOpen(true)} sx={{ m: 2 }} aria-description={bitNode.desc}>
-            onClick={() => setPortalOpen(true)}
+            <Typography>
-            sx={{ m: 2 }}
+              BitNode-{bitNode.number.toString()}: {bitNode.name}
-            aria-description={bitNode.desc}
+            </Typography>
-          >
-            <Typography>BitNode-{bitNode.number.toString()}: {bitNode.name}</Typography>
           </Button>
         ) : (
           <IconButton
@@ -114,9 +111,7 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
         flume={props.flume}
       />
 
-      {Settings.DisableASCIIArt && (
+      {Settings.DisableASCIIArt && <br />}
-        <br/>
-      )}
     </>
   );
 }
@@ -173,19 +168,29 @@ export function BitverseRoot(props: IProps): React.ReactElement {
   if (Settings.DisableASCIIArt) {
     return (
       <>
-        {Object.values(BitNodes).filter((node) => {
+        {Object.values(BitNodes)
+          .filter((node) => {
             console.log(node.desc);
-          return node.desc !== 'COMING SOON';
+            return node.desc !== "COMING SOON";
-        }).map((node) => {
+          })
+          .map((node) => {
             return (
-            <BitNodePortal key={node.number} n={node.number} level={nextSourceFileFlags[node.number]} enter={enter} flume={props.flume} destroyedBitNode={destroyed} />
+              <BitNodePortal
-          )
+                key={node.number}
+                n={node.number}
+                level={nextSourceFileFlags[node.number]}
+                enter={enter}
+                flume={props.flume}
+                destroyedBitNode={destroyed}
+              />
+            );
           })}
         <br />
         <br />
         <br />
         <br />
-        <CinematicText lines={[
+        <CinematicText
+          lines={[
             "> Many decades ago, a humanoid extraterrestrial species which we call the Enders descended on the Earth...violently",
             "> Our species fought back, but it was futile. The Enders had technology far beyond our own...",
             "> Instead of killing every last one of us, the human race was enslaved...",
@@ -207,9 +212,10 @@ export function BitverseRoot(props: IProps): React.ReactElement {
             "> Welcome to the Bitverse...",
             ">  ",
             "> (Enter a new BitNode using the image above)",
-        ]} />
+          ]}
+        />
       </>
-    )
+    );
   }
   return (
     // prettier-ignore

src/Bladeburner/Bladeburner.tsx

@@ -1526,7 +1526,8 @@ export class Bladeburner implements IBladeburner {
         this.startAction(player, this.action);
         if (this.logging.general) {
           this.log(
-            `Rested in Hyperbolic Regeneration Chamber. Restored ${BladeburnerConstants.HrcHpGain
+            `Rested in Hyperbolic Regeneration Chamber. Restored ${
+              BladeburnerConstants.HrcHpGain
             } HP and gained ${numeralWrapper.formatStamina(staminaGain)} stamina`,
           );
         }
@@ -1575,7 +1576,9 @@ export class Bladeburner implements IBladeburner {
     if (factionExists(bladeburnersFactionName)) {
       const bladeburnerFac = Factions[bladeburnersFactionName];
       if (!(bladeburnerFac instanceof Faction)) {
-        throw new Error(`Could not properly get ${FactionNames.Bladeburners} Faction object in ${FactionNames.Bladeburners} UI Overview Faction button`);
+        throw new Error(
+          `Could not properly get ${FactionNames.Bladeburners} Faction object in ${FactionNames.Bladeburners} UI Overview Faction button`,
+        );
       }
       if (bladeburnerFac.isMember) {
         const favorBonus = 1 + bladeburnerFac.favor / 100;