Merge branch 'dev' into prompt-additions

src/ui/React/AlertManager.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { EventEmitter } from "../../utils/EventEmitter";
-import { Modal } from "../../ui/React/Modal";
+import { Modal } from "./Modal";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
 import {sha256} from "js-sha256";

src/ui/React/CharacterOverview.tsx

@@ -4,7 +4,7 @@ import React, { useState, useEffect } from "react";
 import { Theme, useTheme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Reputation } from "./Reputation";
 import { KillScriptsModal } from "./KillScriptsModal";
 import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";
@@ -33,23 +33,34 @@ interface IProps {
 }
 
 function Intelligence(): React.ReactElement {
+  const theme = useTheme();
   const player = use.Player();
   const classes = useStyles();
   if (player.intelligence === 0) return <></>;
+  const progress = player.calculateSkillProgress(player.intelligence_exp);
+
   return (
-    <TableRow>
-      <TableCell component="th" scope="row" classes={{ root: classes.cell }}>
-        <Typography classes={{ root: classes.int }}>Int&nbsp;</Typography>
-      </TableCell>
-      <TableCell align="right" classes={{ root: classes.cell }}>
-        <Typography classes={{ root: classes.int }}>{numeralWrapper.formatSkill(player.intelligence)}</Typography>
-      </TableCell>
-      <TableCell align="right" classes={{ root: classes.cell }}>
-        <Typography id="overview-int-hook" classes={{ root: classes.int }}>
-          {/*Hook for player scripts*/}
-        </Typography>
-      </TableCell>
-    </TableRow>
+    <>
+      <TableRow>
+        <TableCell component="th" scope="row" classes={{ root: classes.cell }}>
+          <Typography classes={{ root: classes.int }}>Int&nbsp;</Typography>
+        </TableCell>
+        <TableCell align="right" classes={{ root: classes.cell }}>
+          <Typography classes={{ root: classes.int }}>{numeralWrapper.formatSkill(player.intelligence)}</Typography>
+        </TableCell>
+        <TableCell align="right" classes={{ root: classes.cell }}>
+          <Typography id="overview-int-hook" classes={{ root: classes.int }}>
+            {/*Hook for player scripts*/}
+          </Typography>
+        </TableCell>
+      </TableRow>
+
+      <TableRow>
+        {!Settings.DisableOverviewProgressBars && (
+          <StatsProgressOverviewCell progress={progress} color={theme.colors.int} />
+        )}
+      </TableRow>
+    </>
   );
 }
 

src/ui/React/Favor.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";

src/ui/React/HashRate.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { Hashes } from "../../ui/React/Hashes";
+import { numeralWrapper } from "../numeralFormat";
+import { Hashes } from "./Hashes";
 
 export function HashRate({ hashes }: { hashes: number }): React.ReactElement {
   return <Hashes hashes={`${numeralWrapper.formatHashes(hashes)} h / s`} />;

src/ui/React/Hashes.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";

src/ui/React/LogBoxManager.tsx

@@ -288,4 +288,4 @@ function LogWindow(props: IProps): React.ReactElement {
       </Paper>
     </Draggable>
   );
-}
+}

src/ui/React/Money.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";

src/ui/React/MoneyRate.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { Money } from "../../ui/React/Money";
+import { numeralWrapper } from "../numeralFormat";
+import { Money } from "./Money";
 
 export function MoneyRate({ money }: { money: number }): JSX.Element {
   return <Money money={`${numeralWrapper.formatMoney(money)} / sec`} />;

src/ui/React/PromptManager.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, Dispatch, SetStateAction } from "react";
 import { EventEmitter } from "../../utils/EventEmitter";
-import { Modal } from "../../ui/React/Modal";
+import { Modal } from "./Modal";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import Select, { SelectChangeEvent } from "@mui/material/Select";

src/ui/React/Reputation.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";

src/ui/React/ReputationRate.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { Reputation } from "../../ui/React/Reputation";
+import { numeralWrapper } from "../numeralFormat";
+import { Reputation } from "./Reputation";
 
 export function ReputationRate({ reputation }: { reputation: number }): React.ReactElement {
   return <Reputation reputation={`${numeralWrapper.formatReputation(reputation)} / sec`} />;