From 5f9fb117b024e8f2391851346e498adac714c5a2 Mon Sep 17 00:00:00 2001 From: nickofolas Date: Sat, 21 May 2022 18:37:27 -0500 Subject: [PATCH 1/3] Remove info icon, show stats on name hover --- .../ui/PurchasableAugmentations.tsx | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/Augmentation/ui/PurchasableAugmentations.tsx b/src/Augmentation/ui/PurchasableAugmentations.tsx index a19060bf4..648e7247a 100644 --- a/src/Augmentation/ui/PurchasableAugmentations.tsx +++ b/src/Augmentation/ui/PurchasableAugmentations.tsx @@ -2,7 +2,7 @@ * React component for displaying a single augmentation for purchase through * the faction UI */ -import { CheckBox, CheckBoxOutlineBlank, CheckCircle, Info, NewReleases, Report } from "@mui/icons-material"; +import { CheckBox, CheckBoxOutlineBlank, CheckCircle, NewReleases, Report } from "@mui/icons-material"; import { Box, Button, Container, Paper, Tooltip, Typography } from "@mui/material"; import React, { useState } from "react"; import { Faction } from "../../Faction/Faction"; @@ -11,8 +11,8 @@ import { Settings } from "../../Settings/Settings"; import { numeralWrapper } from "../../ui/numeralFormat"; import { Augmentation } from "../Augmentation"; import { AugmentationNames } from "../data/AugmentationNames"; -import { PurchaseAugmentationModal } from "./PurchaseAugmentationModal"; import { StaticAugmentations } from "../StaticAugmentations"; +import { PurchaseAugmentationModal } from "./PurchaseAugmentationModal"; interface IPreReqsProps { player: IPlayer; @@ -211,23 +211,22 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac } > - + + {aug.name} + {aug.name === AugmentationNames.NeuroFluxGovernor && ` - Level ${aug.getLevel(props.parent.player)}`} + - - {aug.name} - {aug.name === AugmentationNames.NeuroFluxGovernor && ` - Level ${aug.getLevel(props.parent.player)}`} - {aug.factions.length === 1 && !props.parent.sleeveAugs && ( )} From ea2f412ef17d4a1cf1a29c417aaebc57762c3054 Mon Sep 17 00:00:00 2001 From: nickofolas Date: Sat, 21 May 2022 19:40:27 -0500 Subject: [PATCH 2/3] Initial densification of Augments list --- .../ui/PurchasableAugmentations.tsx | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/Augmentation/ui/PurchasableAugmentations.tsx b/src/Augmentation/ui/PurchasableAugmentations.tsx index 648e7247a..fd2204042 100644 --- a/src/Augmentation/ui/PurchasableAugmentations.tsx +++ b/src/Augmentation/ui/PurchasableAugmentations.tsx @@ -42,11 +42,13 @@ const PreReqs = (props: IPreReqsProps): React.ReactElement => { } > {hasPreReqs ? ( @@ -100,7 +102,10 @@ const Exclusive = (props: IExclusiveProps): React.ReactElement => { } > - + ); }; @@ -176,11 +181,12 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac return ( <> @@ -192,13 +198,13 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac }) } disabled={!props.parent.canPurchase(props.parent.player, aug) || props.owned} - sx={{ width: "48px", height: "48px", float: "left", clear: "none", mr: 1 }} + sx={{ width: "48px", height: "36px", float: "left", clear: "none", mr: 1 }} > {props.owned ? "Owned" : "Buy"} - + @@ -212,8 +218,8 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac } > + {aug.factions.length === 1 && !props.parent.sleeveAugs && ( )} + {aug.prereqs.length > 0 && !props.parent.sleeveAugs && } - - {aug.prereqs.length > 0 && !props.parent.sleeveAugs && } {props.owned || ( - + cost} value={numeralWrapper.formatMoney(cost)} From d1656c05674a18a7b3cd1d663d848708892b812f Mon Sep 17 00:00:00 2001 From: nickofolas Date: Sun, 22 May 2022 11:12:30 -0500 Subject: [PATCH 3/3] Color reqs and increase density --- src/Augmentation/ui/PurchasableAugmentations.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Augmentation/ui/PurchasableAugmentations.tsx b/src/Augmentation/ui/PurchasableAugmentations.tsx index fd2204042..27a8f927b 100644 --- a/src/Augmentation/ui/PurchasableAugmentations.tsx +++ b/src/Augmentation/ui/PurchasableAugmentations.tsx @@ -118,7 +118,9 @@ interface IReqProps { const Requirement = (props: IReqProps): React.ReactElement => { return ( - + {props.fulfilled ? : } {props.value} @@ -143,7 +145,7 @@ export const PurchasableAugmentations = (props: IPurchasableAugsProps): React.Re {props.augNames.map((augName: string) => (