diff --git a/src/Corporation/ui/ResearchModal.tsx b/src/Corporation/ui/ResearchModal.tsx index fc34c2be3..3c882c2b1 100644 --- a/src/Corporation/ui/ResearchModal.tsx +++ b/src/Corporation/ui/ResearchModal.tsx @@ -6,17 +6,18 @@ import { IIndustry } from "../IIndustry"; import { Research } from "../Actions"; import { Node } from "../ResearchTree"; import { ResearchMap } from "../ResearchMap"; +import { Settings } from "../../Settings/Settings"; import { dialogBoxCreate } from "../../ui/React/DialogBox"; import Typography from "@mui/material/Typography"; import Tooltip from "@mui/material/Tooltip"; import Button from "@mui/material/Button"; import Box from "@mui/material/Box"; -import ListItemButton from "@mui/material/ListItemButton"; -import ListItemText from "@mui/material/ListItemText"; import Collapse from "@mui/material/Collapse"; import ExpandMore from "@mui/icons-material/ExpandMore"; import ExpandLess from "@mui/icons-material/ExpandLess"; +import CheckIcon from '@mui/icons-material/Check'; + interface INodeProps { n: Node | null; division: IIndustry; @@ -42,8 +43,8 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement { dialogBoxCreate( `Researched ${n.text}. It may take a market cycle ` + - `(~${CorporationConstants.SecsPerMarketCycle} seconds) before the effects of ` + - `the Research apply.`, + `(~${CorporationConstants.SecsPerMarketCycle} seconds) before the effects of ` + + `the Research apply.`, ); } @@ -52,8 +53,8 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement { color = "info"; } - const but = ( - + const wrapInTooltip = (ele: React.ReactElement): React.ReactElement => { + return ( @@ -63,12 +64,22 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement { } > + {ele} + + ) + } + + const but = ( + + {wrapInTooltip( - - + )} ); @@ -76,15 +87,25 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement { return ( - - {but} - setOpen((old) => !old)}> - + + {wrapInTooltip( + + + + )} + - + {n.children.map((m) => ( ))} @@ -108,7 +129,7 @@ export function ResearchModal(props: IProps): React.ReactElement { return ( - + Research points: {props.industry.sciResearch.qty.toFixed(3)}
Multipliers from research: