Initial changes to purchaseable augs

src/Augmentation/ui/PurchaseableAugmentations.tsx

@@ -12,59 +12,159 @@ import { AugmentationNames } from "../data/AugmentationNames";
 import { Faction } from "../../Faction/Faction";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Settings } from "../../Settings/Settings";
+import { numeralWrapper } from "../../ui/numeralFormat";
 import { Money } from "../../ui/React/Money";
 import { Reputation } from "../../ui/React/Reputation";
 
+import { CheckBox, CheckBoxOutlineBlank } from "@mui/icons-material";
 import { Augmentation as AugFormat } from "../../ui/React/Augmentation";
-import Button from "@mui/material/Button";
+import { Paper, Button, Typography, Tooltip, Box, TableRow, Container, List, ListItem } from "@mui/material";
-import Typography from "@mui/material/Typography";
-import Tooltip from "@mui/material/Tooltip";
-import Box from "@mui/material/Box";
 import { TableCell } from "../../ui/React/Table";
-import TableRow from "@mui/material/TableRow";
+import { Augmentation } from "../Augmentation";
+
+// interface IReqProps {
+//   augName: string;
+//   p: IPlayer;
+//   hasReq: boolean;
+//   rep: number;
+//   hasRep: boolean;
+//   cost: number;
+//   hasCost: boolean;
+// }
+
+// function Requirements(props: IReqProps): React.ReactElement {
+//   const aug = Augmentations[props.augName];
+//   if (!props.hasReq) {
+//     return (
+//       <TableCell key={1} colSpan={2}>
+//         <Typography color="error">
+//           Requires{" "}
+//           {aug.prereqs.map((aug, i) => (
+//             <AugFormat key={i} name={aug} />
+//           ))}
+//         </Typography>
+//       </TableCell>
+//     );
+//   }
+
+//   return (
+//     <React.Fragment key="f">
+//       <TableCell key={1}>
+//         <Typography>
+//           <Money money={props.cost} player={props.p} />
+//         </Typography>
+//       </TableCell>
+//       <TableCell key={2}>
+//         <Typography color={props.hasRep ? "primary" : "error"}>
+//           Requires <Reputation reputation={props.rep} /> faction reputation
+//         </Typography>
+//       </TableCell>
+//     </React.Fragment>
+//   );
+// }
 
 interface IReqProps {
-  augName: string;
+  value: string;
-  p: IPlayer;
+  valueColor: string;
-  hasReq: boolean;
+  fulfilled: boolean;
-  rep: number;
-  hasRep: boolean;
-  cost: number;
-  hasCost: boolean;
 }
 
