Merge branch 'dev' into bugfix/corp-updates

src/Locations/ui/RamButton.tsx

@@ -11,6 +11,7 @@ import { Money } from "../../ui/React/Money";
 import { numeralWrapper } from "../../ui/numeralFormat";
 
 import { MathJaxWrapper } from "../../MathJaxWrapper";
+import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
 
 type IProps = {
   p: IPlayer;
@@ -30,9 +31,13 @@ export function RamButton(props: IProps): React.ReactElement {
     props.rerender();
   }
 
+  const bnMult = BitNodeMultipliers.HomeComputerRamCost === 1 ? "" : `\\cdot ${BitNodeMultipliers.HomeComputerRamCost}`;
+  console.log(BitNodeMultipliers.HomeComputerRamCost);
   return (
     <Tooltip
-      title={<MathJaxWrapper>{`\\(\\large{cost = 3.2 \\cdot 10^3 \\cdot 1.58^{log_2{(ram)}}}\\)`}</MathJaxWrapper>}
+      title={
+        <MathJaxWrapper>{`\\(\\large{cost = ram \\cdot 3.2 \\cdot 10^4 \\cdot 1.58^{log_2{(ram)}}} ${bnMult}\\)`}</MathJaxWrapper>
+      }
     >
       <span>
         <br />

src/Locations/ui/SpecialLocation.tsx

@@ -24,7 +24,7 @@ import { joinFaction } from "../../Faction/FactionHelpers";
 import { use } from "../../ui/Context";
 
 import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { SnackbarEvents } from "../../ui/React/Snackbar";
+import { SnackbarEvents, ToastVariant } from "../../ui/React/Snackbar";
 import { N00dles } from "../../utils/helpers/N00dles";
 import { Exploit } from "../../Exploits/Exploit";
 import { applyAugmentation } from "../../Augmentation/AugmentationHelpers";
@@ -92,7 +92,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
 
   function renderNoodleBar(): React.ReactElement {
     function EatNoodles(): void {
-      SnackbarEvents.emit("You ate some delicious noodles and feel refreshed", "success", 2000);
+      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) {
@@ -175,10 +175,11 @@ export function SpecialLocation(props: IProps): React.ReactElement {
       applyAugmentation({ name: AugmentationNames.StaneksGift1, level: 1 });
     }
 
-    router.toFaction(faction);
+    router.toStaneksGift();
   }
 
   function renderCotMG(): React.ReactElement {
+    const toStanek = <Button onClick={() => router.toStaneksGift()}>Open Stanek's Gift</Button>;
     // prettier-ignore
     const symbol = <Typography sx={{ lineHeight: '1em', whiteSpace: 'pre' }}>
       {"                 ``          "}<br />
@@ -219,6 +220,9 @@ export function SpecialLocation(props: IProps): React.ReactElement {
               seems. Curious, Just how much of a machine's soul do you house in that body?
             </i>
           </Typography>
+          <br />
+          {toStanek}
+          <br />
           {symbol}
         </>
       );
@@ -233,6 +237,9 @@ export function SpecialLocation(props: IProps): React.ReactElement {
               mastery of the gift clearly demonstrates that. My hopes are climbing by the day for you.
             </i>
           </Typography>
+          <br />
+          {toStanek}
+          <br />
           {symbol}
         </>
       );
@@ -243,6 +250,9 @@ export function SpecialLocation(props: IProps): React.ReactElement {
           <Typography>
             <i>Allison "Mother" Stanek: Welcome back my child!</i>
           </Typography>
+          <br />
+          {toStanek}
+          <br />
           {symbol}
         </>
       );