From 720e2112c6766b581e43e1f9e712c47300b22dcd Mon Sep 17 00:00:00 2001 From: nickofolas <60761231+nickofolas@users.noreply.github.com> Date: Mon, 21 Mar 2022 14:40:17 -0500 Subject: [PATCH] prettier and remove formulas dir --- .../Grafting/EntropyAccumulation.ts | 6 +- src/PersonObjects/Grafting/formulas/.gitkeep | 0 .../Grafting/ui/GraftingRoot.tsx | 110 ++++++++---------- 3 files changed, 51 insertions(+), 65 deletions(-) delete mode 100644 src/PersonObjects/Grafting/formulas/.gitkeep diff --git a/src/PersonObjects/Grafting/EntropyAccumulation.ts b/src/PersonObjects/Grafting/EntropyAccumulation.ts index 4ea0ea169..8887df5a0 100644 --- a/src/PersonObjects/Grafting/EntropyAccumulation.ts +++ b/src/PersonObjects/Grafting/EntropyAccumulation.ts @@ -42,11 +42,11 @@ export const calculateEntropy = (player: IPlayer, stacks = 1): IMap => { bladeburner_stamina_gain_mult: player.bladeburner_stamina_gain_mult, bladeburner_analysis_mult: player.bladeburner_analysis_mult, bladeburner_success_chance_mult: player.bladeburner_success_chance_mult, - } + }; for (const [mult, val] of Object.entries(multipliers)) { - multipliers[mult] = val * (CONSTANTS.EntropyEffect ** stacks); + multipliers[mult] = val * CONSTANTS.EntropyEffect ** stacks; } return multipliers; -} +}; diff --git a/src/PersonObjects/Grafting/formulas/.gitkeep b/src/PersonObjects/Grafting/formulas/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx index 852a94c9b..a59e32608 100644 --- a/src/PersonObjects/Grafting/ui/GraftingRoot.tsx +++ b/src/PersonObjects/Grafting/ui/GraftingRoot.tsx @@ -1,28 +1,15 @@ import React, { useState } from "react"; -import { - Typography, - Container, - Box, - Paper, - List, - ListItemButton, - Button -} from "@mui/material"; -import { - Construction -} from "@mui/icons-material"; +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 { Augmentations } from "../../../Augmentation/Augmentations"; -import { AugmentationNames } from "../../../Augmentation/data/AugmentationNames" +import { AugmentationNames } from "../../../Augmentation/data/AugmentationNames"; import { Settings } from "../../../Settings/Settings"; import { IMap } from "../../../types"; -import { - convertTimeMsToTimeElapsedString, - formatNumber -} from "../../../utils/StringHelperFunctions"; +import { convertTimeMsToTimeElapsedString, formatNumber } from "../../../utils/StringHelperFunctions"; import { LocationName } from "../../../Locations/data/LocationNames"; import { Locations } from "../../../Locations/Locations"; import { CONSTANTS } from "../../../Constants"; @@ -31,24 +18,19 @@ import { IPlayer } from "../../IPlayer"; import { CraftableAugmentation } from "../CraftableAugmentation"; -const CraftableAugmentations: IMap = {} +const CraftableAugmentations: IMap = {}; const getAvailableAugs = (player: IPlayer): string[] => { const augs: string[] = []; for (const [augName, aug] of Object.entries(Augmentations)) { - if ( - augName === AugmentationNames.NeuroFluxGovernor || - augName === AugmentationNames.TheRedPill || - aug.isSpecial - ) continue; + if (augName === AugmentationNames.NeuroFluxGovernor || augName === AugmentationNames.TheRedPill || aug.isSpecial) + continue; augs.push(augName); } - return augs.filter( - (augmentation: string) => !player.hasAugmentation(augmentation) - ); -} + return augs.filter((augmentation: string) => !player.hasAugmentation(augmentation)); +}; export const GraftingRoot = (): React.ReactElement => { const player = use.Player(); @@ -64,38 +46,36 @@ export const GraftingRoot = (): React.ReactElement => { return ( - + Grafting Laboratory - You find yourself in a secret laboratory, owned by a mysterious researcher.
- The scientist explains that they've been studying Augmentation grafting, the process - of applying Augmentations without requiring a body reset. -

- Through legally questionable connections, the scientist has access to a vast array of - Augmentation blueprints, even private designs. They offer to build and graft - the Augmentations to you, in exchange for both a hefty sum of money, and being a lab rat. + You find yourself in a secret laboratory, owned by a mysterious researcher. +
+ The scientist explains that they've been studying Augmentation grafting, the process of applying Augmentations + without requiring a body reset. +
+
+ Through legally questionable connections, the scientist has access to a vast array of Augmentation blueprints, + even private designs. They offer to build and graft the Augmentations to you, in exchange for both a hefty sum + of money, and being a lab rat. Craft Augmentations - - + + {getAvailableAugs(player).map((k, i) => ( setSelectedAug(k)} selected={selectedAug === k}> - - {k} - + {k} ))} - + {selectedAug} Time to Craft: {convertTimeMsToTimeElapsedString(CraftableAugmentations[selectedAug].time)} - + {(() => { const aug = Augmentations[selectedAug]; - const info = typeof aug.info === "string" ? {aug.info} : aug.info - const tooltip = (<>{info}

{aug.stats}); + const info = typeof aug.info === "string" ? {aug.info} : aug.info; + const tooltip = ( + <> + {info} +
+
+ {aug.stats} + + ); return tooltip; })()} @@ -130,26 +118,24 @@ export const GraftingRoot = (): React.ReactElement => { Entropy Accumulation - + Accumulated Entropy: {player.entropyStacks}
- All multipliers decreased by: {formatNumber((1 - (CONSTANTS.EntropyEffect ** player.entropyStacks)) * 100, 3)}% - {" "}(multiplicative) + All multipliers decreased by:{" "} + {formatNumber((1 - CONSTANTS.EntropyEffect ** player.entropyStacks) * 100, 3)}% (multiplicative) - When installed on an unconscious individual, Augmentations are scanned by the body - on awakening, eliminating hidden malware. However, grafted Augmentations do not - provide this security measure. -

- Individuals who tested Augmentation grafting have reported symptoms of an unknown - virus, which they've dubbed "Entropy". This virus seems to grow more potent with - each grafted Augmentation... + When installed on an unconscious individual, Augmentations are scanned by the body on awakening, eliminating + hidden malware. However, grafted Augmentations do not provide this security measure. +
+
+ Individuals who tested Augmentation grafting have reported symptoms of an unknown virus, which they've dubbed + "Entropy". This virus seems to grow more potent with each grafted Augmentation... - - ) -} + ); +};