-function Requirements(props: IReqProps): React.ReactElement {
+const Requirement = (props: IReqProps): React.ReactElement => {
-  const aug = Augmentations[props.augName];
-  if (!props.hasReq) {
   return (
-      <TableCell key={1} colSpan={2}>
+    <Typography sx={{ display: "flex", alignItems: "center" }}>
-        <Typography color="error">
+      {props.fulfilled ? <CheckBox sx={{ mr: 1 }} /> : <CheckBoxOutlineBlank sx={{ mr: 1 }} />}
-          Requires{" "}
+      <span style={{ color: props.valueColor }}>{props.value}</span>
-          {aug.prereqs.map((aug, i) => (
-            <AugFormat key={i} name={aug} />
-          ))}
     </Typography>
-      </TableCell>
   );
+};
+
+interface IPurchaseableAugsProps {
+  augNames: string[];
+  player: IPlayer;
+
+  canPurchase: (player: IPlayer, aug: Augmentation) => boolean;
+  purchaseAugmentation: (player: IPlayer, aug: Augmentation, showModal: (open: boolean) => void) => void;
+
+  rep?: number;
+}
+
+export const PurchaseableAugmentations = (props: IPurchaseableAugsProps): React.ReactElement => {
+  return (
+    <Container
+      maxWidth="lg"
+      disableGutters
+      sx={{ mx: 0, display: "grid", gridTemplateColumns: "repeat(1, 1fr)", gap: 1 }}
+    >
+      {props.augNames.map((augName: string) => {
+        const aug = Augmentations[augName];
+
+        const info = typeof aug.info === "string" ? <span>{aug.info}</span> : aug.info;
+        const description = (
+          <>
+            {info}
+            <br />
+            <br />
+            {aug.stats}
+          </>
+        );
+
+        return (
+          <Paper key={augName} sx={{ p: 1, display: "grid", gridTemplateColumns: "1fr 3fr", gap: 1 }}>
+            <Box>
+              <Button
+                onClick={() =>
+                  props.purchaseAugmentation(props.player, aug, (_open: boolean): void => {
+                    null;
+                  })
                 }
-
+                disabled={!props.canPurchase(props.player, aug)}
-  return (
+                sx={{ width: "100%", height: "fit-content" }}
-    <React.Fragment key="f">
+              >
-      <TableCell key={1}>
+                Buy Augmentation
+              </Button>
               <Typography>
-          <Money money={props.cost} player={props.p} />
+                <b>Cost:</b>
               </Typography>
-      </TableCell>
+              <Requirement
-      <TableCell key={2}>
+                fulfilled={aug.baseCost === 0 || props.player.money > aug.baseCost}
-        <Typography color={props.hasRep ? "primary" : "error"}>
+                value={numeralWrapper.formatMoney(aug.baseCost)}
-          Requires <Reputation reputation={props.rep} /> faction reputation
+                valueColor={Settings.theme.money}
+              />
+              {props.rep !== undefined && (
+                <Requirement
+                  fulfilled={props.rep >= aug.baseRepRequirement}
+                  value={`${numeralWrapper.formatReputation(aug.baseRepRequirement)} reputation`}
+                  valueColor={Settings.theme.rep}
+                />
+              )}
+              {aug.prereqs.length > 0 && (
+                <>
+                  <Typography>
+                    <b>Pre-Requisites:</b>
                   </Typography>
-      </TableCell>
+                  {aug.prereqs.map((preAug) => (
-    </React.Fragment>
+                    <Requirement
+                      fulfilled={props.player.hasAugmentation(preAug)}
+                      value={preAug}
+                      valueColor={Settings.theme.money}
+                      key={preAug}
+                    />
+                  ))}
+                </>
+              )}
+            </Box>
+            <Box>
+              <Typography variant="h6">{aug.name}</Typography>
+              <Typography>{description}</Typography>
+            </Box>
+          </Paper>
         );
-}
+      })}
+    </Container>
+  );
+};
 
-interface IProps {
+interface IPurchaseableAugProps {
   augName: string;
   faction: Faction;
   p: IPlayer;
@@ -72,7 +172,7 @@ interface IProps {
   owned?: boolean;
 }
 
-export function PurchaseableAugmentation(props: IProps): React.ReactElement {
+export function PurchaseableAugmentation(props: IPurchaseableAugProps): React.ReactElement {
   const [open, setOpen] = useState(false);
   const aug = Augmentations[props.augName];
   if (aug == null) throw new Error(`aug ${props.augName} does not exists`);

src/Faction/ui/AugmentationsPage.tsx

@@ -1,29 +1,25 @@
 /**
  * Root React Component for displaying a faction's "Purchase Augmentations" page
  */
-import React, { useState } from "react";
-
-import { PurchaseableAugmentation } from "../../Augmentation/ui/PurchaseableAugmentations";
-
-import { Augmentations } from "../../Augmentation/Augmentations";
-import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
-import { Faction } from "../Faction";
-import { PurchaseAugmentationsOrderSetting } from "../../Settings/SettingEnums";
-import { Settings } from "../../Settings/Settings";
-import { hasAugmentationPrereqs, getFactionAugmentationsFiltered } from "../FactionHelpers";
-
-import { use } from "../../ui/Context";
-import { Reputation } from "../../ui/React/Reputation";
-import { Favor } from "../../ui/React/Favor";
-import { numeralWrapper } from "../../ui/numeralFormat";
-
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
-import Typography from "@mui/material/Typography";
-import Tooltip from "@mui/material/Tooltip";
-import TableBody from "@mui/material/TableBody";
 import Table from "@mui/material/Table";
+import TableBody from "@mui/material/TableBody";
+import Tooltip from "@mui/material/Tooltip";
+import Typography from "@mui/material/Typography";
+import React, { useState } from "react";
 import { getGenericAugmentationPriceMultiplier } from "../../Augmentation/AugmentationHelpers";
+import { Augmentations } from "../../Augmentation/Augmentations";
+import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
+import { PurchaseableAugmentation, PurchaseableAugmentations } from "../../Augmentation/ui/PurchaseableAugmentations";
+import { PurchaseAugmentationsOrderSetting } from "../../Settings/SettingEnums";
+import { Settings } from "../../Settings/Settings";
+import { use } from "../../ui/Context";
+import { numeralWrapper } from "../../ui/numeralFormat";
+import { Favor } from "../../ui/React/Favor";
+import { Reputation } from "../../ui/React/Reputation";
+import { Faction } from "../Faction";
+import { getFactionAugmentationsFiltered, hasAugmentationPrereqs, purchaseAugmentation } from "../FactionHelpers";
 
 type IProps = {
   faction: Faction;
@@ -198,13 +194,33 @@ export function AugmentationsPage(props: IProps): React.ReactElement {
       </Button>
       <br />
 
-      <Table size="small" padding="none">
+      <PurchaseableAugmentations
+        augNames={purchasable}
+        player={player}
+        canPurchase={(player, aug) => {
+          return (
+            hasAugmentationPrereqs(aug) &&
+            props.faction.playerReputation >= aug.baseRepRequirement &&
+            (aug.baseCost === 0 || player.money > aug.baseCost)
+          );
+        }}
+        purchaseAugmentation={(player, aug, showModal) => {
+          if (!Settings.SuppressBuyAugmentationConfirmation) {
+            showModal(true);
+          } else {
+            purchaseAugmentation(aug, props.faction);
+            rerender();
+          }
+        }}
+        rep={props.faction.playerReputation}
+      />
+      {/* <Table size="small" padding="none">
         <TableBody>{augListElems}</TableBody>
       </Table>
 
       <Table size="small" padding="none">
         <TableBody>{ownedElem}</TableBody>
-      </Table>
+      </Table> */}
     </>
   );
 }